ChangeLogTag: Fri Jan 24 20:28:22 2003 Krishnakumar B <kitty@insanely.long.id.truncated>Validator

77 files changed, 247 insertions, 6275 deletions

diff --git a/ACEXML/Makefile b/ACEXML/Makefile
index 18e8c1ead27..cc7bb0a7098 100644
--- a/ACEXML/Makefile
+++ b/ACEXML/Makefile
@@ -1,20 +1,22 @@
 # $Id$
 #----------------------------------------------------------------------------
-#       GNU Workspace
+#       GNU ACE Workspace
 #----------------------------------------------------------------------------
 
 include $(ACE_ROOT)/include/makeinclude/macros.GNU
 TARGETS_NESTED := $(TARGETS_NESTED:.nested=)
 MFILES = \
+         examples/SAXPrint/Makefile.SAXPrint \
+         examples/svcconf/Makefile.Svcconf \
          common/Makefile.XML_Common \
          parser/parser/Makefile.Parser \
          parser/debug_validator/Makefile.Validator \
-         apps/svcconf/Makefile.XML_Svc_Conf_Parser \
-         examples/svcconf/Makefile.Svcconf \
-         examples/SAXPrint/Makefile.SAXPrint \
          tests/Makefile.HttpCharStream_Test \
          tests/Makefile.Transcoder_Test \
-         tests/Makefile.NamespaceSupport_Test
+         tests/Makefile.NamespaceSupport_Test \
+         compass/Makefile.Compass \
+         compass/Makefile.Deployment \
+         apps/svcconf/Makefile.XML_Svc_Conf_Parser
 
 $(TARGETS_NESTED):
 ifneq (Windows,$(findstring Windows,$(OS)))
@@ -22,13 +24,15 @@ ifneq (Windows,$(findstring Windows,$(OS)))
 	$(MAKE) -f `basename $$file` -C `dirname $$file` $(@); \
 	done
 else
+	-@cmd /c "$(MAKE) -f Makefile.SAXPrint -C examples/SAXPrint $(@)"
+	-@cmd /c "$(MAKE) -f Makefile.Svcconf -C examples/svcconf $(@)"
 	-@cmd /c "$(MAKE) -f Makefile.XML_Common -C common $(@)"
 	-@cmd /c "$(MAKE) -f Makefile.Parser -C parser/parser $(@)"
 	-@cmd /c "$(MAKE) -f Makefile.Validator -C parser/debug_validator $(@)"
-	-@cmd /c "$(MAKE) -f Makefile.XML_Svc_Conf_Parser -C apps/svcconf $(@)"
-	-@cmd /c "$(MAKE) -f Makefile.Svcconf -C examples/svcconf $(@)"
-	-@cmd /c "$(MAKE) -f Makefile.SAXPrint -C examples/SAXPrint $(@)"
 	-@cmd /c "$(MAKE) -f Makefile.HttpCharStream_Test -C tests $(@)"
 	-@cmd /c "$(MAKE) -f Makefile.Transcoder_Test -C tests $(@)"
 	-@cmd /c "$(MAKE) -f Makefile.NamespaceSupport_Test -C tests $(@)"
+	-@cmd /c "$(MAKE) -f Makefile.Compass -C compass $(@)"
+	-@cmd /c "$(MAKE) -f Makefile.Deployment -C compass $(@)"
+	-@cmd /c "$(MAKE) -f Makefile.XML_Svc_Conf_Parser -C apps/svcconf $(@)"
 endif
diff --git a/ACEXML/apps/svcconf/Makefile b/ACEXML/apps/svcconf/Makefile
new file mode 100644
index 00000000000..9facd56ca45
--- /dev/null
+++ b/ACEXML/apps/svcconf/Makefile
@@ -0,0 +1,14 @@
+# $Id$
+#----------------------------------------------------------------------------
+#       GNU ACE Workspace
+#----------------------------------------------------------------------------
+
+include $(ACE_ROOT)/include/makeinclude/macros.GNU
+TARGETS_NESTED := $(TARGETS_NESTED:.nested=)
+
+$(TARGETS_NESTED):
+ifneq (Windows,$(findstring Windows,$(OS)))
+	@$(MAKE) -f Makefile.XML_Svc_Conf_Parser -C . $(@);
+else
+	-@cmd /c "$(MAKE) -f Makefile.XML_Svc_Conf_Parser -C . $(@)"
+endif
diff --git a/ACEXML/apps/svcconf/Makefile.XML_Svc_Conf_Parser b/ACEXML/apps/svcconf/Makefile.XML_Svc_Conf_Parser
index d59b8be097e..7fac40d9792 100644
--- a/ACEXML/apps/svcconf/Makefile.XML_Svc_Conf_Parser
+++ b/ACEXML/apps/svcconf/Makefile.XML_Svc_Conf_Parser
@@ -1,7 +1,6 @@
 #----------------------------------------------------------------------------
 #       GNU Makefile
 #----------------------------------------------------------------------------
-
 MAKEFILE        = Makefile.XML_Svc_Conf_Parser
 DEPENDENCY_FILE = .depend.Makefile.XML_Svc_Conf_Parser
 LIB_UNCHECKED   = libACEXML_XML_Svc_Conf_Parser.a
@@ -12,13 +11,13 @@ SHLIB_UNCHECKED = libACEXML_XML_Svc_Conf_Parser.$(SOEXT)
 FILES = \
   Svcconf \
   Svcconf_Handler
+#----------------------------------------------------------------------------
+#       Include macros and targets
+#----------------------------------------------------------------------------
 
 LIB   = $(LIB_UNCHECKED)
 SHLIB = $(SHLIB_UNCHECKED)
 
-#----------------------------------------------------------------------------
-#       Include macros and targets
-#----------------------------------------------------------------------------
 include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
 LSRC   = $(addsuffix .cpp, $(FILES))
 ACELIB = -lACE
@@ -30,18 +29,20 @@ include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
 
 CPPFLAGS     += -I../../..
+ifeq ($(static_libs),1)
+  ifneq ($(LIB),)
+    CPPFLAGS += -DACE_AS_STATIC_LIBS
+  endif
+endif
+
+
 LDFLAGS      += -L../../../ace
 
-ACE_SHLIBS = -lACEXML_Parser -lACEXML $(ACELIB)
+ACE_SHLIBS  = -lACEXML_Parser -lACEXML $(ACELIB)
 
 #----------------------------------------------------------------------------
 #       Local targets
 #----------------------------------------------------------------------------
 
-#----------------------------------------------------------------------------
-#       Dependencies
-#----------------------------------------------------------------------------
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
+realclean: clean 
 
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/ACEXML/common/Makefile b/ACEXML/common/Makefile
new file mode 100644
index 00000000000..44b7ccd773a
--- /dev/null
+++ b/ACEXML/common/Makefile
@@ -0,0 +1,14 @@
+# $Id$
+#----------------------------------------------------------------------------
+#       GNU ACE Workspace
+#----------------------------------------------------------------------------
+
+include $(ACE_ROOT)/include/makeinclude/macros.GNU
+TARGETS_NESTED := $(TARGETS_NESTED:.nested=)
+
+$(TARGETS_NESTED):
+ifneq (Windows,$(findstring Windows,$(OS)))
+	@$(MAKE) -f Makefile.XML_Common -C . $(@);
+else
+	-@cmd /c "$(MAKE) -f Makefile.XML_Common -C . $(@)"
+endif
diff --git a/ACEXML/common/Makefile.XML_Common b/ACEXML/common/Makefile.XML_Common
index 1268ed42dff..1ea2e0d262a 100644
--- a/ACEXML/common/Makefile.XML_Common
+++ b/ACEXML/common/Makefile.XML_Common
@@ -1,7 +1,6 @@
 #----------------------------------------------------------------------------
 #       GNU Makefile
 #----------------------------------------------------------------------------
-
 MAKEFILE        = Makefile.XML_Common
 DEPENDENCY_FILE = .depend.Makefile.XML_Common
 LIB_UNCHECKED   = libACEXML.a
@@ -10,37 +9,37 @@ SHLIB_UNCHECKED = libACEXML.$(SOEXT)
 
 
 FILES = \
-  AttributesImpl \
+  SAXExceptions \
   Attributes_Def_Builder \
-  CharStream \
-  DTD_Manager \
-  DefaultHandler \
-  Element_Def_Builder \
-  Encoding \
-  Env \
+  AttributesImpl \
+  Transcode \
+  Mem_Map_Stream \
+  Validator \
   Exception \
-  FileCharStream \
-  HttpCharStream \
+  CharStream \
+  XMLFilterImpl \
   InputSource \
   LocatorImpl \
-  Mem_Map_Stream \
   NamespaceSupport \
-  SAXExceptions \
+  URL_Addr \
   StrCharStream \
+  DTD_Manager \
+  DefaultHandler \
+  Env \
+  FileCharStream \
+  Element_Def_Builder \
   StreamFactory \
-  Transcode \
-  URL_Addr \
-  Validator \
-  XMLFilterImpl \
-  XML_Codecs \
-  ZipCharStream
+  HttpCharStream \
+  ZipCharStream \
+  Encoding \
+  XML_Codecs
+#----------------------------------------------------------------------------
+#       Include macros and targets
+#----------------------------------------------------------------------------
 
 LIB   = $(LIB_UNCHECKED)
 SHLIB = $(SHLIB_UNCHECKED)
 
-#----------------------------------------------------------------------------
-#       Include macros and targets
-#----------------------------------------------------------------------------
 include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
 LSRC   = $(addsuffix .cpp, $(FILES))
 ACELIB = -lACE
@@ -52,18 +51,25 @@ include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
 
 CPPFLAGS     += -I../..
+ifeq ($(shared_libs),1)
+  ifneq ($(SHLIB),)
+    CPPFLAGS += -DACEXML_BUILD
+  endif
+endif
+ifeq ($(static_libs),1)
+  ifneq ($(LIB),)
+    CPPFLAGS += -DACE_AS_STATIC_LIBS
+  endif
+endif
+
+
 LDFLAGS      += -L../../ace
 
-ACE_SHLIBS = -lz -lzzip $(ACELIB)
+ACE_SHLIBS  = -lz -lzzip $(ACELIB)
 
 #----------------------------------------------------------------------------
 #       Local targets
 #----------------------------------------------------------------------------
 
-#----------------------------------------------------------------------------
-#       Dependencies
-#----------------------------------------------------------------------------
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
+realclean: clean 
 
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/ACEXML/compass/Assembly.cpp b/ACEXML/compass/Assembly.cpp
deleted file mode 100644
index e286d702b38..00000000000
--- a/ACEXML/compass/Assembly.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-// $Id$
-
-
-#if defined (__ACE_INLINE__)
-#include "Assembly.inl"
-#endif /* __ACE_INLINE__ */
-
-#include "ACEXML/compass/Assembly.h"
-
-using namespace Deployment;
-
-Assembly::Assembly()
-  : state_ (AssemblyState::INACTIVE),
-    stream_ (0)
-{}
-
-Assembly::Assembly (const AssemblyState& state, ACEXML_CharStream* stream)
-  : state_ (state),
-    stream_ (stream)
-{}
-
-Assembly::~Assembly()
-{
-  this->state_ = Assembly::INACTIVE;
-  delete this->stream;
-}
-
-
-void
-Assembly::build (void)
-  ACE_THROW_SPEC ((CreateFailure))
-{}
-
-void
-Assembly::tear_down(void)
-  ACE_THROW_SPEC ((RemoveFailure))
-{}
diff --git a/ACEXML/compass/Assembly.h b/ACEXML/compass/Assembly.h
deleted file mode 100644
index 467458e9b36..00000000000
--- a/ACEXML/compass/Assembly.h
+++ /dev/null
@@ -1,46 +0,0 @@
-// $Id$
-
-
-#ifndef COMPASS_ASSEMBLY_H
-#define COMPASS_ASSEMBLY_H
-
-#include "ace/pre.h"
-#include "ACEXML/compass/Compass_Export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ACEXML/common/CharStream.h"
-#include "ACEXML/compass/CompassTypes.h"
-
-namespace Deployment
-{
-  class Compass_Export Assembly
-  {
-  public:
-    Assembly(void);
-    Assembly (const AssemblyState& state, ACEXML_CharStream* stream);
-    ~Assembly();
-
-    AssemblyState get_state();
-
-    void build()
-      ACE_THROW_SPEC ((CreateFailure));
-
-    void tear_down()
-      ACE_THROW_SPEC ((RemoveFailure));
-
-  private:
-    AssemblyState state_;
-    ACEXML_CharStream* stream_;
-  };
-}
-
-#if defined (__ACE_INLINE__)
-#include "Assembly.inl"
-#endif /* __ACE_INLINE__ */
-
-#include "ace/post.h"
-
-#endif /* COMPASS_ASSEMBLY_H */
diff --git a/ACEXML/compass/Assembly.inl b/ACEXML/compass/Assembly.inl
deleted file mode 100644
index 8c618dec870..00000000000
--- a/ACEXML/compass/Assembly.inl
+++ /dev/null
@@ -1,9 +0,0 @@
-// $Id$
-
-using namespace Deployment;
-
-ACE_INLINE AssemblyState
-Assembly::get_state()
-{
-  return this->state_;
-}
diff --git a/ACEXML/compass/AssemblyFactory.cpp b/ACEXML/compass/AssemblyFactory.cpp
deleted file mode 100644
index 5a4f3b1afd4..00000000000
--- a/ACEXML/compass/AssemblyFactory.cpp
+++ /dev/null
@@ -1,55 +0,0 @@
-// $Id$
-
-#include "AssemblyFactory.h"
-#include "ACEXML/common/StreamFactory.h"
-
-using namespace Deployment;
-
-AssemblyFactory::AssemblyFactory()
-  : cookies_()
-{}
-
-AssemblyFactory::~AssemblyFactory()
-{}
-
-
-Cookie
-AssemblyFactory::create (const Location& assembly_loc)
-  ACE_THROW_SPEC ((InvalidLocation, CreateFailure))
-{
-  ACEXML_StreamFactory factory;
-  ACEXML_CharStream* stream = factory.create_stream (assembly_loc.c_str());
-  if (stream == 0)
-    ACE_THROW (InvalidLocation());
-  char buf[10];
-  int size = ACE_OS::sprintf (buf, "%@", stream);
-  buf[size] = 0;
-  ACEXML_String cookie (buf);
-  Assembly* assembly = 0;
-  ACE_NEW (assembly, Assembly (AssemblyState::INACTIVE, stream));
-  if (assembly == 0)
-    ACE_THROW ((CreateFailure()));
-  if (this->cookies_.bind (ret, assembly) != 0)
-    ACE_THROW ((CreateFailure()));
-  return cookie;
-}
-
-Assembly*
-AssemblyFactory::lookup (const Cookie& c)
-  ACE_THROW_SPEC ((InvalidAssembly))
-{
-  Assembly* asm = 0;
-  if (this->cookies_->find (c, asm) != 0)
-    ACE_THROW (InvalidAssembly());
-  return asm;
-}
-
-void
-AssemblyFactory::destroy (const Cookie& c)
-  ACE_THROW_SPEC ((InvalidAssembly, RemoveFailure))
-{
-  Assembly* asm = 0;
-  if (this->cookies_->unbind (c, asm) != 0)
-    ACE_THROW (InvalidAssembly());
-  delete asm;
-}
diff --git a/ACEXML/compass/AssemblyFactory.h b/ACEXML/compass/AssemblyFactory.h
deleted file mode 100644
index 001e845b2dd..00000000000
--- a/ACEXML/compass/AssemblyFactory.h
+++ /dev/null
@@ -1,74 +0,0 @@
-// $Id$
-
-
-#ifndef COMPASS_ASSEMBLY_FACTORY_H
-#define COMPASS_ASSEMBLY_FACTORY_H
-
-#include "ace/pre.h"
-#include "ACEXML/compass/Compass_Export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Singleton.h"
-#include "ace/Synch.h"
-#include "ace/Hash_Map_Manager.h"
-#include "ACEXML/compass/CompassTypes.h"
-
-namespace Deployment
-{
-  class Assembly;
-  typedef ACE_Hash_Map_Entry<ACEXML_String,
-                             Assembly*> COOKIE;
-
-  typedef ACE_Hash_Map_Manager_Ex<ACEXML_String,
-                                  Assembly*
-                                  ACE_Hash<ACEXML_String>,
-                                  ACE_Equal_To<ACEXML_String>,
-                                  ACE_SYNCH_MUTEX> COOKIES_MANAGER;
-
-  typedef ACE_Hash_Map_Iterator_Ex<ACEXML_String,
-                                   Assembly*
-                                   ACE_Hash<ACEXML_String>,
-                                   ACE_Equal_To<ACEXML_String>,
-                                   ACE_SYNCH_MUTEX> COOKIES_MANAGER_ITER;
-
-  typedef ACE_Hash_Map_Reverse_Iterator_Ex<ACEXML_String,
-                                           Assembly*
-                                           ACE_Hash<ACEXML_String>,
-                                           ACE_Equal_To<ACEXML_String>,
-                                           ACE_SYNCH_MUTEX> COOKIES_MANAGER_REVERSE_ITER;
-
-  class Compass_Export AssemblyFactory
-  {
-  public:
-
-    friend class ACE_Singleton<AssemblyFactory, ACE_SYNCH_MUTEX>;
-
-    Cookie create(const Location& assembly_loc)
-      ACE_THROW_SPEC ((InvalidLocation, CreateFailure));
-
-    Assembly* lookup(const Cookie& c)
-      ACE_THROW_SPEC ((InvalidAssembly));
-
-    void destroy(const Cookie& c)
-      ACE_THROW_SPEC ((InvalidAssembly, RemoveFailure));
-
-  protected:
-    AssemblyFactory();
-    ~AssemblyFactory();
-    AssemblyFactory (const AssemblyFactory&);
-    AssemblyFactory& operator= (const AssemblyFactory&);
-
-  private:
-
-    COOKIES_MANAGER cookies_;
-
-  };
-  typedef ACE_Singleton<AssemblyFactory, ACE_SYNCH_MUTEX> ASSEMBLY_FACTORY;
-}
-
-#include "ace/post.h"
-
-#endif /* COMPASS_ASSEMBLY_FACTORY_H */
diff --git a/ACEXML/compass/CCMHome.h b/ACEXML/compass/CCMHome.h
deleted file mode 100644
index d339ee71e99..00000000000
--- a/ACEXML/compass/CCMHome.h
+++ /dev/null
@@ -1,42 +0,0 @@
-// $Id$
-
-
-#ifndef COMPASS_CCMHOME_H
-#define COMPASS_CCMHOME_H
-
-#include "ace/pre.h"
-#include "ACEXML/compass/Compass_Export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Unbounded_Set.h"
-#include "ACEXML/compass/CompassTypes.h"
-
-namespace Deployment
-{
-  class Compass_Export CCMHome
-  {
-  public:
-    Component* create_component()
-      ACE_THROW_SPEC ((CreateFailure));
-
-    void remove_component (Component* comp)
-      ACE_THROW_SPEC ((RemoveFailure));
-
-  private:
-    Component* component_;
-  };
-
-  typedef ACE_Unbounded_Set<CCMHome*> CCMHomes;
-
-}
-
-#if defined (__ACE_INLINE__)
-#include "CCMHome.inl"
-#endif /* __ACE_INLINE__ */
-
-#include "ace/post.h"
-
-#endif /* COMPASS_CCMHOME_H */
diff --git a/ACEXML/compass/CCMHome.inl b/ACEXML/compass/CCMHome.inl
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/ACEXML/compass/CCMHome.inl
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/ACEXML/compass/Compass.dsp b/ACEXML/compass/Compass.dsp
deleted file mode 100644
index e42e752d3ad..00000000000
--- a/ACEXML/compass/Compass.dsp
+++ /dev/null
@@ -1,183 +0,0 @@
-# Microsoft Developer Studio Project File - Name="Compass DLL" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102

-

-CFG=Compass DLL - Win32 Debug

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE run the tool that generated this project file and specify the

-!MESSAGE nmake output type.  You can then use the following command:

-!MESSAGE

-!MESSAGE NMAKE /f "Compass.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 "Compass.mak" CFG="Compass DLL - Win32 Debug"

-!MESSAGE

-!MESSAGE Possible choices for configuration are:

-!MESSAGE

-!MESSAGE "Compass DLL - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")

-!MESSAGE "Compass DLL - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")

-!MESSAGE

-

-# Begin Project

-# PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "Compass DLL - Win32 Release"

-

-# 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 CPP /nologo /W3 /GX /O2 /MD /Zi /Ob2 /GR /I "..\.." /D NDEBUG=1 /D WIN32=1 /D _WINDOWS=1 /D COMPASS_BUILD=1 /FD /c

-# SUBTRACT CPP /YX

-# ADD RSC /l 0x409 /d NDEBUG=1 /i "..\.."

-BSC32=bscmake.exe

-# ADD BSC32 /nologo /o".\Compass.bsc"

-LINK32=link.exe

-# ADD LINK32 advapi32.lib user32.lib /INCREMENTAL:NO ACEXML.lib ACEXML_Parser.lib zzip.lib z.lib ACE.lib /libpath:"..\..\ace" /nologo /version:5.2.4 /subsystem:windows /dll  /machine:I386 /out:"..\..\bin\Compass.dll"

-

-!ELSEIF  "$(CFG)" == "Compass DLL - Win32 Debug"

-

-# 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 CPP /nologo /W3 /Gm /GX /Zi /Od /MDd /GR /Gy /I "..\.." /D _DEBUG=1 /D WIN32=1 /D _WINDOWS=1 /D COMPASS_BUILD=1 /FD /c

-# SUBTRACT CPP /Fr /YX

-# ADD RSC /l 0x409 /d _DEBUG=1 /i "..\.."

-BSC32=bscmake.exe

-# ADD BSC32 /nologo /o".\Compass.bsc"

-LINK32=link.exe

-# ADD LINK32 advapi32.lib user32.lib /INCREMENTAL:NO ACEXMLd.lib ACEXML_Parserd.lib zzipd.lib zd.lib ACEd.lib /libpath:"..\..\ace" /nologo /version:5.2.4 /subsystem:windows /dll /debug /pdb:Compassd.pdb /machine:I386 /out:"..\..\bin\Compassd.dll"

-

-!ENDIF

-

-# Begin Target

-

-# Name "Compass DLL - Win32 Release"

-# Name "Compass DLL - Win32 Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter "cpp;cxx;c"

-# Begin Source File

-

-SOURCE=.\Assembly.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\AssemblyFactory.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\ComponentServer.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\ConfigValue.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\PropertyFile_Handler.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\ServerActivator.cpp

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

-# PROP Default_Filter "h;hpp;hxx;hh"

-# Begin Source File

-

-SOURCE=.\Assembly.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\AssemblyFactory.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\CCMHome.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Compass_Export.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\CompassTypes.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\ComponentInstallation.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\ComponentServer.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\ConfigValue.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Container.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Deployment.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\PropertyFile_Handler.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\ServerActivator.h

-# End Source File

-# End Group

-# Begin Group "Inline Files"

-

-# PROP Default_Filter "i;inl"

-# Begin Source File

-

-SOURCE=.\Assembly.inl

-# End Source File

-# Begin Source File

-

-SOURCE=.\CCMHome.inl

-# End Source File

-# Begin Source File

-

-SOURCE=.\ComponentInstallation.inl

-# End Source File

-# Begin Source File

-

-SOURCE=.\ComponentServer.inl

-# End Source File

-# Begin Source File

-

-SOURCE=.\Container.inl

-# End Source File

-# Begin Source File

-

-SOURCE=.\PropertyFile_Handler.inl

-# End Source File

-# Begin Source File

-

-SOURCE=.\ServerActivator.inl

-# End Source File

-# End Group

-# End Target

-# End Project

diff --git a/ACEXML/compass/CompassTypes.h b/ACEXML/compass/CompassTypes.h
deleted file mode 100644
index 67501a8017b..00000000000
--- a/ACEXML/compass/CompassTypes.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// $Id$
-
-#ifndef COMPASS_TYPES_H
-#define COMPASS_TYPES_H
-
-#include "ace/pre.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ACEXML/common/XML_Types.h"
-
-// *************** Packaging and Deployment ***************
-
-namespace Deployment
-{
-  typedef ACEXML_String UUID;
-  typedef ACEXML_String Location;
-  typedef unsigned long FailureReason;
-  typedef ACEXML_String Cookie;
-
-  enum AssemblyState
-    {
-      INACTIVE,
-      INSERVICE
-    };
-
-  typedef ACEXML_String FeatureName;
-
-  struct UnknownImplId {};
-  struct InvalidLocation {};
-  struct InstallationFailure { FailureReason reason; };
-  struct InvalidAssembly {};
-  struct RemoveFailure { FailureReason reason; };
-
-  struct ImplEntryPointNotFound {};
-
-}
-
-#include "ace/post.h"
-
-#endif /* COMPASS_TYPES_H */
diff --git a/ACEXML/compass/Compass_Export.h b/ACEXML/compass/Compass_Export.h
deleted file mode 100644
index 0e8f526a7bb..00000000000
--- a/ACEXML/compass/Compass_Export.h
+++ /dev/null
@@ -1,59 +0,0 @@
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl -f ACE_HAS_DLL -s Compass
-// ------------------------------
-#ifndef COMPASS_EXPORT_H
-#define COMPASS_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (COMPASS_HAS_DLL)
-#  define COMPASS_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && COMPASS_HAS_DLL */
-
-#if defined (ACE_HAS_DLL)
-#  if !defined (COMPASS_HAS_DLL)
-#    define COMPASS_HAS_DLL 0
-#  endif /* ! COMPASS_HAS_DLL */
-#else
-#  if !defined (COMPASS_HAS_DLL)
-#    define COMPASS_HAS_DLL 1
-#  endif /* ! COMPASS_HAS_DLL */
-#endif
-
-#if defined (COMPASS_HAS_DLL) && (COMPASS_HAS_DLL == 1)
-#  if defined (COMPASS_BUILD_DLL)
-#    define Compass_Export ACE_Proper_Export_Flag
-#    define COMPASS_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define COMPASS_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* COMPASS_BUILD_DLL */
-#    define Compass_Export ACE_Proper_Import_Flag
-#    define COMPASS_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define COMPASS_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* COMPASS_BUILD_DLL */
-#else /* COMPASS_HAS_DLL == 1 */
-#  define Compass_Export
-#  define COMPASS_SINGLETON_DECLARATION(T)
-#  define COMPASS_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* COMPASS_HAS_DLL == 1 */
-
-// Set COMPASS_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (COMPASS_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define COMPASS_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define COMPASS_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !COMPASS_NTRACE */
-
-#if (COMPASS_NTRACE == 1)
-#  define COMPASS_TRACE(X)
-#else /* (COMPASS_NTRACE == 1) */
-#  define COMPASS_TRACE(X) ACE_TRACE_IMPL(X)
-#endif /* (COMPASS_NTRACE == 1) */
-
-#endif /* COMPASS_EXPORT_H */
-
-// End of auto generated file.
diff --git a/ACEXML/compass/Compass_Static.dsp b/ACEXML/compass/Compass_Static.dsp
deleted file mode 100644
index f5e94a23c01..00000000000
--- a/ACEXML/compass/Compass_Static.dsp
+++ /dev/null
@@ -1,183 +0,0 @@
-# Microsoft Developer Studio Project File - Name="Compass LIB" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Static Library" 0x0104

-

-CFG=Compass LIB - Win32 Static Debug

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE run the tool that generated this project file and specify the

-!MESSAGE nmake output type.  You can then use the following command:

-!MESSAGE

-!MESSAGE NMAKE /f "Compass_Static.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 "Compass_Static.mak" CFG="Compass LIB - Win32 Static Debug"

-!MESSAGE

-!MESSAGE Possible choices for configuration are:

-!MESSAGE

-!MESSAGE "Compass LIB - Win32 Static Release" (based on "Win32 (x86) Static Library")

-!MESSAGE "Compass LIB - Win32 Static Debug" (based on "Win32 (x86) Static Library")

-!MESSAGE

-

-# Begin Project

-# PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "Compass LIB - Win32 Static Release"

-

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Static_Release"

-# PROP Intermediate_Dir "Static_Release"

-# PROP Target_Dir ""

-LINK32=link.exe -lib

