ChangeLogTag: Sat Oct 12 22:50:02 2002 Krishnakumar B <kitty@cse.wustl.edu>

5 files changed, 479 insertions, 533 deletions

diff --git a/ACEXML/apps/svcconf/Makefile b/ACEXML/apps/svcconf/Makefile
index fdde03fd300..41395961076 100644
--- a/ACEXML/apps/svcconf/Makefile
+++ b/ACEXML/apps/svcconf/Makefile
@@ -40,367 +40,364 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
 
 
 .obj/Svcconf_Handler.o .obj/Svcconf_Handler.so .shobj/Svcconf_Handler.o .shobj/Svcconf_Handler.so: Svcconf_Handler.cpp Svcconf_Handler.h \
- $(ACE_ROOT)/ACEXML/common/DefaultHandler.h \
- $(ACE_ROOT)/ACEXML/common/ContentHandler.h \
- $(ACE_ROOT)/ACEXML/common/Env.h \
- $(ACE_ROOT)/ACEXML/common/Exception.h \
- $(ACE_ROOT)/ACEXML/common/XML_Types.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/pre.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/post.h \
- $(ACE_ROOT)/ace/ace_wchar.h \
- $(ACE_ROOT)/ace/ace_wchar.inl \
- $(ACE_ROOT)/ace/OS_Dirent.h \
- $(ACE_ROOT)/ace/OS_Export.h \
- $(ACE_ROOT)/ace/OS_Errno.h \
- $(ACE_ROOT)/ace/OS_Errno.inl \
- $(ACE_ROOT)/ace/OS_Dirent.inl \
- $(ACE_ROOT)/ace/OS_String.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/ACE_export.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS_String.inl \
- $(ACE_ROOT)/ace/OS_Memory.h \
- $(ACE_ROOT)/ace/OS_Memory.inl \
- $(ACE_ROOT)/ace/OS_TLI.h \
- $(ACE_ROOT)/ace/OS_TLI.inl \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/Time_Value.inl \
- $(ACE_ROOT)/ace/Default_Constants.h \
- $(ACE_ROOT)/ace/Global_Macros.h \
- $(ACE_ROOT)/ace/Min_Max.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/String_Base.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Flag_Manip.h \
- $(ACE_ROOT)/ace/Flag_Manip.i \
- $(ACE_ROOT)/ace/Handle_Ops.h \
- $(ACE_ROOT)/ace/Handle_Ops.i \
- $(ACE_ROOT)/ace/Lib_Find.h \
- $(ACE_ROOT)/ace/Lib_Find.i \
- $(ACE_ROOT)/ace/Init_ACE.h \
- $(ACE_ROOT)/ace/Init_ACE.i \
- $(ACE_ROOT)/ace/Sock_Connect.h \
- $(ACE_ROOT)/ace/Sock_Connect.i \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/String_Base_Const.h \
- $(ACE_ROOT)/ace/String_Base.i \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/String_Base.cpp \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
- $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(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_Adapter.h \
- $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
- $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Malloc_Allocator.h \
- $(ACE_ROOT)/ace/Malloc_Allocator.i \
- $(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/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(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/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/Unbounded_Set.h \
- $(ACE_ROOT)/ace/Node.h \
- $(ACE_ROOT)/ace/Node.cpp \
- $(ACE_ROOT)/ace/Unbounded_Set.inl \
- $(ACE_ROOT)/ace/Unbounded_Set.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Auto_Ptr.h \
- $(ACE_ROOT)/ace/Auto_Ptr.i \
- $(ACE_ROOT)/ace/Auto_Ptr.cpp \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ACEXML/common/ACEXML_Export.h \
- $(ACE_ROOT)/ACEXML/common/Exception.i \
- $(ACE_ROOT)/ACEXML/common/Env.i \
- $(ACE_ROOT)/ACEXML/common/SAXExceptions.h \
- $(ACE_ROOT)/ACEXML/common/SAXExceptions.i \
- $(ACE_ROOT)/ACEXML/common/Locator.h \
- $(ACE_ROOT)/ACEXML/common/Attributes.h \
- $(ACE_ROOT)/ACEXML/common/DTDHandler.h \
- $(ACE_ROOT)/ACEXML/common/EntityResolver.h \
- $(ACE_ROOT)/ACEXML/common/InputSource.h \
- $(ACE_ROOT)/ACEXML/common/CharStream.h \
- $(ACE_ROOT)/ACEXML/common/ErrorHandler.h \
- $(ACE_ROOT)/ACEXML/common/DefaultHandler.i \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/DLL.h \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Unbounded_Queue.h \
- $(ACE_ROOT)/ace/Unbounded_Queue.inl \
- $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
- $(ACE_ROOT)/ace/XML_Svc_Conf.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/Test_and_Set.h \
- $(ACE_ROOT)/ace/Test_and_Set.i \
- $(ACE_ROOT)/ace/Test_and_Set.cpp \
- $(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/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/ARGV.h \
- $(ACE_ROOT)/ace/ARGV.i \
- $(ACE_ROOT)/ace/Module.h \
- $(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/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Notification_Strategy.h \
- $(ACE_ROOT)/ace/Notification_Strategy.inl \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Array_Base.h \
- $(ACE_ROOT)/ace/Array_Base.inl \
- $(ACE_ROOT)/ace/Array_Base.cpp \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_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 \
- $(ACE_ROOT)/ace/Framework_Component.h \
- $(ACE_ROOT)/ace/Framework_Component.inl \
- $(ACE_ROOT)/ace/Framework_Component_T.h \
- $(ACE_ROOT)/ace/Framework_Component_T.inl \
- $(ACE_ROOT)/ace/Framework_Component_T.cpp \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(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.cpp
+  $(ACE_ROOT)/ACEXML/common/DefaultHandler.h \
+  $(ACE_ROOT)/ace/pre.h \
+  $(ACE_ROOT)/ACEXML/common/ACEXML_Export.h \
+  $(ACE_ROOT)/ace/post.h \
+  $(ACE_ROOT)/ace/ace_wchar.h \
+  $(ACE_ROOT)/ace/ace_wchar.inl \
+  $(ACE_ROOT)/ACEXML/common/ContentHandler.h \
+  $(ACE_ROOT)/ACEXML/common/Env.h \
+  $(ACE_ROOT)/ACEXML/common/XML_Macros.h \
+  $(ACE_ROOT)/ACEXML/common/Exception.h \
+  $(ACE_ROOT)/ACEXML/common/XML_Types.h \
+  $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/OS_Dirent.h \
+  $(ACE_ROOT)/ace/OS_Export.h \
+  $(ACE_ROOT)/ace/OS_Errno.h \
+  $(ACE_ROOT)/ace/OS_Errno.inl \
+  $(ACE_ROOT)/ace/OS_Dirent.inl \
+  $(ACE_ROOT)/ace/OS_String.h \
+  $(ACE_ROOT)/ace/Basic_Types.h \
+  $(ACE_ROOT)/ace/ACE_export.h \
+  $(ACE_ROOT)/ace/Basic_Types.i \
+  $(ACE_ROOT)/ace/OS_String.inl \
+  $(ACE_ROOT)/ace/OS_Memory.h \
+  $(ACE_ROOT)/ace/OS_Memory.inl \
+  $(ACE_ROOT)/ace/OS_TLI.h \
+  $(ACE_ROOT)/ace/OS_TLI.inl \
+  $(ACE_ROOT)/ace/Time_Value.h \
+  $(ACE_ROOT)/ace/Time_Value.inl \
+  $(ACE_ROOT)/ace/Default_Constants.h \
+  $(ACE_ROOT)/ace/Global_Macros.h \
+  $(ACE_ROOT)/ace/Min_Max.h \
+  $(ACE_ROOT)/ace/streams.h \
+  $(ACE_ROOT)/ace/Trace.h \
+  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/ACE.h \
+  $(ACE_ROOT)/ace/Flag_Manip.h \
+  $(ACE_ROOT)/ace/Flag_Manip.i \
+  $(ACE_ROOT)/ace/Handle_Ops.h \
+  $(ACE_ROOT)/ace/Handle_Ops.i \
+  $(ACE_ROOT)/ace/Lib_Find.h \
+  $(ACE_ROOT)/ace/Lib_Find.i \
+  $(ACE_ROOT)/ace/Init_ACE.h \
+  $(ACE_ROOT)/ace/Init_ACE.i \
+  $(ACE_ROOT)/ace/Sock_Connect.h \
+  $(ACE_ROOT)/ace/Sock_Connect.i \
+  $(ACE_ROOT)/ace/ACE.i \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/Malloc_Base.h \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Log_Msg.h \
+  $(ACE_ROOT)/ace/Log_Priority.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(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_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread.i \
+  $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Malloc_Allocator.h \
+  $(ACE_ROOT)/ace/Malloc_Allocator.i \
+  $(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/Event_Handler.h \
+  $(ACE_ROOT)/ace/Event_Handler.i \
+  $(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/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/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/Memory_Pool.i \
+  $(ACE_ROOT)/ace/Auto_Ptr.h \
+  $(ACE_ROOT)/ace/Auto_Ptr.i \
+  $(ACE_ROOT)/ace/Auto_Ptr.cpp \
+  $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ACEXML/common/Exception.i \
+  $(ACE_ROOT)/ACEXML/common/Env.i \
+  $(ACE_ROOT)/ACEXML/common/SAXExceptions.h \
+  $(ACE_ROOT)/ACEXML/common/SAXExceptions.i \
+  $(ACE_ROOT)/ACEXML/common/Locator.h \
+  $(ACE_ROOT)/ACEXML/common/Attributes.h \
+  $(ACE_ROOT)/ACEXML/common/DTDHandler.h \
+  $(ACE_ROOT)/ACEXML/common/EntityResolver.h \
+  $(ACE_ROOT)/ACEXML/common/InputSource.h \
+  $(ACE_ROOT)/ACEXML/common/CharStream.h \
+  $(ACE_ROOT)/ACEXML/common/ErrorHandler.h \
+  $(ACE_ROOT)/ACEXML/common/DefaultHandler.i \
+  $(ACE_ROOT)/ace/Service_Types.h \
+  $(ACE_ROOT)/ace/Service_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.i \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(ACE_ROOT)/ace/DLL.h \
+  $(ACE_ROOT)/ace/Service_Object.i \
+  $(ACE_ROOT)/ace/Service_Types.i \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.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/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(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/Service_Repository.h \
+  $(ACE_ROOT)/ace/Service_Repository.i \
+  $(ACE_ROOT)/ace/ARGV.h \
+  $(ACE_ROOT)/ace/ARGV.i \
+  $(ACE_ROOT)/ace/Module.h \
+  $(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/Message_Block_T.h \
+  $(ACE_ROOT)/ace/Message_Block_T.i \
+  $(ACE_ROOT)/ace/Message_Block_T.cpp \
+  $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
+  $(ACE_ROOT)/ace/Message_Queue_T.h \
+  $(ACE_ROOT)/ace/Message_Queue_T.i \
+  $(ACE_ROOT)/ace/Message_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Notification_Strategy.h \
+  $(ACE_ROOT)/ace/Notification_Strategy.inl \
+  $(ACE_ROOT)/ace/Message_Queue.i \
+  $(ACE_ROOT)/ace/Task.h \
+  $(ACE_ROOT)/ace/Thread_Manager.h \
+  $(ACE_ROOT)/ace/Containers.h \
+  $(ACE_ROOT)/ace/Containers.i \
+  $(ACE_ROOT)/ace/Containers_T.h \
+  $(ACE_ROOT)/ace/Array_Base.h \
+  $(ACE_ROOT)/ace/Array_Base.inl \
+  $(ACE_ROOT)/ace/Array_Base.cpp \
+  $(ACE_ROOT)/ace/Containers_T.i \
+  $(ACE_ROOT)/ace/Containers_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 \
+  $(ACE_ROOT)/ace/Framework_Component.h \
+  $(ACE_ROOT)/ace/Framework_Component.inl \
+  $(ACE_ROOT)/ace/Framework_Component_T.h \
+  $(ACE_ROOT)/ace/Framework_Component_T.inl \
+  $(ACE_ROOT)/ace/Framework_Component_T.cpp \
+  $(ACE_ROOT)/ace/Thread_Manager.i \
+  $(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.cpp
 
-.obj/Svcconf.o .obj/Svcconf.so .shobj/Svcconf.o .shobj/Svcconf.so: Svcconf.cpp Svcconf.h \
- $(ACE_ROOT)/ace/pre.h \
- $(ACE_ROOT)/ace/XML_Svc_Conf.h \
- $(ACE_ROOT)/ace/ACE_export.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/post.h \
- $(ACE_ROOT)/ace/ace_wchar.h \
- $(ACE_ROOT)/ace/ace_wchar.inl \
- $(ACE_ROOT)/ACEXML/parser/parser/Parser.h \
- $(ACE_ROOT)/ACEXML/common/XMLReader.h \
- $(ACE_ROOT)/ACEXML/common/ContentHandler.h \
- $(ACE_ROOT)/ACEXML/common/Env.h \
- $(ACE_ROOT)/ACEXML/common/Exception.h \
- $(ACE_ROOT)/ACEXML/common/XML_Types.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/OS_Dirent.h \
- $(ACE_ROOT)/ace/OS_Export.h \
- $(ACE_ROOT)/ace/OS_Errno.h \
- $(ACE_ROOT)/ace/OS_Errno.inl \
- $(ACE_ROOT)/ace/OS_Dirent.inl \
- $(ACE_ROOT)/ace/OS_String.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS_String.inl \
- $(ACE_ROOT)/ace/OS_Memory.h \
- $(ACE_ROOT)/ace/OS_Memory.inl \
- $(ACE_ROOT)/ace/OS_TLI.h \
- $(ACE_ROOT)/ace/OS_TLI.inl \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/Time_Value.inl \
- $(ACE_ROOT)/ace/Default_Constants.h \
- $(ACE_ROOT)/ace/Global_Macros.h \
- $(ACE_ROOT)/ace/Min_Max.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/String_Base.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Flag_Manip.h \
- $(ACE_ROOT)/ace/Flag_Manip.i \
- $(ACE_ROOT)/ace/Handle_Ops.h \
- $(ACE_ROOT)/ace/Handle_Ops.i \
- $(ACE_ROOT)/ace/Lib_Find.h \
- $(ACE_ROOT)/ace/Lib_Find.i \
- $(ACE_ROOT)/ace/Init_ACE.h \
- $(ACE_ROOT)/ace/Init_ACE.i \
- $(ACE_ROOT)/ace/Sock_Connect.h \
- $(ACE_ROOT)/ace/Sock_Connect.i \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/String_Base_Const.h \
- $(ACE_ROOT)/ace/String_Base.i \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/String_Base.cpp \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
- $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(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_Adapter.h \
- $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
- $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Malloc_Allocator.h \
- $(ACE_ROOT)/ace/Malloc_Allocator.i \
- $(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/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(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/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/Unbounded_Set.h \
- $(ACE_ROOT)/ace/Node.h \
- $(ACE_ROOT)/ace/Node.cpp \
- $(ACE_ROOT)/ace/Unbounded_Set.inl \
- $(ACE_ROOT)/ace/Unbounded_Set.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Auto_Ptr.h \
- $(ACE_ROOT)/ace/Auto_Ptr.i \
- $(ACE_ROOT)/ace/Auto_Ptr.cpp \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ACEXML/common/ACEXML_Export.h \
- $(ACE_ROOT)/ACEXML/common/Exception.i \
- $(ACE_ROOT)/ACEXML/common/Env.i \
- $(ACE_ROOT)/ACEXML/common/SAXExceptions.h \
- $(ACE_ROOT)/ACEXML/common/SAXExceptions.i \
- $(ACE_ROOT)/ACEXML/common/Locator.h \
- $(ACE_ROOT)/ACEXML/common/Attributes.h \
- $(ACE_ROOT)/ACEXML/common/DTDHandler.h \
- $(ACE_ROOT)/ACEXML/common/EntityResolver.h \
- $(ACE_ROOT)/ACEXML/common/InputSource.h \
- $(ACE_ROOT)/ACEXML/common/CharStream.h \
- $(ACE_ROOT)/ACEXML/common/ErrorHandler.h \
- $(ACE_ROOT)/ACEXML/common/LocatorImpl.h \
- $(ACE_ROOT)/ACEXML/common/LocatorImpl.i \
- $(ACE_ROOT)/ACEXML/common/NamespaceSupport.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/DLL.h \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Unbounded_Queue.h \
- $(ACE_ROOT)/ace/Unbounded_Queue.inl \
- $(ACE_ROOT)/ace/Unbounded_Queue.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/Test_and_Set.h \
- $(ACE_ROOT)/ace/Test_and_Set.i \
- $(ACE_ROOT)/ace/Test_and_Set.cpp \
- $(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/Containers_T.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Array_Base.h \
- $(ACE_ROOT)/ace/Array_Base.inl \
- $(ACE_ROOT)/ace/Array_Base.cpp \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ACEXML/common/NamespaceSupport.i \
- $(ACE_ROOT)/ACEXML/parser/parser/Parser_export.h \
- $(ACE_ROOT)/ace/Obstack.h \
- $(ACE_ROOT)/ace/Obstack_T.h \
- $(ACE_ROOT)/ace/Obchunk.h \
- $(ACE_ROOT)/ace/Obchunk.i \
- $(ACE_ROOT)/ace/Obstack_T.i \
- $(ACE_ROOT)/ace/Obstack_T.cpp \
- $(ACE_ROOT)/ACEXML/parser/parser/Entity_Manager.h \
- $(ACE_ROOT)/ACEXML/parser/parser/Entity_Manager.i \
- $(ACE_ROOT)/ACEXML/parser/parser/Parser.i \
- Svcconf_Handler.h \
- $(ACE_ROOT)/ACEXML/common/DefaultHandler.h \
- $(ACE_ROOT)/ACEXML/common/DefaultHandler.i \
- $(ACE_ROOT)/ACEXML/common/FileCharStream.h \
- $(ACE_ROOT)/ACEXML/common/StrCharStream.h
+.obj/Svcconf.o .obj/Svcconf.so .shobj/Svcconf.o .shobj/Svcconf.so: Svcconf.cpp Svcconf.h $(ACE_ROOT)/ace/pre.h \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/ACE_export.h \
+  $(ACE_ROOT)/ace/post.h \
+  $(ACE_ROOT)/ace/ace_wchar.h \
+  $(ACE_ROOT)/ace/ace_wchar.inl \
+  $(ACE_ROOT)/ACEXML/parser/parser/Parser.h \
+  $(ACE_ROOT)/ACEXML/parser/parser/Parser_export.h \
+  $(ACE_ROOT)/ACEXML/common/XMLReader.h \
+  $(ACE_ROOT)/ACEXML/common/ACEXML_Export.h \
+  $(ACE_ROOT)/ACEXML/common/ContentHandler.h \
+  $(ACE_ROOT)/ACEXML/common/Env.h \
+  $(ACE_ROOT)/ACEXML/common/XML_Macros.h \
+  $(ACE_ROOT)/ACEXML/common/Exception.h \
+  $(ACE_ROOT)/ACEXML/common/XML_Types.h \
+  $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/OS_Dirent.h \
+  $(ACE_ROOT)/ace/OS_Export.h \
+  $(ACE_ROOT)/ace/OS_Errno.h \
+  $(ACE_ROOT)/ace/OS_Errno.inl \
+  $(ACE_ROOT)/ace/OS_Dirent.inl \
+  $(ACE_ROOT)/ace/OS_String.h \
+  $(ACE_ROOT)/ace/Basic_Types.h \
+  $(ACE_ROOT)/ace/Basic_Types.i \
+  $(ACE_ROOT)/ace/OS_String.inl \
+  $(ACE_ROOT)/ace/OS_Memory.h \
+  $(ACE_ROOT)/ace/OS_Memory.inl \
+  $(ACE_ROOT)/ace/OS_TLI.h \
+  $(ACE_ROOT)/ace/OS_TLI.inl \
+  $(ACE_ROOT)/ace/Time_Value.h \
+  $(ACE_ROOT)/ace/Time_Value.inl \
+  $(ACE_ROOT)/ace/Default_Constants.h \
+  $(ACE_ROOT)/ace/Global_Macros.h \
+  $(ACE_ROOT)/ace/Min_Max.h \
+  $(ACE_ROOT)/ace/streams.h \
+  $(ACE_ROOT)/ace/Trace.h \
+  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/ACE.h \
+  $(ACE_ROOT)/ace/Flag_Manip.h \
+  $(ACE_ROOT)/ace/Flag_Manip.i \
+  $(ACE_ROOT)/ace/Handle_Ops.h \
+  $(ACE_ROOT)/ace/Handle_Ops.i \
+  $(ACE_ROOT)/ace/Lib_Find.h \
+  $(ACE_ROOT)/ace/Lib_Find.i \
+  $(ACE_ROOT)/ace/Init_ACE.h \
+  $(ACE_ROOT)/ace/Init_ACE.i \
+  $(ACE_ROOT)/ace/Sock_Connect.h \
+  $(ACE_ROOT)/ace/Sock_Connect.i \
+  $(ACE_ROOT)/ace/ACE.i \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/Malloc_Base.h \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Log_Msg.h \
+  $(ACE_ROOT)/ace/Log_Priority.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(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_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread.i \
+  $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Malloc_Allocator.h \
+  $(ACE_ROOT)/ace/Malloc_Allocator.i \
+  $(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/Event_Handler.h \
+  $(ACE_ROOT)/ace/Event_Handler.i \
+  $(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/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/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/Memory_Pool.i \
+  $(ACE_ROOT)/ace/Auto_Ptr.h \
+  $(ACE_ROOT)/ace/Auto_Ptr.i \
+  $(ACE_ROOT)/ace/Auto_Ptr.cpp \
+  $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ACEXML/common/Exception.i \
+  $(ACE_ROOT)/ACEXML/common/Env.i \
+  $(ACE_ROOT)/ACEXML/common/SAXExceptions.h \
+  $(ACE_ROOT)/ACEXML/common/SAXExceptions.i \
+  $(ACE_ROOT)/ACEXML/common/Locator.h \
+  $(ACE_ROOT)/ACEXML/common/Attributes.h \
+  $(ACE_ROOT)/ACEXML/common/DTDHandler.h \
+  $(ACE_ROOT)/ACEXML/common/EntityResolver.h \
+  $(ACE_ROOT)/ACEXML/common/InputSource.h \
+  $(ACE_ROOT)/ACEXML/common/CharStream.h \
+  $(ACE_ROOT)/ACEXML/common/ErrorHandler.h \
+  $(ACE_ROOT)/ACEXML/common/LocatorImpl.h \
+  $(ACE_ROOT)/ACEXML/common/LocatorImpl.i \
+  $(ACE_ROOT)/ACEXML/common/NamespaceSupport.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Service_Types.h \
+  $(ACE_ROOT)/ace/Service_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.i \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(ACE_ROOT)/ace/DLL.h \
+  $(ACE_ROOT)/ace/Service_Object.i \
+  $(ACE_ROOT)/ace/Service_Types.i \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.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/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(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/Containers_T.h \
+  $(ACE_ROOT)/ace/Containers.h \
+  $(ACE_ROOT)/ace/Containers.i \
+  $(ACE_ROOT)/ace/Array_Base.h \
+  $(ACE_ROOT)/ace/Array_Base.inl \
+  $(ACE_ROOT)/ace/Array_Base.cpp \
+  $(ACE_ROOT)/ace/Containers_T.i \
+  $(ACE_ROOT)/ace/Containers_T.cpp \
+  $(ACE_ROOT)/ACEXML/common/NamespaceSupport.i \
+  $(ACE_ROOT)/ace/Obstack.h \
+  $(ACE_ROOT)/ace/Obstack_T.h \
+  $(ACE_ROOT)/ace/Obchunk.h \
+  $(ACE_ROOT)/ace/Obchunk.i \
+  $(ACE_ROOT)/ace/Obstack_T.i \
+  $(ACE_ROOT)/ace/Obstack_T.cpp \
+  $(ACE_ROOT)/ACEXML/parser/parser/Entity_Manager.h \
+  $(ACE_ROOT)/ACEXML/parser/parser/Entity_Manager.i \
+  $(ACE_ROOT)/ACEXML/parser/parser/Parser.i \
+  Svcconf_Handler.h \
+  $(ACE_ROOT)/ACEXML/common/DefaultHandler.h \
+  $(ACE_ROOT)/ACEXML/common/DefaultHandler.i \
+  $(ACE_ROOT)/ACEXML/common/FileCharStream.h \
+  $(ACE_ROOT)/ACEXML/common/StrCharStream.h
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/ACEXML/apps/svcconf/Svcconf.cpp b/ACEXML/apps/svcconf/Svcconf.cpp
index a720811ffde..acbaa6388c2 100644
--- a/ACEXML/apps/svcconf/Svcconf.cpp
+++ b/ACEXML/apps/svcconf/Svcconf.cpp
@@ -42,7 +42,7 @@ ACEXML_Svcconf_Parser::operator new (size_t s)
 void
 ACEXML_Svcconf_Parser::operator delete (void *p)
 {
-  delete[] (char *)p;
+  delete[] (char*)p;
 }
 
 int
@@ -64,12 +64,17 @@ ACEXML_Svcconf_Parser::parse_file (const ACE_TCHAR file[])
 
   this->input_stream_.setCharStream (fstm);
 
-  this->parser_.parse (&this->input_stream_, this->env_);
-  if (this->env_.exception ())
+  ACEXML_TRY_NEW_ENV
     {
-      this->env_.exception ()->print ();
+      this->parser_.parse (&this->input_stream_ ACEXML_ENV_ARG_PARAMETER);
+      ACEXML_TRY_CHECK;
+    }
+  ACEXML_CATCH (ACEXML_SAXException, ex)
+    {
+      ex.print ();
       return -1;
     }
+  ACEXML_ENDTRY;
   return 0;
 }
 
@@ -86,13 +91,17 @@ ACEXML_Svcconf_Parser::parse_string (const ACE_TCHAR str[])
                   -1);
 
   this->input_stream_.setCharStream (stm);
-
-  this->parser_.parse (&this->input_stream_, this->env_);
-  if (this->env_.exception ())
+  ACEXML_TRY_NEW_ENV
+    {
+      this->parser_.parse (&this->input_stream_ ACEXML_ENV_ARG_PARAMETER);
+      ACEXML_TRY_CHECK;
+    }
+  ACEXML_CATCH (ACEXML_SAXException, ex)
     {
-      this->env_.exception ()->print ();
+      ex.print ();
       return -1;
     }
+  ACEXML_ENDTRY;
   return 0;
 }
 
diff --git a/ACEXML/apps/svcconf/Svcconf.h b/ACEXML/apps/svcconf/Svcconf.h
index 63b4c6df972..f023af45a53 100644
--- a/ACEXML/apps/svcconf/Svcconf.h
+++ b/ACEXML/apps/svcconf/Svcconf.h
@@ -40,7 +40,7 @@ protected:
   ACEXML_Parser parser_;
   ACEXML_Svcconf_Handler svcconf_handler_;
   ACEXML_InputSource input_stream_;
-  ACEXML_Env env_;
+  // ACEXML_Env env_;
 };
 
 #endif /* ACE_USES_CLASSIC_SVC_CONF == 0 */
diff --git a/ACEXML/apps/svcconf/Svcconf_Handler.cpp b/ACEXML/apps/svcconf/Svcconf_Handler.cpp
index 808d458f3bb..e8ce1b04453 100644
--- a/ACEXML/apps/svcconf/Svcconf_Handler.cpp
+++ b/ACEXML/apps/svcconf/Svcconf_Handler.cpp
@@ -33,16 +33,15 @@ ACEXML_Svcconf_Handler::~ACEXML_Svcconf_Handler (void)
 void
 ACEXML_Svcconf_Handler::characters (const ACEXML_Char *,
                                     int,
-                                    int,
-                                    ACEXML_Env &)
-  //    ACE_THROW_SPEC ((ACEXML_SAXException))
+                                    int ACEXML_ENV_ARG_DECL)
+      ACE_THROW_SPEC ((ACEXML_SAXException))
 {
   // no-op
 }
 
 void
-ACEXML_Svcconf_Handler::endDocument (ACEXML_Env &)
-  //    ACE_THROW_SPEC ((ACEXML_SAXException))
+ACEXML_Svcconf_Handler::endDocument ( ACEXML_ENV_SINGLE_ARG_DECL)
+      ACE_THROW_SPEC ((ACEXML_SAXException))
 {
   // no-op
 }
@@ -50,9 +49,8 @@ ACEXML_Svcconf_Handler::endDocument (ACEXML_Env &)
 void
 ACEXML_Svcconf_Handler::endElement (const ACEXML_Char *,
                                     const ACEXML_Char *,
-                                    const ACEXML_Char *qName,
-                                    ACEXML_Env &xmlenv)
-  //    ACE_THROW_SPEC ((ACEXML_SAXException))
+                                    const ACEXML_Char *qName ACEXML_ENV_ARG_DECL)
+      ACE_THROW_SPEC ((ACEXML_SAXException))
 {
   if (ACE_OS_String::strcmp (qName, ACE_TEXT ("dynamic")) == 0)
     {
@@ -64,8 +62,7 @@ ACEXML_Svcconf_Handler::endElement (const ACEXML_Char *,
 
       if (svc_dll.open (active_info->path ()) == -1)
         {
-          xmlenv.exception (new ACEXML_SAXException ("Cannot locate DLL\n"));
-          return;
+          ACEXML_THROW (ACEXML_SAXException ("Cannot locate DLL\n"));
         }
 
       void *(*func) (ACE_Service_Object_Exterminator *) = 0;
@@ -79,8 +76,7 @@ ACEXML_Svcconf_Handler::endElement (const ACEXML_Char *,
 
       if (func == 0)
         {
-          xmlenv.exception (new ACEXML_SAXException ("Cannot locate init function\n"));
-          return;
+          ACEXML_THROW (ACEXML_SAXException ("Cannot locate init function\n"));
         }
       symbol = (*func)(&gobbler); // target object created in the loaded DLL.
 
@@ -102,9 +98,7 @@ ACEXML_Svcconf_Handler::endElement (const ACEXML_Char *,
             }
           else
             {
-              xmlenv.exception (new ACEXML_SAXException
-                                ("Expecting Stream type in stream header\n"));
-              return;
+              ACEXML_THROW (ACEXML_SAXException ("Expecting Stream type in stream header\n"));
             }
 
           this->stream_svc_type_ =
@@ -136,7 +130,7 @@ ACEXML_Svcconf_Handler::endElement (const ACEXML_Char *,
               if (mt->init (args.argc (), args.argv ()) == -1
                   || this->stream_->push (mt) == -1)
                 {
-                  xmlenv.exception (new ACEXML_SAXException ("Error initializing module"));
+                  ACEXML_THROW (ACEXML_SAXException ("Error initializing module"));
                 }
 
 
@@ -158,9 +152,7 @@ ACEXML_Svcconf_Handler::endElement (const ACEXML_Char *,
               if (ACE_Service_Config::initialize (stype,
                                                   active_info->init_params ()) == -1)
                 {
-                  xmlenv.exception (new ACEXML_SAXException
-                                    ("Failed to initialize dynamic service\n"));
-                  return;
+                  ACEXML_THROW (ACEXML_SAXException ("Failed to initialize dynamic service\n"));
                 }
             }
           this->parsed_info_.reset ();
@@ -190,8 +182,7 @@ ACEXML_Svcconf_Handler::endElement (const ACEXML_Char *,
               if (ACE_Service_Config::initialize (this->parsed_info_.name (),
                                                   this->parsed_info_.init_params ()) == -1)
                 {
-                  xmlenv.exception (new ACEXML_SAXException
-                                    (ACE_TEXT ("Fail initializing static service\n")));
+                  ACEXML_THROW (ACEXML_SAXException (ACE_TEXT ("Failed to initialize static service\n")));
                 }
             }
           this->parsed_info_.reset ();
@@ -226,9 +217,8 @@ ACEXML_Svcconf_Handler::endElement (const ACEXML_Char *,
 }
 
 void
-ACEXML_Svcconf_Handler::endPrefixMapping (const ACEXML_Char *,
-                                          ACEXML_Env &)
-  //    ACE_THROW_SPEC ((ACEXML_SAXException))
+ACEXML_Svcconf_Handler::endPrefixMapping (const ACEXML_Char * ACEXML_ENV_ARG_DECL)
+      ACE_THROW_SPEC ((ACEXML_SAXException))
 {
   // no-op
 }
@@ -236,40 +226,36 @@ ACEXML_Svcconf_Handler::endPrefixMapping (const ACEXML_Char *,
 void
 ACEXML_Svcconf_Handler::ignorableWhitespace (const ACEXML_Char *,
                                              int,
-                                             int,
-                                             ACEXML_Env &)
-  //    ACE_THROW_SPEC ((ACEXML_SAXException))
+                                             int ACEXML_ENV_ARG_DECL)
+      ACE_THROW_SPEC ((ACEXML_SAXException))
 {
   // no-op
 }
 
 void
 ACEXML_Svcconf_Handler::processingInstruction (const ACEXML_Char *,
-                                               const ACEXML_Char *,
-                                               ACEXML_Env &)
-  //    ACE_THROW_SPEC ((ACEXML_SAXException))
+                                               const ACEXML_Char * ACEXML_ENV_ARG_DECL)
+      ACE_THROW_SPEC ((ACEXML_SAXException))
 {
   // no-op
 }
 
 void
-ACEXML_Svcconf_Handler::setDocumentLocator (ACEXML_Locator* locator,
-                                            ACEXML_Env &)
+ACEXML_Svcconf_Handler::setDocumentLocator (ACEXML_Locator* locator)
 {
   this->locator_ = locator;
 }
 
 void
-ACEXML_Svcconf_Handler::skippedEntity (const ACEXML_Char *,
-                                       ACEXML_Env &)
-  //    ACE_THROW_SPEC ((ACEXML_SAXException))
+ACEXML_Svcconf_Handler::skippedEntity (const ACEXML_Char * ACEXML_ENV_ARG_DECL)
+      ACE_THROW_SPEC ((ACEXML_SAXException))
 {
   // no-op
 }
 
 void
-ACEXML_Svcconf_Handler::startDocument (ACEXML_Env &)
-  //    ACE_THROW_SPEC ((ACEXML_SAXException))
+ACEXML_Svcconf_Handler::startDocument ( ACEXML_ENV_SINGLE_ARG_DECL)
+      ACE_THROW_SPEC ((ACEXML_SAXException))
 {
   // no-op
 }
@@ -278,33 +264,31 @@ void
 ACEXML_Svcconf_Handler::startElement (const ACEXML_Char *,
                                       const ACEXML_Char *,
                                       const ACEXML_Char *qName,
-                                      ACEXML_Attributes *alist,
-                                      ACEXML_Env &xmlenv)
-  //    ACE_THROW_SPEC ((ACEXML_SAXException))
+                                      ACEXML_Attributes *alist ACEXML_ENV_ARG_DECL)
+      ACE_THROW_SPEC ((ACEXML_SAXException))
 {
   if (ACE_OS_String::strcmp (qName, ACE_TEXT ("dynamic")) == 0)
     {
-      this->get_dynamic_attrs (alist, xmlenv);
+      this->get_dynamic_attrs (alist ACEXML_ENV_ARG_PARAMETER);
     }
   else if (ACE_OS_String::strcmp (qName, ACE_TEXT ("initializer")) == 0)
     {
-      this->get_initializer_attrs (alist, xmlenv);
+      this->get_initializer_attrs (alist ACEXML_ENV_ARG_PARAMETER);
 
     }
   else if (ACE_OS_String::strcmp (qName, ACE_TEXT ("static")) == 0)
     {
-      this->get_static_attrs (alist, xmlenv);
+      this->get_static_attrs (alist ACEXML_ENV_ARG_PARAMETER);
     }
   else if (ACE_OS_String::strcmp (qName, ACE_TEXT ("stream")) == 0)
     {
-      this->get_stream_id (alist, xmlenv);
+      this->get_stream_id (alist ACEXML_ENV_ARG_PARAMETER);
 
       if (ACE_Service_Repository::instance()->find
           (this->stream_info_.name (),
            (const ACE_Service_Type **) &this->stream_svc_type_) == -1)
         {
-          xmlenv.exception (new ACEXML_SAXException ("Cannot find stream\n"));
-          return;
+          ACEXML_THROW (ACEXML_SAXException ("Cannot find stream\n"));
         }
       this->stream_ =   this->stream_svc_type_ == 0
         ? 0
@@ -327,7 +311,7 @@ ACEXML_Svcconf_Handler::startElement (const ACEXML_Char *,
     }
   else if (ACE_OS_String::strcmp (qName, ACE_TEXT ("resume")) == 0)
     {
-      this->get_id (alist, xmlenv);
+      this->get_id (alist ACEXML_ENV_ARG_PARAMETER);
       if (this->in_module_)
         {
 //           ACE_DEBUG ((LM_INFO, ACE_TEXT ("Resume %s in stream %s\n"),
@@ -339,8 +323,7 @@ ACEXML_Svcconf_Handler::startElement (const ACEXML_Char *,
 
           if (mt == 0)
             {
-              xmlenv.exception (new ACEXML_SAXException ("Can't locate module\n"));
-              return;
+              ACEXML_THROW (ACEXML_SAXException ("Can't locate module\n"));
             }
 
           mt->resume ();
@@ -351,14 +334,14 @@ ACEXML_Svcconf_Handler::startElement (const ACEXML_Char *,
 //                       this->parsed_info_.name ()));
           if (ACE_Service_Config::resume (this->parsed_info_.name ()) == -1)
             {
-              xmlenv.exception (new ACEXML_SAXException (ACE_TEXT ("Resume fail\n")));
+              ACEXML_THROW (ACEXML_SAXException (ACE_TEXT ("Resume fail\n")));
             }
         }
       this->parsed_info_.reset ();
     }
   else if (ACE_OS_String::strcmp (qName, ACE_TEXT ("suspend")) == 0)
     {
-      this->get_id (alist, xmlenv);
+      this->get_id (alist ACEXML_ENV_ARG_PARAMETER);
       if (this->in_module_)
         {
 //           ACE_DEBUG ((LM_INFO, ACE_TEXT ("Suspend %s in stream %s\n"),
@@ -370,8 +353,7 @@ ACEXML_Svcconf_Handler::startElement (const ACEXML_Char *,
 
           if (mt == 0)
             {
-              xmlenv.exception (new ACEXML_SAXException ("Can't locate module\n"));
-              return;
+              ACEXML_THROW (ACEXML_SAXException ("Can't locate module\n"));
             }
 
           mt->suspend ();
@@ -382,14 +364,14 @@ ACEXML_Svcconf_Handler::startElement (const ACEXML_Char *,
           //                      this->parsed_info_.name ()));
           if (ACE_Service_Config::suspend (this->parsed_info_.name ()) == -1)
             {
-              xmlenv.exception (new ACEXML_SAXException (ACE_TEXT ("Suspend fail\n")));
+              ACEXML_THROW (ACEXML_SAXException (ACE_TEXT ("Suspend failed\n")));
             }
         }
       this->parsed_info_.reset ();
     }
   else if (ACE_OS_String::strcmp (qName, ACE_TEXT ("remove")) == 0)
     {
-      this->get_id (alist, xmlenv);
+      this->get_id (alist ACEXML_ENV_ARG_PARAMETER);
       if (this->in_module_)
         {
 //           ACE_DEBUG ((LM_INFO, ACE_TEXT ("Remove %s in stream %s\n"),
@@ -401,8 +383,7 @@ ACEXML_Svcconf_Handler::startElement (const ACEXML_Char *,
 
           if (mt == 0)
             {
-              xmlenv.exception (new ACEXML_SAXException ("Can't locate module\n"));
-              return;
+              ACEXML_THROW (ACEXML_SAXException ("Can't locate module\n"));
             }
 
           this->stream_->remove (mt);
@@ -413,7 +394,7 @@ ACEXML_Svcconf_Handler::startElement (const ACEXML_Char *,
 //                       this->parsed_info_.name ()));
           if (ACE_Service_Config::remove (this->parsed_info_.name ()) == -1)
             {
-              xmlenv.exception (new ACEXML_SAXException (ACE_TEXT ("Remove fail\n")));
+              ACEXML_THROW (ACEXML_SAXException (ACE_TEXT ("Remove failed\n")));
             }
         }
       this->parsed_info_.reset ();
@@ -433,9 +414,8 @@ ACEXML_Svcconf_Handler::startElement (const ACEXML_Char *,
 
 void
 ACEXML_Svcconf_Handler::startPrefixMapping (const ACEXML_Char *,
-                                            const ACEXML_Char *,
-                                            ACEXML_Env &)
-  //    ACE_THROW_SPEC ((ACEXML_SAXException))
+                                            const ACEXML_Char * ACEXML_ENV_ARG_DECL)
+      ACE_THROW_SPEC ((ACEXML_SAXException))
 {
   // No-op.
 }
@@ -445,9 +425,8 @@ ACEXML_Svcconf_Handler::startPrefixMapping (const ACEXML_Char *,
 void
 ACEXML_Svcconf_Handler::notationDecl (const ACEXML_Char *,
                                       const ACEXML_Char *,
-                                      const ACEXML_Char *,
-                                      ACEXML_Env &)
-  //    ACE_THROW_SPEC ((ACEXML_SAXException))
+                                      const ACEXML_Char * ACEXML_ENV_ARG_DECL)
+      ACE_THROW_SPEC ((ACEXML_SAXException))
 {
   // No-op.
 }
@@ -456,9 +435,8 @@ void
 ACEXML_Svcconf_Handler::unparsedEntityDecl (const ACEXML_Char *,
                                             const ACEXML_Char *,
                                             const ACEXML_Char *,
-                                            const ACEXML_Char *,
-                                            ACEXML_Env &)
-  //    ACE_THROW_SPEC ((ACEXML_SAXException))
+                                            const ACEXML_Char * ACEXML_ENV_ARG_DECL)
+      ACE_THROW_SPEC ((ACEXML_SAXException))
 {
   // No-op.
 }
@@ -467,9 +445,8 @@ ACEXML_Svcconf_Handler::unparsedEntityDecl (const ACEXML_Char *,
 
 ACEXML_InputSource *
 ACEXML_Svcconf_Handler::resolveEntity (const ACEXML_Char *,
-                                       const ACEXML_Char *,
-                                       ACEXML_Env &)
-  //    ACE_THROW_SPEC ((ACEXML_SAXException))
+                                       const ACEXML_Char * ACEXML_ENV_ARG_DECL)
+      ACE_THROW_SPEC ((ACEXML_SAXException))
 {
   // No-op.
   return 0;
@@ -481,9 +458,8 @@ ACEXML_Svcconf_Handler::resolveEntity (const ACEXML_Char *,
    * Receive notification of a recoverable error.
    */
 void
-ACEXML_Svcconf_Handler::error (ACEXML_SAXParseException& ex,
-                               ACEXML_Env &)
-  //    ACE_THROW_SPEC ((ACEXML_SAXException))
+ACEXML_Svcconf_Handler::error (ACEXML_SAXParseException& ex ACEXML_ENV_ARG_DECL)
+      ACE_THROW_SPEC ((ACEXML_SAXException))
 {
   ACE_DEBUG ((LM_DEBUG, "%s: line :%d col: %d ", this->locator_->getSystemId(),
               this->locator_->getLineNumber(),
@@ -492,9 +468,8 @@ ACEXML_Svcconf_Handler::error (ACEXML_SAXParseException& ex,
 }
 
 void
-ACEXML_Svcconf_Handler::fatalError (ACEXML_SAXParseException& ex,
-                                    ACEXML_Env &)
-  //    ACE_THROW_SPEC ((ACEXML_SAXException))
+ACEXML_Svcconf_Handler::fatalError (ACEXML_SAXParseException& ex ACEXML_ENV_ARG_DECL)
+      ACE_THROW_SPEC ((ACEXML_SAXException))
 {
   ACE_DEBUG ((LM_DEBUG, "%s: line :%d col: %d ", this->locator_->getSystemId(),
               this->locator_->getLineNumber(),
@@ -503,9 +478,8 @@ ACEXML_Svcconf_Handler::fatalError (ACEXML_SAXParseException& ex,
 }
 
 void
-ACEXML_Svcconf_Handler::warning (ACEXML_SAXParseException& ex,
-                                 ACEXML_Env &)
-  //    ACE_THROW_SPEC ((ACEXML_SAXException))
+ACEXML_Svcconf_Handler::warning (ACEXML_SAXParseException& ex ACEXML_ENV_ARG_DECL)
+      ACE_THROW_SPEC ((ACEXML_SAXException))
 {
   ACE_DEBUG ((LM_DEBUG, "%s: line :%d col: %d ", this->locator_->getSystemId(),
               this->locator_->getLineNumber(),
@@ -514,8 +488,7 @@ ACEXML_Svcconf_Handler::warning (ACEXML_SAXParseException& ex,
 }
 
 int
-ACEXML_Svcconf_Handler::get_stream_id (ACEXML_Attributes *alist,
-                                       ACEXML_Env &xmlenv)
+ACEXML_Svcconf_Handler::get_stream_id (ACEXML_Attributes *alist ACEXML_ENV_ARG_DECL)
 {
   if (alist != 0)
     for (size_t i = 0; i < alist->getLength (); ++i)
@@ -526,16 +499,14 @@ ACEXML_Svcconf_Handler::get_stream_id (ACEXML_Attributes *alist,
           }
         else
           {
-            xmlenv.exception (new ACEXML_SAXException ("Invalid stream attribute\n"));
-            return -1;
+            ACEXML_THROW_RETURN (ACEXML_SAXException ("Invalid stream attribute\n"), -1);
           }
       }
   return 0;
 }
 
 int
-ACEXML_Svcconf_Handler::get_id (ACEXML_Attributes *alist,
-                                ACEXML_Env &xmlenv)
+ACEXML_Svcconf_Handler::get_id (ACEXML_Attributes *alist ACEXML_ENV_ARG_DECL)
 {
   if (alist != 0)
     for (size_t i = 0; i < alist->getLength (); ++i)
@@ -546,16 +517,14 @@ ACEXML_Svcconf_Handler::get_id (ACEXML_Attributes *alist,
           }
         else
           {
-            xmlenv.exception (new ACEXML_SAXException ("Invalid attribute, expecting 'id'\n"));
-            return -1;
+            ACEXML_THROW_RETURN (ACEXML_SAXException ("Invalid attribute, expecting 'id'\n"), -1);
           }
       }
   return 0;
 }
 
 int
-ACEXML_Svcconf_Handler::get_dynamic_attrs (ACEXML_Attributes *alist,
-                                           ACEXML_Env &xmlenv)
+ACEXML_Svcconf_Handler::get_dynamic_attrs (ACEXML_Attributes *alist ACEXML_ENV_ARG_DECL)
 {
   if (alist != 0)
     {
@@ -580,9 +549,7 @@ ACEXML_Svcconf_Handler::get_dynamic_attrs (ACEXML_Attributes *alist,
                 }
               else
                 {
-                  xmlenv.exception
-                    (new ACEXML_SAXException ("Invalid attribute value, expecting 'active' or 'inactive'\n"));
-                  return -1;
+                  ACEXML_THROW_RETURN (ACEXML_SAXException ("Invalid attribute value, expecting 'active' or 'inactive'\n"), -1);
                 }
             }
           else if (ACE_OS_String::strcmp (alist->getQName (i), ACE_TEXT ("type")) == 0)
@@ -601,15 +568,12 @@ ACEXML_Svcconf_Handler::get_dynamic_attrs (ACEXML_Attributes *alist,
                 }
               else
                 {
-                  xmlenv.exception
-                    (new ACEXML_SAXException ("Invalid Service_Object attribute value\n"));
-                  return -1;
+                  ACEXML_THROW_RETURN (ACEXML_SAXException ("Invalid Service_Object attribute value\n"), -1);
                 }
             }
           else
             {
-              xmlenv.exception (new ACEXML_SAXException ("Invalid attribute\n"));
-              return -1;
+              ACEXML_THROW_RETURN(ACEXML_SAXException("Invalid attribute\n"), -1);
             }
         }
     }
@@ -617,8 +581,7 @@ ACEXML_Svcconf_Handler::get_dynamic_attrs (ACEXML_Attributes *alist,
 }
 
 int
-ACEXML_Svcconf_Handler::get_initializer_attrs (ACEXML_Attributes *alist,
-                                               ACEXML_Env &xmlenv)
+ACEXML_Svcconf_Handler::get_initializer_attrs (ACEXML_Attributes *alist ACEXML_ENV_ARG_DECL)
 {
   if (alist != 0)
     {
@@ -641,8 +604,7 @@ ACEXML_Svcconf_Handler::get_initializer_attrs (ACEXML_Attributes *alist,
             }
           else
             {
-              xmlenv.exception (new ACEXML_SAXException ("Invalid initializer attribute.\n"));
-              return -1;
+              ACEXML_THROW_RETURN (ACEXML_SAXException ("Invalid initializer attribute.\n"), -1);
             }
         }
     }
@@ -650,8 +612,7 @@ ACEXML_Svcconf_Handler::get_initializer_attrs (ACEXML_Attributes *alist,
 }
 
 int
-ACEXML_Svcconf_Handler::get_static_attrs (ACEXML_Attributes *alist,
-                                          ACEXML_Env &xmlenv)
+ACEXML_Svcconf_Handler::get_static_attrs (ACEXML_Attributes *alist ACEXML_ENV_ARG_DECL)
 {
   if (alist != 0)
     {
@@ -670,8 +631,7 @@ ACEXML_Svcconf_Handler::get_static_attrs (ACEXML_Attributes *alist,
             }
           else
             {
-              xmlenv.exception (new ACEXML_SAXException ("Invalid static attribute.\n"));
-              return -1;
+              ACEXML_THROW_RETURN (ACEXML_SAXException ("Invalid static attribute.\n"), -1);
             }
         }
     }
diff --git a/ACEXML/apps/svcconf/Svcconf_Handler.h b/ACEXML/apps/svcconf/Svcconf_Handler.h
index 3ee6567be98..c9093f9bd7a 100644
--- a/ACEXML/apps/svcconf/Svcconf_Handler.h
+++ b/ACEXML/apps/svcconf/Svcconf_Handler.h
@@ -102,16 +102,15 @@ public:
    */
   virtual void characters (const ACEXML_Char *ch,
                            int start,
-                           int length,
-                           ACEXML_Env &xmlenv)
-    //    ACE_THROW_SPEC ((ACEXML_SAXException))
+                           int length ACEXML_ENV_ARG_DECL)
+        ACE_THROW_SPEC ((ACEXML_SAXException))
     ;
 
   /*
    * Receive notification of the end of a document.
    */
-  virtual void endDocument (ACEXML_Env &xmlenv)
-    //    ACE_THROW_SPEC ((ACEXML_SAXException))
+  virtual void endDocument (ACEXML_ENV_SINGLE_ARG_DECL)
+        ACE_THROW_SPEC ((ACEXML_SAXException))
     ;
 
   /*
@@ -119,17 +118,15 @@ public:
    */
   virtual void endElement (const ACEXML_Char *namespaceURI,
                            const ACEXML_Char *localName,
-                           const ACEXML_Char *qName,
-                           ACEXML_Env &xmlenv)
-    //    ACE_THROW_SPEC ((ACEXML_SAXException))
+                           const ACEXML_Char *qName ACEXML_ENV_ARG_DECL)
+        ACE_THROW_SPEC ((ACEXML_SAXException))
     ;
 
   /*
    * End the scope of a prefix-URI mapping.
    */
-  virtual void endPrefixMapping (const ACEXML_Char *prefix,
-                                 ACEXML_Env &xmlenv)
-    //    ACE_THROW_SPEC ((ACEXML_SAXException))
+  virtual void endPrefixMapping (const ACEXML_Char *prefix ACEXML_ENV_ARG_DECL)
+        ACE_THROW_SPEC ((ACEXML_SAXException))
     ;
 
   /*
@@ -137,39 +134,35 @@ public:
    */
   virtual void ignorableWhitespace (const ACEXML_Char *ch,
                                     int start,
-                                    int length,
-                                    ACEXML_Env &xmlenv)
-    //    ACE_THROW_SPEC ((ACEXML_SAXException))
+                                    int length ACEXML_ENV_ARG_DECL)
+        ACE_THROW_SPEC ((ACEXML_SAXException))
     ;
 
   /*
    * Receive notification of a processing instruction.
    */
   virtual void processingInstruction (const ACEXML_Char *target,
-                                      const ACEXML_Char *data,
-                                      ACEXML_Env &xmlenv)
-    //    ACE_THROW_SPEC ((ACEXML_SAXException))
+                                      const ACEXML_Char *data ACEXML_ENV_ARG_DECL)
+        ACE_THROW_SPEC ((ACEXML_SAXException))
     ;
 
   /*
    * Receive an object for locating the origin of SAX document events.
    */
-  virtual void setDocumentLocator (ACEXML_Locator *locator,
-                                   ACEXML_Env &xmlenv) ;
+  virtual void setDocumentLocator (ACEXML_Locator *locator) ;
 
   /*
    * Receive notification of a skipped entity.
    */
-  virtual void skippedEntity (const ACEXML_Char *name,
-                              ACEXML_Env &xmlenv)
-    //    ACE_THROW_SPEC ((ACEXML_SAXException))
+  virtual void skippedEntity (const ACEXML_Char *name ACEXML_ENV_ARG_DECL)
+        ACE_THROW_SPEC ((ACEXML_SAXException))
     ;
 
   /*
    * Receive notification of the beginning of a document.
    */
-  virtual void startDocument (ACEXML_Env &xmlenv)
-    //    ACE_THROW_SPEC ((ACEXML_SAXException))
+  virtual void startDocument (ACEXML_ENV_SINGLE_ARG_DECL)
+        ACE_THROW_SPEC ((ACEXML_SAXException))
     ;
 
   /*
@@ -178,18 +171,16 @@ public:
   virtual void startElement (const ACEXML_Char *namespaceURI,
                              const ACEXML_Char *localName,
                              const ACEXML_Char *qName,
-                             ACEXML_Attributes *atts,
-                             ACEXML_Env &xmlenv)
-    //    ACE_THROW_SPEC ((ACEXML_SAXException))
+                             ACEXML_Attributes *atts ACEXML_ENV_ARG_DECL)
+        ACE_THROW_SPEC ((ACEXML_SAXException))
     ;
 
   /*
    * Begin the scope of a prefix-URI Namespace mapping.
    */
   virtual void startPrefixMapping (const ACEXML_Char *prefix,
-                                   const ACEXML_Char *uri,
-                                   ACEXML_Env &xmlenv)
-    //    ACE_THROW_SPEC ((ACEXML_SAXException))
+                                   const ACEXML_Char *uri ACEXML_ENV_ARG_DECL)
+        ACE_THROW_SPEC ((ACEXML_SAXException))
     ;
 
   // *** Methods inherit from ACEXML_DTDHandler.
@@ -199,9 +190,8 @@ public:
    */
   virtual void notationDecl (const ACEXML_Char *name,
                              const ACEXML_Char *publicId,
-                             const ACEXML_Char *systemId,
-                             ACEXML_Env &xmlenv)
-    //    ACE_THROW_SPEC ((ACEXML_SAXException))
+                             const ACEXML_Char *systemId ACEXML_ENV_ARG_DECL)
+        ACE_THROW_SPEC ((ACEXML_SAXException))
     ;
 
   /*
@@ -210,9 +200,8 @@ public:
   virtual void unparsedEntityDecl (const ACEXML_Char *name,
                                    const ACEXML_Char *publicId,
                                    const ACEXML_Char *systemId,
-                                   const ACEXML_Char *notationName,
-                                   ACEXML_Env &xmlenv)
-    //    ACE_THROW_SPEC ((ACEXML_SAXException))
+                                   const ACEXML_Char *notationName ACEXML_ENV_ARG_DECL)
+        ACE_THROW_SPEC ((ACEXML_SAXException))
     ;
 
   // Methods inherit from ACEXML_EnitityResolver.
@@ -221,9 +210,8 @@ public:
    * Allow the application to resolve external entities.
    */
   virtual ACEXML_InputSource *resolveEntity (const ACEXML_Char *publicId,
-                                             const ACEXML_Char *systemId,
-                                             ACEXML_Env &xmlenv)
-    //    ACE_THROW_SPEC ((ACEXML_SAXException))
+                                             const ACEXML_Char *systemId ACEXML_ENV_ARG_DECL)
+        ACE_THROW_SPEC ((ACEXML_SAXException))
     ;
 
   // Methods inherit from ACEXML_ErrorHandler.
@@ -231,57 +219,49 @@ public:
   /*
    * Receive notification of a recoverable error.
    */
-  virtual void error (ACEXML_SAXParseException &exception,
-                      ACEXML_Env &xmlenv)
-    //    ACE_THROW_SPEC ((ACEXML_SAXException))
+  virtual void error (ACEXML_SAXParseException &exception ACEXML_ENV_ARG_DECL)
+        ACE_THROW_SPEC ((ACEXML_SAXException))
     ;
 
   /*
    * Receive notification of a non-recoverable error.
    */
-  virtual void fatalError (ACEXML_SAXParseException &exception,
-                           ACEXML_Env &xmlenv)
-    //    ACE_THROW_SPEC ((ACEXML_SAXException))
+  virtual void fatalError (ACEXML_SAXParseException &exception ACEXML_ENV_ARG_DECL)
+        ACE_THROW_SPEC ((ACEXML_SAXException))
     ;
 
   /*
    * Receive notification of a warning.
    */
-  virtual void warning (ACEXML_SAXParseException &exception,
-                        ACEXML_Env &xmlenv)
-    //    ACE_THROW_SPEC ((ACEXML_SAXException))
+  virtual void warning (ACEXML_SAXParseException &exception ACEXML_ENV_ARG_DECL)
+        ACE_THROW_SPEC ((ACEXML_SAXException))
     ;
 
 protected:
   /**
    * Get the only attribute in <stream> or <streamdef>.
    */
-  int get_stream_id (ACEXML_Attributes *alist,
-                     ACEXML_Env &xmlenv);
+  int get_stream_id (ACEXML_Attributes *alist ACEXML_ENV_ARG_DECL);
 
   /**
    * Get the only attribute in <resume>, <suspend>, <remove>
    */
-  int get_id (ACEXML_Attributes *alist,
-              ACEXML_Env &xmlenv);
+  int get_id (ACEXML_Attributes *alist ACEXML_ENV_ARG_DECL);
 
   /**
    * Get the dynamic tag attributes.
    */
-  int get_dynamic_attrs (ACEXML_Attributes *alist,
-                         ACEXML_Env &xmlenv);
+  int get_dynamic_attrs (ACEXML_Attributes *alist ACEXML_ENV_ARG_DECL);
 
   /**
    * Get the initializer tag attributes.
    */
-  int get_initializer_attrs (ACEXML_Attributes *alist,
-                             ACEXML_Env &xmlenv);
+  int get_initializer_attrs (ACEXML_Attributes *alist ACEXML_ENV_ARG_DECL);
 
   /**
    * Get the static tag attributes.
    */
-  int get_static_attrs (ACEXML_Attributes *alist,
-                        ACEXML_Env &xmlenv);
+  int get_static_attrs (ACEXML_Attributes *alist ACEXML_ENV_ARG_DECL);
 
 private:
   /// We are parsing a stream definition