*** empty log message ***

3 files changed, 6 insertions, 193 deletions

diff --git a/TAO/CIAO/tools/Config_Handlers/Utils/GNUmakefile b/TAO/CIAO/tools/Config_Handlers/Utils/GNUmakefile
deleted file mode 100644
index 8e0cef2b22d..00000000000
--- a/TAO/CIAO/tools/Config_Handlers/Utils/GNUmakefile
+++ /dev/null
@@ -1,31 +0,0 @@
-# -*- makefile -*-
-#-------------------------------------------------------------------------
-#       GNU ACE Workspace
-#
-# $Id$
-#
-# This file was generated by MPC.  Any changes made directly to
-# this file will be lost the next time it is generated.
-#
-# MPC Command:
-# /project/balartmp/wotte/experimental/ACE_wrappers/bin/mwc.pl -include /project/balartmp/wotte/experimental/ACE_wrappers/MPC/config -include /project/balartmp/wotte/experimental/ACE_wrappers/MPC/templates
-#
-#-------------------------------------------------------------------------
-MAKEFILE = GNUmakefile
-
-ifeq ($(findstring k,$(MAKEFLAGS)),k)
-  KEEP_GOING = -
-endif
-
-include $(ACE_ROOT)/include/makeinclude/macros.GNU
-
-all: CIAO_XML_Utils
-
-.PHONY: CIAO_XML_Utils
-CIAO_XML_Utils:
-	$(KEEP_GOING)@$(MAKE) -f GNUmakefile.CIAO_XML_Utils
-
-REMAINING_TARGETS := $(subst all, , $(TARGETS_NESTED:.nested=)) $(CUSTOM_TARGETS)
-$(REMAINING_TARGETS):
-	$(KEEP_GOING)@$(MAKE) -f GNUmakefile.CIAO_XML_Utils $(@)
-
diff --git a/TAO/CIAO/tools/Config_Handlers/Utils/GNUmakefile.CIAO_XML_Utils b/TAO/CIAO/tools/Config_Handlers/Utils/GNUmakefile.CIAO_XML_Utils
deleted file mode 100644
index 2f947584ed0..00000000000
--- a/TAO/CIAO/tools/Config_Handlers/Utils/GNUmakefile.CIAO_XML_Utils
+++ /dev/null
@@ -1,161 +0,0 @@
-# -*- Makefile -*-
-#----------------------------------------------------------------------------
-#       GNU Makefile
-#
-# @file GNUmakefile.CIAO_XML_Utils
-#
-# $Id$
-#
-# This file was automatically generated by MPC.  Any changes made directly to
-# this file will be lost the next time it is generated.
-#
-#----------------------------------------------------------------------------
-MAKEFILE         = GNUmakefile.CIAO_XML_Utils
-DEPENDENCY_FILE  = .depend.CIAO_XML_Utils
-
-## LIB may be set to empty later on in this file
-LIB_UNCHECKED    = libCIAO_XML_Utils.a
-LIB              = $(LIB_UNCHECKED)
-
-## SHLIB may be set to empty later on in this file
-SHLIB_UNCHECKED  = libCIAO_XML_Utils.$(SOEXT)
-SHLIB            = $(SHLIB_UNCHECKED)
-
-TAO_ROOT  ?= $(ACE_ROOT)/TAO
-CIAO_ROOT ?= $(TAO_ROOT)/CIAO
-
-FILES = \
-  XML_Error_Handler.cpp \
-  XML_Helper.cpp \
-  XercesString.cpp
-
-#----------------------------------------------------------------------------
-#       Include macros and targets
-#----------------------------------------------------------------------------
-XERCESLIB ?= xerces-c
-ACE_SHLIBS = -lACE -l$(XERCESLIB)
-
-INSLIB ?= ../../../../../lib
-ifeq ($(INSLIB),.)
-  ifeq ($(PWD),)
-    PWD=$(shell pwd)
-  endif
-  INSLIB = $(PWD)
-endif
-OUTPUT_DIRECTORY = $(INSLIB)
-
-include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-## We don't need the ACELIB setting from wrapper_macros.GNU
-ACELIB =
-include $(CIAO_ROOT)/rules.ciao.GNU
-
-# To build multiple targets in the same directory on AIX, it works
-# best to have a template directory per project.
-# The compiler/linker isn't too smart about instantiating templates...
-ifdef TEMPINCDIR
-TEMPINCDIR := $(TEMPINCDIR)/CIAO_XML_Utils
-all: $(TEMPINCDIR)
-endif
-
-ifneq ($(OUTPUT_DIRECTORY),)
-all: $(OUTPUT_DIRECTORY)
-$(OUTPUT_DIRECTORY):
-	-@$(MKDIR) "$(OUTPUT_DIRECTORY)"
-endif
-
-# turn off libcheck if doing a dry run
-ifeq ($(findstring n, $(MAKEFLAGS)),n)
-  LIBCHECK = 1
-else
-  # turn off libcheck if keep going was passed too
-  ifeq ($(findstring k, $(MAKEFLAGS)),k)
-    LIBCHECK = 1
-  else
-    LIBCHECK ?= $(filter-out $(foreach lib,ACE,$(findstring $(lib),$(foreach libpath,. ../../../../../lib $(XERCESCROOT)/lib /usr/lib $(INSLIB),$(wildcard $(libpath)/lib$(lib).* $(libpath)/$(lib).lib)))),ACE)
-    ifeq ($(LIBCHECK),)
-      LIBCHECK = 1
-    endif
-  endif
-endif
-ifeq ($(exceptions),1)
-ifneq ($(LIBCHECK), 1)
-  LIB   =
-  SHLIB =
-  all: lib_warning
-endif
-else
-  LIB   =
-  SHLIB =
-  all: require_warning
-endif
-
-ifeq ($(exceptions),1)
-else
-  LIB   =
-  SHLIB =
-  all: require_warning
-endif
-LSRC   = $(FILES)
-
-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
-ifeq ($(VXWORKSLINK),true)
-include $(TGT_DIR)/h/make/rules.$(PRJ_TYPE)
-endif
-
-ifeq ($(VXWORKSLINK),true)
-LDLIBPATH     = -L. -L../../../../../lib -L$(XERCESCROOT)/lib
-else
-LDFLAGS      += -L. -L../../../../../lib -L$(XERCESCROOT)/lib
-endif
-CPPFLAGS     += -I../../../../.. -I$(XERCESCROOT)/include -I../../../tools/Config_Handlers
-CPPFLAGS     += -DXML_USE_PTHREADS
-ifeq ($(shared_libs),1)
-  ifneq ($(SHLIB),)
-    CPPFLAGS += -DCONFIG_HANDLERS_BUILD_DLL
-  endif
-endif
-ifeq ($(static_libs),1)
-  CPPFLAGS += -DACE_AS_STATIC_LIBS
-endif
-
-#----------------------------------------------------------------------------
-#       Local targets
-#----------------------------------------------------------------------------
-lib_warning:
-	@echo This project will not be built due to the following missing library:
-	@echo $(LIBCHECK)
-
-require_warning:
-	@echo This project will not be built due to one of the following missing features:
-	@echo exceptions
-
-## Some OS's have /bin/test others only have /usr/bin/test
-ifeq ($(wildcard /bin/test), /bin/test)
-  TEST_EXE = /bin/test
-else
-ifeq ($(wildcard /usr/bin/test), /usr/bin/test)
-  TEST_EXE = /usr/bin/test
-endif
-endif
-
-ifneq ($(GENERATED_DIRTY),)
-.PRECIOUS: $(GENERATED_DIRTY)
-## If the generated files are anything but source files, we need to
-## ensure that those files are generated before we attempt to build anything
-## else.
-ifeq ($(OBJS_DEPEND_ON_GENERATED),1)
-$(VDIR)$(ACE_PCH_FILE) $(addprefix $(VDIR), $(OBJS)): $(GENERATED_DIRTY)
-$(VSHDIR)$(ACE_PCH_FILE) $(VSHOBJS): $(GENERATED_DIRTY)
-endif
-endif
-
-
-realclean: clean
-ifneq ($(GENERATED_DIRTY),)
-	-$(RM) -r $(GENERATED_DIRTY)
-endif
-
diff --git a/TAO/CIAO/tools/Config_Handlers/Utils/XML_Helper.cpp b/TAO/CIAO/tools/Config_Handlers/Utils/XML_Helper.cpp
index dc72c984b5a..f065f10e17c 100644
--- a/TAO/CIAO/tools/Config_Handlers/Utils/XML_Helper.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/Utils/XML_Helper.cpp
@@ -1,5 +1,6 @@
 //$Id$
 #include "XML_Helper.h"
+#include "XML_Schema_Handler.h"
 #include "ace/Auto_Ptr.h"
 #include "ace/Log_Msg.h"
 #include "xercesc/util/XMLUniDefs.hpp"
@@ -150,7 +151,11 @@ namespace CIAO
           XML_Error_Handler handler;
 
           parser->setErrorHandler (&handler);
-
+          
+          XML_Schema_Handler resolver;
+          
+          parser->setEntityResolver (&resolver);
+          
           DOMDocument* doc = parser->parseURI (url);
 
           if (handler.getErrors ())