-# ADD CPP /nologo /G5 /W3 /GX /O2 /MD /Zi /GR /I "..\.." /D NDEBUG=1 /D WIN32=1 /D _WINDOWS=1 /D ACE_AS_STATIC_LIBS=1 /FD /c

-# SUBTRACT CPP /YX

-# ADD RSC /l 0x409 /d NDEBUG=1 /i "..\.."

-BSC32=bscmake.exe

-# ADD BSC32 /nologo /o".\Compass.bsc"

-LIB32=link.exe -lib

-# ADD LIB32 /nologo /out:".\Compasss.lib"

-

-!ELSEIF  "$(CFG)" == "Compass LIB - Win32 Static Debug"

-

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "Static_Debug"

-# PROP Intermediate_Dir "Static_Debug"

-# PROP Target_Dir ""

-LINK32=link.exe -lib

-# ADD CPP /nologo /G5 /W3 /Gm /GX /Zi /Od /GR /Gy /MDd /I "..\.." /D _DEBUG=1 /D WIN32=1 /D _WINDOWS=1 /D ACE_AS_STATIC_LIBS=1 /FD /c

-# SUBTRACT CPP /Fr /YX

-# ADD RSC /l 0x409 /d _DEBUG=1 /i "..\.."

-BSC32=bscmake.exe

-# ADD BSC32 /nologo /o".\Compass.bsc"

-LIB32=link.exe -lib

-# ADD LIB32 /nologo /out:".\Compasssd.lib"

-

-!ENDIF

-

-# Begin Target

-

-# Name "Compass LIB - Win32 Static Release"

-# Name "Compass LIB - Win32 Static Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter "cpp;cxx;c"

-# Begin Source File

-

-SOURCE=.\Assembly.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\AssemblyFactory.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\ComponentServer.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\ConfigValue.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\PropertyFile_Handler.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\ServerActivator.cpp

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

-# PROP Default_Filter "h;hpp;hxx;hh"

-# Begin Source File

-

-SOURCE=.\Assembly.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\AssemblyFactory.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\CCMHome.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Compass_Export.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\CompassTypes.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\ComponentInstallation.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\ComponentServer.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\ConfigValue.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Container.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Deployment.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\PropertyFile_Handler.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\ServerActivator.h

-# End Source File

-# End Group

-# Begin Group "Inline Files"

-

-# PROP Default_Filter "i;inl"

-# Begin Source File

-

-SOURCE=.\Assembly.inl

-# End Source File

-# Begin Source File

-

-SOURCE=.\CCMHome.inl

-# End Source File

-# Begin Source File

-

-SOURCE=.\ComponentInstallation.inl

-# End Source File

-# Begin Source File

-

-SOURCE=.\ComponentServer.inl

-# End Source File

-# Begin Source File

-

-SOURCE=.\Container.inl

-# End Source File

-# Begin Source File

-

-SOURCE=.\PropertyFile_Handler.inl

-# End Source File

-# Begin Source File

-

-SOURCE=.\ServerActivator.inl

-# End Source File

-# End Group

-# End Target

-# End Project

diff --git a/ACEXML/compass/ComponentInstallation.cpp b/ACEXML/compass/ComponentInstallation.cpp
deleted file mode 100644
index b00d89ae995..00000000000
--- a/ACEXML/compass/ComponentInstallation.cpp
+++ /dev/null
@@ -1,109 +0,0 @@
-// $Id$
-
-#include "ACEXML/compass/ComponentInstallation.h"
-#include "ACEXML/common/ZipCharStream.h"
-
-using namespace Deployment;
-
-static const empty_string[] = {0};
-
-ComponentInstallation::ComponentInstallation()
-  : packages_()
-{}
-
-ComponentInstallation::~ComponentInstallation()
-{
-
-}
-
-void
-ComponentInstallation::install (const UUID& implUUID,
-                                const Location& component_loc)
-  ACE_THROW_SPEC ((InvalidLocation,InstallationFailure))
-{
-  if (implUUID == empty_string)
-    {
-      ACE_ERROR ((LM_ERROR, "Implementation id is an Empty string\n"));
-      ACE_THROW (InstallationFailure());
-    }
-  else if (component_loc == empty_string)
-    {
-      ACE_ERROR ((LM_ERROR, "Component Location is an Empty string\n"));
-      ACE_THROW (InvalidLocation());
-    }
-
-  ACEXML_StreamFactory factory;
-  ACEXML_CharStream* stream = factory.create_stream (component_loc.c_str());
-  if (!stream)
-    {
-      ACE_ERROR ((LM_ERROR, "Unable to create a stream for the Component"
-                  "location %s\n", component_loc.c_str()));
-      ACE_THROW (InstallationFailure());
-    }
-
-  ACEXML_Char temp[MAXNAMLEN + 1] = "acefileXXXXXX";
-  if (mkdtemp (temp) == 0)
-    {
-      ACE_ERROR ((LM_ERROR, "Unable to create safe temporary directory\n"));
-      ACE_THROW (InstallationFailure());
-    }
-  ACEXML_Char* file = ACE_OS::strrchr (component_loc.c_str(), '/');
-  if (!file)
-    file = component_loc.c_str();
-  else
-    file += 1;
-  ACEXML_String dsoname = temp + '/' + file;
-  ACE_HANDLE dso = ACE_OS::open (dsoname.c_str(),
-                                 O_WRONLY| O_CREAT|O_EXCL, S_IRWXU);
-  if (dso == 0)
-    {
-      ACE_ERROR ((LM_ERROR, "Unable to unpack the implementation %s : %m\n",
-                  dsoname.c_str()));
-      ACE_THROW (InstallationFailure());
-    }
-  ACEXML_Char buf[65535];
-  int bytes = 0;
-  while ((bytes = stream.read (buf, sizeof(buf))) > 0)
-    {
-      if (ACE_OS::write (dso, buf, bytes) != bytes)
-        {
-          ACE_ERROR ((LM_ERROR, "Unable to unpack the implementation %s: %m\n",
-                      dsoname.c_str()));
-          ACE_THROW (InstallationFailure());
-        }
-    }
-  ACE_OS::close (dso);
-  if (this->packages_->bind (implUUID, dsoname) != 0)
-    {
-      ACE_ERROR ((LM_ERROR, "Component %s already installed\n",
-                  implUUID.c_str()));
-      ACE_THROW (InstallationFailure());
-    }
-}
-
-void
-ComponentInstallation::replace (const UUID& implUUID,
-                                const Location& component_loc)
-  ACE_THROW_SPEC ((InvalidLocation,InstallationFailure))
-{
-  if (implUUID == empty_string)
-    ACE_THROW (InstallationFailure());
-  else if (component_loc == empty_string)
-    ACE_THROW (InvalidLocation());
-  else
-    {
-      if (this->packages_->unbind (implUUID) != 0)
-        ACE_THROW (InstallationFailure());
-      this->install (implUUID, component_loc);
-    }
-}
-
-void
-ComponentInstallation::remove (const UUID& implUUID)
-  ACE_THROW_SPEC ((UnknownImplId, RemoveFailure));
-{
-  if (implUUID == empty_string)
-    ACE_THROW (UnknownImplId());
-  else if (this->packages_->unbind (implUUID) != 0)
-    ACE_THROW (RemoveFailure());
-}
diff --git a/ACEXML/compass/ComponentInstallation.h b/ACEXML/compass/ComponentInstallation.h
deleted file mode 100644
index c6c30b9fe7a..00000000000
--- a/ACEXML/compass/ComponentInstallation.h
+++ /dev/null
@@ -1,76 +0,0 @@
-// $Id$
-
-
-#ifndef COMPASS_COMPONENT_INSTALLATION_H
-#define COMPASS_COMPONENT_INSTALLATION_H
-
-#include "ace/pre.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ACEXML/compass/CompassTypes.h"
-#include "ace/Unbounded_Set.h"
-
-namespace Deployment
-{
-  typedef ACE_Hash_Map_Entry<ACEXML_String,
-                             ACEXML_String> Package;
-
-  typedef ACE_Hash_Map_Manager_Ex<ACEXML_String,
-                                  ACEXML_String,
-                                  ACE_Hash<ACEXML_String>,
-                                  ACE_Equal_To<ACEXML_String>,
-                                  ACE_SYNCH_MUTEX> Package_Manager;
-
-  typedef ACE_Hash_Map_Iterator_Ex<ACEXML_String,
-                                   ACEXML_String,
-                                   ACE_Hash<ACEXML_String>,
-                                   ACE_Equal_To<ACEXML_String>,
-                                   ACE_SYNCH_MUTEX> Package_Manager_Iter;
-
-  typedef ACE_Hash_Map_Reverse_Iterator_Ex<ACEXML_String,
-                                           ACEXML_String,
-                                           ACE_Hash<ACEXML_String>,
-                                           ACE_Equal_To<ACEXML_String>,
-                                           ACE_SYNCH_MUTEX> Package_Manager_Reverse_Iter;
-
-  class Compass_Export ComponentInstallation
-  {
-  public:
-    friend class ACE_Singleton<ComponentInstallation, ACE_SYNCH_MUTEX>;
-
-    void install(const UUID& implUUID, const Location& component_loc)
-      ACE_THROW_SPEC ((InvalidLocation,InstallationFailure));
-
-    void replace(const UUID& implUUID, const Location& component_loc)
-      ACE_THROW_SPEC ((InvalidLocation, InstallationFailure));
-
-    void remove(const UUID& implUUID)
-      ACE_THROW_SPEC ((UnknownImplId, RemoveFailure));
-
-    const Location& get_implementation (const UUID& implUUID)
-      ACE_THROW_SPEC ((UnknownImplId, InstallationFailure));
-
-  protected:
-    ComponentInstallation();
-    ~ComponentInstallation();
-    ComponentInstallation (const ComponentInstallation&);
-    ComponentInstallation& operator= (const ComponentInstallation&);
-
-  private:
-    Package_Manager packages_;
-  };
-  typedef ACE_Singleton<ComponentInstallation, ACE_SYNCH_MUTEX> COMP_INSTALL;
-
-
-}
-
-#if defined (__ACE_INLINE__)
-#include "ComponentInstallation.inl"
-#endif /* __ACE_INLINE__ */
-
-#include "ace/post.h"
-
-#endif /* COMPASS_COMPONENT_INSTALLATION_H */
diff --git a/ACEXML/compass/ComponentInstallation.inl b/ACEXML/compass/ComponentInstallation.inl
deleted file mode 100644
index 80de2184058..00000000000
--- a/ACEXML/compass/ComponentInstallation.inl
+++ /dev/null
@@ -1,11 +0,0 @@
-// $Id$
-
-ACE_INLINE const Location&
-get_implementation (const UUID& implUUID)
-  ACE_THROW_SPEC ((UnknownImplId, InstallationFailure));
-{
-  ACEXML_String loc;
-  if (this->packages_.find (implUUID, loc) != 0)
-    ACE_THROW (UnknownImplId());
-  return this->loc;
-}
diff --git a/ACEXML/compass/ComponentServer.cpp b/ACEXML/compass/ComponentServer.cpp
deleted file mode 100644
index 0909d8be5ba..00000000000
--- a/ACEXML/compass/ComponentServer.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
-// $Id$
-
-#if defined (__ACE_INLINE__)
-#include "ComponentServer.inl"
-#endif /* __ACE_INLINE__ */
-
-#include "ACEXML/compass/ComponentServer.h"
-
-using namespace Deployment;
-
-ComponentServer::ComponentServer(ConfigValues* config)
-  : containers_ (0),
-    config_ (config),
-    activator_ (SERVER_ACTIVATOR::instance())
-{}
-
-ComponentServer::~ComponentServer()
-{
-  this->remove();
-}
-
-Container*
-ComponentServer::create_container (ConfigValues* config)
-  ACE_THROW_SPEC ((CreateFailure, InvalidConfiguration))
-{
-  Container* ctr = 0;
-  ACE_NEW_RETURN (ctr, Container (config), 0);
-  if (this->containers_->insert (ctr) != 0)
-    ACE_THROW (CreateFailure());
-  return ctr;
-}
-
-void
-ComponentServer::remove_container (Container* cref)
-  ACE_THROW_SPEC ((RemoveFailure));
-{
-  if (this->containers_->remove (cref) != 0)
-    ACE_THROW (RemoveFailure());
-  delete cref;
-}
-
-void
-ComponentServer::remove()
-  ACE_THROW_SPEC ((RemoveFailure))
-{
-  Container** entry = 0;
-  for (Containers::iterator iter (*this->containers_);
-       iter.next (entry) != 0;
-       iter->advance())
-    delete *entry;
-
-  ConfigValues** value = 0;
-  for (ConfigValues::iterator iter (*this->config_);
-       iter.next (value) != 0;
-       iter->advance())
-    delete *value;
-
-  this->activator_ = 0;
-}
diff --git a/ACEXML/compass/ComponentServer.h b/ACEXML/compass/ComponentServer.h
deleted file mode 100644
index ebcaa53e157..00000000000
--- a/ACEXML/compass/ComponentServer.h
+++ /dev/null
@@ -1,57 +0,0 @@
-// $Id$
-
-
-#ifndef COMPASS_COMPONENT_SERVER_H
-#define COMPASS_COMPONENT_SERVER_H
-
-#include "ace/pre.h"
-#include "ACEXML/compass/Compass_Export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Unbounded_Set.h"
-#include "ACEXML/compass/CompassTypes.h"
-
-namespace Deployment
-{
-  class Container;        // Forward decl.
-  typedef ACE_Unbounded_Set<Container*> Containers;
-
-  class Compass_Export ComponentServer
-  {
-  public:
-    ComponentServer (ConfigValues* config = 0);
-    ~ComponentServer();
-
-    ServerActivator* get_server_activator ();
-
-    Container* create_container (ConfigValues* config = 0)
-      ACE_THROW_SPEC ((CreateFailure, InvalidConfiguration));
-
-    void remove_container (Container* cref)
-      ACE_THROW_SPEC ((RemoveFailure));
-
-    Containers* get_containers ();
-
-    void remove ()
-      ACE_THROW_SPEC ((RemoveFailure));
-
-    const ConfigValues& get_configuration (void);
-
-    void set_configuration (ConfigValues* config);
-
-  private:
-    Containers* containers_;
-    ServerActivator* activator_;
-    ConfigValues* config_;
-  };
-
-}
-
-#if defined (__ACE_INLINE__)
-#include "ComponentServer.inl"
-#endif /* __ACE_INLINE__ */
-
-#endif /* COMPASS_COMPONENT_SERVER_H */
diff --git a/ACEXML/compass/ComponentServer.inl b/ACEXML/compass/ComponentServer.inl
deleted file mode 100644
index 65dd132782a..00000000000
--- a/ACEXML/compass/ComponentServer.inl
+++ /dev/null
@@ -1,27 +0,0 @@
-// $Id$
-
-using namespace Deployment;
-
-ACE_INLINE ServerActivator*
-ComponentServer::get_server_activator (void)
-{
-  return this->activator_;
-}
-
-ACE_INLINE Containers*
-ComponentServer::get_containers (void)
-{
-  return this->containers_;
-}
-
-ACE_INLINE const ConfigValues*
-ComponentServer::get_configuration (void)
-{
-  return this->config_;
-}
-
-ACE_INLINE void
-ComponentServer::set_configuration (ConfigValues* config)
-{
-  this->config_ = config;
-}
diff --git a/ACEXML/compass/ConfigValue.cpp b/ACEXML/compass/ConfigValue.cpp
deleted file mode 100644
index 7c495947cb9..00000000000
--- a/ACEXML/compass/ConfigValue.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
-// $Id$
-
-#include "ACEXML/compass/ConfigValue.h"
-
-using namespace Deployment;
-
-ConfigValue::ConfigValue()
-  : name_(), value_()
-{
-
-}
-
-ConfigValue::~ConfigValue()
-{
-  delete this->name_;
-  delete this->value_;
-}
-
-ConfigValue::ConfigValue (const ConfigValue& config)
-{
-  if (*this != config)
-    {
-      this->name_ = config.name_;
-      this->value_ = config.value_;
-    }
-  return *this;
-}
-
-ConfigValue&
-ConfigValue::operator= (const ConfigValue& config)
-{
-  this->name_ = config.name_;
-  this->value_ = config.value_;
-  return *this;
-}
-
-int
-ConfigValue::operator== (const ConfigValue& config)
-{
-  return (this->name_ == config.name_ && this->value_ == config.value_);
-}
diff --git a/ACEXML/compass/ConfigValue.h b/ACEXML/compass/ConfigValue.h
deleted file mode 100644
index 03d0cff5210..00000000000
--- a/ACEXML/compass/ConfigValue.h
+++ /dev/null
@@ -1,35 +0,0 @@
-// $Id$
-
-#ifndef COMPASS_CONFIG_VALUE_H
-#define COMPASS_CONFIG_VALUE_H
-
-#include "ace/pre.h"
-#include "ACEXML/compass/Compass_Export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ACEXML/common/XML_Types.h"
-
-namespace Deployment
-{
-  class Compass_Export ConfigValue
-  {
-  public:
-    ConfigValue();
-    ~ConfigValue();
-    ConfigValue (const ConfigValue& config);
-    ConfigValue& operator= (const ConfigValue& config);
-    int operator== (const ConfigValue& config);
-
-    FeatureName name_;
-    ACEXML_String value_;
-  };
-
-  typedef ACE_Unbounded_Set<ConfigValue> ConfigValues;
-}
-
-#include "ace/post.h"
-
-#endif /* COMPASS_CONFIG_VALUE_H */
diff --git a/ACEXML/compass/Consumer.cpp b/ACEXML/compass/Consumer.cpp
deleted file mode 100644
index d3660daec42..00000000000
--- a/ACEXML/compass/Consumer.cpp
+++ /dev/null
@@ -1,164 +0,0 @@
-// $Id$
-
-#include "Consumer.h"
-#include "orbsvcs/RtecEventChannelAdminC.h"
-#include "orbsvcs/Event_Service_Constants.h"
-
-ACE_RCSID(EC_Examples, Consumer, "$Id$")
-
-extern "C"
-int
-createConsumer (int argc, char* argv[])
-{
-  Consumer consumer;
-  return consumer.run (argc, argv);
-}
-
-Consumer::Consumer (void)
-  : event_count_ (0)
-{
-}
-
-int
-Consumer::run (int argc, char* argv[])
-{
-//   int register_with_object_manager = 0;
-//   if (TAO_Singleton_Manager::instance ()->init (
-//         register_with_object_manager) == -1)
-//     ACE_ERROR_RETURN ((LM_ERROR,
-//                        "Consumer::init -- ORB pre-initialization "
-//                        "failed.\n"),
-//                       -1);  // No exceptions available yet, so return
-//                             // an error status.
-
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      // Initialize the ORB.
-      CORBA::ORB_var orb = CORBA::ORB_init (argc,
-                                            argv,
-                                            "Consumer"
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // Do *NOT* make a copy because we don't want the ORB to outlive
-      // the run() method.
-      this->orb_ = orb.in ();
-
-      CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      PortableServer::POAManager_var poa_manager =
-        poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      TAO_Naming_Client naming_client;
-
-      // Initialization of the naming service.
-      if (naming_client.init (orb.in ()) != 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "(%P|%t) Unable to initialize "
-                           "the TAO_Naming_Client. \n"),
-                          -1);
-
-      CosNaming::Name ec_name (1);
-      ec_name.length (1);
-      ec_name[0].id = CORBA::string_dup ("EventChannel");
-
-      CORBA::Object_var ec_obj =
-        naming_client->resolve (ec_name
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      RtecEventChannelAdmin::EventChannel_var event_channel =
-        RtecEventChannelAdmin::EventChannel::_narrow (ec_obj.in ()
-                                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // The canonical protocol to connect to the EC
-      RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-        event_channel->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      RtecEventChannelAdmin::ProxyPushSupplier_var supplier =
-        consumer_admin->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      RtecEventComm::PushConsumer_var consumer =
-        this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // Simple subscription, but usually the helper classes in
-      // $TAO_ROOT/orbsvcs/Event_Utils.h are a better way to do this.
-      RtecEventChannelAdmin::ConsumerQOS qos;
-      qos.dependencies.length (2);
-      RtecEventComm::EventHeader& h0 =
-        qos.dependencies[0].event.header;
-      h0.type   = ACE_ES_DISJUNCTION_DESIGNATOR;
-      h0.source = ACE_ES_EVENT_SOURCE_ANY;
-
-      RtecEventComm::EventHeader& h1 =
-        qos.dependencies[1].event.header;
-      h1.type   = ACE_ES_EVENT_UNDEFINED; // first free event type
-      h1.source = ACE_ES_EVENT_SOURCE_ANY;
-
-      supplier->connect_push_consumer (consumer.in (), qos
-                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // Wait for events, using work_pending()/perform_work() may help
-      // or using another thread, this example is too simple for that.
-      orb->run();
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Consumer::run");
-      return 1;
-    }
-  ACE_ENDTRY;
-//   if (TAO_Singleton_Manager::instance ()->fini () == -1)
-//     ACE_ERROR_RETURN ((LM_ERROR,
-//                        "Consumer::fini -- ORB pre-termination failed."),
-//                       -1);
-  ACE_DEBUG ((LM_DEBUG, "Consumer exiting...\n"));
-  return 0;
-}
-
-void
-Consumer::push (const RtecEventComm::EventSet& events
-                ACE_ENV_ARG_DECL_NOT_USED)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  if (events.length () == 0)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "Consumer (%P|%t) no events\n"));
-      return;
-    }
-
-  this->event_count_ += events.length ();
-  if (this->event_count_ % 100 == 0)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "Consumer (%P|%t): %d events received\n",
-                  this->event_count_));
-    }
-}
-
-void
-Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
-}
-
-// ****************************************************************
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/ACEXML/compass/Consumer.h b/ACEXML/compass/Consumer.h
deleted file mode 100644
index 6338c5c7854..00000000000
--- a/ACEXML/compass/Consumer.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//   ORBSVCS Real-time Event Channel examples
-//
-// = FILENAME
-//   Consumer
-//
-// = AUTHOR
-//   Carlos O'Ryan (coryan@cs.wustl.edu)
-//
-// ============================================================================
-
-#ifndef CONSUMER_H
-#define CONSUMER_H
-
-#include "orbsvcs/RtecEventCommS.h"
-#include "orbsvcs/CosNamingS.h"
-#include "orbsvcs/Naming/Naming_Utils.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-class Consumer : public POA_RtecEventComm::PushConsumer
-{
-  // = TITLE
-  //   Simple consumer object
-  //
-  // = DESCRIPTION
-  //   This class is a consumer of events.
-  //   It simply registers for one event type.
-  //
-public:
-  Consumer (void);
-  // Constructor
-
-  int run (int argc, char* argv[]);
-  // Run the test
-
-  // = The RtecEventComm::PushConsumer methods
-
-  virtual void push (const RtecEventComm::EventSet& events
-                     ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // The skeleton methods.
-
-private:
-  CORBA::ULong event_count_;
-  // Keep track of the number of events received.
-
-  CORBA::ORB_ptr orb_;
-  // The orb, just a pointer because the ORB does not outlive the
-  // run() method...
-};
-
-#endif /* CONSUMER_H */
diff --git a/ACEXML/compass/Container.cpp b/ACEXML/compass/Container.cpp
deleted file mode 100644
index 8be3fb6cd5e..00000000000
--- a/ACEXML/compass/Container.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-// $Id$
-
-#include "ACEXML/compass/Container.h"
-
-static ACE_TCHAR empty_string[] = { 0 };
-
-using namespace Deployment;
-
-Container::Container (ComponentServer* server)
-  : config_ (0), homes_ (0), parent_ (server)
-{}
-
-Container::~Container()
-{
-  this->remove();
-}
-
-CCMHome*
-Container::install_home (const UUID& id, const string& entrypt,
-                         const ConfigValues* config)
-  ACE_THROW_SPEC ((UnknownImplId, ImplEntryPointNotFound,
-                   InstallationFailure, InvalidConfiguration))
-{
-  if (COMP_SER
diff --git a/ACEXML/compass/Container.h b/ACEXML/compass/Container.h
deleted file mode 100644
index 2665f6eba4c..00000000000
--- a/ACEXML/compass/Container.h
+++ /dev/null
@@ -1,58 +0,0 @@
-// $Id$
-
-#ifndef COMPASS_CONTAINER_H
-#define COMPASS_CONTAINER_H
-
-#include "ace/pre.h"
-#include "ACEXML/compass/Compass_Export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ACEXML/compass/CompassTypes.h"
-#include "ACEXML/compass/CCMHome.h"
-
-namespace Deployment
-{
-  class Compass_Export Container
-  {
-  public:
-    Container(ComponentServer* server);
-
-    ~Container();
-
-    CCMHome* install_home (const UUID& id, const string& entrypt,
-                           const ConfigValues* config = 0)
-      ACE_THROW_SPEC ((UnknownImplId, ImplEntryPointNotFound,
-                       InstallationFailure, InvalidConfiguration));
-
-    void remove_home (const CCMHome* href)
-      ACE_THROW_SPEC ((RemoveFailure));
-
-    void remove ()
-      ACE_THROW_SPEC ((RemoveFailure));
-
-    CCMHomes* get_homes ();
-
-    ComponentServer* get_component_server ();
-
-    ConfigValues* get_configuration (void);
-
-    void set_configuration (const ConfigValues* config);
-
-  private:
-    ConfigValues*   config_;
-    CCMHomes*       homes_;
-    ComponentServer* parent_;
-  };
-
-}
-
-#if defined (__ACE_INLINE__)
-#include "Container.inl"
-#endif /* __ACE_INLINE__ */
-
-#include "ace/post.h"
-
-#endif /* COMPASS_CONTAINER_H */
diff --git a/ACEXML/compass/Container.inl b/ACEXML/compass/Container.inl
deleted file mode 100644
index fe8ef2c94b9..00000000000
--- a/ACEXML/compass/Container.inl
+++ /dev/null
@@ -1,25 +0,0 @@
-// $Id$
-
-ACE_INLINE ComponentServer*
-Container::get_component_server()
-{
-  return this->parent_;
-}
-
-ACE_INLINE CCMHomes*
-Container::get_homes()
-{
-  return this->homes_;
-}
-
-ACE_INLINE ConfigValues*
-Container::get_configuration()
-{
-  return this->config_;
-}
-
-ACE_INLINE void
-Container::set_configuration (ConfigValues* config)
-{
-  this->config_ = config;
-}
diff --git a/ACEXML/compass/Deployment.cpp b/ACEXML/compass/Deployment.cpp
deleted file mode 100644
index defc2a1332a..00000000000
--- a/ACEXML/compass/Deployment.cpp
+++ /dev/null
@@ -1,315 +0,0 @@
-// $Id$
-
-#include "ACEXML/common/XML_Types.h"
-#include "ACEXML/common/StreamFactory.h"
-#include "ACEXML/parser/parser/Parser.h"
-#include "ACEXML/compass/SoftPkgHandler.h"
-#include "ACEXML/compass/PropertyFile_Handler.h"
-#include "ace/Get_Opt.h"
-#include "ace/Auto_Ptr.h"
-#include "ace/ARGV.h"
-#include "ace/Thread_Manager.h"
-#include "ace/DLL.h"
-#include "ace/SString.h"
-
-struct ThrCreate
-{
-  const ACE_TCHAR* name;
-  int argc;
-  ACE_TCHAR** argv;
-};
-
-
-void*
-create_dll (void* name)
-{
-  typedef int (*dll_func) (int, char**);
-  ThrCreate* thr = ACE_reinterpret_cast (ThrCreate*, name);
-  const ACE_TCHAR* dllname = thr->name;
-  const int argc = thr->argc;
-  ACE_TCHAR** argv = thr->argv;
-
-  if (dllname == 0)
-    {
-      ACE_ERROR ((LM_ERROR, "Trying to create a dll with null name"));
-      return (void*)-1;
-    }
-  ACE_DLL dll;
-  if (dll.open (dllname) == -1)
-    {
-     ACE_ERROR ((LM_ERROR, "Failed to open Service: %m\n"));
-     return (void*)-1;
-    }
-
-  void *foo;
-  const ACE_TCHAR* create = "create";
-  ACE_CString entrypoint (create);
-  entrypoint += dllname;
-  foo = dll.symbol (entrypoint.c_str());
-
-  // Cast the void* to long first.
-  long tmp = ACE_reinterpret_cast (long, foo);
-  dll_func factory = ACE_reinterpret_cast (dll_func, tmp);
-  if (factory == 0)
-    {
-      ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unable to resolve factory: %s: %m\n"),
-                  dll.error ()));
-      return (void*)-1;
-    }
-  return (void*)factory (argc, argv);
-}
-
-static void
-usage (const ACE_TCHAR* program)
-{
-  ACE_ERROR ((LM_ERROR,
-              ACE_TEXT ("Usage: %s [-l <filename>]\n")
-              ACE_TEXT ("  -l: Install components from <filename>\n"),
-              program));
-}
-
-static int
-error_cleanup (const ACE_TCHAR* dir)
-{
-  if (rmdir (dir) < 0)
-    ACE_ERROR ((LM_ERROR, "Unable to cleanup safe temp directory : %m\n"));
-  return -1;
-}
-
-int
-ACE_TMAIN (int argc, char* argv[])
-{
-  ACEXML_Char* filename = 0;
-  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("l:"));
-  int c;
-
-  while ((c = get_opt ()) != EOF)
-    {
-      switch (c)
-        {
-          case 'l':
-            filename = get_opt.opt_arg ();
-            break;
-          default:
-            break;
-        }
-    }
-  if (filename == 0)
-    {
-      usage(argv[0]);
-      return -1;
-    }
-  ACE_ARGV myargv;
-
-  const ACEXML_Char meta_inf[] = {'m', 'e', 't', 'a', '-', 'i', 'n', 'f', 0};
-  ACEXML_Char* path = 0;
-  size_t pos = ACE_OS::strlen (filename);
-  ACEXML_Char* basename = 0;
-  if ((basename = ACE_OS::strrchr (filename, '.')) != 0)
-    pos = basename - filename;
-  size_t len = pos + sizeof (meta_inf) + sizeof (ACE_TCHAR) * 2;
-  ACE_NEW_RETURN (path, ACEXML_Char[len], -1);
-  ACE_Auto_Basic_Array_Ptr<ACEXML_Char> cleanup_path (path);
-
-  ACE_OS::strncpy (path, filename, pos);
-  path[pos++] = '/';
-
-  // Store a copy for future use
-  ACEXML_Char* dirname = 0;
-  ACE_NEW_RETURN (dirname, ACEXML_Char[pos], -1);
-  ACE_Auto_Basic_Array_Ptr<ACEXML_Char> cleanup_dirname (dirname);
-  ACE_OS::memcpy (dirname, path, pos);
-  dirname[pos] = 0;
-
-  ACE_OS::strcpy (path + pos, meta_inf);
-
-
-  ACEXML_StreamFactory factory;
-  ACEXML_CharStream* stream = factory.create_stream (path);
-  if (!stream)
-    {
-      ACE_ERROR ((LM_ERROR, "Failed to create input stream from %s\n",
-                  path));
-      return -1;
-    }
-
-  ACEXML_SoftPkgHandler* handler = 0;
-  ACE_NEW_RETURN (handler, ACEXML_SoftPkgHandler (path), -1);
-  auto_ptr<ACEXML_SoftPkgHandler> cleanup_handler (handler);
-
-  ACEXML_Parser parser;
-  ACEXML_InputSource input (stream);
-
-  parser.setContentHandler (handler);
-  parser.setDTDHandler (handler);
-  parser.setErrorHandler (handler);
-  parser.setEntityResolver (handler);
-
-  ACEXML_TRY_NEW_ENV
-    {
-      parser.parse (&input ACEXML_ENV_ARG_PARAMETER);
-      ACEXML_TRY_CHECK;
-    }
-  ACEXML_CATCH (ACEXML_SAXException, ex)
-    {
-      ex.print();
-      ACE_DEBUG ((LM_ERROR, ACE_TEXT ("Exception occurred. Exiting...\n")));
-    }
-  ACEXML_ENDTRY;
-  const ACEXML_SoftPkg* pkg = handler->get_softpkg();
-  pkg->dump();
-
-  ACEXML_Char temp[] = "acefileXXXXXX";
-  if (mkdtemp (temp) == 0)
-    {
-      ACE_ERROR ((LM_ERROR, "Unable to create safe temp directory\n"));
-      return -1;
-    }
-  char* oldpath = ACE_OS::getenv ("LD_LIBRARY_PATH");
-  size_t env_len = 0;
-  if (oldpath)
-    env_len = ACE_OS::strlen (oldpath);
-  env_len += 18;  // For 'LD_LIBRARY_PATH=' + ':' + '\0'
-  ACEXML_Char pwd[MAXPATHLEN + 1];
-  size_t size = sizeof (pwd);
-  if (ACE_OS::getcwd(pwd, size) == 0)
-    {
-      ACE_ERROR ((LM_ERROR, "Unable to set up environment for the Component"
-                  "location: %m\n"));
-      return error_cleanup (temp);
-    }
-  ACEXML_String temp_dir (pwd);
-  temp_dir += "/";
-  temp_dir += temp;
-  ACEXML_Char* new_path = 0;
-  ACE_NEW_RETURN (new_path, ACEXML_Char[env_len + temp_dir.length()], -1);
-  int n = 0;
-  n += ACE_OS::sprintf (new_path, "LD_LIBRARY_PATH=%s", temp_dir.c_str());
-  if (oldpath)
-    ACE_OS::sprintf (new_path + n, ":%s", oldpath);
-  ACE_DEBUG ((LM_DEBUG, "Added %s to environment\n", new_path));
-
-  if (ACE_OS::putenv (new_path) < 0)
-    {
-      ACE_ERROR ((LM_ERROR, "Unable to set up environment for the Component"
-                  "location: %m\n"));
-      return error_cleanup (temp);
-    }
-
-  ACE_Thread_Manager* thr_mgr = ACE_Thread_Manager::instance();
-
-  ThrCreate param;
-
-  const ACEXML_SoftPkg::Implementations& impls = pkg->get_impls();
-  ACEXML_SoftPkg::Implementation** entry = 0;
-  ACEXML_SoftPkg::Implementations::const_iterator iter (impls);
-  for (; iter.next (entry); iter.advance())
-    {
-      ACEXML_SoftPkg::Implementation* impl = *entry;
-      ACEXML_String dll_path = dirname + impl->code_.file_;
-      ACEXML_CharStream* dll = factory.create_stream (dll_path.c_str());
-      if (!dll)
-        {
-          ACE_ERROR ((LM_ERROR, "Unable to create stream for the Component"
-                      "location %s\n", dll_path.c_str()));
-          return error_cleanup (temp);
-        }
-      ACEXML_String dsoname (temp);
-      dsoname += "/" + impl->code_.file_;
-      ACE_HANDLE dso = ACE_OS::open (dsoname.c_str(),
-                                     O_WRONLY| O_CREAT|O_EXCL, S_IRWXU);
-      if (dso == -1)
-        {
-          ACE_ERROR ((LM_ERROR, "Unable to create local copy %s : %m\n",
-                      dsoname.c_str()));
-          return error_cleanup (temp);
-        }
-      else if (ACE_OS::unlink (dsoname.c_str()) < 0)
-        {
-          ACE_ERROR ((LM_ERROR, "Unable to unlink local copy %s : %m\n",
-                      dsoname.c_str()));
-          return error_cleanup (temp);
-        }
-      ACEXML_Char buf[65535];
-      int bytes = 0;
-      while ((bytes = dll->read (buf, sizeof(buf))) > 0)
-        {
-          if (ACE_OS::write (dso, buf, bytes) != bytes)
-            {
-              ACE_ERROR ((LM_ERROR, "Unable to create dll %s: %m\n",
-                          dsoname.c_str()));
-              return error_cleanup (temp);
-            }
-        }
-      ACE_OS::close (dso);
-
-      ACE_ARGV* pArgv = 0;
-
-      if (impl->propfile_.file_.length())
-        {
-          ACEXML_String path = dirname + impl->propfile_.file_;
-          ACEXML_CharStream* pstream = factory.create_stream (path.c_str());
-          if (!pstream)
-            {
-              ACE_ERROR ((LM_ERROR, "Failed to create input stream from %s\n",
-                          path.c_str()));
-              return error_cleanup (temp);
-            }
-          ACEXML_PropertyFile_Handler* pHandler = 0;
-          ACE_NEW_RETURN (pHandler,
-                          ACEXML_PropertyFile_Handler (path.c_str()) , -1);
-          auto_ptr<ACEXML_PropertyFile_Handler> cleanup_pHandler (pHandler);
-          ACEXML_InputSource property (pstream);
-
-          ACEXML_Parser propParser;
-          propParser.setContentHandler (pHandler);
-          propParser.setDTDHandler (pHandler);
-          propParser.setErrorHandler (pHandler);
-          propParser.setEntityResolver (pHandler);
-
-          ACEXML_TRY_NEW_ENV
-            {
-              propParser.parse (&property ACEXML_ENV_ARG_PARAMETER);
-              ACEXML_TRY_CHECK;
-            }
-          ACEXML_CATCH (ACEXML_SAXException, ex)
-            {
-              ex.print();
-              ACE_ERROR ((LM_ERROR, ACE_TEXT ("Parser Exception....\n")));
-              return error_cleanup (temp);
-            }
-          ACEXML_ENDTRY;
-          const ACEXML_Property* prop = pHandler->get_property();
-          ACEXML_Char* list = prop->dump();
-          ACE_Auto_Basic_Array_Ptr<ACEXML_Char> cleanup_list (list);
-          ACE_DEBUG ((LM_DEBUG, "Property obtained = %s\n", list));
-          ACE_NEW_RETURN (pArgv, ACE_ARGV (list), -1);
-        }
-      if (pArgv)
-        {
-          myargv.add (pArgv->argv());
-          param.argv = myargv.argv();
-          param.argc = myargv.argc();
-        }
-      else
-        {
-          param.argc = argc;
-          param.argv = argv;
-        }
-      param.name = impl->id_.c_str();
-      if (thr_mgr->spawn (create_dll,(void*)&param) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             ACE_TEXT ("Unable to spawn dll %s\n"),
-                             impl->id_.c_str()), -1);
-        }
-      ACE_OS::sleep (3);
-    }
-  thr_mgr->wait();
-  if (rmdir (temp) < 0)
-    {
-      ACE_ERROR ((LM_ERROR, "Unable to cleanup temporary directory : %m\n"));
-      return -1;
-    }
-  return 0;
-}
diff --git a/ACEXML/compass/EC_Property.cpp b/ACEXML/compass/EC_Property.cpp
deleted file mode 100644
index c6e8de22631..00000000000
--- a/ACEXML/compass/EC_Property.cpp
+++ /dev/null
@@ -1,301 +0,0 @@
-// $Id$
-
-#include "ACEXML/compass/EC_Property.h"
-#include "ace/OS_String.h"
-
-ACEXML_EC_Property::ACEXML_EC_Property()
-  : ec_consumer_control_period_ (0), ec_supplier_control_period_ (0),
-    ec_dispatching_threads_ (0)
-{}
-
-ACEXML_EC_Property::~ACEXML_EC_Property()
-{}
-
-int
-ACEXML_EC_Property::set (const ACEXML_String& property,
-                         const ACEXML_String& value)
-{
-  const ACEXML_Char* prop = property.c_str();
-  const ACEXML_Char* val = value.c_str();
-  if (ACE_OS::strcasecmp (prop, "ECDispatching") == 0)
-    {
-      if (ACE_OS::strcasecmp (val, "reactive") == 0 ||
-          ACE_OS::strcasecmp (val, "mt") == 0)
-        {
-          this->ec_dispatching_ = value;
-          return 0;
-        }
-    }
-  else if (ACE_OS::strcasecmp (prop, "ECFiltering") == 0)
-    {
-      if (ACE_OS::strcasecmp (val, "null") == 0 ||
-          ACE_OS::strcasecmp (val, "basic") == 0 ||
-          ACE_OS::strcasecmp (val, "prefix") == 0)
-        {
-          this->ec_filtering_ = value;
-          return 0;
-        }
-    }
-  else if (ACE_OS::strcasecmp (prop, "ECSupplierFiltering") == 0 ||
-           ACE_OS::strcasecmp (prop, "ECSupplierFilter") == 0)
-    {
-      if (ACE_OS::strcasecmp (val, "null") == 0 ||
-          ACE_OS::strcasecmp (val, "per-supplier") == 0)
-        {
-          this->ec_supplier_filtering_ = value;
-          return 0;
-        }
-    }
-  else if (ACE_OS::strcasecmp (prop, "ECTimeout") == 0)
-    {
-      if (ACE_OS::strcasecmp (val, "reactive") == 0)
-        {
-          this->ec_timeout_ = value;
-          return 0;
-        }
-    }
-  else if (ACE_OS::strcasecmp (prop, "ECObserver") == 0)
-    {
-      if (ACE_OS::strcasecmp (val, "null") == 0 ||
-          ACE_OS::strcasecmp (val, "basic") == 0)
-        {
-          this->ec_observer_ = value;
-          return 0;
-        }
-    }
-  else if (ACE_OS::strcasecmp (prop, "ECScheduling") == 0)
-    {
-      if (ACE_OS::strcasecmp (val, "null") == 0 ||
-          ACE_OS::strcasecmp (val, "group") == 0)
-        {
-          this->ec_scheduling_ = value;
-          return 0;
-        }
-    }
-  else if (ACE_OS::strcasecmp (prop, "ECProxyPushConsumerCollection") == 0)
-    {
-      if (this->check_collection (val) == 0)
-        {
-          this->ec_proxy_push_consumer_collection_  = value;
-          return 0;
-        }
-    }
-  else if (ACE_OS::strcasecmp (prop, "ECProxyPushSupplierCollection") == 0)
-    {
-      if (this->check_collection (val) == 0)
-        {
-          this->ec_proxy_push_supplier_collection_  = value;
-          return 0;
-        }
-    }
-  else if (ACE_OS::strcasecmp (prop, "ECProxyConsumerLock") == 0)
-    {
-      if (ACE_OS::strcasecmp (val, "null") == 0 ||
-          ACE_OS::strcasecmp (val, "thread") == 0 ||
-          ACE_OS::strcasecmp (val, "recursive") == 0)
-        {
-          this->ec_proxy_consumer_lock_ = value;
-          return 0;
-        }
-    }
-  else if (ACE_OS::strcasecmp (prop, "ECProxySupplierLock") == 0)
-    {
-      if (ACE_OS::strcasecmp (val, "null") == 0 ||
-          ACE_OS::strcasecmp (val, "thread") == 0 ||
-          ACE_OS::strcasecmp (val, "recursive") == 0)
-        {
-          this->ec_proxy_supplier_lock_ = value;
-          return 0;
-        }
-    }
-  else if (ACE_OS::strcasecmp (prop, "ECUseORBId") == 0)
-    {
-      this->ec_orbid_ = value;
-      return 0;
-    }
-  else if (ACE_OS::strcasecmp (prop, "ECConsumerControl") == 0)
-    {
-      if (ACE_OS::strcasecmp (val, "null") == 0 ||
-          ACE_OS::strcasecmp (val, "reactive") == 0)
-        {
-          this->ec_consumer_control_ = value;
-          return 0;
-        }
-    }
-  else if (ACE_OS::strcasecmp (prop, "ECSupplierControl") == 0)
-    {
-      if (ACE_OS::strcasecmp (val, "null") == 0 ||
-          ACE_OS::strcasecmp (val, "reactive") == 0)
-        {
-          this->ec_supplier_control_ = value;
-          return 0;
-        }
-    }
-  ACE_ERROR ((LM_ERROR, "Invalid property %s = %s\n", prop, val));
-  return -1;
-}
-
-int
-ACEXML_EC_Property::check_collection (const ACEXML_Char* str)
-{
-  ACEXML_Char* opt = ACE_OS::strdup (str);
-  ACE_Auto_Basic_Array_Ptr<ACEXML_Char> cleanup_opt (opt);
-  ACEXML_Char* aux;
-  for (ACE_TCHAR* arg = ACE_OS::strtok_r (opt, ACE_TEXT(":"), &aux);
-       arg != 0;
-       arg = ACE_OS::strtok_r (0, ACE_TEXT(":"), &aux))
-    {
-      if (ACE_OS::strcasecmp (arg, ACE_TEXT("mt")) == 0
-          || ACE_OS::strcasecmp (arg, ACE_TEXT("st")) == 0
-          || ACE_OS::strcasecmp (arg, ACE_TEXT("list")) == 0
-          || ACE_OS::strcasecmp (arg, ACE_TEXT("rb_tree")) == 0
-          || ACE_OS::strcasecmp (arg, ACE_TEXT("immediate")) == 0
-          || ACE_OS::strcasecmp (arg, ACE_TEXT("copy_on_read")) == 0
-          || ACE_OS::strcasecmp (arg, ACE_TEXT("copy_on_write")) == 0
-          || ACE_OS::strcasecmp (arg, ACE_TEXT("delayed")) == 0)
-        continue;
-      else
-        return -1;
-    }
-  return 0;
-}
-
-int
-ACEXML_EC_Property::set (const ACEXML_String& property, const long value)
-{
-  const ACEXML_Char* prop = property.c_str();
-  if (ACE_OS::strcasecmp (prop, "ECConsumerControlPeriod") == 0)
-    {
-      this->ec_consumer_control_period_ = value;
-      if (this->ec_consumer_control_period_ != 0 &&
-          this->ec_consumer_control_period_ < 1000)
-        {
-          ACE_ERROR ((LM_ERROR, "Invalid configuration ECConsumerControlPeriod"
-                      " = %d\n", this->ec_consumer_control_period_));
-          return -1;
-        }
-    }
-  else if (ACE_OS::strcasecmp (prop, "ECSupplierControlPeriod") == 0)
-    {
-      this->ec_supplier_control_period_ = value;
-      if (this->ec_supplier_control_period_ != 0 &&
-          this->ec_supplier_control_period_ < 1000)
-        {
-          ACE_ERROR ((LM_ERROR, "Invalid configuration ECSupplierControlPeriod"
-                      " = %d\n", this->ec_supplier_control_period_));
-          return -1;
-        }
-    }
-  else if (ACE_OS::strcasecmp (prop, "ECDispatchingThreads") == 0)
-    {
-      this->ec_dispatching_threads_ = value;
-      if (this->ec_dispatching_threads_ <= 0)
-        {
-          ACE_ERROR ((LM_ERROR, "Invalid value ECDispatchingThreads = %d "
-                      "when ECDispatching = mt\n",
-                      this->ec_dispatching_threads_));
-          return -1;
-        }
-    }
-  else
-    {
-      ACE_ERROR ((LM_ERROR, "Unknown property %s in property file", prop));
-      return -1;
-    }
-  return 0;
-}
-
-ACEXML_Char*
-ACEXML_EC_Property::dump() const
-{
-  ACEXML_String argv (" ");
-  if (this->ec_dispatching_.length())
-    {
-      argv += " -ECDispatching ";
-      argv += this->ec_dispatching_;
-    }
-  if (this->ec_filtering_.length())
-    {
-      argv += " -ECFiltering ";
-      argv += this->ec_filtering_;
-    }
-  if (this->ec_supplier_filtering_.length())
-    {
-      argv += " -ECSupplierFilter ";
-      argv += this->ec_supplier_filtering_;
-    }
-  if (this->ec_timeout_.length())
-    {
-      argv += " -ECTimeout ";
-      argv += this->ec_timeout_;
-    }
-  if (this->ec_observer_.length())
-    {
-      argv += " -ECObserver ";
-      argv += this->ec_observer_;
-    }
-  if (this->ec_scheduling_.length())
-    {
-      argv += " -ECScheduling ";
-      argv += this->ec_scheduling_;
-    }
-  if (this->ec_proxy_push_consumer_collection_.length())
-    {
-      argv += " -ECProxyPushSupplierCollection ";
-      argv += this->ec_proxy_push_consumer_collection_;
-    }
-  if (this->ec_proxy_push_supplier_collection_.length())
-    {
-      argv += " -ECProxyPushSupplierCollection ";
-      argv += this->ec_proxy_push_supplier_collection_;
-    }
-  if (this->ec_proxy_consumer_lock_.length())
-    {
-      argv += " -ECProxyConsumerLock ";
-      argv += this->ec_proxy_consumer_lock_;
-    }
-  if (this->ec_proxy_supplier_lock_.length())
-    {
-      argv += " -ECProxySupplierLock ";
-      argv += this->ec_proxy_supplier_lock_;
-    }
-  if (this->ec_orbid_.length())
-    {
-      argv += " -ECUseORBId ";
-      argv += this->ec_orbid_;
-    }
-  if (this->ec_consumer_control_.length())
-    {
-      argv += " -ECConsumerControl ";
-      argv += this->ec_consumer_control_;
-    }
-  if (this->ec_supplier_control_.length())
-    {
-      argv += " -ECSupplierControl ";
-      argv += this->ec_supplier_control_;
-    }
-  char temp[20] = {0};
-  int pos = 0;
-  if (this->ec_consumer_control_period_ > 0)
-    {
-      argv += " -ECConsumerControlPeriod ";
-      pos += ACE_OS::sprintf (temp, "%ld", this->ec_consumer_control_period_);
-      temp[pos] = 0;
-      argv += temp;
-    }
-  if (this->ec_supplier_control_period_ > 0)
-    {
-      argv += " -ECSupplierControlPeriod ";
-      pos += ACE_OS::sprintf (temp, "%ld", this->ec_consumer_control_period_);
-      temp[pos] = 0;
-      argv += temp;
-    }
-  if (this->ec_dispatching_threads_ > 0)
-    {
-      argv += " -ECDispatchingThreads ";
-      pos += ACE_OS::sprintf (temp, "%ld", this->ec_dispatching_threads_);
-      temp[pos] = 0;
-      argv += temp;
-    }
-  return argv.rep();
-}
diff --git a/ACEXML/compass/EC_Property.h b/ACEXML/compass/EC_Property.h
deleted file mode 100644
index e9f3c00d366..00000000000
--- a/ACEXML/compass/EC_Property.h
+++ /dev/null
@@ -1,47 +0,0 @@
-// $Id$
-
-#ifndef ACEXML_EC_PROPERTY_H
-#define ACEXML_EC_PROPERTY_H
-
-#include "ace/pre.h"
-#include "ACEXML/compass/Compass_Export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ACEXML/common/XML_Types.h"
-#include "ACEXML/compass/Property.h"
-
-class Compass_Export ACEXML_EC_Property : public ACEXML_Property
-{
-public:
-  ACEXML_EC_Property();
-  virtual ~ACEXML_EC_Property();
-  virtual int set (const ACEXML_String& property, const ACEXML_String& value);
-  virtual int set (const ACEXML_String& property, const long value);
-  virtual int check_collection (const ACEXML_Char* str);
-  virtual ACEXML_Char* dump() const;
-private:
-  ACEXML_String ec_dispatching_;
-  ACEXML_String ec_filtering_;
-  ACEXML_String ec_supplier_filtering_;
-  ACEXML_String ec_timeout_;
-  ACEXML_String ec_observer_;
-  ACEXML_String ec_scheduling_;
-  ACEXML_String ec_proxy_push_consumer_collection_;
-  ACEXML_String ec_proxy_push_supplier_collection_;
-  ACEXML_String ec_proxy_consumer_lock_;
-  ACEXML_String ec_proxy_supplier_lock_;
-  ACEXML_String ec_orbid_;
-  ACEXML_String ec_consumer_control_;
-  ACEXML_String ec_supplier_control_;
-
-  long ec_consumer_control_period_;
-  long ec_supplier_control_period_;
-  long ec_dispatching_threads_;
-};
-
-#include "ace/post.h"
-
-#endif /* ACEXML_EC_PROPERTY_H */
diff --git a/ACEXML/compass/Makefile.Compass b/ACEXML/compass/Makefile.Compass
deleted file mode 100644
index c00b5bc8d31..00000000000
--- a/ACEXML/compass/Makefile.Compass
+++ /dev/null
@@ -1,42 +0,0 @@
-#----------------------------------------------------------------------------
-#       GNU Makefile
-#----------------------------------------------------------------------------
-MAKEFILE        = Makefile.Compass
-DEPENDENCY_FILE = .depend.Makefile.Compass
-LIB_UNCHECKED   = libCompass.a
-SHLIB_UNCHECKED = libCompass.$(SOEXT)
-
-
-
-FILES = \
-  Property \
-  PropertyFile_Handler \
-  SoftPkgHandler \
-  SoftPkg \
-  EC_Property
-
-LIB   = $(LIB_UNCHECKED)
-SHLIB = $(SHLIB_UNCHECKED)
-
-#----------------------------------------------------------------------------
-#       Include macros and targets
-#----------------------------------------------------------------------------
-include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-LSRC   = $(addsuffix .cpp, $(FILES))
-ACELIB = -lACE
-
-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.local.GNU
-
-CPPFLAGS     += -I../..
-LDFLAGS      += -L../../ace
-
-ACE_SHLIBS = -lACEXML -lACEXML_Parser -lzzip -lz $(ACELIB)
-
-#----------------------------------------------------------------------------
-#       Local targets
-#----------------------------------------------------------------------------
-
diff --git a/ACEXML/compass/Makefile.Consumer b/ACEXML/compass/Makefile.Consumer
deleted file mode 100644
index bc6b0de80a7..00000000000
--- a/ACEXML/compass/Makefile.Consumer
+++ /dev/null
@@ -1,266 +0,0 @@
-#----------------------------------------------------------------------------
-#       $Id$
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#       Local macros
-#----------------------------------------------------------------------------
-
-# Override default to make dependency generation work properly.
-ifndef TAO_ROOT
-  TAO_ROOT = $(ACE_ROOT)/TAO
-endif # ! TAO_ROOT
-
-MAKEFILE = Makefile.Consumer
-SONAME =
-SOVERSION =
-LIB     = libConsumer.a
-SHLIB   = libConsumer.$(SOEXT)
-FILES   = Consumer
-LSRC    = $(addsuffix .cpp,$(FILES))
-
-LIBS   += -lTAO_RTEvent -lTAO_RTSched -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_Messaging  -lTAO_PortableServer -lTAO $(ACELIB)
-
-TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs)
-
-CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs \
-        $(foreach svc, $(TAO_ORBSVCS), -DTAO_ORBSVCS_HAS_$(svc))
-
-BUILD   = $(VLIB) $(VSHLIB)
-
-#----------------------------------------------------------------------------
-#       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.local.GNU
-
-# To remake the Test_Client_Module source with xlC 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
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#       Dependencies
-#----------------------------------------------------------------------------
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-
-.obj/Consumer.o .obj/Consumer.so .shobj/Consumer.o .shobj/Consumer.so: Consumer.cpp Consumer.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \
-  $(ACE_ROOT)/ace/pre.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \
-  $(TAO_ROOT)/tao/TimeBaseS.h \
-  $(TAO_ROOT)/tao/TimeBaseC.h \
-  $(TAO_ROOT)/tao/corbafwd.h \
-  $(ACE_ROOT)/ace/CDR_Base.h \
-  $(ACE_ROOT)/ace/post.h \
-  $(ACE_ROOT)/ace/ace_wchar.h \
-  $(ACE_ROOT)/ace/ace_wchar.inl \
-  $(ACE_ROOT)/ace/Basic_Types.h \
-  $(ACE_ROOT)/ace/ACE_export.h \
-  $(ACE_ROOT)/ace/Message_Block.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_String.h \
-  $(ACE_ROOT)/ace/OS_Memory.h \
-  $(ACE_ROOT)/ace/OS_TLI.h \
-  $(ACE_ROOT)/ace/Time_Value.h \
-  $(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/Message_Block_T.h \
-  $(ACE_ROOT)/ace/Message_Block_T.cpp \
-  $(ACE_ROOT)/ace/Message_Block_T.i \
-  $(ACE_ROOT)/ace/CORBA_macros.h \
-  $(ACE_ROOT)/ace/Exception_Macros.h \
-  $(TAO_ROOT)/tao/orbconf.h \
-  $(TAO_ROOT)/tao/varbase.h \
-  $(TAO_ROOT)/tao/TAO_Export.h \
-  $(TAO_ROOT)/tao/CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(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.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/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h \
-  $(ACE_ROOT)/ace/Synch_T.h \
-  $(ACE_ROOT)/ace/Synch_T.cpp \
-  $(ACE_ROOT)/ace/Thread.h \
-  $(ACE_ROOT)/ace/Thread_Adapter.h \
-  $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
-  $(ACE_ROOT)/ace/Synch_T.i \
-  $(ACE_ROOT)/ace/Malloc_Allocator.h \
-  $(ACE_ROOT)/ace/Malloc_Base.h \
-  $(ACE_ROOT)/ace/Free_List.h \
-  $(ACE_ROOT)/ace/Free_List.cpp \
-  $(ACE_ROOT)/ace/Free_List.i \
-  $(ACE_ROOT)/ace/Malloc_T.cpp \
-  $(ACE_ROOT)/ace/Malloc_T.i \
-  $(ACE_ROOT)/ace/Memory_Pool.h \
-  $(ACE_ROOT)/ace/Event_Handler.h \
-  $(ACE_ROOT)/ace/Signal.h \
-  $(ACE_ROOT)/ace/Mem_Map.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/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h \
-  $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Auto_Ptr.h \
-  $(ACE_ROOT)/ace/Auto_Ptr.cpp \
-  $(ACE_ROOT)/ace/Auto_Ptr.i \
-  $(ACE_ROOT)/ace/String_Base.i \
-  $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Environment.h \
-  $(TAO_ROOT)/tao/Object.h \
-  $(TAO_ROOT)/tao/Policy_ForwardC.h \
-  $(TAO_ROOT)/tao/Sequence.h \
-  $(TAO_ROOT)/tao/Managed_Types.h \
-  $(TAO_ROOT)/tao/Sequence_T.h \
-  $(TAO_ROOT)/tao/Sequence_T.cpp \
-  $(TAO_ROOT)/tao/Sequence_T.i \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Exception.h \
-  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
-  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
-  $(TAO_ROOT)/tao/TAO_Singleton.h \
-  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
-  $(ACE_ROOT)/ace/Object_Manager.h \
-  $(ACE_ROOT)/ace/Managed_Object.h \
-  $(ACE_ROOT)/ace/Managed_Object.cpp \
-  $(ACE_ROOT)/ace/Managed_Object.i \
-  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
-  $(TAO_ROOT)/tao/TAO_Singleton.inl \
-  $(TAO_ROOT)/tao/TimeBaseS_T.h \
-  $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
-  $(TAO_ROOT)/tao/TimeBaseS_T.i \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
-  $(TAO_ROOT)/tao/corba.h \
-  $(TAO_ROOT)/tao/NVList.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(TAO_ROOT)/tao/LocalObject.h \
-  $(TAO_ROOT)/tao/Principal.h \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
-  $(TAO_ROOT)/tao/ORB.h \
-  $(TAO_ROOT)/tao/Services.h \
-  $(TAO_ROOT)/tao/CORBA_String.h \
-  $(TAO_ROOT)/tao/objectid.h \
-  $(TAO_ROOT)/tao/PolicyC.h \
-  $(TAO_ROOT)/tao/CurrentC.h \
-  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
-  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
-  $(TAO_ROOT)/tao/Encodable.h \
-  $(TAO_ROOT)/tao/BoundsC.h \
-  $(TAO_ROOT)/tao/ValueBase.h \
-  $(TAO_ROOT)/tao/ValueFactory.h \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/DomainC.h \
-  $(TAO_ROOT)/tao/WrongTransactionC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.h \
-  $(TAO_ROOT)/tao/ObjectIDList.h \
-  $(TAO_ROOT)/tao/StringSeqC.h \
-  $(TAO_ROOT)/tao/PortableInterceptorC.h \
-  $(TAO_ROOT)/tao/DynamicC.h \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
-  $(TAO_ROOT)/tao/IOPC.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \
-  $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
-  $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
-  $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
-  $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \
-  $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
-  $(ACE_ROOT)/ace/Atomic_Op.h \
-  $(ACE_ROOT)/ace/Atomic_Op_T.h \
-  $(ACE_ROOT)/ace/Atomic_Op_T.cpp \
-  $(ACE_ROOT)/ace/Atomic_Op_T.i \
-  $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \
-  $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \
-  $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.cpp \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.i \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \
-  $(ACE_ROOT)/ace/INET_Addr.h \
-  $(ACE_ROOT)/ace/Addr.h \
-  $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \
-  $(ACE_ROOT)/ace/SOCK_Dgram.h \
-  $(ACE_ROOT)/ace/SOCK.h \
-  $(ACE_ROOT)/ace/IPC_SAP.h \
-  $(ACE_ROOT)/ace/IPC_SAP.i \
-  $(ACE_ROOT)/ace/SOCK.i \
-  $(ACE_ROOT)/ace/SOCK_Dgram.i \
-  $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(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.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/nsconf.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Service_Constants.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/ACEXML/compass/Makefile.Deployment b/ACEXML/compass/Makefile.Deployment
deleted file mode 100644
index c3b04638c42..00000000000
--- a/ACEXML/compass/Makefile.Deployment
+++ /dev/null
@@ -1,40 +0,0 @@
-#----------------------------------------------------------------------------
-#       GNU Makefile
-#----------------------------------------------------------------------------
-MAKEFILE        = Makefile.Deployment
-DEPENDENCY_FILE = .depend.Makefile.Deployment
-BIN_UNCHECKED   = Deployment
-
-
-
-FILES = \
-  Deployment
-
-#----------------------------------------------------------------------------
-#       Include macros and targets
-#----------------------------------------------------------------------------
-include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-
-BIN    = $(BIN_UNCHECKED)
-
-OBJS   = $(addsuffix .o, $(notdir $(FILES)))
-SRC    = $(addsuffix .cpp, $(FILES))
-ACELIB = -lACE
-
-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
-
-CPPFLAGS     += -I../..
-LDFLAGS      += -L../../ace
-
-LDLIBS = -lCompass -lACEXML_Parser -lACEXML -lzzip -lz
-
-#----------------------------------------------------------------------------
-#       Local targets
-#----------------------------------------------------------------------------
-
-$(BIN): $(addprefix $(VDIR), $(OBJS))
-	$(LINK.cc) $(LDFLAGS) $(CC_OUTPUT_FLAG) $@ $^ $(VLDLIBS) $(POSTLINK)
-
diff --git a/ACEXML/compass/Makefile.Service b/ACEXML/compass/Makefile.Service
deleted file mode 100644
index 8822e7056c9..00000000000
--- a/ACEXML/compass/Makefile.Service
+++ /dev/null
@@ -1,291 +0,0 @@
-#----------------------------------------------------------------------------
-#       $Id$
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#       Local macros
-#----------------------------------------------------------------------------
-
-# Override default to make dependency generation work properly.
-ifndef TAO_ROOT
-  TAO_ROOT = $(ACE_ROOT)/TAO
-endif # ! TAO_ROOT
-
-MAKEFILE = Makefile.Service
-SONAME =
-SOVERSION =
-LIB     = libService.a
-SHLIB   = libService.$(SOEXT)
-FILES   = Service
-LSRC    = $(addsuffix .cpp,$(FILES))
-
-LIBS   += -lTAO_RTEvent -lTAO_RTSched -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_Messaging -lTAO_PortableServer -lTAO $(ACELIB)
-
-TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs)
-
-CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs \
-        $(foreach svc, $(TAO_ORBSVCS), -DTAO_ORBSVCS_HAS_$(svc))
-
-BUILD   = $(VLIB) $(VSHLIB)
-
-#----------------------------------------------------------------------------
-#       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.local.GNU
-
-# To remake the Test_Client_Module source with xlC 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
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#       Dependencies
-#----------------------------------------------------------------------------
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-
-.obj/Service.o .obj/Service.so .shobj/Service.o .shobj/Service.so: Service.cpp \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Event_Channel.h \
-  $(ACE_ROOT)/ace/pre.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Factory.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \
-  $(ACE_ROOT)/ace/post.h \
-  $(ACE_ROOT)/ace/ace_wchar.h \
-  $(ACE_ROOT)/ace/ace_wchar.inl \
-  $(TAO_ROOT)/tao/corba.h \
-  $(TAO_ROOT)/tao/corbafwd.h \
-  $(ACE_ROOT)/ace/CDR_Base.h \
-  $(ACE_ROOT)/ace/Basic_Types.h \
-  $(ACE_ROOT)/ace/ACE_export.h \
-  $(ACE_ROOT)/ace/Message_Block.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_String.h \
-  $(ACE_ROOT)/ace/OS_Memory.h \
-  $(ACE_ROOT)/ace/OS_TLI.h \
-  $(ACE_ROOT)/ace/Time_Value.h \
-  $(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/Message_Block_T.h \
-  $(ACE_ROOT)/ace/Message_Block_T.cpp \
-  $(ACE_ROOT)/ace/Message_Block_T.i \
-  $(ACE_ROOT)/ace/CORBA_macros.h \
-  $(ACE_ROOT)/ace/Exception_Macros.h \
-  $(TAO_ROOT)/tao/orbconf.h \
-  $(TAO_ROOT)/tao/varbase.h \
-  $(TAO_ROOT)/tao/TAO_Export.h \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(ACE_ROOT)/ace/Synch.h \
-  $(ACE_ROOT)/ace/Synch_T.h \
-  $(ACE_ROOT)/ace/Synch_T.cpp \
-  $(ACE_ROOT)/ace/Thread.h \
-  $(ACE_ROOT)/ace/Thread_Adapter.h \
-  $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
-  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
-  $(ACE_ROOT)/ace/Log_Msg.h \
-  $(ACE_ROOT)/ace/Log_Priority.h \
-  $(ACE_ROOT)/ace/Synch_T.i \
-  $(TAO_ROOT)/tao/Exception.h \
-  $(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.cpp \
-  $(ACE_ROOT)/ace/Malloc.h \
-  $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Malloc_Allocator.h \
-  $(ACE_ROOT)/ace/Malloc_Base.h \
-  $(ACE_ROOT)/ace/Free_List.h \
-  $(ACE_ROOT)/ace/Free_List.cpp \
-  $(ACE_ROOT)/ace/Free_List.i \
-  $(ACE_ROOT)/ace/Malloc_T.cpp \
-  $(ACE_ROOT)/ace/Malloc_T.i \
-  $(ACE_ROOT)/ace/Memory_Pool.h \
-  $(ACE_ROOT)/ace/Event_Handler.h \
-  $(ACE_ROOT)/ace/Signal.h \
-  $(ACE_ROOT)/ace/Mem_Map.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/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h \
-  $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Auto_Ptr.h \
-  $(ACE_ROOT)/ace/Auto_Ptr.cpp \
-  $(ACE_ROOT)/ace/Auto_Ptr.i \
-  $(ACE_ROOT)/ace/String_Base.i \
-  $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(TAO_ROOT)/tao/Environment.h \
-  $(TAO_ROOT)/tao/Object.h \
-  $(TAO_ROOT)/tao/Policy_ForwardC.h \
-  $(TAO_ROOT)/tao/Sequence.h \
-  $(TAO_ROOT)/tao/Managed_Types.h \
-  $(TAO_ROOT)/tao/Sequence_T.h \
-  $(TAO_ROOT)/tao/Sequence_T.cpp \
-  $(TAO_ROOT)/tao/Sequence_T.i \
-  $(TAO_ROOT)/tao/NVList.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(TAO_ROOT)/tao/LocalObject.h \
-  $(TAO_ROOT)/tao/Principal.h \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
-  $(TAO_ROOT)/tao/ORB.h \
-  $(TAO_ROOT)/tao/Services.h \
-  $(TAO_ROOT)/tao/CORBA_String.h \
-  $(TAO_ROOT)/tao/objectid.h \
-  $(TAO_ROOT)/tao/PolicyC.h \
-  $(TAO_ROOT)/tao/CurrentC.h \
-  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
-  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
-  $(TAO_ROOT)/tao/Encodable.h \
-  $(TAO_ROOT)/tao/BoundsC.h \
-  $(TAO_ROOT)/tao/ValueBase.h \
-  $(TAO_ROOT)/tao/ValueFactory.h \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/DomainC.h \
-  $(TAO_ROOT)/tao/WrongTransactionC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.h \
-  $(TAO_ROOT)/tao/ObjectIDList.h \
-  $(TAO_ROOT)/tao/StringSeqC.h \
-  $(TAO_ROOT)/tao/PortableInterceptorC.h \
-  $(TAO_ROOT)/tao/DynamicC.h \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
-  $(TAO_ROOT)/tao/IOPC.h \
-  $(ACE_ROOT)/ace/Service_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.h \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  $(ACE_ROOT)/ace/DLL.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Defaults.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \
-  $(TAO_ROOT)/tao/TimeBaseS.h \
-  $(TAO_ROOT)/tao/TimeBaseC.h \
-  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
-  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
-  $(TAO_ROOT)/tao/TAO_Singleton.h \
-  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
-  $(ACE_ROOT)/ace/Object_Manager.h \
-  $(ACE_ROOT)/ace/Managed_Object.h \
-  $(ACE_ROOT)/ace/Managed_Object.cpp \
-  $(ACE_ROOT)/ace/Managed_Object.i \
-  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
-  $(TAO_ROOT)/tao/TAO_Singleton.inl \
-  $(TAO_ROOT)/tao/TimeBaseS_T.h \
-  $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
-  $(TAO_ROOT)/tao/TimeBaseS_T.i \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \
-  $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
-  $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
-  $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
-  $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \
-  $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
-  $(ACE_ROOT)/ace/Atomic_Op.h \
-  $(ACE_ROOT)/ace/Atomic_Op_T.h \
-  $(ACE_ROOT)/ace/Atomic_Op_T.cpp \
-  $(ACE_ROOT)/ace/Atomic_Op_T.i \
-  $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \
-  $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \
-  $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.cpp \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.i \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.cpp \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.i \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.i \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Default_Factory.h \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/Service_Types.h \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(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.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Get_Opt.h \
-  $(ACE_ROOT)/ace/Containers.h \
-  $(ACE_ROOT)/ace/Containers_T.h \
-  $(ACE_ROOT)/ace/Array_Base.h \
-  $(ACE_ROOT)/ace/Array_Base.cpp \
-  $(ACE_ROOT)/ace/Array_Base.inl \
-  $(ACE_ROOT)/ace/Containers_T.cpp \
-  $(ACE_ROOT)/ace/Containers_T.i \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \
-  $(ACE_ROOT)/ace/INET_Addr.h \
-  $(ACE_ROOT)/ace/Addr.h \
-  $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \
-  $(ACE_ROOT)/ace/SOCK_Dgram.h \
-  $(ACE_ROOT)/ace/SOCK.h \
-  $(ACE_ROOT)/ace/IPC_SAP.h \
-  $(ACE_ROOT)/ace/IPC_SAP.i \
-  $(ACE_ROOT)/ace/SOCK.i \
-  $(ACE_ROOT)/ace/SOCK_Dgram.i \
-  $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/nsconf.h
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/ACEXML/compass/Makefile.Supplier b/ACEXML/compass/Makefile.Supplier
deleted file mode 100644
index 3d03470a3db..00000000000
--- a/ACEXML/compass/Makefile.Supplier
+++ /dev/null
@@ -1,266 +0,0 @@
-#----------------------------------------------------------------------------
-#       $Id$
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#       Local macros
-#----------------------------------------------------------------------------
-
-# Override default to make dependency generation work properly.
-ifndef TAO_ROOT
-  TAO_ROOT = $(ACE_ROOT)/TAO
-endif # ! TAO_ROOT
-
-MAKEFILE = Makefile.Supplier
-SONAME =
-SOVERSION =
-LIB     = libSupplier.a
-SHLIB   = libSupplier.$(SOEXT)
-FILES   = Supplier
-LSRC    = $(addsuffix .cpp,$(FILES))
-
-LIBS   += -lTAO_RTEvent -lTAO_RTSched -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_Messaging  -lTAO_PortableServer -lTAO $(ACELIB)
-
-TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs)
-
-CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs \
-        $(foreach svc, $(TAO_ORBSVCS), -DTAO_ORBSVCS_HAS_$(svc))
-
-BUILD   = $(VLIB) $(VSHLIB)
-
-#----------------------------------------------------------------------------
-#       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.local.GNU
-
-# To remake the Test_Client_Module source with xlC 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
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#       Dependencies
-#----------------------------------------------------------------------------
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-
-.obj/Supplier.o .obj/Supplier.so .shobj/Supplier.o .shobj/Supplier.so: Supplier.cpp Supplier.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \
-  $(ACE_ROOT)/ace/pre.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \
-  $(TAO_ROOT)/tao/TimeBaseS.h \
-  $(TAO_ROOT)/tao/TimeBaseC.h \
-  $(TAO_ROOT)/tao/corbafwd.h \
-  $(ACE_ROOT)/ace/CDR_Base.h \
-  $(ACE_ROOT)/ace/post.h \
-  $(ACE_ROOT)/ace/ace_wchar.h \
-  $(ACE_ROOT)/ace/ace_wchar.inl \
-  $(ACE_ROOT)/ace/Basic_Types.h \
-  $(ACE_ROOT)/ace/ACE_export.h \
-  $(ACE_ROOT)/ace/Message_Block.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_String.h \
-  $(ACE_ROOT)/ace/OS_Memory.h \
-  $(ACE_ROOT)/ace/OS_TLI.h \
-  $(ACE_ROOT)/ace/Time_Value.h \
-  $(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/Message_Block_T.h \
-  $(ACE_ROOT)/ace/Message_Block_T.cpp \
-  $(ACE_ROOT)/ace/Message_Block_T.i \
-  $(ACE_ROOT)/ace/CORBA_macros.h \
-  $(ACE_ROOT)/ace/Exception_Macros.h \
-  $(TAO_ROOT)/tao/orbconf.h \
-  $(TAO_ROOT)/tao/varbase.h \
-  $(TAO_ROOT)/tao/TAO_Export.h \
-  $(TAO_ROOT)/tao/CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(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.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/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h \
-  $(ACE_ROOT)/ace/Synch_T.h \
-  $(ACE_ROOT)/ace/Synch_T.cpp \
-  $(ACE_ROOT)/ace/Thread.h \
-  $(ACE_ROOT)/ace/Thread_Adapter.h \
-  $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
-  $(ACE_ROOT)/ace/Synch_T.i \
-  $(ACE_ROOT)/ace/Malloc_Allocator.h \
-  $(ACE_ROOT)/ace/Malloc_Base.h \
-  $(ACE_ROOT)/ace/Free_List.h \
-  $(ACE_ROOT)/ace/Free_List.cpp \
-  $(ACE_ROOT)/ace/Free_List.i \
-  $(ACE_ROOT)/ace/Malloc_T.cpp \
-  $(ACE_ROOT)/ace/Malloc_T.i \
-  $(ACE_ROOT)/ace/Memory_Pool.h \
-  $(ACE_ROOT)/ace/Event_Handler.h \
-  $(ACE_ROOT)/ace/Signal.h \
-  $(ACE_ROOT)/ace/Mem_Map.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/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Node.h \
-  $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Auto_Ptr.h \
-  $(ACE_ROOT)/ace/Auto_Ptr.cpp \
-  $(ACE_ROOT)/ace/Auto_Ptr.i \
-  $(ACE_ROOT)/ace/String_Base.i \
-  $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Environment.h \
-  $(TAO_ROOT)/tao/Object.h \
-  $(TAO_ROOT)/tao/Policy_ForwardC.h \
-  $(TAO_ROOT)/tao/Sequence.h \
-  $(TAO_ROOT)/tao/Managed_Types.h \
-  $(TAO_ROOT)/tao/Sequence_T.h \
-  $(TAO_ROOT)/tao/Sequence_T.cpp \
-  $(TAO_ROOT)/tao/Sequence_T.i \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Exception.h \
-  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
-  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
-  $(TAO_ROOT)/tao/TAO_Singleton.h \
-  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
-  $(ACE_ROOT)/ace/Object_Manager.h \
-  $(ACE_ROOT)/ace/Managed_Object.h \
-  $(ACE_ROOT)/ace/Managed_Object.cpp \
-  $(ACE_ROOT)/ace/Managed_Object.i \
-  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
-  $(TAO_ROOT)/tao/TAO_Singleton.inl \
-  $(TAO_ROOT)/tao/TimeBaseS_T.h \
-  $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
-  $(TAO_ROOT)/tao/TimeBaseS_T.i \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
-  $(TAO_ROOT)/tao/corba.h \
-  $(TAO_ROOT)/tao/NVList.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(TAO_ROOT)/tao/LocalObject.h \
-  $(TAO_ROOT)/tao/Principal.h \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
-  $(TAO_ROOT)/tao/ORB.h \
-  $(TAO_ROOT)/tao/Services.h \
-  $(TAO_ROOT)/tao/CORBA_String.h \
-  $(TAO_ROOT)/tao/objectid.h \
-  $(TAO_ROOT)/tao/PolicyC.h \
-  $(TAO_ROOT)/tao/CurrentC.h \
-  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
-  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
-  $(TAO_ROOT)/tao/Encodable.h \
-  $(TAO_ROOT)/tao/BoundsC.h \
-  $(TAO_ROOT)/tao/ValueBase.h \
-  $(TAO_ROOT)/tao/ValueFactory.h \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/DomainC.h \
-  $(TAO_ROOT)/tao/WrongTransactionC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.h \
-  $(TAO_ROOT)/tao/ObjectIDList.h \
-  $(TAO_ROOT)/tao/StringSeqC.h \
-  $(TAO_ROOT)/tao/PortableInterceptorC.h \
-  $(TAO_ROOT)/tao/DynamicC.h \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
-  $(TAO_ROOT)/tao/IOPC.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \
-  $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
-  $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
-  $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
-  $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \
-  $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
-  $(ACE_ROOT)/ace/Atomic_Op.h \
-  $(ACE_ROOT)/ace/Atomic_Op_T.h \
-  $(ACE_ROOT)/ace/Atomic_Op_T.cpp \
-  $(ACE_ROOT)/ace/Atomic_Op_T.i \
-  $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \
-  $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \
-  $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.cpp \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.i \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \
-  $(ACE_ROOT)/ace/INET_Addr.h \
-  $(ACE_ROOT)/ace/Addr.h \
-  $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \
-  $(ACE_ROOT)/ace/SOCK_Dgram.h \
-  $(ACE_ROOT)/ace/SOCK.h \
-  $(ACE_ROOT)/ace/IPC_SAP.h \
-  $(ACE_ROOT)/ace/IPC_SAP.i \
-  $(ACE_ROOT)/ace/SOCK.i \
-  $(ACE_ROOT)/ace/SOCK_Dgram.i \
-  $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(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.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/nsconf.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Service_Constants.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/ACEXML/compass/Property.cpp b/ACEXML/compass/Property.cpp
deleted file mode 100644
index 50021e0a974..00000000000
--- a/ACEXML/compass/Property.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
-// $Id$
-
-#include "ACEXML/compass/Property.h"
-
-ACEXML_Property::ACEXML_Property()
-{}
-
-ACEXML_Property::~ACEXML_Property()
-{}
diff --git a/ACEXML/compass/Property.h b/ACEXML/compass/Property.h
deleted file mode 100644
index 80d344ba42b..00000000000
--- a/ACEXML/compass/Property.h
+++ /dev/null
@@ -1,29 +0,0 @@
-// $Id$
-
-#ifndef ACEXML_PROPERTY_H
-#define ACEXML_PROPERTY_H
-
-#include "ace/pre.h"
-#include "ACEXML/compass/Compass_Export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ACEXML/common/XML_Types.h"
-
-class Compass_Export ACEXML_Property
-{
-public:
-  ACEXML_Property(void);
-  virtual ~ACEXML_Property();
-  virtual int set (const ACEXML_String& property,
-                   const ACEXML_String& value) = 0;
-  virtual int set (const ACEXML_String& property, const long value) = 0;
-  virtual ACEXML_Char* dump() const = 0;
-};
-
-
-#include "ace/post.h"
-
-#endif /* ACEXML_PROPERTY_H */
diff --git a/ACEXML/compass/PropertyFile_Handler.cpp b/ACEXML/compass/PropertyFile_Handler.cpp
deleted file mode 100644
index 12b98fa594a..00000000000
--- a/ACEXML/compass/PropertyFile_Handler.cpp
+++ /dev/null
@@ -1,178 +0,0 @@
-// $Id$
-
-#include "ace/ACE.h"
-#include "ace/Log_Msg.h"
-#include "ACEXML/compass/PropertyFile_Handler.h"
-#include "ACEXML/compass/EC_Property.h"
-
-#if !defined (__ACEXML_INLINE__)
-# include "ACEXML/compass/PropertyFile_Handler.inl"
-#endif /* __ACEXML_INLINE__ */
-
-static const ACEXML_Char empty_string[] = {0};
-
-extern int errno;
-
-ACEXML_PropertyFile_Handler::ACEXML_PropertyFile_Handler (const ACEXML_Char* filename)
-  : fileName_(ACE::strnew (filename)), locator_ (0), property_ (0)
-{
-  // no-op
-}
-
-ACEXML_PropertyFile_Handler::~ACEXML_PropertyFile_Handler (void)
-{
-  delete [] this->fileName_;
-  delete this->property_;
-}
-
-void
-ACEXML_PropertyFile_Handler::startElement (const ACEXML_Char *,
-                                           const ACEXML_Char *,
-                                           const ACEXML_Char *qName,
-                                           ACEXML_Attributes *alist
-                                           ACEXML_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((ACEXML_SAXException))
-{
-  this->name_ = qName;
-  if (ACE_OS::strcmp (qName, "properties") == 0 ||
-      ACE_OS::strcmp (qName, "description") == 0)
-    return;
-  else if (ACE_OS::strcmp (qName, "struct") == 0 ||
-           ACE_OS::strcmp (qName, "simple") == 0)
-    {
-      this->attname_.clear();
-      this->atttype_.clear();
-      for (size_t i = 0; i < alist->getLength (); ++i)
-        {
-          if (ACE_OS::strcmp (alist->getQName (i), "name") == 0)
-            this->attname_ = alist->getValue (i);
-          else if (ACE_OS::strcmp (alist->getQName (i), "type") == 0)
-            this->atttype_ = alist->getValue (i);
-        }
-      if (!this->property_ && this->atttype_ == "ACEXML_EC_Property")
-        ACE_NEW (this->property_, ACEXML_EC_Property);
-    }
-  else if (ACE_OS::strcmp (qName, "value") == 0)
-    this->cdata_.clear();
-  else
-    {
-      ACE_ERROR ((LM_ERROR, "Unknown element %s encountered\n", qName));
-      ACEXML_SAXParseException* exception = 0;
-      ACE_NEW_NORETURN (exception,
-                        ACEXML_SAXParseException ("Unknown Element"));
-      ACEXML_ENV_RAISE (exception);
-    }
-  return;
-}
-
-void
-ACEXML_PropertyFile_Handler::endElement (const ACEXML_Char *,
-                                         const ACEXML_Char *,
-                                         const ACEXML_Char *qName
-                                         ACEXML_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((ACEXML_SAXException))
-{
-  if (ACE_OS::strcmp (qName, "description") == 0)
-    this->cdata_.clear();
-  else if (ACE_OS::strcmp (qName, "value") == 0)
-    this->value_ = this->cdata_;
-  else if (ACE_OS::strcmp (qName, "simple") == 0)
-    {
-      if (this->atttype_ == "string")
-        {
-          if (this->property_->set (this->attname_, this->value_) != 0)
-            {
-              ACE_ERROR ((LM_ERROR, "Property %s = %s invalid\n",
-                          this->attname_.c_str(), this->value_.c_str()));
-              ACEXML_SAXParseException* exception = 0;
-              ACE_NEW_NORETURN (exception,
-                                ACEXML_SAXParseException ("Invalid Property"));
-              ACEXML_ENV_RAISE (exception);
-            }
-        }
-      else if (this->atttype_ == "long")
-        {
-          errno = 0;
-          long value = ACE_OS::strtol (this->value_.c_str(), 0, 10);
-          if (errno != 0)
-            {
-              ACE_ERROR ((LM_ERROR, "Property %s = %d invalid: %m\n",
-                          this->attname_.c_str(), value));
-              ACEXML_SAXParseException* exception = 0;
-              ACE_NEW_NORETURN (exception,
-                                ACEXML_SAXParseException ("Invalid Property"));
-              ACEXML_ENV_RAISE (exception);
-            }
-          else if (this->property_->set (this->attname_, value) != 0)
-            {
-              ACE_ERROR ((LM_ERROR, "Property %s = %d invalid\n",
-                          this->attname_.c_str(), value));
-              ACEXML_SAXParseException* exception = 0;
-              ACE_NEW_NORETURN (exception,
-                                ACEXML_SAXParseException ("Invalid Property"));
-              ACEXML_ENV_RAISE (exception);
-            }
-        }
-      this->value_.clear();
-      this->cdata_.clear();
-    }
-  this->name_.clear();
-  return;
-}
-
-void
-ACEXML_PropertyFile_Handler::characters (const ACEXML_Char *cdata,
-                                         int, int
-                                         ACEXML_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((ACEXML_SAXException))
-{
-  if (this->cdata_.length())
-    this->cdata_ += cdata;
-  else
-    this->cdata_ = cdata;
-}
-
-
-// Methods inherited from ACEXML_ErrorHandler.
-
-/*
- * Receive notification of a recoverable error.
- */
-void
-ACEXML_PropertyFile_Handler::error (ACEXML_SAXParseException & ex
-                                    ACEXML_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((ACEXML_SAXException))
-{
-  ACE_DEBUG ((LM_DEBUG, "%s: line: %d col: %d ",
-              (this->locator_->getSystemId() == 0
-               ? this->fileName_ : this->locator_->getSystemId()),
-              this->locator_->getLineNumber(),
-              this->locator_->getColumnNumber()));
-  ex.print();
-}
-
-void
-ACEXML_PropertyFile_Handler::fatalError (ACEXML_SAXParseException & ex
-                                         ACEXML_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((ACEXML_SAXException))
-{
-  ACE_DEBUG ((LM_DEBUG, "%s: line: %d col: %d ",
-              (this->locator_->getSystemId() == 0
-               ? this->fileName_ : this->locator_->getSystemId()),
-              this->locator_->getLineNumber(),
-              this->locator_->getColumnNumber()));
-  ex.print();
-}
-
-void
-ACEXML_PropertyFile_Handler::warning (ACEXML_SAXParseException & ex
-                                      ACEXML_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((ACEXML_SAXException))
-{
-  ACE_DEBUG ((LM_DEBUG, "%s: line: %d col: %d ",
-              (this->locator_->getSystemId() == 0
-               ? this->fileName_ : this->locator_->getSystemId()),
-              this->locator_->getLineNumber(),
-              this->locator_->getColumnNumber()));
-  ex.print();
-}
diff --git a/ACEXML/compass/PropertyFile_Handler.h b/ACEXML/compass/PropertyFile_Handler.h
deleted file mode 100644
index 47c86719652..00000000000
--- a/ACEXML/compass/PropertyFile_Handler.h
+++ /dev/null
@@ -1,195 +0,0 @@
-// $Id$
-
-//=============================================================================
-/**
- *  @file    PropertyFile_Handler.h
- *
- *  $Id$
- *
- *  @author Krishnakumar B <kitty@cs.wustl.edu>
- */
-//=============================================================================
-
-#ifndef ACEXML_PROPERTYFILE_HANDLER_H
-#define ACEXML_PROPERTYFILE_HANDLER_H
-
-#include "ace/pre.h"
-#include "ACEXML/compass/Compass_Export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ACEXML/common/DefaultHandler.h"
-#include "ACEXML/compass/Property.h"
-
-/**
- * @class ACEXML_PropertyFile_Handler
- *
- * @brief ACEXML_PropertyFile_Handler is an example SAX event handler.
- *
- * This SAX event handler try to regenerate the XML document it
- * reads with correct indentation.
- */
-class Compass_Export ACEXML_PropertyFile_Handler : public ACEXML_DefaultHandler
-{
-public:
-  /*
-   * Default constructor.
-   */
-  ACEXML_PropertyFile_Handler (const ACEXML_Char* name);
-
-  /*
-   * Default destructor.
-   */
-  virtual ~ACEXML_PropertyFile_Handler (void);
-
-  // Methods inherited from ACEXML_ContentHandler.
-
-  /*
-   * Receive notification of character data.
-   */
-  virtual void characters (const ACEXML_Char *ch, int start,
-                           int length ACEXML_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((ACEXML_SAXException));
-
-  /*
-   * Receive notification of the end of a document.
-   */
-  virtual void endDocument (ACEXML_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((ACEXML_SAXException));
-
-  /*
-   * Receive notification of the end of an element.
-   */
-  virtual void endElement (const ACEXML_Char *namespaceURI,
-                           const ACEXML_Char *localName,
-                           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_ARG_DECL)
-    ACE_THROW_SPEC ((ACEXML_SAXException));
-
-  /*
-   * Receive notification of ignorable whitespace in element content.
-   */
-  virtual void ignorableWhitespace (const ACEXML_Char *ch, int start,
-                                    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_ARG_DECL)
-    ACE_THROW_SPEC ((ACEXML_SAXException));
-
-  /*
-   * Receive an object for locating the origin of SAX document events.
-   */
-  virtual void setDocumentLocator (ACEXML_Locator *locator) ;
-
-  /*
-   * Receive notification of a skipped entity.
-   */
-  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_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((ACEXML_SAXException));
-
-  /*
-   * Receive notification of the beginning of an element.
-   */
-  virtual void startElement (const ACEXML_Char *namespaceURI,
-                             const ACEXML_Char *localName,
-                             const ACEXML_Char *qName,
-                             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_ARG_DECL)
-    ACE_THROW_SPEC ((ACEXML_SAXException));
-
-  // *** Methods inherited from ACEXML_DTDHandler.
-
-  /*
-   * Receive notification of a notation declaration event.
-   */
-  virtual void notationDecl (const ACEXML_Char *name,
-                             const ACEXML_Char *publicId,
-                             const ACEXML_Char *systemId ACEXML_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((ACEXML_SAXException));
-
-  /*
-   * Receive notification of an unparsed entity declaration event.
-   */
-  virtual void unparsedEntityDecl (const ACEXML_Char *name,
-                                   const ACEXML_Char *publicId,
-                                   const ACEXML_Char *systemId,
-                                   const ACEXML_Char *notationName
-                                   ACEXML_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((ACEXML_SAXException));
-
-  // Methods inherited from ACEXML_EnitityResolver.
-
-  /*
-   * Allow the application to resolve external entities.
-   */
-  virtual ACEXML_InputSource *resolveEntity (const ACEXML_Char *publicId,
-                                             const ACEXML_Char *systemId
-                                             ACEXML_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((ACEXML_SAXException));
-
-  // Methods inherited from ACEXML_ErrorHandler.
-
-  /*
-   * Receive notification of a recoverable error.
-   */
-  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_ARG_DECL)
-    ACE_THROW_SPEC ((ACEXML_SAXException));
-
-  /*
-   * Receive notification of a warning.
-   */
-  virtual void warning (ACEXML_SAXParseException &exception
-                        ACEXML_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((ACEXML_SAXException));
-
-  virtual const ACEXML_Property* get_property(void) const;
-
-private:
-  ACEXML_Char* fileName_;
-  ACEXML_Locator* locator_;
-  ACEXML_Property* property_;
-  ACEXML_String cdata_;
-  ACEXML_String name_;
-  ACEXML_String attname_;
-  ACEXML_String atttype_;
-  ACEXML_String value_;
-};
-
-#if defined (__ACEXML_INLINE__)
-# include "ACEXML/compass/PropertyFile_Handler.inl"
-#endif /* __ACEXML_INLINE__ */
-
-#include "ace/post.h"
-
-#endif /* ACEXML_PROPERTYFILE_HANDLER_H */
diff --git a/ACEXML/compass/PropertyFile_Handler.inl b/ACEXML/compass/PropertyFile_Handler.inl
deleted file mode 100644
index 595fbe03614..00000000000
--- a/ACEXML/compass/PropertyFile_Handler.inl
+++ /dev/null
@@ -1,103 +0,0 @@
-// $Id$
-
-const ACEXML_Property*
-ACEXML_PropertyFile_Handler::get_property (void) const
-{
-  return this->property_;
-}
-
-void
-ACEXML_PropertyFile_Handler::startDocument (ACEXML_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((ACEXML_SAXException))
-{
-}
-
-void
-ACEXML_PropertyFile_Handler::endDocument (ACEXML_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((ACEXML_SAXException))
-{
-
-}
-
-void
-ACEXML_PropertyFile_Handler::endPrefixMapping (const ACEXML_Char *
-                                               ACEXML_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((ACEXML_SAXException))
-{
-}
-
-void
-ACEXML_PropertyFile_Handler::ignorableWhitespace (const ACEXML_Char *,
-                                                  int,
-                                                  int
-                                                  ACEXML_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((ACEXML_SAXException))
-{
-
-}
-
-void
-ACEXML_PropertyFile_Handler::processingInstruction (const ACEXML_Char *,
-                                                    const ACEXML_Char *
-                                                    ACEXML_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((ACEXML_SAXException))
-{
-
-}
-
-void
-ACEXML_PropertyFile_Handler::setDocumentLocator (ACEXML_Locator * locator)
-{
-  this->locator_ = locator;
-}
-
-void
-ACEXML_PropertyFile_Handler::skippedEntity (const ACEXML_Char *
-                                            ACEXML_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((ACEXML_SAXException))
-{
-}
-
-void
-ACEXML_PropertyFile_Handler::startPrefixMapping (const ACEXML_Char *,
-                                                 const ACEXML_Char *
-                                                 ACEXML_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((ACEXML_SAXException))
-{
-
-}
-
-// *** Methods inherited from ACEXML_DTDHandler.
-
-void
-ACEXML_PropertyFile_Handler::notationDecl (const ACEXML_Char *,
-                                           const ACEXML_Char *,
-                                           const ACEXML_Char *
-                                           ACEXML_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((ACEXML_SAXException))
-{
-  // No-op.
-}
-
-void
-ACEXML_PropertyFile_Handler::unparsedEntityDecl (const ACEXML_Char *,
-                                                 const ACEXML_Char *,
-                                                 const ACEXML_Char *,
-                                                 const ACEXML_Char *
-                                                 ACEXML_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((ACEXML_SAXException))
-{
-  // No-op.
-}
-
-// Methods inherited from ACEXML_EnitityResolver.
-
-ACEXML_InputSource *
-ACEXML_PropertyFile_Handler::resolveEntity (const ACEXML_Char *,
-                                            const ACEXML_Char *
-                                            ACEXML_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((ACEXML_SAXException))
-{
-  // No-op.
-  return 0;
-}
diff --git a/ACEXML/compass/ServerActivator.cpp b/ACEXML/compass/ServerActivator.cpp
deleted file mode 100644
index a1594dc81c8..00000000000
--- a/ACEXML/compass/ServerActivator.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-// $Id$
-
-
-#if defined (__ACE_INLINE__)
-#include "ServerActivator.inl"
-#endif /* __ACE_INLINE__ */
-
-#include "ACEXML/compass/ServerActivator.h"
-
-using namespace Deployment;
-
-
-ServerActivator::ServerActivator()
-{
-  ACE_NEW (this->comp_servers_, ComponentServers());
-}
-
-ServerActivator::~ServerActivator()
-{
-  ComponentServer** entry = 0;
-  for (ComponentServers::iterator iter (*this->comp_servers_);
-       iter.next (entry) != 0;
-       iter->advance())
-    delete *entry;
-}
-
-ComponentServer*
-ServerActivator::create_component_server (ConfigValues* config)
-  ACE_THROW_SPEC ((CreateFailure, InvalidConfiguration))
-{
-  ComponentServer* cserver = 0;
-  ACE_NEW_RETURN (cserver, ComponentServer (config), 0);
-  if (this->comp_servers_->insert (cserver) < 0)
-    ACE_THROW (CreateFailure());
-  return cserver;
-}
-
-void
-ServerActivator::remove_component_server (ComponentServer* server)
-  ACE_THROW_SPEC ((RemoveFailure))
-{
-  if (this->comp_servers_->remove (server) != 0)
-    ACE_THROW (RemoveFailure());
-  delete server;
-  return;
-}
diff --git a/ACEXML/compass/ServerActivator.h b/ACEXML/compass/ServerActivator.h
deleted file mode 100644
index 637de028cbd..00000000000
--- a/ACEXML/compass/ServerActivator.h
+++ /dev/null
@@ -1,57 +0,0 @@
-// $Id$
-
-
-#ifndef COMPASS_SERVER_ACTIVATOR_H
-#define COMPASS_SERVER_ACTIVATOR_H
-
-
-#include "ace/pre.h"
-#include "ACEXML/compass/Compass_Export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Singleton.h"
-#include "ace/Synch.h"
-#include "ace/Unbounded_Set.h"
-#include "ACEXML/compass/CompassTypes.h"
-
-namespace Deployment
-{
-  class ComponentServer;  // Forward decl.
-  typedef ACE_Unbounded_Set<ComponentServer*> ComponentServers;
-
-  class Compass_Export ServerActivator
-  {
-  public:
-    friend class ACE_Singleton <ServerActivator, ACE_SYNCH_MUTEX>;
-
-    ComponentServer* create_component_server (ConfigValues* config = 0)
-      ACE_THROW_SPEC ((CreateFailure, InvalidConfiguration));
-
-    void remove_component_server (ComponentServer* server)
-      ACE_THROW_SPEC ((RemoveFailure));
-
-    ComponentServers* get_component_servers ();
-
-  protected:
-    ServerActivator();
-    ~ServerActivator();
-    ServerActivator (const ServerActivator&);
-    ServerActivator& operator= (const ServerActivator&);
-
-  private:
-    ComponentServers* comp_servers_;
-
-  };
-  typedef ACE_Singleton <ServerActivator, ACE_SYNCH_MUTEX> SERVER_ACTIVATOR;
-}
-
-#if defined (__ACE_INLINE__)
-#include "ServerActivator.inl"
-#endif /* __ACE_INLINE__ */
-
-#include "ace/post.h"
-
-#endif /* COMPASS_SERVER_ACTIVATOR_H */
diff --git a/ACEXML/compass/ServerActivator.inl b/ACEXML/compass/ServerActivator.inl
deleted file mode 100644
index b1c737d7a33..00000000000
--- a/ACEXML/compass/ServerActivator.inl
+++ /dev/null
@@ -1,9 +0,0 @@
-// $Id$
-
-using namespace Deployment;
-
-ACE_INLINE ComponentServers*
-ServerActivator::get_component_servers (void)
-{
-  return this->comp_servers_;
-}
diff --git a/ACEXML/compass/Service.cpp b/ACEXML/compass/Service.cpp
deleted file mode 100644
index 249a3d9d063..00000000000
--- a/ACEXML/compass/Service.cpp
+++ /dev/null
@@ -1,127 +0,0 @@
-// $Id$
-
-#include "Service.h"
-#include "ace/Service_Repository.h"
-#include "ace/ARGV.h"
-
-ACE_RCSID(EC_Examples, Service, "$Id$");
-
-extern "C"
-int
-createService (int argc, char* argv[])
-{
-
-  if (ACE_Service_Config::process_directive ("dynamic EC_Factory Service_Object * TAO_RTEvent:_make_TAO_EC_Default_Factory() \"-ECDispatching reactive -ECFiltering basic -ECSupplierFiltering per-supplier -ECProxyConsumerLock thread -ECProxySupplierLock thread -ECConsumerControl reactive -ECSupplierControl reactive -ECConsumerControlPeriod 50000 -ECSupplierControlPeriod 50000\"") != 0)
-    {
-
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "%p\n",
-                         "ERROR: Client unable to process the "
-                         "Service Configurator directive"),
-                        -1);
-    }
-  Service service;
-  return service.run (argc, argv);
-}
-
-Service::Service()
-{
-
-}
-
-int
-Service::run (int argc, char* argv[])
-{
-//   int register_with_object_manager = 0;
-//   if (TAO_Singleton_Manager::instance ()->init (
-//         register_with_object_manager) == -1)
-//     ACE_ERROR_RETURN ((LM_ERROR,
-//                        "Service::init -- ORB pre-initialization "
-//                        "failed.\n"),
-//                       -1);  // No exceptions available yet, so return
-//                             // an error
-
-  const ACE_Service_Type* service;
-  const ACE_TCHAR* factory = "EC_Factory";
-
-  if (ACE_Service_Repository::instance()->find (factory, &service) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "Unable to locate EC_Factory"), -1);
-
-  if (service->type()->init (argc, argv) != 0)
-    return -1;
-
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      // Initialize the ORB.
-      CORBA::ORB_var orb = CORBA::ORB_init (argc,
-                                            argv,
-                                            "Service"
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      this->orb_ = orb.in();
-
-      CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      PortableServer::POAManager_var poa_manager =
-        poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      TAO_EC_Event_Channel_Attributes attributes (poa.in (),
-                                                  poa.in ());
-
-      TAO_EC_Event_Channel ec_impl (attributes);
-      ec_impl.activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      RtecEventChannelAdmin::EventChannel_var event_channel =
-        ec_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      TAO_Naming_Client naming_client;
-
-      // Initialization of the naming service.
-      if (naming_client.init (orb.in ()) != 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "(%P|%t) Unable to initialize "
-                           "the TAO_Naming_Client. \n"),
-                          -1);
-
-      CosNaming::Name ec_name (1);
-      ec_name.length (1);
-      ec_name[0].id = CORBA::string_dup ("EventChannel");
-      ACE_TRY_CHECK;
-
-      naming_client->bind (ec_name, event_channel.in() ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // Wait for events, using work_pending()/perform_work() may help
-      // or using another thread, this example is too simple for that.
-
-      ACE_Time_Value tv (90, 0);
-      orb->run (tv);
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Service");
-      return 1;
-    }
-  ACE_ENDTRY;
-//   if (TAO_Singleton_Manager::instance ()->fini () == -1)
-//     ACE_ERROR_RETURN ((LM_ERROR,
-//                        "Service::fini -- ORB pre-termination failed."),
-//                       -1);
-  return 0;
-
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/ACEXML/compass/Service.h b/ACEXML/compass/Service.h
deleted file mode 100644
index b2e3db4226d..00000000000
--- a/ACEXML/compass/Service.h
+++ /dev/null
@@ -1,36 +0,0 @@
-// $Id$
-
-#ifndef SERVICE_H
-#define SERVICE_H
-
-#include "orbsvcs/RtecEventCommS.h"
-#include "orbsvcs/Event/EC_Event_Channel.h"
-#include "orbsvcs/Event/EC_Default_Factory.h"
-#include "orbsvcs/CosNamingS.h"
-#include "orbsvcs/Naming/Naming_Utils.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-class Service
-{
-  // = TITLE
-  //   Simple consumer object
-  //
-  // = DESCRIPTION
-  //   This class is a consumer of events.
-  //   It simply registers for one event type.
-  //
-public:
-  Service (void);
-  // Constructor
-
-  int run (int argc, char* argv[]);
-  // Run the test
-
-private:
-  CORBA::ORB_ptr orb_;
-};
-
-#endif /* CONSUMER_H */
diff --git a/ACEXML/compass/SoftPkg.cpp b/ACEXML/compass/SoftPkg.cpp
deleted file mode 100644
index 7e6fa61d07c..00000000000
--- a/ACEXML/compass/SoftPkg.cpp
+++ /dev/null
@@ -1,191 +0,0 @@
-// $Id$
-
-#include "ACEXML/compass/SoftPkg.h"
-
-ACEXML_SoftPkg::ACEXML_SoftPkg()
-  : current_code_ (0), current_dep_ (0), current_impl_ (0)
-{}
-
-ACEXML_SoftPkg::~ACEXML_SoftPkg()
-{
-  Dependency** dep = 0;
-  DEP_ITERATOR dep_iter (this->deps_);
-  for (; dep_iter.next (dep); dep_iter.advance())
-    delete *dep;
-  Implementation** impl = 0;
-  IMPL_ITERATOR impl_iter (this->impls_);
-  for (; impl_iter.next (impl); impl_iter.advance())
-    delete *impl;
-}
-
-void
-ACEXML_SoftPkg::dump (void)const
-{
-  ACE_DEBUG ((LM_DEBUG, "Name = %s\n", this->name_.c_str()));
-  ACE_DEBUG ((LM_DEBUG, "Version = %s\n", this->version_.c_str()));
-  ACE_DEBUG ((LM_DEBUG, "Package Type = %s\n", this->pkgtype_.c_str()));
-  ACE_DEBUG ((LM_DEBUG, "Title = %s\n", this->title_.c_str()));
-  ACE_DEBUG ((LM_DEBUG, "Description = %s\n", this->description_.c_str()));
-  this->propfile_.dump();
-  Dependency** dep = 0;
-  Dependencies::const_iterator dep_iter (this->deps_);
-  for (; dep_iter.next (dep); dep_iter.advance())
-    (*dep)->dump();
-  Implementation** impl = 0;
-  Implementations::const_iterator impl_iter (this->impls_);
-  for (; impl_iter.next (impl); impl_iter.advance())
-    (*impl)->dump();
-}
-
-void
-ACEXML_SoftPkg::PropertyFile::dump(void)const
-{
-  ACE_DEBUG ((LM_DEBUG, "Property File = %s\n", this->file_.c_str()));
-}
-
-void
-ACEXML_SoftPkg::OperSys::dump(void)const
-{
-  ACE_DEBUG ((LM_DEBUG, "OS = %s Version = %s\n",
-              this->name_.c_str(), this->version_.c_str()));
-}
-void
-ACEXML_SoftPkg::Code::dump(void)const
-{
-  ACE_DEBUG ((LM_DEBUG, " Code: \n  Type = %s\n  File = %s\n  "
-              "EntryPoint = %s\n", this->type_.c_str(), this->file_.c_str(),
-              this->func_.c_str()));
-}
-void
-ACEXML_SoftPkg::Dependency::dump(void)const
-{
-  ACE_DEBUG ((LM_DEBUG, "Dependency: \n Type = %s\n File = %s\n",
-              this->type_.c_str(), this->localfile_.c_str()));
-}
-void
-ACEXML_SoftPkg::Implementation::dump(void)const
-{
-  ACE_DEBUG ((LM_DEBUG, "Implementation: \n Id = %s\n ", this->id_.c_str()));
-  this->os_.dump();
-  ACE_DEBUG ((LM_DEBUG, " Processor = %s\n Compiler = %s\n ProgLang = %s\n ",
-              this->cpu_.c_str(), this->compiler_.c_str(),
-              this->lang_.c_str()));
-  this->propfile_.dump();
-  this->code_.dump();
-}
-
-int
-ACEXML_SoftPkg::start_element (const ACEXML_Char* element,
-                               const ACEXML_String& id)
-{
-  if (ACE_OS::strcmp (element, "implementation") == 0)
-    {
-      Implementation* impl = 0;
-      ACE_NEW_RETURN (impl, Implementation, -1);
-      impl->id_ = id;
-      if (this->impls_.insert (impl) < 0)
-        {
-          ACE_ERROR ((LM_ERROR, "Implementation already exists\n"));
-          return -1;
-        }
-      this->current_impl_ = impl;
-    }
-  else if (ACE_OS::strcmp (element, "dependency") == 0)
-    {
-      Dependency* dep = 0;
-      ACE_NEW_RETURN (dep, Dependency, -1);
-      dep->type_ = id;
-      if (this->deps_.insert (dep) < 0)
-        {
-          ACE_ERROR ((LM_ERROR, "Dependency already exists\n"));
-          return -1;
-        }
-      this->current_dep_ = dep;
-    }
-  else if (ACE_OS::strcmp (element, "code") == 0)
-    {
-      if (!this->current_impl_)
-        {
-          ACE_ERROR ((LM_ERROR, "Code section outside of implementation\n"));
-          return -1;
-        }
-      this->current_code_ = &this->current_impl_->code_;
-      this->current_code_->type_ = id;
-    }
-  else
-    return -1;
-  return 0;
-}
-
-void
-ACEXML_SoftPkg::end_element (const ACEXML_Char* element)
-{
-  if (ACE_OS::strcmp (element, "implementation") == 0)
-    this->current_impl_ = 0;
-  else if (ACE_OS::strcmp (element, "dependency") == 0)
-    this->current_dep_ = 0;
-  else if (ACE_OS::strcmp (element, "code") == 0)
-    this->current_code_ = 0;
-  return;
-}
-
-const ACEXML_SoftPkg::Implementations&
-ACEXML_SoftPkg::get_impls (void) const
-{
-  return this->impls_;
-}
-
-const ACEXML_SoftPkg::Dependencies&
-ACEXML_SoftPkg::get_deps (void) const
-{
-  return this->deps_;
-}
-
-int
-ACEXML_SoftPkg::set (const ACEXML_Char* element,
-                     const ACEXML_String& attname,
-                     const ACEXML_String& value)
-{
-  if (ACE_OS::strcmp (element, "softpkg") == 0)
-    {
-      if (attname == "name")
-        this->name_ = value;
-      else if (attname == "version")
-        this->version_ = value;
-    }
-  else if (ACE_OS::strcmp (element, "pkgtype") == 0)
-    this->pkgtype_ = value;
-  else if (ACE_OS::strcmp (element, "title") == 0)
-    this->title_ = value;
-  else if (ACE_OS::strcmp (element, "description") == 0)
-    this->description_ = value;
-  else if (ACE_OS::strcmp (element, "localfile") == 0)
-    this->current_dep_->localfile_ = value;
-  else if (ACE_OS::strcmp (element, "os") == 0)
-    {
-      if (attname == "name")
-        this->current_impl_->os_.name_ = value;
-      else
-        this->current_impl_->os_.version_ = value;
-    }
-  else if (ACE_OS::strcmp (element, "processor") == 0)
-    this->current_impl_->cpu_ = value;
-  else if (ACE_OS::strcmp (element, "compiler") == 0)
-    this->current_impl_->compiler_ = value;
-  else if (ACE_OS::strcmp (element, "programminglanguage") == 0)
-    this->current_impl_->lang_ = value;
-  else if (ACE_OS::strcmp (element, "fileinarchive") == 0)
-    {
-      if (this->current_code_)
-        this->current_code_->file_ = value;
-      else if (this->current_impl_)
-        this->current_impl_->propfile_.file_ = value;
-      else
-        this->propfile_.file_ = value;
-    }
-  else if (ACE_OS::strcmp (element, "entrypoint") == 0)
-    this->current_code_->func_ = value;
-  else
-    return -1;
-  return 0;
-}
diff --git a/ACEXML/compass/SoftPkg.h b/ACEXML/compass/SoftPkg.h
deleted file mode 100644
index 5cadaf5444c..00000000000
--- a/ACEXML/compass/SoftPkg.h
+++ /dev/null
@@ -1,93 +0,0 @@
-// $Id$
-
-#ifndef ACEXML_SOFTPKG_H
-#define ACEXML_SOFTPKG_H
-
-#include "ace/pre.h"
-#include "ACEXML/compass/Compass_Export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ACEXML/common/XML_Types.h"
-#include "ace/Unbounded_Set.h"
-
-class Compass_Export ACEXML_SoftPkg
-{
-public:
-  typedef ACEXML_String Localfile;
-  typedef ACEXML_String Fileinarchive;
-  typedef ACEXML_String EntryPoint;
-  typedef ACEXML_String Processor;
-  typedef ACEXML_String Compiler;
-  typedef ACEXML_String ProgLang;
-
-  struct PropertyFile
-  {
-    Fileinarchive file_;
-    void dump(void) const;
-  };
-
-  struct Dependency
-  {
-    ACEXML_String type_;
-    Localfile     localfile_;
-    void dump(void) const;
-  };
-  struct OperSys
-  {
-    ACEXML_String name_;
-    ACEXML_String version_;
-    void dump(void) const;
-  };
-  struct Code
-  {
-    ACEXML_String type_;
-    Fileinarchive file_;
-    EntryPoint    func_;
-    void dump(void) const;
-  };
-  struct Implementation
-  {
-    ACEXML_String   id_;
-    OperSys         os_;
-    Processor       cpu_;
-    Compiler        compiler_;
-    ProgLang        lang_;
-    PropertyFile    propfile_;
-    Code            code_;
-    void dump(void) const;
-  };
-  typedef ACE_Unbounded_Set<Dependency*> Dependencies;
-  typedef ACE_Unbounded_Set_Iterator<Dependency*> DEP_ITERATOR;
-  typedef ACE_Unbounded_Set<Implementation*> Implementations;
-  typedef ACE_Unbounded_Set_Iterator<Implementation*> IMPL_ITERATOR;
-
-  ACEXML_SoftPkg();
-  ~ACEXML_SoftPkg();
-  int start_element (const ACEXML_Char* element, const ACEXML_String& id);
-  void end_element (const ACEXML_Char* element);
-  const Implementations& get_impls (void) const;
-  const Dependencies& get_deps (void) const;
-  int set (const ACEXML_Char* element,
-           const ACEXML_String& attname,
-           const ACEXML_String& value);
-  void dump(void) const;
-private:
-  ACEXML_String name_;
-  ACEXML_String version_;
-  ACEXML_String pkgtype_;
-  ACEXML_String title_;
-  ACEXML_String description_;
-  PropertyFile  propfile_;
-  Code* current_code_;
-  Dependency* current_dep_;
-  Implementation* current_impl_;
-  Implementations impls_;
-  Dependencies deps_;
-};
-
-#include "ace/post.h"
-
-#endif /* ACEXML_SOFTPKG_H */
diff --git a/ACEXML/compass/SoftPkgHandler.cpp b/ACEXML/compass/SoftPkgHandler.cpp
deleted file mode 100644
index cf5c0512f7c..00000000000
--- a/ACEXML/compass/SoftPkgHandler.cpp
+++ /dev/null
@@ -1,211 +0,0 @@
-// $Id$
-
-#include "ACEXML/compass/SoftPkgHandler.h"
-#include "ace/ACE.h"
-#include "ace/Log_Msg.h"
-
-#if !defined (__ACEXML_INLINE__)
-# include "ACEXML/compass/SoftPkgHandler.inl"
-#endif /* __ACEXML_INLINE__ */
-
-static const ACEXML_Char empty_string[] = {0};
-
-ACEXML_SoftPkgHandler::ACEXML_SoftPkgHandler (const ACEXML_Char* filename)
-  : fileName_(ACE::strnew (filename)), locator_ (0), softpkg_ (0)
-{
-  // no-op
-}
-
-ACEXML_SoftPkgHandler::~ACEXML_SoftPkgHandler (void)
-{
-  delete [] this->fileName_;
-  delete this->softpkg_;
-}
-
-void
-ACEXML_SoftPkgHandler::startElement (const ACEXML_Char *,
-                                     const ACEXML_Char *,
-                                     const ACEXML_Char *qName,
-                                     ACEXML_Attributes *alist
-                                     ACEXML_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((ACEXML_SAXException))
-{
-  ACEXML_SAXParseException* exception = 0;
-  if (!this->softpkg_)
-    {
-      ACE_NEW_NORETURN (this->softpkg_, ACEXML_SoftPkg);
-      if (!this->softpkg_)
-        {
-          ACE_ERROR ((LM_ERROR, "Unable to allocate memory for %s\n",
-                      qName));
-          return;
-        }
-    }
-  if (ACE_OS::strcmp (qName, "softpkg") == 0
-      || ACE_OS::strcmp (qName, "os") == 0
-      || ACE_OS::strcmp (qName, "processor") == 0
-      || ACE_OS::strcmp (qName, "compiler") == 0
-      || ACE_OS::strcmp (qName, "programminglanguage") == 0
-      || ACE_OS::strcmp (qName, "fileinarchive") == 0
-      || ACE_OS::strcmp (qName, "localfile") == 0)
-    {
-      for (size_t i = 0; i < alist->getLength (); ++i)
-        {
-          if (this->softpkg_->set (qName, alist->getQName (i),
-                                   alist->getValue (i)) < 0)
-            {
-              ACE_ERROR ((LM_ERROR, "Unable to set value for element %s\n",
-                          qName));
-              ACE_NEW_NORETURN (exception,
-                                ACEXML_SAXParseException ("Set value"));
-              ACEXML_ENV_RAISE (exception);
-            }
-        }
-    }
-  else if (ACE_OS::strcmp (qName, "dependency") == 0 ||
-           ACE_OS::strcmp (qName, "implementation") == 0 ||
-           ACE_OS::strcmp (qName, "code") == 0)
-    {
-      if (this->softpkg_->start_element (qName, alist->getValue (0U)) < 0)
-        {
-          ACE_ERROR ((LM_ERROR, "Invalid element %s encountered\n",
-                      qName));
-          ACE_NEW_NORETURN (exception,
-                            ACEXML_SAXParseException ("Invalid Element"));
-          ACEXML_ENV_RAISE (exception);
-        }
-    }
-  else if (ACE_OS::strcmp (qName, "pkgtype") == 0
-           || ACE_OS::strcmp (qName, "title") == 0
-           || ACE_OS::strcmp (qName, "description") == 0
-           || ACE_OS::strcmp (qName, "propertyfile") == 0
-           || ACE_OS::strcmp (qName, "entrypoint") == 0)
-    return;
-  else
-    {
-      ACE_ERROR ((LM_ERROR, "Unknown element %s encountered\n", qName));
-      ACEXML_SAXParseException* exception = 0;
-      ACE_NEW_NORETURN (exception,
-                        ACEXML_SAXParseException ("Unknown Element"));
-      ACEXML_ENV_RAISE (exception);
-    }
-  return;
-}
-
-void
-ACEXML_SoftPkgHandler::endElement (const ACEXML_Char *,
-                                   const ACEXML_Char *,
-                                   const ACEXML_Char *qName
-                                   ACEXML_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((ACEXML_SAXException))
-{
-  if (ACE_OS::strcmp (qName, "pkgtype") == 0
-      || ACE_OS::strcmp (qName, "title") == 0
-      || ACE_OS::strcmp (qName, "description") == 0
-      || ACE_OS::strcmp (qName, "propertyfile") == 0
-      || ACE_OS::strcmp (qName, "entrypoint") == 0)
-    {
-      if (this->cdata_.length())
-        {
-          ACEXML_String temp;
-          if (this->softpkg_->set (qName, temp, this->cdata_) < 0)
-            {
-              ACE_ERROR ((LM_ERROR, "Invalid content in %s\n", qName));
-              ACEXML_SAXParseException* exception = 0;
-              ACE_NEW_NORETURN (exception,
-                                ACEXML_SAXParseException ("Invalid Content"));
-              ACEXML_ENV_RAISE (exception);
-            }
-          this->cdata_.clear();
-        }
-//       else
-//         {
-//           ACE_ERROR ((LM_ERROR, "Empty element %s encountered\n", qName));
-//           ACEXML_SAXParseException* exception = 0;
-//           ACE_NEW_NORETURN (exception,
-//                             ACEXML_SAXParseException ("Empty Element"));
-//           ACEXML_ENV_RAISE (exception);
-//         }
-    }
-  else if (ACE_OS::strcmp (qName, "dependency") == 0 ||
-           ACE_OS::strcmp (qName, "implementation") == 0 ||
-           ACE_OS::strcmp (qName, "code") == 0)
-    {
-      this->softpkg_->end_element (qName);
-    }
-  else if (ACE_OS::strcmp (qName, "softpkg") == 0
-           || ACE_OS::strcmp (qName, "os") == 0
-           || ACE_OS::strcmp (qName, "processor") == 0
-           || ACE_OS::strcmp (qName, "compiler") == 0
-           || ACE_OS::strcmp (qName, "programminglanguage") == 0
-           || ACE_OS::strcmp (qName, "fileinarchive") == 0
-           || ACE_OS::strcmp (qName, "localfile") == 0)
-
-    return;
-  else
-    {
-      ACE_ERROR ((LM_ERROR, "Unknown element %s encountered\n", qName));
-      ACEXML_SAXParseException* exception = 0;
-      ACE_NEW_NORETURN (exception,
-                        ACEXML_SAXParseException ("Unknown Element"));
-      ACEXML_ENV_RAISE (exception);
-    }
-  return;
-}
-
-void
-ACEXML_SoftPkgHandler::characters (const ACEXML_Char *cdata,
-                                   int, int
-                                   ACEXML_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((ACEXML_SAXException))
-{
-  if (this->cdata_.length())
-    this->cdata_ += cdata;
-  else
-    this->cdata_ = cdata;
-}
-
-
-// Methods inherited from ACEXML_ErrorHandler.
-
-/*
- * Receive notification of a recoverable error.
- */
-void
-ACEXML_SoftPkgHandler::error (ACEXML_SAXParseException & ex
-                              ACEXML_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((ACEXML_SAXException))
-{
-  ACE_DEBUG ((LM_DEBUG, "%s: line: %d col: %d ",
-              (this->locator_->getSystemId() == 0
-               ? this->fileName_ : this->locator_->getSystemId()),
-              this->locator_->getLineNumber(),
-              this->locator_->getColumnNumber()));
-  ex.print();
-}
-
-void
-ACEXML_SoftPkgHandler::fatalError (ACEXML_SAXParseException & ex
-                                   ACEXML_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((ACEXML_SAXException))
-{
-  ACE_DEBUG ((LM_DEBUG, "%s: line: %d col: %d ",
-              (this->locator_->getSystemId() == 0
-               ? this->fileName_ : this->locator_->getSystemId()),
-              this->locator_->getLineNumber(),
-              this->locator_->getColumnNumber()));
-  ex.print();
-}
-
-void
-ACEXML_SoftPkgHandler::warning (ACEXML_SAXParseException & ex
-                                ACEXML_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((ACEXML_SAXException))
-{
-  ACE_DEBUG ((LM_DEBUG, "%s: line: %d col: %d ",
-              (this->locator_->getSystemId() == 0
-               ? this->fileName_ : this->locator_->getSystemId()),
-              this->locator_->getLineNumber(),
-              this->locator_->getColumnNumber()));
-  ex.print();
-}
diff --git a/ACEXML/compass/SoftPkgHandler.h b/ACEXML/compass/SoftPkgHandler.h
deleted file mode 100644
index 887b72ebf62..00000000000
--- a/ACEXML/compass/SoftPkgHandler.h
+++ /dev/null
@@ -1,191 +0,0 @@
-// $Id$
-
-//=============================================================================
-/**
- *  @file    SoftPkgHandler.h
- *
- *  $Id$
- *
- *  @author Krishnakumar B <kitty@cs.wustl.edu>
- */
-//=============================================================================
-
-#ifndef ACEXML_SOFTPKG_HANDLER_H
-#define ACEXML_SOFTPKG_HANDLER_H
-
-#include "ace/pre.h"
-#include "ACEXML/compass/Compass_Export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ACEXML/common/DefaultHandler.h"
-#include "ACEXML/compass/SoftPkg.h"
-
-/**
- * @class ACEXML_SoftPkgHandler
- *
- * @brief ACEXML_SoftPkgHandler is an example SAX event handler.
- *
- * This SAX event handler try to regenerate the XML document it
- * reads with correct indentation.
- */
-class Compass_Export ACEXML_SoftPkgHandler : public ACEXML_DefaultHandler
-{
-public:
-  /*
-   * Default constructor.
-   */
-  ACEXML_SoftPkgHandler (const ACEXML_Char* name);
-
-  /*
-   * Default destructor.
-   */
-  virtual ~ACEXML_SoftPkgHandler (void);
-
-  // Methods inherited from ACEXML_ContentHandler.
-
-  /*
-   * Receive notification of character data.
-   */
-  virtual void characters (const ACEXML_Char *ch, int start,
-                           int length ACEXML_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((ACEXML_SAXException));
-
-  /*
-   * Receive notification of the end of a document.
-   */
-  virtual void endDocument (ACEXML_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((ACEXML_SAXException));
-
-  /*
-   * Receive notification of the end of an element.
-   */
-  virtual void endElement (const ACEXML_Char *namespaceURI,
-                           const ACEXML_Char *localName,
-                           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_ARG_DECL)
-    ACE_THROW_SPEC ((ACEXML_SAXException));
-
-  /*
-   * Receive notification of ignorable whitespace in element content.
-   */
-  virtual void ignorableWhitespace (const ACEXML_Char *ch, int start,
-                                    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_ARG_DECL)
-    ACE_THROW_SPEC ((ACEXML_SAXException));
-
-  /*
-   * Receive an object for locating the origin of SAX document events.
-   */
-  virtual void setDocumentLocator (ACEXML_Locator *locator) ;
-
-  /*
-   * Receive notification of a skipped entity.
-   */
-  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_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((ACEXML_SAXException));
-
-  /*
-   * Receive notification of the beginning of an element.
-   */
-  virtual void startElement (const ACEXML_Char *namespaceURI,
-                             const ACEXML_Char *localName,
-                             const ACEXML_Char *qName,
-                             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_ARG_DECL)
-    ACE_THROW_SPEC ((ACEXML_SAXException));
-
-  // *** Methods inherited from ACEXML_DTDHandler.
-
-  /*
-   * Receive notification of a notation declaration event.
-   */
-  virtual void notationDecl (const ACEXML_Char *name,
-                             const ACEXML_Char *publicId,
-                             const ACEXML_Char *systemId ACEXML_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((ACEXML_SAXException));
-
-  /*
-   * Receive notification of an unparsed entity declaration event.
-   */
-  virtual void unparsedEntityDecl (const ACEXML_Char *name,
-                                   const ACEXML_Char *publicId,
-                                   const ACEXML_Char *systemId,
-                                   const ACEXML_Char *notationName
-                                   ACEXML_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((ACEXML_SAXException));
-
-  // Methods inherited from ACEXML_EnitityResolver.
-
-  /*
-   * Allow the application to resolve external entities.
-   */
-  virtual ACEXML_InputSource *resolveEntity (const ACEXML_Char *publicId,
-                                             const ACEXML_Char *systemId
-                                             ACEXML_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((ACEXML_SAXException));
-
-  // Methods inherited from ACEXML_ErrorHandler.
-
-  /*
-   * Receive notification of a recoverable error.
-   */
-  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_ARG_DECL)
-    ACE_THROW_SPEC ((ACEXML_SAXException));
-
-  /*
-   * Receive notification of a warning.
-   */
-  virtual void warning (ACEXML_SAXParseException &exception
-                        ACEXML_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((ACEXML_SAXException));
-
-  virtual const ACEXML_SoftPkg* get_softpkg(void) const;
-
-private:
-  ACEXML_Char* fileName_;
-  ACEXML_Locator* locator_;
-  ACEXML_SoftPkg* softpkg_;
-  ACEXML_String cdata_;
-};
-
-#if defined (__ACEXML_INLINE__)
-#include "ACEXML/compass/SoftPkgHandler.inl"
-#endif /* __ACEXML_INLINE__ */
-
-#include "ace/post.h"
-
-#endif /* ACEXML_SOFTPKG_HANDLER_H */
diff --git a/ACEXML/compass/SoftPkgHandler.inl b/ACEXML/compass/SoftPkgHandler.inl
deleted file mode 100644
index 733ede135dc..00000000000
--- a/ACEXML/compass/SoftPkgHandler.inl
+++ /dev/null
@@ -1,104 +0,0 @@
-// $Id$
-
-const ACEXML_SoftPkg*
-ACEXML_SoftPkgHandler::get_softpkg (void) const
-{
-  return this->softpkg_;
-}
-
-void
-ACEXML_SoftPkgHandler::startDocument (ACEXML_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((ACEXML_SAXException))
-{
-}
-
-void
-ACEXML_SoftPkgHandler::endDocument (ACEXML_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((ACEXML_SAXException))
-{
-
-}
-
-void
-ACEXML_SoftPkgHandler::endPrefixMapping (const ACEXML_Char *
-                                         ACEXML_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((ACEXML_SAXException))
-{
-}
-
-void
-ACEXML_SoftPkgHandler::ignorableWhitespace (const ACEXML_Char *cdata,
-                                            int,
-                                            int
-                                            ACEXML_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((ACEXML_SAXException))
-{
-  if (this->cdata_.length())
-    this->cdata_ += cdata;
-}
-
-void
-ACEXML_SoftPkgHandler::processingInstruction (const ACEXML_Char *,
-                                              const ACEXML_Char *
-                                              ACEXML_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((ACEXML_SAXException))
-{
-
-}
-
-void
-ACEXML_SoftPkgHandler::setDocumentLocator (ACEXML_Locator * locator)
-{
-  this->locator_ = locator;
-}
-
-void
-ACEXML_SoftPkgHandler::skippedEntity (const ACEXML_Char *
-                                      ACEXML_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((ACEXML_SAXException))
-{
-}
-
-void
-ACEXML_SoftPkgHandler::startPrefixMapping (const ACEXML_Char *,
-                                           const ACEXML_Char *
-                                           ACEXML_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((ACEXML_SAXException))
-{
-
-}
-
-// *** Methods inherited from ACEXML_DTDHandler.
-
-void
-ACEXML_SoftPkgHandler::notationDecl (const ACEXML_Char *,
-                                     const ACEXML_Char *,
-                                     const ACEXML_Char *
-                                     ACEXML_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((ACEXML_SAXException))
-{
-  // No-op.
-}
-
-void
-ACEXML_SoftPkgHandler::unparsedEntityDecl (const ACEXML_Char *,
-                                           const ACEXML_Char *,
-                                           const ACEXML_Char *,
-                                           const ACEXML_Char *
-                                           ACEXML_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((ACEXML_SAXException))
-{
-  // No-op.
-}
-
-// Methods inherited from ACEXML_EnitityResolver.
-
-ACEXML_InputSource *
-ACEXML_SoftPkgHandler::resolveEntity (const ACEXML_Char *,
-                                      const ACEXML_Char *
-                                      ACEXML_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((ACEXML_SAXException))
-{
-  // No-op.
-  return 0;
-}
diff --git a/ACEXML/compass/Supplier.cpp b/ACEXML/compass/Supplier.cpp
deleted file mode 100644
index f69970145dc..00000000000
--- a/ACEXML/compass/Supplier.cpp
+++ /dev/null
@@ -1,169 +0,0 @@
-// $Id$
-
-#include "Supplier.h"
-#include "orbsvcs/RtecEventChannelAdminC.h"
-#include "orbsvcs/Event_Service_Constants.h"
-
-ACE_RCSID(EC_Examples, Supplier, "$Id$");
-
-extern "C"
-int
-createSupplier (int argc, char* argv[])
-{
-  Supplier supplier;
-  return supplier.run (argc, argv);
-}
-
-Supplier::Supplier (void)
-{
-}
-
-int
-Supplier::run (int argc, char* argv[])
-{
-
-//  int register_with_object_manager = 0;
-//  if (TAO_Singleton_Manager::instance ()->init (
-//         register_with_object_manager) == -1)
-//     ACE_ERROR_RETURN ((LM_ERROR,
-//                        "Supplier::init -- ORB pre-initialization "
-//                        "failed.\n"),
-//                       -1);  // No exceptions available yet, so return
-//                             // an error status.
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      // Initialize the ORB.
-      CORBA::ORB_var orb = CORBA::ORB_init (argc,
-                                            argv,
-                                            "Consumer"
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      PortableServer::POAManager_var poa_manager =
-        poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      TAO_Naming_Client naming_client;
-
-      // Initialization of the naming service.
-      if (naming_client.init (orb.in ()) != 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "(%P|%t) Unable to initialize "
-                           "the TAO_Naming_Client. \n"),
-                          -1);
-
-      CosNaming::Name ec_name (1);
-      ec_name.length (1);
-      ec_name[0].id = CORBA::string_dup ("EventChannel");
-
-      CORBA::Object_var ec_obj =
-       naming_client->resolve (ec_name
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      RtecEventChannelAdmin::EventChannel_var event_channel =
-        RtecEventChannelAdmin::EventChannel::_narrow (ec_obj.in ()
-                                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // The canonical protocol to connect to the EC
-      RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
-        event_channel->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      RtecEventChannelAdmin::ProxyPushConsumer_var consumer =
-        supplier_admin->obtain_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      RtecEventComm::PushSupplier_var supplier =
-        this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // Simple publication, but usually the helper classes in
-      // $TAO_ROOT/orbsvcs/Event_Utils.h are a better way to do this.
-      RtecEventChannelAdmin::SupplierQOS qos;
-      qos.publications.length (1);
-      RtecEventComm::EventHeader& h0 =
-        qos.publications[0].event.header;
-      h0.type   = ACE_ES_EVENT_UNDEFINED; // first free event type
-      h0.source = 1;                      // first free event source
-
-      consumer->connect_push_supplier (supplier.in (), qos
-                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // Push the events...
-      ACE_Time_Value sleep_time (0, 10000); // 10 milliseconds
-
-      RtecEventComm::EventSet event (1);
-      event.length (1);
-      event[0].header.type   = ACE_ES_EVENT_UNDEFINED;
-      event[0].header.source = 1;
-      event[0].header.ttl    = 1;
-
-      for (int i = 0; i != 2000; ++i)
-        {
-          consumer->push (event ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-          ACE_OS::sleep (sleep_time);
-        }
-      ACE_OS::sleep (3);
-
-      naming_client->unbind (ec_name ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // Disconnect from the EC
-      consumer->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      ACE_DEBUG ((LM_DEBUG, "Push Consumer disconnected\n"));
-
-      // Destroy the EC....
-      event_channel->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      ACE_DEBUG ((LM_DEBUG, "EventChannel destroyed\n"));
-
-      // Deactivate this object...
-//       PortableServer::ObjectId_var id =
-//         poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
-//       ACE_TRY_CHECK;
-
-//       poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
-//       ACE_TRY_CHECK;
-
-//       // Destroy the POA
-//       poa->destroy (1, 0 ACE_ENV_ARG_PARAMETER);
-//       ACE_TRY_CHECK;
-
-}
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Supplier::run");
-      return 1;
-    }
-  ACE_ENDTRY;
-//   if (TAO_Singleton_Manager::instance ()->fini () == -1)
-//     ACE_ERROR_RETURN ((LM_ERROR,
-//                        "Supplier::fini -- ORB pre-termination failed."),
-//                       -1);
-   ACE_DEBUG ((LM_DEBUG, "Supplier exiting...\n"));
-   return 0;
-}
-
-void
-Supplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-{
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/ACEXML/compass/Supplier.h b/ACEXML/compass/Supplier.h
deleted file mode 100644
index e8a3a4d546e..00000000000
--- a/ACEXML/compass/Supplier.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//   ORBSVCS Real-time Event Channel examples
-//
-// = FILENAME
-//   Supplier
-//
-// = AUTHOR
-//   Carlos O'Ryan (coryan@cs.wustl.edu)
-//
-// ============================================================================
-
-#ifndef SUPPLIER_H
-#define SUPPLIER_H
-
-#include "orbsvcs/RtecEventCommS.h"
-#include "orbsvcs/CosNamingS.h"
-#include "orbsvcs/Naming/Naming_Utils.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-class Supplier : public POA_RtecEventComm::PushSupplier
-{
-  // = TITLE
-  //   Simple supplier object
-  //
-  // = DESCRIPTION
-  //   This class is a supplier of events.
-  //   It simply publishes one event type.
-  //
-public:
-  Supplier (void);
-  // Constructor
-
-  int run (int argc, char* argv[]);
-  // Run the test
-
-  // = The RtecEventComm::PushSupplier methods
-
-  virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // The skeleton methods.
-};
-
-#endif /* SUPPLIER_H */
diff --git a/ACEXML/compass/compass.mpc b/ACEXML/compass/compass.mpc
deleted file mode 100644
index decc796cb82..00000000000
--- a/ACEXML/compass/compass.mpc
+++ /dev/null
@@ -1,21 +0,0 @@
-project (Compass) : acelib {
-   depends = ACEXML ACEXML_Parser
-   sharedname = Compass
-   dllflags   = COMPASS_BUILD
-   libs = ACEXML ACEXML_Parser zzip z
-   Source_Files {
-      Property.cpp
-      PropertyFile_Handler.cpp
-      SoftPkgHandler.cpp
-      SoftPkg.cpp
-      EC_Property.cpp
-   }
-}
-
-project (Deployment) : aceexe {
-   exename = Deployment
-   libs = Compass ACEXML_Parser ACEXML zzip z
-   Source_Files {
-      Deployment.cpp
-   }
-}
diff --git a/ACEXML/compass/component.xml b/ACEXML/compass/component.xml
deleted file mode 100644
index 4d7fe61424b..00000000000
--- a/ACEXML/compass/component.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0"?>
- <!DOCTYPE corbacomponent SYSTEM "corbacomponent.dtd">
-<corbacomponent>
-  <corbaversion> 3.0 </corbaversion>
-  <componentrepid repid="IDL:BookStore:1.0" />
-  <homerepid repid="IDL:BookStoreHome:1.0" />
-  <componentkind>
-    <entity> <servant lifetime="component" /> </entity>
-  </componentkind>
-  <security rightsfamily="corba" rightscombinator="secallrights"> </security>
-  <threading policy="multithread" />
-  <configurationcomplete set="true" />
-  <segment name="bookseg" segmenttag="1">
-    <segmentmember facettag="1" />
-    <segmentmember facettag="2" />
-    <containermanagedpersistence>
-      <storagehome id="PSDL:BookHome:1.0" />
-      <pssimplementation id="ACME-PSS" />
-      <catalog type="PSDL:BookCatalog:1.0" />
-      <accessmode mode="READ_ONLY" />
-      <psstransaction policy="TRANSACTIONAL" >
-        <psstransactionisolationlevel level="SERIALIZABLE" />
-      </psstransaction>
-      <params> <param name="x" value="1" /> </params>
-    </containermanagedpersistence>
-  </segment>
-  <homefeatures name="BookStoreHome" repid="IDL:BookStoreHome:1.0">
-    <operationpolicies>
-      <operation name="*"> <transaction use="never" /> </operation>
-    </operationpolicies>
-  </homefeatures>
-  <componentfeatures name="BookStore" repid="IDL:BookStore:1.0">
-    <inheritscomponent repid="IDL:Acme/Store:1.0" />
-    <ports>
-      <provides providesname="book_search" repid="IDL:BookSearch:1.0"
-                facettag="1">
-        <operationpolicies>
-          <operation name="getByAuthor">
-            <requiredrights> <right name="get"/> </requiredrights>
-          </operation>
-          <operation name="getByTitle">
-            <requiredrights> <right name="get"/> </requiredrights>
-          </operation>
-          <operation name="getByISBN">
-            <requiredrights> <right name="get"/> </requiredrights>
-          </operation>
-        </operationpolicies>
-      </provides>
-      <provides providesname="shopping_cart" repid="IDL:CartFactory:1.0"
-                facettag="2" />
-      <uses usesname="ups_rates" repid="IDL:ShippingRates:1.0" />
-      <uses usesname="fedex_rates" repid="IDL:ShippingRates:1.0" />
-      <emits emitsname="low_stock" eventtype="StockRecord">
-        <eventpolicy policy="normal" />
-      </emits>
-      <publishes publishesname="offer_alert" eventtype="SpecialOffer">
-        <eventpolicy policy="normal" />
-      </publishes>
-    </ports>
-  </componentfeatures>
-  <componentfeatures name="Store" repid="IDL:Acme/Store">
-    <supportsinterface repid="IDL:Acme/GeneralStore">
-      <operationpolicies>
-        <operation name="*"> <transaction use="required" /> </operation>
-      </operationpolicies>
-    </supportsinterface>
-    <ports> <provides providesname="admin" repid="IDL:Acme/StoreAdmin:1.0"
-                      facettag="3" />
-    </ports>
-  </componentfeatures>
-  <interface name="BookSearch" repid="IDL:BookSearch:1.0">
-    <inheritsinterface repid="IDL:SearchEngine:1.0" />
-  </interface>
-  <interface name="SearchEngine" repid="IDL:SearchEngine:1.0"/>
-  <interface name="CartFactory" repid="IDL:CartFactory:1.0"/>
-  <interface name="ShippingRates" repid="IDL:ShippingRates:1.0"/>
-  <interface name="StoreAdmin" repid="IDL:Acme/StoreAdmin:1.0">
-    <operationpolicies>
-      <operation name="*">
-        <transaction use="required" />
-        <requiredrights>
-          <right name="manage"/> <right name="set"/>
-        </requiredrights>
-      </operation>
-    </operationpolicies>
-  </interface>
-  <interface name="GeneralStore" repid="IDL:Acme/GeneralStore:1.0"/>
-</corbacomponent>
diff --git a/ACEXML/compass/componentassembly.dtd b/ACEXML/compass/componentassembly.dtd
deleted file mode 100644
index 92c819d9b9b..00000000000
--- a/ACEXML/compass/componentassembly.dtd
+++ /dev/null
@@ -1,326 +0,0 @@
-<!-- DTD for Component Assembly Descriptor. The root element is
-     <componentassembly>. Elements are listed alphabetically. -->
-
-<!-- Simple xml link attributes based on W3C WD-xlink-19980303. May change
-     slightly when XLL is finalized. -->
-<!ENTITY % simple-link-attributes "
-        xml:link        CDATA       #FIXED 'SIMPLE'
-        href            CDATA       #REQUIRED " >
-
-<!-- If file not available locally, then download via codebase link -->
-<!ELEMENT codebase EMPTY >
-<!ATTLIST codebase filename CDATA #IMPLIED
-          %simple-link-attributes; >
-
-<!ELEMENT componentassembly
-          ( description?
-          , componentfiles
-          , partitioning
-          , connections?
-          , extension* ) >
-<!ATTLIST componentassembly
-        id ID #REQUIRED
-        derivedfrom CDATA #IMPLIED >
-
-<!ELEMENT componentfile
-          ( fileinarchive
-          | codebase
-          | link ) >
-<!ATTLIST componentfile
-          id ID #REQUIRED
-          type CDATA #IMPLIED >
-
-<!ELEMENT componentfileref EMPTY >
-<!ATTLIST componentfileref
-          idref CDATA #REQUIRED >
-
-<!ELEMENT componentfiles ( componentfile+ ) >
-
-<!ELEMENT componentimplref EMPTY >
-<!ATTLIST componentimplref
-          idref CDATA #REQUIRED >
-
-<!ELEMENT componentinstantiation
-          ( usagename?
-          , componentproperties?
-          , registercomponent*
-          , extension* ) >
-<!ATTLIST componentinstantiation
-          id ID #REQUIRED >
-
-<!ELEMENT componentinstantiationref EMPTY >
-<!ATTLIST componentinstantiationref
-          idref CDATA #REQUIRED >
-
-<!ELEMENT componentproperties
-          ( fileinarchive
-          | codebase) >
-
-<!ELEMENT componentsupportedinterface
-          ( componentinstantiationref
-          | findby )>
-
-<!ELEMENT connectevent
-          ( consumesport
-          , ( emitsport
-            | publishesport
-            )
-          ) >
-<!ATTLIST connectevent
-          id ID #IMPLIED >
-
-<!ELEMENT connecthomes
-          ( proxyhome
-          , destinationhome ) >
-<!ATTLIST connecthomes
-          id ID #IMPLIED >
-
-<!ELEMENT connectinterface
-          ( usesport
-          , ( providesport
-            | componentsupportedinterface
-            | existinginterface
-            | homeinterface
-            )
-          ) >
-<!ATTLIST connectinterface
-          id ID #IMPLIED >
-
-<!ELEMENT connections
-          ( connectinterface
-          | connectevent
-          | connecthomes
-          | extension )* >
-
-<!ELEMENT consumesidentifier ( #PCDATA ) >
-
-<!ELEMENT consumesport
-          ( consumesidentifier
-          , ( componentinstantiationref
-            | findby
-            )
-          )>
-
-<!ELEMENT description ( #PCDATA ) >
-
-<!ELEMENT destination ( #PCDATA ) >
-
-<!ELEMENT destinationhome
-          ( homeplacementref
-          | findby ) >
-
-<!ELEMENT emitsidentifier (#PCDATA ) >
-
-<!ELEMENT emitsport
-          ( emitsidentifier
-          , ( componentinstantiationref
-            | findby
-            )
-          )>
-
-<!ELEMENT executableplacement
-          ( usagename?
-          , componentfileref
-          , componentimplref?
-          , invocation?
-          , destination?
-          , extension* ) >
-<!ATTLIST executableplacement
-          id ID #REQUIRED
-          cardinality CDATA "1" >
-
-<!ELEMENT existinginterface ( findby )>
-
-<!-- The "extension" element is used for vendor-specific extensions -->
-
-<!ELEMENT extension (#PCDATA) >
-<!ATTLIST extension
-          class CDATA #REQUIRED
-          origin CDATA #REQUIRED
-          id ID #IMPLIED
-          extra CDATA #IMPLIED
-          html-form CDATA #IMPLIED >
-
-<!-- The "fileinarchive" element is used to specify a file in the archive.
-     If the file is independent of an archive then link is used to point to
-     the archive in which the file may be found. -->
-
-<!ELEMENT fileinarchive ( link? ) >
-<!ATTLIST fileinarchive
-          name CDATA #REQUIRED >
-
-<!ELEMENT findby
-          ( namingservice
-          | stringifiedobjectref
-          | traderquery
-          | homefinder
-          | extension
-          ) >
-
-<!ELEMENT homefinder EMPTY >
-<!ATTLIST homefinder  name CDATA #REQUIRED >
-
-<!ELEMENT homeinterface ( homeplacementref | findby )>
-
-<!ELEMENT homeplacement
-          ( usagename?
-          , componentfileref
-          , componentimplref?
-          , homeproperties?
-          , componentproperties?
-          , registerwithhomefinder*
-          , registerwithnaming*
-          , registerwithtrader*
-          , componentinstantiation*
-          , destination?
-          , extension* ) >
-<!ATTLIST homeplacement
-          id ID #REQUIRED
-          cardinality CDATA "1"
-          >
-
-<!ELEMENT homeplacementref EMPTY >
-<!ATTLIST homeplacementref idref CDATA #REQUIRED >
-
-<!ELEMENT homeproperties
-          ( fileinarchive
-          | codebase ) >
-
-<!ELEMENT hostcollocation
-          ( usagename?
-          , impltype?
-          , ( homeplacement
-            | executableplacement
-            | processcollocation
-            | extension )+
-          , destination? ) >
-<!ATTLIST hostcollocation
-          id ID #IMPLIED
-          cardinality CDATA "1" >
-
-<!ELEMENT impltype EMPTY >
-<!ATTLIST impltype
-          language CDATA #REQUIRED
-          version CDATA #IMPLIED >
-
-<!ELEMENT invocation EMPTY >
-<!ATTLIST invocation
-          args CDATA #REQUIRED >
-
-<!ELEMENT link ( #PCDATA ) >
-<!ATTLIST link
-          %simple-link-attributes; >
-
-<!ELEMENT namingservice EMPTY >
-<!ATTLIST namingservice name CDATA #REQUIRED >
-
-<!ELEMENT partitioning
-          ( homeplacement
-          | executableplacement
-          | processcollocation
-          | hostcollocation
-          | extension
-          )* >
-
-<!ELEMENT processcollocation
-          ( usagename?
-          , impltype?
-          , ( homeplacement
-            | extension
-            )+
-          , destination?
-          ) >
-<!ATTLIST processcollocation
-          id ID #IMPLIED
-          cardinality CDATA "1" >
-
-<!ELEMENT providesidentifier ( #PCDATA ) >
-
-<!ELEMENT providesport
-          ( providesidentifier
-          , ( componentinstantiationref
-            | findby
-            )
-          )>
-
-<!ELEMENT publishesidentifier ( #PCDATA ) >
-
-<!ELEMENT publishesport
-          ( publishesidentifier
-          , ( componentinstantiationref
-            | findby
-            )
-          )>
-
-<!ELEMENT registercomponent
-          ( ( emitsidentifier
-            | providesidentifier
-            | publishesidentifier
-            )?
-          , ( registerwithnaming
-            | registerwithtrader )+
-          ) >
-
-<!ELEMENT registerwithhomefinder EMPTY >
-<!ATTLIST registerwithhomefinder
-          name CDATA #REQUIRED >
-
-<!ELEMENT registerwithnaming EMPTY >
-<!ATTLIST registerwithnaming
-          name CDATA #IMPLIED >
-
-<!ELEMENT registerwithtrader ( traderproperties ) >
-<!ATTLIST registerwithtrader
-          tradername CDATA #IMPLIED >
-
-<!-- DEVNOTE: is tradername necessary? -->
-
-<!-- DEVNOTE: Should trader properties be specified in component file? And
-              in assembly file? -->
-
-<!ELEMENT proxyhome ( homeplacementref | findby ) >
-
-<!ELEMENT stringifiedobjectref ( #PCDATA ) >
-
-<!ELEMENT traderconstraint ( #PCDATA ) >
-
-<!ELEMENT traderexport ( traderservicetypename , traderproperties ) >
-
-<!ELEMENT traderpolicy ( traderpolicyname , traderpolicyvalue ) >
-
-<!ELEMENT traderpolicyname ( #PCDATA ) >
-
-<!ELEMENT traderpolicyvalue ( #PCDATA ) >
-
-<!ELEMENT traderpreference ( #PCDATA ) >
-
-<!ELEMENT traderproperties ( traderproperty+ ) >
-
-<!ELEMENT traderproperty ( traderpropertyname , traderpropertyvalue ) >
-
-<!ELEMENT traderpropertyname ( #PCDATA ) >
-
-<!ELEMENT traderpropertyvalue ( #PCDATA ) >
-
-<!ELEMENT traderquery
-          ( traderservicetypename
-          , traderconstraint
-          , traderpreference?
-          , traderpolicy*
-          , traderspecifiedprop*
-          ) >
-
-<!ELEMENT traderservicetypename ( #PCDATA ) >
-
-<!ELEMENT traderspecifiedprop ( #PCDATA ) >
-
-<!ELEMENT usagename ( #PCDATA ) >
-
-<!ELEMENT usesidentifier ( #PCDATA ) >
-
-<!ELEMENT usesport
-          ( usesidentifier
-          , ( componentinstantiationref
-            | findby
-            )
-          ) >
diff --git a/ACEXML/compass/componentassembly.xml b/ACEXML/compass/componentassembly.xml
deleted file mode 100644
index 247c11c01a7..00000000000
--- a/ACEXML/compass/componentassembly.xml
+++ /dev/null
@@ -1,138 +0,0 @@
-<!DOCTYPE componentassembly SYSTEM "componentassembly.dtd">
-<componentassembly id="ZZZ123">
-  <description>Example assembly"</description>
-
-  <componentfiles>
-    <componentfile id="A"> <fileinarchive name="ca.ccsd"/> </componentfile>
-    <componentfile id="B"> <fileinarchive name="cb.ccsd"/> </componentfile>
-    <componentfile id="C">
-      <fileinarchive name="cc.ccsd">
-        <link href="ftp://www.xyz.com/car/cc.car"/>
-      </fileinarchive>
-    </componentfile>
-    <componentfile id="D"> <fileinarchive name="cd.ccsd"/> </componentfile>
-    <componentfile id="E"> <fileinarchive name="ce.ccsd"/> </componentfile>
-    <componentfile id="F"> <fileinarchive name="cf.ccsd"/> </componentfile>
-  </componentfiles>
-
-  <partitioning>
-    <homeplacement id="AaHome">
-      <componentfileref idref="A"/> <componentinstantiation id="Aa"/>
-    </homeplacement>
-
-    <processcollocation cardinality="*">
-      <usagename>Example process collocation</usagename>
-      <impltype language="C++" />
-      <!-- optional -->
-      <homeplacement id="BbHome">
-        <componentfileref idref="B"/> <componentinstantiation id="Bb"/>
-      </homeplacement>
-      <homeplacement id="CcHome">
-        <componentfileref idref="C"/>
-        <componentinstantiation id="Cc"/>
-      </homeplacement>
-    </processcollocation>
-
-    <hostcollocation cardinality="1">
-      <usagename>Example host collocation</usagename>
-
-      <processcollocation cardinality="*">
-
-        <homeplacement id="DdHome">
-          <componentfileref idref="D"/>
-          <componentinstantiation id="Dd"/>
-        </homeplacement>
-
-        <homeplacement id="EdHome">
-          <componentfileref idref="E"/>
-          <componentinstantiation id="Ee"/>
-        </homeplacement>
-
-      </processcollocation>
-
-      <homeplacement id="FfHome">
-        <componentfileref idref="F"/>
-        <componentinstantiation id="Ff"/>
-      </homeplacement>
-
-    </hostcollocation>
-
-    <homeplacement id="AaaHome">
-
-      <usagename>Example home for A components</usagename>
-      <componentfileref idref="A"/>
-      <componentimplref idref="an A impl"/>
-
-      <homeproperties>
-        <fileinarchive name="AHomeProperties.cpf"/>
-      </homeproperties>
-
-      <componentproperties>
-        <fileinarchive name="defaultAProperties.cpf"/>
-      </componentproperties>
-
-      <registerwithhomefinder name="AaHome"/>
-
-      <componentinstantiation id="Aaa">
-        <usagename>Example component instantiation </usagename>
-
-        <componentproperties>
-          <fileinarchive name="AaaProperties.cpf"/>
-        </componentproperties>
-
-        <registercomponent>
-          <registerwithnaming name="sink"/>
-
-          <registerwithtrader>
-
-            <traderproperties>
-
-              <traderproperty>
-                <traderpropertyname>ppm</traderpropertyname>
-                <traderpropertyvalue>10</traderpropertyvalue>
-              </traderproperty>
-
-              <traderproperty>
-                <traderpropertyname>weight</traderpropertyname>
-                <traderpropertyvalue>333</traderpropertyvalue>
-              </traderproperty>
-
-            </traderproperties>
-
-          </registerwithtrader>
-
-        </registercomponent>
-
-      </componentinstantiation>
-
-    </homeplacement>
-
-  </partitioning>
-
-  <connections>
-
-    <connectinterface>
-      <usesport>
-        <usesidentifier>abc</usesidentifier>
-        <componentinstantiationref idref="Aa"/>
-      </usesport>
-      <providesport>
-        <providesidentifier>abc</providesidentifier>
-        <componentinstantiationref idref="Bb"/>
-      </providesport>
-    </connectinterface>
-
-    <connectevent>
-      <consumesport>
-        <consumesidentifier>pqr</consumesidentifier>
-        <componentinstantiationref idref="Aaa"/>
-      </consumesport>
-      <emitsport>
-        <emitsidentifier>mno</emitsidentifier>
-        <componentinstantiationref idref="Ee"/>
-      </emitsport>
-    </connectevent>
-
-  </connections>
-
-</componentassembly>
diff --git a/ACEXML/compass/corbacomponent.dtd b/ACEXML/compass/corbacomponent.dtd
deleted file mode 100644
index 8b8963b85c9..00000000000
--- a/ACEXML/compass/corbacomponent.dtd
+++ /dev/null
@@ -1,302 +0,0 @@
-<!-- DTD for CORBA Component Descriptor. The root element is
-     <corbacomponent>. Elements are listed alphabetically. -->
-
-<!-- Simple xml link attributes based on W3C WD-xlink-19980303. May change
-     when XLL is finalized. -->
-
-<!ENTITY % simple-link-attributes "
-         xml:link CDATA #FIXED 'SIMPLE'
-         href CDATA #REQUIRED ">
-
-<!ELEMENT accessmode EMPTY>
-<!ATTLIST accessmode
-          mode (READ_ONLY|READ_WRITE) #REQUIRED >
-
-<!ELEMENT catalog EMPTY>
-<!ATTLIST catalog
-          type CDATA #REQUIRED >
-
-<!ELEMENT componentfeatures
-          ( inheritscomponent?
-          , supportsinterface*
-          , ports
-          , operationpolicies?
-          , extension* ) >
-<!ATTLIST componentfeatures
-          name CDATA #REQUIRED
-          repid CDATA #REQUIRED >
-
-<!ELEMENT componentkind
-          ( service
-          | session
-          | process
-          | entity
-          | unclassified ) >
-
-<!ELEMENT componentproperties ( fileinarchive ) >
-
-<!ELEMENT componentrepid EMPTY >
-<!ATTLIST componentrepid
-          repid CDATA #IMPLIED >
-
-<!ELEMENT containermanagedpersistence
-          ( storagehome
-          , pssimplementation?
-          , catalog?
-          , accessmode
-          , psstransaction
-          , params? ) >
-
-<!ELEMENT configurationcomplete EMPTY >
-<!ATTLIST configurationcomplete
-          set ( true | false ) #REQUIRED >
-
-<!ELEMENT consumes
-          ( eventpolicy
-          , extension*
-          ) >
-<!ATTLIST consumes
-          consumesname CDATA #REQUIRED
-          eventtype CDATA #REQUIRED >
-
-<!ELEMENT corbacomponent
-          ( corbaversion
-          , componentrepid
-          , homerepid
-          , componentkind
-          , interop?
-          , transaction?
-          , security?
-          , threading
-          , configurationcomplete
-          , extendedpoapolicy*
-          , repository?
-          , segment*
-          , componentproperties?
-          , homeproperties?
-          , homefeatures+
-          , componentfeatures+
-          , interface*
-          , extension*
-          ) >
-
-<!ELEMENT corbaversion (#PCDATA) >
-
-<!ELEMENT description ( #PCDATA ) >
-
-<!ELEMENT emits ( eventpolicy , extension* ) >
-<!ATTLIST emits
-          emitsname CDATA #REQUIRED
-          eventtype CDATA #REQUIRED >
-
-<!ELEMENT entity ( servant ) >
-
-<!ELEMENT eventpolicy EMPTY>
-<!ATTLIST eventpolicy
-          policy ( normal | default | transaction ) #IMPLIED>
-
-<!ELEMENT extendedpoapolicy EMPTY>
-<!ATTLIST extendedpoapolicy
-          name CDATA #REQUIRED
-          value CDATA #REQUIRED >
-
-<!-- The "extension" element is used for vendor-specific extensions -->
-<!ELEMENT extension (#PCDATA) >
-<!ATTLIST extension
-          class CDATA #REQUIRED
-          origin CDATA #REQUIRED
-          id ID #IMPLIED
-          extra CDATA #IMPLIED
-          html-form CDATA #IMPLIED >
-
-<!-- The "fileinarchive" element is used to specify a file in the archive.
-     If the file is in another archive then link is used to point to the
-     archive in which the file may be found. -->
-
-<!ELEMENT fileinarchive ( link? ) >
-<!ATTLIST fileinarchive
-          name CDATA #REQUIRED >
-
-<!ELEMENT homefeatures
-          ( inheritshome?
-          , operationpolicies?
-          , extension*
-          ) >
-<!ATTLIST homefeatures
-          name CDATA #REQUIRED
-          repid CDATA #REQUIRED >
-
-<!ELEMENT homeproperties ( fileinarchive ) >
-
-<!ELEMENT homerepid EMPTY >
-<!ATTLIST homerepid
-          repid CDATA #IMPLIED >
-
-<!ELEMENT inheritscomponent EMPTY>
-<!ATTLIST inheritscomponent
-          repid CDATA #REQUIRED>
-
-<!ELEMENT inheritshome EMPTY>
-<!ATTLIST inheritshome
-          repid CDATA #REQUIRED>
-
-<!ELEMENT inheritsinterface EMPTY>
-<!ATTLIST inheritsinterface
-          repid CDATA #REQUIRED>
-
-<!ELEMENT ins EMPTY>
-<!ATTLIST ins
-          name CDATA #REQUIRED >
-
-<!ELEMENT interface
-          ( inheritsinterface*
-          , operationpolicies? ) >
-<!ATTLIST interface
-          name CDATA #REQUIRED
-          repid CDATA #REQUIRED >
-
-<!ELEMENT interop EMPTY>
-<!ATTLIST interop
-          type CDATA #REQUIRED
-          direction ( hasview | isview) #REQUIRED
-          descriptor CDATA #REQUIRED >
-
-<!ELEMENT link ( #PCDATA ) >
-<!ATTLIST link
-          %simple-link-attributes; >
-
-<!ELEMENT objref EMPTY>
-<!ATTLIST objref
-          string CDATA #REQUIRED >
-
-<!ELEMENT operation
-          ( transaction?
-          , requiredrights? ) >
-<!ATTLIST operation
-          name CDATA #REQUIRED >
-<!-- an operation name of "*" specifies all operations in the current
-     scope -->
-
-<!ELEMENT operationpolicies ( operation+ ) >
-
-<!ELEMENT param EMPTY >
-<!ATTLIST param
-          name CDATA #REQUIRED
-          value CDATA #REQUIRED >
-
-<!ELEMENT params (param+) >
-
-<!ELEMENT poapolicies EMPTY>
-<!ATTLIST poapolicies
-          thread            ( ORB_CTRL_MODEL | SINGLE_THREAD_SAFE ) #REQUIRED
-          lifespan          ( TRANSIENT | PERSISTENT )              #REQUIRED
-          iduniqueness      ( UNIQUE_ID | MULTIPLE_ID )             #REQUIRED
-          idassignment      ( USER_ID | SYSTEM_ID )                 #REQUIRED
-          servantretention  ( RETAIN | NON_RETAIN )                 #REQUIRED
-          requestprocessing ( USE_ACTIVE_OBJECT_MAP_ONLY
-                            | USE_DEFAULT_SERVANT
-                            | USE_SERVANT_MANAGER)                  #REQUIRED
-          implicitactivation ( IMPLICIT_ACTIVATION
-                             | NON_IMPLICIT_ACTIVATION )            #REQUIRED>
-
-<!ELEMENT ports
-          ( uses
-          | provides
-          | emits
-          | publishes
-          | consumes
-          )* >
-
-<!ELEMENT process (servant ) >
-
-<!ELEMENT provides ( operationpolicies? , extension* ) >
-<!ATTLIST provides
-          providesname CDATA #REQUIRED
-          repid CDATA #REQUIRED
-          facettag CDATA #REQUIRED >
-
-<!ELEMENT pssimplementation EMPTY>
-<!ATTLIST pssimplementation
-          id CDATA #REQUIRED >
-
-<!ELEMENT psstransaction (psstransactionisolationlevel?) >
-<!ATTLIST psstransaction
-          policy (TRANSACTIONAL|NON_TRANSACTIONAL) #REQUIRED >
-
-<!ELEMENT psstransactionisolationlevel EMPTY>
-<!ATTLIST psstransactionisolationlevel
-          level ( READ_UNCOMMITTED
-                | READ_COMMITTED
-                | REPEATABLE_READ
-                | SERIALIZABLE ) #REQUIRED >
-
-<!ELEMENT publishes ( eventpolicy , extension* ) >
-<!ATTLIST publishes
-          publishesname CDATA #REQUIRED
-          eventtype CDATA #REQUIRED >
-
-<!ELEMENT repository ( ins | objref | link ) >
-<!ATTLIST repository
-          type CDATA #IMPLIED >
-
-<!ELEMENT requiredrights ( right* ) >
-
-<!ELEMENT right (description? ) >
-<!ATTLIST right
-          name CDATA #REQUIRED >
-
-<!ELEMENT security ( requiredrights? ) >
-<!ATTLIST security
-          rightsfamily CDATA #REQUIRED
-          rightscombinator (secallrights | secanyrights) #REQUIRED >
-
-<!ELEMENT segment
-          ( segmentmember+
-          , containermanagedpersistence?
-          , extension*
-          ) >
-<!ATTLIST segment
-          name CDATA #REQUIRED
-          segmenttag CDATA #REQUIRED >
-
-<!ELEMENT segmentmember EMPTY>
-<!ATTLIST segmentmember
-          facettag CDATA #REQUIRED >
-
-<!ELEMENT servant EMPTY >
-<!ATTLIST servant
-          lifetime (component|method|transaction|container) #REQUIRED >
-
-<!ELEMENT service EMPTY >
-
-<!ELEMENT session ( servant ) >
-
-<!ELEMENT storagehome EMPTY>
-<!ATTLIST storagehome
-          id CDATA #REQUIRED >
-
-<!ELEMENT supportsinterface (operationpolicies? , extension* ) >
-<!ATTLIST supportsinterface
-          repid CDATA #REQUIRED >
-
-<!ELEMENT threading EMPTY>
-<!ATTLIST threading
-          policy (serialize | multithread ) #REQUIRED >
-
-<!ELEMENT transaction EMPTY >
-<!ATTLIST transaction
-          use ( self-managed
-              | not-supported
-              | required
-              | supports
-              | requiresnew
-              | mandatory
-              | never
-              ) #REQUIRED >
-
-<!ELEMENT unclassified ( poapolicies ) >
-
-<!ELEMENT uses (extension* ) >
-<!ATTLIST uses
-          usesname CDATA #REQUIRED
-          repid CDATA #REQUIRED >
diff --git a/ACEXML/compass/eventchannel.cpf b/ACEXML/compass/eventchannel.cpf
deleted file mode 100644
index e015005de6e..00000000000
--- a/ACEXML/compass/eventchannel.cpf
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE properties SYSTEM "properties.dtd">
-<properties>
-  <struct name="ECProperties" type="ACEXML_EC_Property">
-    <description>Configuration for a Simple Event Channel</description>
-    <simple name="ECDispatching" type="string">
-      <value>mt</value>
-    </simple>
-    <simple name="ECDispatchingThreads" type="long">
-      <value>4</value>
-    </simple>
-    <simple name="ECFiltering" type="string">
-      <value>basic</value>
-    </simple>
-    <simple name="ECSupplierFiltering" type="string">
-      <value>per-supplier</value>
-    </simple>
-   <simple name="ECProxyConsumerLock" type="string">
-      <value>thread</value>
-    </simple>
-    <simple name="ECProxySupplierLock" type="string">
-      <value>thread</value>
-    </simple>
-    <simple name="ECConsumerControl" type="string">
-      <value>reactive</value>
-    </simple>
-    <simple name="ECSupplierControl" type="string">
-      <value>reactive</value>
-    </simple>
-    <simple name="ECConsumerControlPeriod" type="long">
-      <value>50000</value>
-    </simple>
-    <simple name="ECSupplierControlPeriod" type="long">
-      <value>50000</value>
-    </simple>
-  </struct>
-</properties>
diff --git a/ACEXML/compass/meta-inf b/ACEXML/compass/meta-inf
deleted file mode 100644
index bf5736a92bd..00000000000
--- a/ACEXML/compass/meta-inf
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE softpkg SYSTEM "softpkg.dtd">
-<softpkg name="EventChannelPkg" version="0.1">
- <pkgtype>CORBA Component</pkgtype>
- <title>EventChannel</title>
- <description>A simple Event Channel test </description>
-  <dependency type="DSO" >
-    <localfile name="libTAO.so"/>
-  </dependency>
-  <implementation id="Service" >
-    <os name="Linux" version="2,4,0,0" />
-    <processor name="x86" />
-    <compiler name="gcc" />
-    <programminglanguage name="C++" />
-    <propertyfile> <fileinarchive name="eventchannel.cpf"/></propertyfile>
-    <code type="DSO" >
-      <fileinarchive name="libService.so"/>
-      <entrypoint>createEventChannel</entrypoint>
-    </code>
-  </implementation>
-  <implementation id="Supplier" >
-    <os name="Linux" version="2,4,0,0" />
-    <processor name="x86" />
-    <compiler name="gcc" />
-    <programminglanguage name="C++" />
-    <code type="DSO">
-      <fileinarchive name="libSupplier.so"/>
-      <entrypoint>createSupplier</entrypoint>
-    </code>
-  </implementation>
-  <implementation id="Consumer" >
-    <os name="Linux" version="2,4,0,0" />
-    <processor name="x86" />
-    <compiler name="gcc" />
-    <programminglanguage name="C++" />
-    <code type="DSO" >
-      <fileinarchive name="libConsumer.so"/>
-      <entrypoint>createConsumer</entrypoint>
-    </code>
-  </implementation>
-</softpkg>
diff --git a/ACEXML/compass/properties.dtd b/ACEXML/compass/properties.dtd
deleted file mode 100644
index 2dd070fb8ec..00000000000
--- a/ACEXML/compass/properties.dtd
+++ /dev/null
@@ -1,82 +0,0 @@
-<!-- DTD for CORBA Component property file. The root element is
-     <properties>. Elements are listed alphabetically. -->
-
-<!ELEMENT choice (#PCDATA ) >
-
-<!ELEMENT choices ( choice | range )+ >
-
-<!ELEMENT defaultvalue ( #PCDATA ) >
-
-<!ELEMENT description ( #PCDATA ) >
-
-<!ELEMENT value ( #PCDATA) >
-
-<!ELEMENT properties
-          ( description?
-          , ( simple
-            | sequence
-            | struct
-            | valuetype
-            )*
-          ) >
-
-<!ELEMENT range (value, value) >
-
-<!ELEMENT simple
-          ( description?
-          , value
-          , choices?
-          , defaultvalue?
-          ) >
-<!ATTLIST simple
-          name CDATA #IMPLIED
-          type ( boolean
-               | char
-               | double
-               | float
-               | short
-               | long
-               | objref
-               | octet
-               | short
-               | string
-               | ulong
-               | ushort
-               ) #REQUIRED >
-
-<!ELEMENT sequence
-          ( description?
-          , ( simple*
-            | struct*
-            | sequence*
-            | valuetype*
-            )
-          ) >
-<!ATTLIST sequence
-          name CDATA #IMPLIED
-          type CDATA #REQUIRED >
-
-<!ELEMENT struct
-          ( description?
-          , ( simple
-            | sequence
-            | struct
-            | valuetype
-            )*
-          ) >
-<!ATTLIST struct
-          name CDATA #IMPLIED
-          type CDATA #REQUIRED >
-
-<!ELEMENT valuetype
-          ( description?
-          , ( simple
-            | sequence
-            | struct
-            | valuetype
-            )*
-          ) >
-<!ATTLIST valuetype
-          name CDATA #IMPLIED
-          type CDATA #REQUIRED
-          primarykey (true | false) "false" >
diff --git a/ACEXML/compass/properties.xml b/ACEXML/compass/properties.xml
deleted file mode 100644
index c619cc0e0c3..00000000000
--- a/ACEXML/compass/properties.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE properties SYSTEM "properties.dtd">
-<properties>
-  <struct name="ECProperties" type="EC_Properties">
-    <description>Simple Event Channel</description>
-    <simple name="ECDispactching" type="string">
-      <value>reactive</value>
-    </simple>
-    <simple name="ECFiltering" type="string">
-      <value>basic</value>
-    </simple>
-    <simple name="ECSupplierFiltering"
-            type="string">
-      <value>per-supplier</value>
-    </simple>
-   <simple name="ECProxyConsumerLock"
-           type="string">
-      <value>thread</value>
-    </simple>
-    <simple name="ECProxySupplierLock"
-            type="string">
-      <value>thread</value>
-    </simple>
-    <simple name="ECConsumerControl"
-            type="string">
-      <value>reactive</value>
-    </simple>
-    <simple name="ECSupplierControl"
-            type="string">
-      <value>reactive</value>
-    </simple>
-    <simple name="ECConsumerControlPeriod"
-            type="long">
-      <value>50000</value>
-    </simple>
-    <simple name="ECSupplierControlPeriod"
-            type="long">
-      <value>50000</value>
-    </simple>
-  </struct>
-</properties>
diff --git a/ACEXML/compass/softpkg.dtd b/ACEXML/compass/softpkg.dtd
deleted file mode 100644
index feab0f69da8..00000000000
--- a/ACEXML/compass/softpkg.dtd
+++ /dev/null
@@ -1,187 +0,0 @@
-<!-- DTD for softpkg. Used to describe CORBA Component implementations. The
-     root element is <softpkg>. Elements are listed alphabetically. -->
-
-<!-- Simple xml link attributes based on W3C WD-xlink-19980303. May change
-     when XLL is finalized. -->
-
-<!ENTITY % simple-link-attributes
-         " xml:link CDATA #FIXED 'SIMPLE'
-         href CDATA #REQUIRED ">
-
-<!ELEMENT author ( name | company | webpage)* >
-
-<!ELEMENT code ( ( codebase
-                 | fileinarchive
-                 | link
-                 )
-               , entrypoint?
-               , usage?
-               ) >
-<!ATTLIST code type CDATA #IMPLIED >
-
-<!-- If file not available locally, then download via codebase link -->
-<!ELEMENT codebase EMPTY >
-<!ATTLIST codebase
-          filename CDATA #IMPLIED
-          %simple-link-attributes; >
-
-<!ELEMENT compiler EMPTY >
-<!ATTLIST compiler
-          name CDATA #REQUIRED
-          version CDATA #IMPLIED >
-
-<!ELEMENT company ( #PCDATA ) >
-
-<!ELEMENT dependency
-          ( softpkgref
-          | codebase
-          | fileinarchive
-          | localfile
-          | name
-          | valuetypefactory ) >
-<!ATTLIST dependency
-          type CDATA #IMPLIED
-          action (assert | install) "assert">
-
-<!ELEMENT description ( #PCDATA ) >
-
-<!ELEMENT descriptor ( link | fileinarchive ) >
-<!ATTLIST descriptor
-          type CDATA #IMPLIED>
-
-<!ELEMENT entrypoint ( #PCDATA) >
-
-<!-- The "extension" element is used for vendor-specific extensions -->
-<!ELEMENT extension (#PCDATA) >
-<!ATTLIST extension
-          class CDATA #REQUIRED
-          origin CDATA #REQUIRED
-          id ID #IMPLIED
-          extra CDATA #IMPLIED
-          html-form CDATA #IMPLIED >
-
-<!-- The "fileinarchive" element is used to specify a file in the archive.
-     If the file is in another archive then link is used to point to the
-     archive in which the file may be found. -->
-
-<!ELEMENT fileinarchive ( link? ) >
-<!ATTLIST fileinarchive
-          name CDATA #REQUIRED >
-
-<!ELEMENT idl ( link | fileinarchive | repository ) >
-<!ATTLIST idl
-          id CDATA #REQUIRED >
-
-<!ELEMENT implementation
-          ( description
-          | code
-          | compiler
-          | dependency
-          | descriptor
-          | extension
-          | programminglanguage
-          | humanlanguage
-          | os
-          | propertyfile
-          | processor
-          | runtime
-          )* >
-<!ATTLIST implementation
-          id ID #IMPLIED
-          variation CDATA #IMPLIED >
-
-<!ELEMENT implref EMPTY >
-<!ATTLIST implref
-          idref CDATA #REQUIRED >
-
-<!ELEMENT humanlanguage EMPTY >
-<!ATTLIST humanlanguage
-          name CDATA #REQUIRED >
-
-<!ELEMENT license ( #PCDATA ) >
-<!ATTLIST license
-          %simple-link-attributes; >
-
-<!ELEMENT link ( #PCDATA ) >
-<!ATTLIST link
-          %simple-link-attributes; >
-
-<!-- A file that should be available in the local environment -->
-
-<!ELEMENT localfile EMPTY >
-<!ATTLIST localfile
-          name CDATA #REQUIRED >
-
-<!ELEMENT name ( #PCDATA ) >
-
-<!ELEMENT os EMPTY >
-<!ATTLIST os
-          name CDATA #REQUIRED
-          version CDATA #IMPLIED>
-
-<!ELEMENT pkgtype ( #PCDATA ) >
-<!ATTLIST pkgtype
-          version CDATA #IMPLIED >
-
-<!ELEMENT processor EMPTY >
-<!ATTLIST processor
-          name CDATA #REQUIRED >
-
-<!ELEMENT programminglanguage EMPTY>
-<!ATTLIST programminglanguage
-          name CDATA #REQUIRED
-          version CDATA #IMPLIED >
-
-<!ELEMENT propertyfile
-          ( fileinarchive
-          | link
-          ) >
-<!ATTLIST propertyfile
-          type CDATA #IMPLIED >
-
-<!ELEMENT repository ( ins | objref | link ) >
-<!ATTLIST repository
-          type CDATA #IMPLIED >
-
-<!ELEMENT runtime EMPTY >
-<!ATTLIST runtime
-          name CDATA #REQUIRED
-          version CDATA #IMPLIED>
-
-<!ELEMENT softpkg
-          ( title
-          | pkgtype
-          | author
-          | description?
-          | license
-          | idl
-          | propertyfile
-          | dependency
-          | descriptor
-          | implementation
-          | extension
-          )* >
-<!ATTLIST softpkg
-          name ID #REQUIRED
-          version CDATA #IMPLIED >
-
-<!ELEMENT softpkgref
-          ( ( fileinarchive
-            | link )
-          , implref? ) >
-
-<!ELEMENT title ( #PCDATA ) >
-
-<!ELEMENT usage ( #PCDATA ) >
-
-<!ELEMENT valuetypefactory
-          ( codebase
-          | fileinarchive
-          | link ) >
-<!ATTLIST valuetypefactory
-          repid CDATA #REQUIRED
-          valueentrypoint CDATA #IMPLIED
-          factoryentrypoint CDATA #IMPLIED >
-
-<!ELEMENT webpage ( #PCDATA ) >
-<!ATTLIST webpage %simple-link-attributes; >
diff --git a/ACEXML/compass/softpkg.xml b/ACEXML/compass/softpkg.xml
deleted file mode 100644
index 98b6d8169e9..00000000000
--- a/ACEXML/compass/softpkg.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE softpkg SYSTEM "softpkg.dtd">
-<softpkg name="EventChannelPkg" version="0.1">
- <pkgtype>CORBA Component</pkgtype>
- <title>EventChannel</title>
- <author>
-    <company>DOC group </company>
-    <webpage href="http://www.cs.wustl.edu/~doc"/>
- </author>
- <description>Simple Event Channel</description>
-  <dependency type="DSO" >
-    <localfile name="libTAO.so"/>
-  </dependency>
-  <implementation id="EventChannel" >
-    <os name="Linux" version="4,0,0,0" />
-    <processor name="x86" />
-    <compiler name="gcc" />
-    <programminglanguage name="C++" />
-    <propertyfile>
-      <fileinarchive name="eventchannel.cpf"/>
-    </propertyfile>
-    <code type="DSO" >
-      <fileinarchive name="libService.so"/>
-      <entrypoint>createEventChannel</entrypoint>
-    </code>
-  </implementation>
-  <implementation id="Supplier" >
-    <os name="Linux" version="4,0,0,0" />
-    <processor name="x86" />
-    <compiler name="gcc" />
-    <programminglanguage name="C++" />
-    <code type="DSO">
-      <fileinarchive name="libSupplier.so"/>
-      <entrypoint>createSupplier</entrypoint>
-    </code>
-  </implementation>
-  <implementation id="Consumer" >
-    <os name="Linux" version="4,0,0,0" />
-    <processor name="x86" />
-    <compiler name="gcc" />
-    <programminglanguage name="C++" />
-    <code type="DSO" >
-      <fileinarchive name="libConsumer.so"/>
-      <entrypoint>createConsumer</entrypoint>
-    </code>
-  </implementation>
-</softpkg>
diff --git a/ACEXML/examples/SAXPrint/Makefile b/ACEXML/examples/SAXPrint/Makefile
new file mode 100644
index 00000000000..79a07ed6ca5
--- /dev/null
+++ b/ACEXML/examples/SAXPrint/Makefile
@@ -0,0 +1,14 @@
+# $Id$
+#----------------------------------------------------------------------------
+#       GNU ACE Workspace
+#----------------------------------------------------------------------------
+
+include $(ACE_ROOT)/include/makeinclude/macros.GNU
+TARGETS_NESTED := $(TARGETS_NESTED:.nested=)
+
+$(TARGETS_NESTED):
+ifneq (Windows,$(findstring Windows,$(OS)))
+	@$(MAKE) -f Makefile.SAXPrint -C . $(@);
+else
+	-@cmd /c "$(MAKE) -f Makefile.SAXPrint -C . $(@)"
+endif
diff --git a/ACEXML/examples/SAXPrint/Makefile.SAXPrint b/ACEXML/examples/SAXPrint/Makefile.SAXPrint
index 752f4b81b2e..7822bd66b94 100644
--- a/ACEXML/examples/SAXPrint/Makefile.SAXPrint
+++ b/ACEXML/examples/SAXPrint/Makefile.SAXPrint
@@ -1,7 +1,6 @@
 #----------------------------------------------------------------------------
 #       GNU Makefile
 #----------------------------------------------------------------------------
-
 MAKEFILE        = Makefile.SAXPrint
 DEPENDENCY_FILE = .depend.Makefile.SAXPrint
 BIN_UNCHECKED   = SAXPrint
@@ -12,10 +11,10 @@ FILES = \
   main \
   SAXPrint_Handler \
   Print_Handler
-
 #----------------------------------------------------------------------------
 #       Include macros and targets
 #----------------------------------------------------------------------------
+
 include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
 
 BIN    = $(BIN_UNCHECKED)
@@ -30,9 +29,16 @@ include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
 
 CPPFLAGS     += -I../../..
+ifeq ($(static_libs),1)
+  ifneq ($(LIB),)
+    CPPFLAGS += -DACE_AS_STATIC_LIBS
+  endif
+endif
+
+
 LDFLAGS      += -L../../../ace
 
-LDLIBS = -lACEXML_Parser -lACEXML
+LDLIBS  = -lACEXML_Parser -lACEXML
 
 #----------------------------------------------------------------------------
 #       Local targets
@@ -41,10 +47,5 @@ LDLIBS = -lACEXML_Parser -lACEXML
 $(BIN): $(addprefix $(VDIR), $(OBJS))
 	$(LINK.cc) $(LDFLAGS) $(CC_OUTPUT_FLAG) $@ $^ $(VLDLIBS) $(POSTLINK)
 
-#----------------------------------------------------------------------------
-#       Dependencies
-#----------------------------------------------------------------------------
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
+realclean: clean 
 
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/ACEXML/examples/svcconf/Makefile b/ACEXML/examples/svcconf/Makefile
new file mode 100644
index 00000000000..d476cd46d25
--- /dev/null
+++ b/ACEXML/examples/svcconf/Makefile
@@ -0,0 +1,14 @@
+# $Id$
+#----------------------------------------------------------------------------
+#       GNU ACE Workspace
+#----------------------------------------------------------------------------
+
+include $(ACE_ROOT)/include/makeinclude/macros.GNU
+TARGETS_NESTED := $(TARGETS_NESTED:.nested=)
+
+$(TARGETS_NESTED):
+ifneq (Windows,$(findstring Windows,$(OS)))
+	@$(MAKE) -f Makefile.Svcconf -C . $(@);
+else
+	-@cmd /c "$(MAKE) -f Makefile.Svcconf -C . $(@)"
+endif
diff --git a/ACEXML/examples/svcconf/Makefile.Svcconf b/ACEXML/examples/svcconf/Makefile.Svcconf
index ccce348faad..0cc2cb5e5db 100644
--- a/ACEXML/examples/svcconf/Makefile.Svcconf
+++ b/ACEXML/examples/svcconf/Makefile.Svcconf
@@ -1,7 +1,6 @@
 #----------------------------------------------------------------------------
 #       GNU Makefile
 #----------------------------------------------------------------------------
-
 MAKEFILE        = Makefile.Svcconf
 DEPENDENCY_FILE = .depend.Makefile.Svcconf
 BIN_UNCHECKED   = Svcconf
@@ -11,10 +10,10 @@ BIN_UNCHECKED   = Svcconf
 FILES = \
   main \
   Svcconf_Handler
-
 #----------------------------------------------------------------------------
 #       Include macros and targets
 #----------------------------------------------------------------------------
+
 include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
 
 BIN    = $(BIN_UNCHECKED)
@@ -29,9 +28,16 @@ include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
 
 CPPFLAGS     += -I../../..
+ifeq ($(static_libs),1)
+  ifneq ($(LIB),)
+    CPPFLAGS += -DACE_AS_STATIC_LIBS
+  endif
+endif
+
+
 LDFLAGS      += -L../../../ace
 
-LDLIBS = -lACEXML_XML_Svc_Conf_Parser -lACEXML_Parser -lACEXML
+LDLIBS  = -lACEXML_XML_Svc_Conf_Parser -lACEXML_Parser -lACEXML
 
 #----------------------------------------------------------------------------
 #       Local targets
@@ -40,10 +46,5 @@ LDLIBS = -lACEXML_XML_Svc_Conf_Parser -lACEXML_Parser -lACEXML
 $(BIN): $(addprefix $(VDIR), $(OBJS))
 	$(LINK.cc) $(LDFLAGS) $(CC_OUTPUT_FLAG) $@ $^ $(VLDLIBS) $(POSTLINK)
 
-#----------------------------------------------------------------------------
-#       Dependencies
-#----------------------------------------------------------------------------
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
+realclean: clean 
 
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/ACEXML/parser/debug_validator/Makefile b/ACEXML/parser/debug_validator/Makefile
new file mode 100644
index 00000000000..84ba07cb748
--- /dev/null
+++ b/ACEXML/parser/debug_validator/Makefile
@@ -0,0 +1,14 @@
+# $Id$
+#----------------------------------------------------------------------------
+#       GNU ACE Workspace
+#----------------------------------------------------------------------------
+
+include $(ACE_ROOT)/include/makeinclude/macros.GNU
+TARGETS_NESTED := $(TARGETS_NESTED:.nested=)
+
+$(TARGETS_NESTED):
+ifneq (Windows,$(findstring Windows,$(OS)))
+	@$(MAKE) -f Makefile.Validator -C . $(@);
+else
+	-@cmd /c "$(MAKE) -f Makefile.Validator -C . $(@)"
+endif
diff --git a/ACEXML/parser/debug_validator/Makefile.Validator b/ACEXML/parser/debug_validator/Makefile.Validator
index aba23bd3161..fce31a6081f 100644
--- a/ACEXML/parser/debug_validator/Makefile.Validator
+++ b/ACEXML/parser/debug_validator/Makefile.Validator
@@ -1,7 +1,6 @@
 #----------------------------------------------------------------------------
 #       GNU Makefile
 #----------------------------------------------------------------------------
-
 MAKEFILE        = Makefile.Validator
 DEPENDENCY_FILE = .depend.Makefile.Validator
 LIB_UNCHECKED   = libACEXML_Validator.a
@@ -10,17 +9,17 @@ SHLIB_UNCHECKED = libACEXML_Validator.$(SOEXT)
 
 
 FILES = \
-  Debug_Attributes_Builder \
-  Debug_DTD_Manager \
   Debug_Element_Builder \
-  Element_Tree
+  Element_Tree \
+  Debug_DTD_Manager \
+  Debug_Attributes_Builder
+#----------------------------------------------------------------------------
+#       Include macros and targets
+#----------------------------------------------------------------------------
 
 LIB   = $(LIB_UNCHECKED)
 SHLIB = $(SHLIB_UNCHECKED)
 
-#----------------------------------------------------------------------------
-#       Include macros and targets
-#----------------------------------------------------------------------------
 include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
 LSRC   = $(addsuffix .cpp, $(FILES))
 ACELIB = -lACE
@@ -32,18 +31,20 @@ include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
 
 CPPFLAGS     += -I../../..
+ifeq ($(static_libs),1)
+  ifneq ($(LIB),)
+    CPPFLAGS += -DACE_AS_STATIC_LIBS
+  endif
+endif
+
+
 LDFLAGS      += -L../../../ace
 
-ACE_SHLIBS = -lACEXML_Parser -lACEXML $(ACELIB)
+ACE_SHLIBS  = -lACEXML_Parser -lACEXML $(ACELIB)
 
 #----------------------------------------------------------------------------
 #       Local targets
 #----------------------------------------------------------------------------
 
-#----------------------------------------------------------------------------
-#       Dependencies
-#----------------------------------------------------------------------------
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
+realclean: clean 
 
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/ACEXML/parser/parser/Makefile b/ACEXML/parser/parser/Makefile
new file mode 100644
index 00000000000..253f01100d3
--- /dev/null
+++ b/ACEXML/parser/parser/Makefile
@@ -0,0 +1,14 @@
+# $Id$
+#----------------------------------------------------------------------------
+#       GNU ACE Workspace
+#----------------------------------------------------------------------------
+
+include $(ACE_ROOT)/include/makeinclude/macros.GNU
+TARGETS_NESTED := $(TARGETS_NESTED:.nested=)
+
+$(TARGETS_NESTED):
+ifneq (Windows,$(findstring Windows,$(OS)))
+	@$(MAKE) -f Makefile.Parser -C . $(@);
+else
+	-@cmd /c "$(MAKE) -f Makefile.Parser -C . $(@)"
+endif
diff --git a/ACEXML/parser/parser/Makefile.Parser b/ACEXML/parser/parser/Makefile.Parser
index 0a0a464f338..0986826a655 100644
--- a/ACEXML/parser/parser/Makefile.Parser
+++ b/ACEXML/parser/parser/Makefile.Parser
@@ -1,7 +1,6 @@
 #----------------------------------------------------------------------------
 #       GNU Makefile
 #----------------------------------------------------------------------------
-
 MAKEFILE        = Makefile.Parser
 DEPENDENCY_FILE = .depend.Makefile.Parser
 LIB_UNCHECKED   = libACEXML_Parser.a
@@ -10,17 +9,17 @@ SHLIB_UNCHECKED = libACEXML_Parser.$(SOEXT)
 
 
 FILES = \
-  Entity_Manager \
   Parser \
+  Entity_Manager \
   ParserContext \
   ParserInternals
+#----------------------------------------------------------------------------
+#       Include macros and targets
+#----------------------------------------------------------------------------
 
 LIB   = $(LIB_UNCHECKED)
 SHLIB = $(SHLIB_UNCHECKED)
 
-#----------------------------------------------------------------------------
-#       Include macros and targets
-#----------------------------------------------------------------------------
 include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
 LSRC   = $(addsuffix .cpp, $(FILES))
 ACELIB = -lACE
@@ -32,18 +31,25 @@ include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
 
 CPPFLAGS     += -I../../..
+ifeq ($(shared_libs),1)
+  ifneq ($(SHLIB),)
+    CPPFLAGS += -DACEXML_PARSER_BUILD
+  endif
+endif
+ifeq ($(static_libs),1)
+  ifneq ($(LIB),)
+    CPPFLAGS += -DACE_AS_STATIC_LIBS
+  endif
+endif
+
+
 LDFLAGS      += -L../../../ace
 
-ACE_SHLIBS = -lACEXML $(ACELIB)
+ACE_SHLIBS  = -lACEXML $(ACELIB)
 
 #----------------------------------------------------------------------------
 #       Local targets
 #----------------------------------------------------------------------------
 
-#----------------------------------------------------------------------------
-#       Dependencies
-#----------------------------------------------------------------------------
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
+realclean: clean 
 
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/ACEXML/tests/Makefile b/ACEXML/tests/Makefile
new file mode 100644
index 00000000000..24ca1173078
--- /dev/null
+++ b/ACEXML/tests/Makefile
@@ -0,0 +1,22 @@
+# $Id$
+#----------------------------------------------------------------------------
+#       GNU ACE Workspace
+#----------------------------------------------------------------------------
+
+include $(ACE_ROOT)/include/makeinclude/macros.GNU
+TARGETS_NESTED := $(TARGETS_NESTED:.nested=)
+MFILES = \
+         Makefile.HttpCharStream_Test \
+         Makefile.Transcoder_Test \
+         Makefile.NamespaceSupport_Test
+
+$(TARGETS_NESTED):
+ifneq (Windows,$(findstring Windows,$(OS)))
+	@for file in $(MFILES); do \
+	$(MAKE) -f `basename $$file` -C `dirname $$file` $(@); \
+	done
+else
+	-@cmd /c "$(MAKE) -f Makefile.HttpCharStream_Test -C . $(@)"
+	-@cmd /c "$(MAKE) -f Makefile.Transcoder_Test -C . $(@)"
+	-@cmd /c "$(MAKE) -f Makefile.NamespaceSupport_Test -C . $(@)"
+endif
diff --git a/ACEXML/tests/Makefile.HttpCharStream_Test b/ACEXML/tests/Makefile.HttpCharStream_Test
index 2a9f8a7fadf..6429daab346 100644
--- a/ACEXML/tests/Makefile.HttpCharStream_Test
+++ b/ACEXML/tests/Makefile.HttpCharStream_Test
@@ -1,7 +1,6 @@
 #----------------------------------------------------------------------------
 #       GNU Makefile
 #----------------------------------------------------------------------------
-
 MAKEFILE        = Makefile.HttpCharStream_Test
 DEPENDENCY_FILE = .depend.Makefile.HttpCharStream_Test
 BIN_UNCHECKED   = HttpCharStream_Test
@@ -10,10 +9,10 @@ BIN_UNCHECKED   = HttpCharStream_Test
 
 FILES = \
   HttpCharStream_Test
-
 #----------------------------------------------------------------------------
 #       Include macros and targets
 #----------------------------------------------------------------------------
+
 include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
 
 BIN    = $(BIN_UNCHECKED)
@@ -28,9 +27,16 @@ include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
 
 CPPFLAGS     += -I../..
+ifeq ($(static_libs),1)
+  ifneq ($(LIB),)
+    CPPFLAGS += -DACE_AS_STATIC_LIBS
+  endif
+endif
+
+
 LDFLAGS      += -L../../ace
 
-LDLIBS = -lACEXML
+LDLIBS  = -lACEXML
 
 #----------------------------------------------------------------------------
 #       Local targets
@@ -39,10 +45,5 @@ LDLIBS = -lACEXML
 $(BIN): $(addprefix $(VDIR), $(OBJS))
 	$(LINK.cc) $(LDFLAGS) $(CC_OUTPUT_FLAG) $@ $^ $(VLDLIBS) $(POSTLINK)
 
-#----------------------------------------------------------------------------
-#       Dependencies
-#----------------------------------------------------------------------------
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
+realclean: clean 
 
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/ACEXML/tests/Makefile.NamespaceSupport_Test b/ACEXML/tests/Makefile.NamespaceSupport_Test
index f418135f6ec..26657dec00a 100644
--- a/ACEXML/tests/Makefile.NamespaceSupport_Test
+++ b/ACEXML/tests/Makefile.NamespaceSupport_Test
@@ -1,7 +1,6 @@
 #----------------------------------------------------------------------------
 #       GNU Makefile
 #----------------------------------------------------------------------------
-
 MAKEFILE        = Makefile.NamespaceSupport_Test
 DEPENDENCY_FILE = .depend.Makefile.NamespaceSupport_Test
 BIN_UNCHECKED   = NamespaceSupport_Test
@@ -10,10 +9,10 @@ BIN_UNCHECKED   = NamespaceSupport_Test
 
 FILES = \
   NamespaceSupport_Test
-
 #----------------------------------------------------------------------------
 #       Include macros and targets
 #----------------------------------------------------------------------------
+
 include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
 
 BIN    = $(BIN_UNCHECKED)
@@ -28,9 +27,16 @@ include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
 
 CPPFLAGS     += -I../..
+ifeq ($(static_libs),1)
+  ifneq ($(LIB),)
+    CPPFLAGS += -DACE_AS_STATIC_LIBS
+  endif
+endif
+
+
 LDFLAGS      += -L../../ace
 
-LDLIBS = -lACEXML
+LDLIBS  = -lACEXML
 
 #----------------------------------------------------------------------------
 #       Local targets
@@ -39,10 +45,5 @@ LDLIBS = -lACEXML
 $(BIN): $(addprefix $(VDIR), $(OBJS))
 	$(LINK.cc) $(LDFLAGS) $(CC_OUTPUT_FLAG) $@ $^ $(VLDLIBS) $(POSTLINK)
 
-#----------------------------------------------------------------------------
-#       Dependencies
-#----------------------------------------------------------------------------
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
+realclean: clean 
 
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/ACEXML/tests/Makefile.Transcoder_Test b/ACEXML/tests/Makefile.Transcoder_Test
index d85fdbcdb11..9d53e26195c 100644
--- a/ACEXML/tests/Makefile.Transcoder_Test
+++ b/ACEXML/tests/Makefile.Transcoder_Test
@@ -1,7 +1,6 @@
 #----------------------------------------------------------------------------
 #       GNU Makefile
 #----------------------------------------------------------------------------
-
 MAKEFILE        = Makefile.Transcoder_Test
 DEPENDENCY_FILE = .depend.Makefile.Transcoder_Test
 BIN_UNCHECKED   = Transcoder_Test
@@ -10,10 +9,10 @@ BIN_UNCHECKED   = Transcoder_Test
 
 FILES = \
   Transcoder_Test
-
 #----------------------------------------------------------------------------
 #       Include macros and targets
 #----------------------------------------------------------------------------
+
 include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
 
 BIN    = $(BIN_UNCHECKED)
@@ -28,9 +27,16 @@ include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
 
 CPPFLAGS     += -I../..
+ifeq ($(static_libs),1)
+  ifneq ($(LIB),)
+    CPPFLAGS += -DACE_AS_STATIC_LIBS
+  endif
+endif
+
+
 LDFLAGS      += -L../../ace
 
-LDLIBS = -lACEXML
+LDLIBS  = -lACEXML
 
 #----------------------------------------------------------------------------
 #       Local targets
@@ -39,10 +45,5 @@ LDLIBS = -lACEXML
 $(BIN): $(addprefix $(VDIR), $(OBJS))
 	$(LINK.cc) $(LDFLAGS) $(CC_OUTPUT_FLAG) $@ $^ $(VLDLIBS) $(POSTLINK)
 
-#----------------------------------------------------------------------------
-#       Dependencies
-#----------------------------------------------------------------------------
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
+realclean: clean 
 
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY