diff options
author | kitty <kitty@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-05-30 19:23:10 +0000 |
---|---|---|
committer | kitty <kitty@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-05-30 19:23:10 +0000 |
commit | a9900634307ef4b2ef4dad023a52e0caea565856 (patch) | |
tree | f1402cf3364377ed8cbfdd49720ac6e881437299 /ACEXML | |
parent | 54f0b1c1684660875a633bc1f5f993ad249b4590 (diff) | |
download | ATCD-a9900634307ef4b2ef4dad023a52e0caea565856.tar.gz |
ChangeLogTag: Fri May 30 14:16:33 2003 Krishnakumar B <kitty@spam.invalid.domain>
Diffstat (limited to 'ACEXML')
26 files changed, 539 insertions, 1444 deletions
diff --git a/ACEXML/ACEXML.dsw b/ACEXML/ACEXML.dsw index 4294abaa076..3c175a9821e 100644 --- a/ACEXML/ACEXML.dsw +++ b/ACEXML/ACEXML.dsw @@ -66,27 +66,6 @@ Package=<4> ###############################################################################
-Project: "Svcconf EXE"=examples\svcconf\Svcconf.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name ACEXML_XML_Svc_Conf_Parser DLL
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name ACEXML_Parser DLL
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name ACEXML DLL
- End Project Dependency
-}}}
-
-###############################################################################
-
Project: "Transcoder_Test EXE"=tests\Transcoder_Test.dsp - Package Owner=<4>
Package=<5>
diff --git a/ACEXML/ChangeLog b/ACEXML/ChangeLog index 5beb6b8d14c..338ed132219 100644 --- a/ACEXML/ChangeLog +++ b/ACEXML/ChangeLog @@ -1,3 +1,51 @@ +Fri May 30 14:16:33 2003 Krishnakumar B <kitty@spam.invalid.domain> + + * examples/svcconf/.depend.Makefile.Svcconf: + * examples/svcconf/Makefile: + * examples/svcconf/Makefile.Svcconf: + * examples/svcconf/Makefile.Svcconf.bor: + * examples/svcconf/Makefile.bor: + * examples/svcconf/README: + * examples/svcconf/Svcconf.dsp: + * examples/svcconf/Svcconf.dsw: + * examples/svcconf/Svcconf.mpc: + * examples/svcconf/Svcconf_Handler.cpp: + * examples/svcconf/Svcconf_Handler.h: + * examples/svcconf/Svcconf_Handler.i: + * examples/svcconf/main.cpp: + + Removed directories causing problems with Win XP release. + + * ACEXML.dsw: + * Makefile: + * Makefile.bor: + * apps/svcconf/Makefile: + * apps/svcconf/Makefile.ACEXML_XML_Svc_Conf_Parser.bor: + * apps/svcconf/Makefile.bor: + * common/Makefile: + * common/Makefile.ACEXML.bor: + * common/Makefile.bor: + * examples/SAXPrint/Makefile: + * examples/SAXPrint/Makefile.SAXPrint.bor: + * examples/SAXPrint/Makefile.bor: + * parser/parser/Makefile: + * parser/parser/Makefile.ACEXML_Parser.bor: + * parser/parser/Makefile.bor: + * tests/.depend.Makefile.ContentHandler_Test: + * tests/.depend.Makefile.HttpCharStream_Test: + * tests/.depend.Makefile.NamespaceSupport_Test: + * tests/.depend.Makefile.Transcoder_Test:: + * tests/Makefile: + * tests/Makefile.ContentHandler_Test: + * tests/Makefile.ContentHandler_Test.bor: + * tests/Makefile.HttpCharStream_Test.bor: + * tests/Makefile.NamespaceSupport_Test.bor: + * tests/Makefile.Transcoder_Test.bor: + * tests/Makefile.bor: + + More build related delicacies needed updating because of the + previous change. + Fri May 30 13:56:40 2003 Krishnakumar B <kitty@spam.invalid.domain> * common/XML_Common.dsp: Removed old dsp left over from previous diff --git a/ACEXML/Makefile b/ACEXML/Makefile index e0454a993dd..6697ebf02f7 100644 --- a/ACEXML/Makefile +++ b/ACEXML/Makefile @@ -10,7 +10,6 @@ MFILES = \ parser/parser/Makefile.ACEXML_Parser \ apps/svcconf/Makefile.ACEXML_XML_Svc_Conf_Parser \ examples/SAXPrint/Makefile.SAXPrint \ - examples/svcconf/Makefile.Svcconf \ tests/Makefile.Transcoder_Test \ tests/Makefile.NamespaceSupport_Test \ tests/Makefile.HttpCharStream_Test \ @@ -26,7 +25,6 @@ else -@cmd /c "$(MAKE) -f Makefile.ACEXML_Parser -C parser/parser $(@)" -@cmd /c "$(MAKE) -f Makefile.ACEXML_XML_Svc_Conf_Parser -C apps/svcconf $(@)" -@cmd /c "$(MAKE) -f Makefile.SAXPrint -C examples/SAXPrint $(@)" - -@cmd /c "$(MAKE) -f Makefile.Svcconf -C examples/svcconf $(@)" -@cmd /c "$(MAKE) -f Makefile.Transcoder_Test -C tests $(@)" -@cmd /c "$(MAKE) -f Makefile.NamespaceSupport_Test -C tests $(@)" -@cmd /c "$(MAKE) -f Makefile.HttpCharStream_Test -C tests $(@)" diff --git a/ACEXML/Makefile.bor b/ACEXML/Makefile.bor index fa36fd809e6..29834328e6d 100644 --- a/ACEXML/Makefile.bor +++ b/ACEXML/Makefile.bor @@ -17,9 +17,6 @@ all: @cd examples/SAXPrint $(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f Makefile.SAXPrint.bor all @cd ../../ - @cd examples/svcconf - $(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f Makefile.Svcconf.bor all - @cd ../../ @cd tests $(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f Makefile.Transcoder_Test.bor all @cd ../ @@ -46,9 +43,6 @@ clean: @cd examples/SAXPrint $(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f Makefile.SAXPrint.bor clean @cd ../../ - @cd examples/svcconf - $(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f Makefile.Svcconf.bor clean - @cd ../../ @cd tests $(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f Makefile.Transcoder_Test.bor clean @cd ../ @@ -75,9 +69,6 @@ realclean: @cd examples/SAXPrint $(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f Makefile.SAXPrint.bor realclean @cd ../../ - @cd examples/svcconf - $(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f Makefile.Svcconf.bor realclean - @cd ../../ @cd tests $(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f Makefile.Transcoder_Test.bor realclean @cd ../ @@ -104,9 +95,6 @@ install: @cd examples/SAXPrint $(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f Makefile.SAXPrint.bor install @cd ../../ - @cd examples/svcconf - $(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f Makefile.Svcconf.bor install - @cd ../../ @cd tests $(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f Makefile.Transcoder_Test.bor install @cd ../ @@ -121,4 +109,4 @@ install: @cd ../ regenerate: - D:\Perl\bin\perl.exe D:\ACE_wrappers\bin\mwc.pl -type borland -recurse + /usr/bin/perl /build/kitty/ACE_wrappers/bin/mwc.pl -type borland ACEXML.mwc diff --git a/ACEXML/apps/svcconf/Makefile.bor b/ACEXML/apps/svcconf/Makefile.bor index b088d5d48da..6c8a1fbb9d1 100644 --- a/ACEXML/apps/svcconf/Makefile.bor +++ b/ACEXML/apps/svcconf/Makefile.bor @@ -17,4 +17,4 @@ install: $(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f Makefile.ACEXML_XML_Svc_Conf_Parser.bor install regenerate: - D:\Perl\bin\perl.exe D:\ACE_wrappers\bin\mwc.pl -type borland -recurse + /usr/bin/perl /build/kitty/ACE_wrappers/bin/mwc.pl -type borland ACEXML.mwc diff --git a/ACEXML/common/Makefile.bor b/ACEXML/common/Makefile.bor index 31b53535630..9b5ff84dadf 100644 --- a/ACEXML/common/Makefile.bor +++ b/ACEXML/common/Makefile.bor @@ -17,4 +17,4 @@ install: $(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f Makefile.ACEXML.bor install regenerate: - D:\Perl\bin\perl.exe D:\ACE_wrappers\bin\mwc.pl -type borland -recurse + /usr/bin/perl /build/kitty/ACE_wrappers/bin/mwc.pl -type borland ACEXML.mwc diff --git a/ACEXML/examples/SAXPrint/Makefile.bor b/ACEXML/examples/SAXPrint/Makefile.bor index 2db22658bac..1f8759f9727 100644 --- a/ACEXML/examples/SAXPrint/Makefile.bor +++ b/ACEXML/examples/SAXPrint/Makefile.bor @@ -17,4 +17,4 @@ install: $(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f Makefile.SAXPrint.bor install regenerate: - D:\Perl\bin\perl.exe D:\ACE_wrappers\bin\mwc.pl -type borland -recurse + /usr/bin/perl /build/kitty/ACE_wrappers/bin/mwc.pl -type borland ACEXML.mwc diff --git a/ACEXML/examples/svcconf/Makefile b/ACEXML/examples/svcconf/Makefile deleted file mode 100644 index d476cd46d25..00000000000 --- a/ACEXML/examples/svcconf/Makefile +++ /dev/null @@ -1,14 +0,0 @@ -# $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 deleted file mode 100644 index 94317241e70..00000000000 --- a/ACEXML/examples/svcconf/Makefile.Svcconf +++ /dev/null @@ -1,56 +0,0 @@ -#---------------------------------------------------------------------------- -# GNU Makefile -#---------------------------------------------------------------------------- -MAKEFILE = Makefile.Svcconf -DEPENDENCY_FILE = .depend.Makefile.Svcconf -BIN_UNCHECKED = main - - - -FILES = \ - main \ - Svcconf_Handler -#---------------------------------------------------------------------------- -# 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../../.. - - -ifeq ($(static_libs),1) - ifneq ($(LIB),) - CPPFLAGS += -DACE_AS_STATIC_LIBS - endif -endif - - -LDFLAGS += -L../../../ACEXML/apps/svcconf -L../../../ACEXML/common -L../../../ACEXML/parser/parser -L../../../ace - - - -LDLIBS = -lACEXML_XML_Svc_Conf_Parser -lACEXML_Parser -lACEXML -#---------------------------------------------------------------------------- -# Local targets -#---------------------------------------------------------------------------- - -$(BIN): $(addprefix $(VDIR), $(OBJS)) - $(LINK.cc) $(LDFLAGS) $(CC_OUTPUT_FLAG) $@ $^ $(VLDLIBS) $(POSTLINK) - -realclean: clean -ifneq ($(GENERATED_DIRTY),) - -$(RM) -r $(GENERATED_DIRTY) -endif - diff --git a/ACEXML/examples/svcconf/Makefile.Svcconf.bor b/ACEXML/examples/svcconf/Makefile.Svcconf.bor deleted file mode 100644 index e9394ccaf10..00000000000 --- a/ACEXML/examples/svcconf/Makefile.Svcconf.bor +++ /dev/null @@ -1,55 +0,0 @@ -# Makefile for building the main exe with Borland C++ Builder - -NAME = main - -NAME = main - - -OBJFILES = \ - $(OBJDIR)\Svcconf_Handler.obj \ - $(OBJDIR)\main.obj - -EXTERNAL_LIBS = \ - \ - -LFLAGS = \ - -j..\..\..\ACEXML\apps\svcconf\$(CONFIG_SUBDIR) -j..\..\..\ACEXML\apps\svcconf \ - -L..\..\..\ACEXML\apps\svcconf\$(CONFIG_SUBDIR) -L..\..\..\ACEXML\apps\svcconf \ - -j..\..\..\ACEXML\common\$(CONFIG_SUBDIR) -j..\..\..\ACEXML\common \ - -L..\..\..\ACEXML\common\$(CONFIG_SUBDIR) -L..\..\..\ACEXML\common \ - -j..\..\..\ACEXML\parser\parser\$(CONFIG_SUBDIR) -j..\..\..\ACEXML\parser\parser \ - -L..\..\..\ACEXML\parser\parser\$(CONFIG_SUBDIR) -L..\..\..\ACEXML\parser\parser \ - -j..\..\..\ace\$(CONFIG_SUBDIR) -j..\..\..\ace \ - -L..\..\..\ace\$(CONFIG_SUBDIR) -L..\..\..\ace \ - -j$(CORE_BINDIR) \ - -L$(CORE_BINDIR) - -LIBFILES = \ - ACEXML_XML_Svc_Conf_Parser$(LIB_DECORATOR).lib \ - ACEXML_Parser$(LIB_DECORATOR).lib \ - ACEXML$(LIB_DECORATOR).lib \ - ACE$(LIB_DECORATOR).lib \ - $(EXTERNAL_LIBS) - - - -!ifdef STATIC -LIB_FLAGS = -DACE_AS_STATIC_LIBS -DLL_FLAGS = -!else -LIB_FLAGS = -DLL_FLAGS = -!endif - -CFLAGS = \ - -I..\..\.. \ - $(LIB_FLAGS) \ - $(DLL_FLAGS) - -CPPDIR = . - -INCLUDES = \ - Svcconf_Handler.h \ - Svcconf_Handler.i - -!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor> diff --git a/ACEXML/examples/svcconf/Makefile.bor b/ACEXML/examples/svcconf/Makefile.bor deleted file mode 100644 index 3f477c204a4..00000000000 --- a/ACEXML/examples/svcconf/Makefile.bor +++ /dev/null @@ -1,20 +0,0 @@ -#---------------------------------------------------------------------------- -# Borland Workspace -#---------------------------------------------------------------------------- - -!include <$(ACE_ROOT)\include\makeinclude\make_flags.bor> - -all: - $(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f Makefile.Svcconf.bor all - -clean: - $(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f Makefile.Svcconf.bor clean - -realclean: - $(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f Makefile.Svcconf.bor realclean - -install: - $(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f Makefile.Svcconf.bor install - -regenerate: - D:\Perl\bin\perl.exe D:\ACE_wrappers\bin\mwc.pl -type borland -recurse diff --git a/ACEXML/examples/svcconf/README b/ACEXML/examples/svcconf/README deleted file mode 100644 index 7463c7e9572..00000000000 --- a/ACEXML/examples/svcconf/README +++ /dev/null @@ -1,3 +0,0 @@ -$Id$ - -A test workspace for svc.conf handler.
\ No newline at end of file diff --git a/ACEXML/examples/svcconf/Svcconf.dsp b/ACEXML/examples/svcconf/Svcconf.dsp deleted file mode 100644 index fe7b170cdae..00000000000 --- a/ACEXML/examples/svcconf/Svcconf.dsp +++ /dev/null @@ -1,105 +0,0 @@ -# Microsoft Developer Studio Project File - Name="Svcconf EXE" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=Svcconf EXE - 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 "Svcconf.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 "Svcconf.mak" CFG="Svcconf EXE - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "Svcconf EXE - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Svcconf EXE - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "Svcconf EXE - Win32 Release"
-
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release\Svcconf"
-# PROP Target_Dir ""
-# ADD CPP /nologo /W3 /GX /O2 /MD /GR /I "..\..\.." /D NDEBUG=1 /D WIN32=1 /D _CONSOLE=1 /FD /c
-# SUBTRACT CPP /YX
-# ADD RSC /l 0x409 /d NDEBUG=1 /i "..\..\.."
-BSC32=bscmake.exe
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD LINK32 advapi32.lib user32.lib /INCREMENTAL:NO ACEXML_XML_Svc_Conf_Parser.lib ACEXML_Parser.lib ACEXML.lib ACE.lib /libpath:"..\..\..\ACEXML\apps\svcconf" /libpath:"..\..\..\ACEXML\common" /libpath:"..\..\..\ACEXML\parser\parser" /libpath:"..\..\..\ace" /nologo /version:5.3.1 /subsystem:console /pdb:"Release\main.pdb" /machine:I386 /out:"Release\main.exe"
-
-!ELSEIF "$(CFG)" == "Svcconf EXE - Win32 Debug"
-
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "."
-# PROP Intermediate_Dir "Debug\Svcconf"
-# PROP Target_Dir ""
-# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /MDd /GR /Gy /I "..\..\.." /D _DEBUG=1 /D WIN32=1 /D _CONSOLE=1 /FD /c
-# SUBTRACT CPP /YX
-# ADD RSC /l 0x409 /d _DEBUG=1 /i "..\..\.."
-BSC32=bscmake.exe
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD LINK32 advapi32.lib user32.lib /INCREMENTAL:NO ACEXML_XML_Svc_Conf_Parserd.lib ACEXML_Parserd.lib ACEXMLd.lib ACEd.lib /libpath:"..\..\..\ACEXML\apps\svcconf" /libpath:"..\..\..\ACEXML\common" /libpath:"..\..\..\ACEXML\parser\parser" /libpath:"..\..\..\ace" /nologo /version:5.3.1 /subsystem:console /pdb:".\main.pdb" /debug /machine:I386 /out:".\main.exe"
-
-!ENDIF
-
-# Begin Target
-
-# Name "Svcconf EXE - Win32 Release"
-# Name "Svcconf EXE - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;cxx;c"
-# Begin Source File
-
-SOURCE=.\main.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Svcconf_Handler.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hh"
-# Begin Source File
-
-SOURCE=.\Svcconf_Handler.h
-# End Source File
-# End Group
-# Begin Group "Inline Files"
-
-# PROP Default_Filter "i;inl"
-# Begin Source File
-
-SOURCE=.\Svcconf_Handler.i
-# End Source File
-# End Group
-# Begin Group "Documentation"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\README
-# End Source File
-# End Group
-# End Target
-# End Project
diff --git a/ACEXML/examples/svcconf/Svcconf.dsw b/ACEXML/examples/svcconf/Svcconf.dsw deleted file mode 100644 index f25a54a4e72..00000000000 --- a/ACEXML/examples/svcconf/Svcconf.dsw +++ /dev/null @@ -1,29 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "Svcconf"=.\Svcconf.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
diff --git a/ACEXML/examples/svcconf/Svcconf.mpc b/ACEXML/examples/svcconf/Svcconf.mpc deleted file mode 100644 index 4210bafc0c0..00000000000 --- a/ACEXML/examples/svcconf/Svcconf.mpc +++ /dev/null @@ -1,5 +0,0 @@ -project (Svcconf) : aceexe, acexml { - depends += ACEXML_XML_Svc_Conf_Parser - libs += ACEXML_XML_Svc_Conf_Parser - libpaths += $(ACE_ROOT)/ACEXML/apps/svcconf -} diff --git a/ACEXML/examples/svcconf/Svcconf_Handler.cpp b/ACEXML/examples/svcconf/Svcconf_Handler.cpp deleted file mode 100644 index f2bc70292cf..00000000000 --- a/ACEXML/examples/svcconf/Svcconf_Handler.cpp +++ /dev/null @@ -1,486 +0,0 @@ -// -*- C++ -*- $Id$ - -#include "Svcconf_Handler.h" -#include "ace/ACE.h" -#include "ace/Log_Msg.h" - -#if !defined (__ACEXML_INLINE__) -# include "Svcconf_Handler.i" -#endif /* __ACEXML_INLINE__ */ - -ACEXML_Svcconf_Handler::ACEXML_Svcconf_Handler (void) - : in_stream_def_ (0), - in_module_ (0) -{ - // no-op -} - -ACEXML_Svcconf_Handler::~ACEXML_Svcconf_Handler (void) -{ - // no-op -} - -void -ACEXML_Svcconf_Handler::characters (const ACEXML_Char *, - int, - int ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) -{ - // no-op -} - -void -ACEXML_Svcconf_Handler::endDocument (ACEXML_ENV_SINGLE_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) -{ - // no-op -} - -void -ACEXML_Svcconf_Handler::endElement (const ACEXML_Char *, - const ACEXML_Char *, - const ACEXML_Char *qName ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) -{ - - - if (ACE_OS_String::strcmp (qName, ACE_TEXT ("dynamic")) == 0) - { - if (this->in_stream_def_) - { - ACE_DEBUG ((LM_INFO, ACE_TEXT ("Create dynamic %s for stream\n"), - this->stream_info_.name ())); - } - else - { - if (this->in_module_) - { - ACE_DEBUG ((LM_INFO, ACE_TEXT ("Push dynamic %s into stream %s\n"), - this->parsed_info_.name (), - this->stream_info_.name ())); - } - else - { - ACE_DEBUG ((LM_INFO, ACE_TEXT ("Apply dynamic %s\n"), - this->parsed_info_.name ())); - } - this->parsed_info_.reset (); - } - } - else if (ACE_OS_String::strcmp (qName, ACE_TEXT ("static")) == 0) - { - if (this->in_stream_def_) - { - ACE_DEBUG ((LM_INFO, ACE_TEXT ("Create sttaic %s for stream\n"), - this->stream_info_.name ())); - } - else - { - if (this->in_module_) - { - ACE_DEBUG ((LM_INFO, ACE_TEXT ("Push static %s into stream %s\n"), - this->parsed_info_.name (), - this->stream_info_.name ())); - } - else - { - ACE_DEBUG ((LM_INFO, ACE_TEXT ("Apply static %s\n"), - this->parsed_info_.name ())); - } - this->parsed_info_.reset (); - } - } - else if (ACE_OS_String::strcmp (qName, ACE_TEXT ("module")) == 0) - { - this->in_module_ = 0; - } - else if (ACE_OS_String::strcmp (qName, ACE_TEXT ("streamdef")) == 0 || - ACE_OS_String::strcmp (qName, ACE_TEXT ("stream")) == 0) - { - ACE_DEBUG ((LM_INFO, ACE_TEXT ("Apply stream %s of type %s\n"), - this->stream_info_.name (), - this->stream_info_.name ())); - this->stream_info_.reset (); - } - else - { - } -} - -void -ACEXML_Svcconf_Handler::endPrefixMapping (const ACEXML_Char * ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) -{ - // no-op -} - -void -ACEXML_Svcconf_Handler::ignorableWhitespace (const ACEXML_Char *, - int, - int ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) -{ - // no-op -} - -void -ACEXML_Svcconf_Handler::processingInstruction (const ACEXML_Char *, - const ACEXML_Char * ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) -{ - // no-op -} - -void -ACEXML_Svcconf_Handler::setDocumentLocator (ACEXML_Locator* ) -{ -} - -void -ACEXML_Svcconf_Handler::skippedEntity (const ACEXML_Char * ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) -{ - // no-op -} - -void -ACEXML_Svcconf_Handler::startDocument (ACEXML_ENV_SINGLE_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) -{ - // no-op -} - -void -ACEXML_Svcconf_Handler::startElement (const ACEXML_Char *, - const ACEXML_Char *, - const ACEXML_Char *qName, - ACEXML_Attributes *alist ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) -{ - if (ACE_OS_String::strcmp (qName, ACE_TEXT ("dynamic")) == 0) - { - this->get_dynamic_attrs (alist ACEXML_ENV_ARG_PARAMETER); - } - else if (ACE_OS_String::strcmp (qName, ACE_TEXT ("initializer")) == 0) - { - this->get_initializer_attrs (alist ACEXML_ENV_ARG_PARAMETER); - } - else if (ACE_OS_String::strcmp (qName, ACE_TEXT ("static")) == 0) - { - this->get_static_attrs (alist ACEXML_ENV_ARG_PARAMETER); - } - else if (ACE_OS_String::strcmp (qName, ACE_TEXT ("stream")) == 0) - { - this->get_stream_id (alist ACEXML_ENV_ARG_PARAMETER); - ACE_DEBUG ((LM_INFO, ACE_TEXT ("Retrieve stream %s from repository\n"), - this->stream_info_.name ())); - } - else if (ACE_OS_String::strcmp (qName, ACE_TEXT ("streamdef")) == 0) - { - this->in_stream_def_ = 1; - // @@ Set up stream service object - } - else if (ACE_OS_String::strcmp (qName, ACE_TEXT ("module")) == 0) - { - this->in_stream_def_ = 0; - this->in_module_ = 1; - } - else if (ACE_OS_String::strcmp (qName, ACE_TEXT ("resume")) == 0) - { - this->get_id (alist ACEXML_ENV_ARG_PARAMETER); - if (this->in_module_) - { - ACE_DEBUG ((LM_INFO, ACE_TEXT ("Resume %s in stream %s\n"), - this->parsed_info_.name (), - this->stream_info_.name ())); - } - else - { - ACE_DEBUG ((LM_INFO, ACE_TEXT ("Resume %s\n"), - this->parsed_info_.name ())); - } - this->parsed_info_.reset (); - } - else if (ACE_OS_String::strcmp (qName, ACE_TEXT ("suspend")) == 0) - { - this->get_id (alist ACEXML_ENV_ARG_PARAMETER); - if (this->in_module_) - { - ACE_DEBUG ((LM_INFO, ACE_TEXT ("Suspend %s in stream %s\n"), - this->parsed_info_.name (), - this->stream_info_.name ())); - } - else - { - ACE_DEBUG ((LM_INFO, ACE_TEXT ("Suspend %s\n"), - this->parsed_info_.name ())); - } - this->parsed_info_.reset (); - } - else if (ACE_OS_String::strcmp (qName, ACE_TEXT ("remove")) == 0) - { - this->get_id (alist ACEXML_ENV_ARG_PARAMETER); - if (this->in_module_) - { - ACE_DEBUG ((LM_INFO, ACE_TEXT ("Remove %s in stream %s\n"), - this->parsed_info_.name (), - this->stream_info_.name ())); - } - else - { - ACE_DEBUG ((LM_INFO, ACE_TEXT ("Remove %s\n"), - this->parsed_info_.name ())); - } - this->parsed_info_.reset (); - } - else if (ACE_OS_String::strcmp (qName, ACE_TEXT ("ACE_Svc_Conf")) == 0) - { - // Main document tag. no-op. - ACE_DEBUG ((LM_INFO, ACE_TEXT ("ACE_Svc_Conf tag\n"))); - } - else - { - // @@ Error. Perhaps we should relay to user event handler here, if available. - } - - return; - - if (alist != 0) - for (size_t i = 0; i < alist->getLength (); ++i) - { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT (" %s = \"%s\""), - alist->getQName (i), alist->getValue (i))); - } - ACE_DEBUG ((LM_DEBUG, ACE_TEXT (">"))); -} - -void -ACEXML_Svcconf_Handler::startPrefixMapping (const ACEXML_Char *, - const ACEXML_Char * ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) -{ - // No-op. -} - -// *** Methods inherit from ACEXML_DTDHandler. - -void -ACEXML_Svcconf_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_Svcconf_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 inherit from ACEXML_EnitityResolver. - -ACEXML_InputSource * -ACEXML_Svcconf_Handler::resolveEntity (const ACEXML_Char *, - const ACEXML_Char * ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) -{ - // No-op. - return 0; -} - -// Methods inherit from ACEXML_ErrorHandler. - - /* - * Receive notification of a recoverable error. - */ -void -ACEXML_Svcconf_Handler::error (ACEXML_SAXParseException & ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) -{ - // No-op. -} - -void -ACEXML_Svcconf_Handler::fatalError (ACEXML_SAXParseException & ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) -{ - // No-op. -} - -void -ACEXML_Svcconf_Handler::warning (ACEXML_SAXParseException & ACEXML_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((ACEXML_SAXException)) -{ - // No-op. -} - -int -ACEXML_Svcconf_Handler::get_stream_id (ACEXML_Attributes *alist ACEXML_ENV_ARG_DECL) -{ - - - if (alist != 0) - for (size_t i = 0; i < alist->getLength (); ++i) - { - if (ACE_OS_String::strcmp (alist->getQName (i), ACE_TEXT ("id")) == 0) - { - this->stream_info_.name (alist->getValue (i)); - } - else - { - // @@ Exception... - return -1; - } - } - return 0; -} - -int -ACEXML_Svcconf_Handler::get_id (ACEXML_Attributes *alist ACEXML_ENV_ARG_DECL) -{ - - - if (alist != 0) - for (size_t i = 0; i < alist->getLength (); ++i) - { - if (ACE_OS_String::strcmp (alist->getQName (i), ACE_TEXT ("id")) == 0) - { - this->parsed_info_.name (alist->getValue (i)); - } - else - { - // @@ Exception... - return -1; - } - } - return 0; -} - -int -ACEXML_Svcconf_Handler::get_dynamic_attrs (ACEXML_Attributes *alist ACEXML_ENV_ARG_DECL) -{ - - - if (alist != 0) - { - ACE_Parsed_Info *info = (this->in_stream_def_ == 0 ? - &this->parsed_info_ : - &this->stream_info_); - for (size_t i = 0; i < alist->getLength (); ++i) - { - if (ACE_OS_String::strcmp (alist->getQName (i), ACE_TEXT ("id")) == 0) - { - info->name (alist->getValue (i)); - } - else if (ACE_OS_String::strcmp (alist->getQName (i), ACE_TEXT ("status")) == 0) - { - if (ACE_OS_String::strcmp (alist->getValue (i), ACE_TEXT ("inactive")) == 0) - { - } - else if (ACE_OS_String::strcmp (alist->getValue (i), ACE_TEXT ("active")) == 0) - { - } - else - { - // @@ error, invalid 'status' value. - } - } - else if (ACE_OS_String::strcmp (alist->getQName (i), ACE_TEXT ("type")) == 0) - { - if (ACE_OS_String::strcmp (alist->getValue (i), ACE_TEXT ("service_object")) == 0) - { - info->service_type (ACE_Parsed_Info::SERVICE_OBJECT_TYPE); - } - else if (ACE_OS_String::strcmp (alist->getValue (i), ACE_TEXT ("stream")) == 0) - { - info->service_type (ACE_Parsed_Info::STREAM_TYPE); - } - else if (ACE_OS_String::strcmp (alist->getValue (i), ACE_TEXT ("module")) == 0) - { - info->service_type (ACE_Parsed_Info::MODULE_TYPE); - } - else - { - // @@ error, invalid 'type' value. - } - } - else - { - // @@ Exception... - return -1; - } - } - } - return 0; -} - -int -ACEXML_Svcconf_Handler::get_initializer_attrs (ACEXML_Attributes *alist ACEXML_ENV_ARG_DECL) -{ - - - if (alist != 0) - { - ACE_Parsed_Info *info = (this->in_stream_def_ == 0 ? - &this->parsed_info_ : - &this->stream_info_); - for (size_t i = 0; i < alist->getLength (); ++i) - { - if (ACE_OS_String::strcmp (alist->getQName (i), ACE_TEXT ("init")) == 0) - { - info->init_func (alist->getValue (i)); - } - else if (ACE_OS_String::strcmp (alist->getQName (i), ACE_TEXT ("path")) == 0) - { - info->path (alist->getValue (i)); - } - else if (ACE_OS_String::strcmp (alist->getQName (i), ACE_TEXT ("params")) == 0) - { - info->init_params (alist->getValue (i)); - } - else - { - // @@ Exception... - return -1; - } - } - } - return 0; -} - -int -ACEXML_Svcconf_Handler::get_static_attrs (ACEXML_Attributes *alist ACEXML_ENV_ARG_DECL) -{ - - - if (alist != 0) - { - ACE_Parsed_Info *info = (this->in_stream_def_ == 0 ? - &this->parsed_info_ : - &this->stream_info_); - for (size_t i = 0; i < alist->getLength (); ++i) - { - if (ACE_OS_String::strcmp (alist->getQName (i), ACE_TEXT ("id")) == 0) - { - info->name (alist->getValue (i)); - } - else if (ACE_OS_String::strcmp (alist->getQName (i), ACE_TEXT ("params")) == 0) - { - info->init_params (alist->getValue (i)); - } - else - { - // @@ Exception... - return -1; - } - } - } - return 0; -} diff --git a/ACEXML/examples/svcconf/Svcconf_Handler.h b/ACEXML/examples/svcconf/Svcconf_Handler.h deleted file mode 100644 index 3c02f9e9d4a..00000000000 --- a/ACEXML/examples/svcconf/Svcconf_Handler.h +++ /dev/null @@ -1,285 +0,0 @@ -// $Id$ - -//============================================================================= -/** - * @file Svcconf_Handler.h - * - * $Id$ - * - * @author Nanbor Wang <nanbor@cs.wustl.edu> - */ -//============================================================================= - -#ifndef ACEXML_SVCCONF_HANDLER_H -#define ACEXML_SVCCONF_HANDLER_H - -#include "ACEXML/common/DefaultHandler.h" - -class ACE_Parsed_Info -{ -public: - typedef enum { - MODULE_TYPE, - SERVICE_OBJECT_TYPE, - STREAM_TYPE, - INVALID_TYPE - } Service_Type; - - ACE_Parsed_Info (); - ~ACE_Parsed_Info (); - - /** - * Set/get name of a parsed entity. - */ - int name (const ACEXML_Char *n); - const ACEXML_Char *name (void); - - /** - * Set/get type of a dynamic node. - */ - int service_type (Service_Type type); - Service_Type service_type (void); - - /** - * Set/Get active status. - */ - int active (int a); - int active (void); - - /** - * Set/get initializer path. - */ - int path (const ACEXML_Char *n); - const ACEXML_Char *path (void); - - /** - * Set/get initializer init function. - */ - int init_func (const ACEXML_Char *n); - const ACEXML_Char *init_func (void); - - /** - * Set/get initializer init parameter. - */ - int init_params (const ACEXML_Char *n); - const ACEXML_Char *init_params (void); - - /** - * Reset Parsed_Info. - */ - void reset (void); - -protected: - ACEXML_Char *name_; - Service_Type service_type_; - int active_; - ACEXML_Char *path_; - ACEXML_Char *init_func_; - ACEXML_Char *init_params_; -}; - -/** - * @class ACEXML_Svcconf_Handler - * - * @brief ACEXML_Svcconf_Handler is an example SAX event handler. - * - * This SAX event handler try to regenerate the XML document it - * reads with correct indentation. - */ -class ACEXML_Svcconf_Handler : public ACEXML_DefaultHandler -{ -public: - /* - * Default constructor. - */ - ACEXML_Svcconf_Handler (void); - - /* - * Default destructor. - */ - virtual ~ACEXML_Svcconf_Handler (void); - - // Methods inherit 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 *) ; - - /* - * 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 inherit 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 inherit 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 inherit 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)) - ; - -protected: - /** - * Get the only attribute in <stream> or <streamdef>. - */ - int get_stream_id (ACEXML_Attributes *alist ACEXML_ENV_ARG_DECL); - - /** - * Get the only attribute in <resume>, <suspend>, <remove> - */ - int get_id (ACEXML_Attributes *alist ACEXML_ENV_ARG_DECL); - - /** - * Get the dynamic tag attributes. - */ - int get_dynamic_attrs (ACEXML_Attributes *alist ACEXML_ENV_ARG_DECL); - - /** - * Get the initializer tag attributes. - */ - int get_initializer_attrs (ACEXML_Attributes *alist ACEXML_ENV_ARG_DECL); - - /** - * Get the static tag attributes. - */ - int get_static_attrs (ACEXML_Attributes *alist ACEXML_ENV_ARG_DECL); - -private: - /// We are parsing a stream definition - int in_stream_def_; - - /// We are defining a steam module - int in_module_; - - ACE_Parsed_Info parsed_info_; - - ACE_Parsed_Info stream_info_; -}; - -#if defined (__ACEXML_INLINE__) -# include "Svcconf_Handler.i" -#endif /* __ACEXML_INLINE__ */ -#endif /* ACEXML_SVCCONF_HANDLER_H */ diff --git a/ACEXML/examples/svcconf/Svcconf_Handler.i b/ACEXML/examples/svcconf/Svcconf_Handler.i deleted file mode 100644 index fb6ea3db2ce..00000000000 --- a/ACEXML/examples/svcconf/Svcconf_Handler.i +++ /dev/null @@ -1,133 +0,0 @@ -// -*- C++ -*- $Id$ - -ACE_INLINE -ACE_Parsed_Info::ACE_Parsed_Info () - : name_ (0), - service_type_ (INVALID_TYPE), - active_ (1), - path_ (0), - init_func_ (0), - init_params_ (0) -{ -} - -ACE_INLINE -ACE_Parsed_Info::~ACE_Parsed_Info () -{ - delete this->name_; - delete this->path_; - delete this->init_func_; - delete this->init_params_; -} - -ACE_INLINE int -ACE_Parsed_Info::name (const ACEXML_Char *n) -{ - if (this->name_ == 0) - { - this->name_ = ACE::strnew (n); - return 0; - } - return -1; -} - -ACE_INLINE const ACEXML_Char * -ACE_Parsed_Info::name (void) -{ - return this->name_; -} - -ACE_INLINE int -ACE_Parsed_Info::service_type (Service_Type type) -{ - if (this->service_type_ == INVALID_TYPE) - { - this->service_type_ = type; - return 0; - } - return -1; -} - -ACE_INLINE ACE_Parsed_Info::Service_Type -ACE_Parsed_Info::service_type (void) -{ - return this->service_type_; -} - -ACE_INLINE int -ACE_Parsed_Info::active (int a) -{ - this->active_ = a; - return 0; -} - -ACE_INLINE int -ACE_Parsed_Info::active (void) -{ - return this->active_; -} - -ACE_INLINE int -ACE_Parsed_Info::path (const ACEXML_Char *p) -{ - if (this->path_ == 0) - { - this->path_ = ACE::strnew (p); - return 0; - } - return -1; -} - -ACE_INLINE const ACEXML_Char * -ACE_Parsed_Info::path (void) -{ - return this->path_; -} - -ACE_INLINE int -ACE_Parsed_Info::init_func (const ACEXML_Char *n) -{ - if (this->init_func_ == 0) - { - this->init_func_ = ACE::strnew (n); - return 0; - } - return -1; -} - -ACE_INLINE const ACEXML_Char * -ACE_Parsed_Info::init_func (void) -{ - return this->init_func_; -} - -ACE_INLINE int -ACE_Parsed_Info::init_params (const ACEXML_Char *n) -{ - if (this->init_params_ == 0) - { - this->init_params_ = ACE::strnew (n); - return 0; - } - return -1; -} - -ACE_INLINE const ACEXML_Char * -ACE_Parsed_Info::init_params (void) -{ - return this->init_params_; -} - -ACE_INLINE void -ACE_Parsed_Info::reset (void) -{ - delete this->name_; - this->name_ = 0; - this->service_type_ = INVALID_TYPE; - delete this->path_; - this->path_ = 0; - delete this->init_func_; - this->init_func_ = 0; - delete this->init_params_; - this->init_params_ = 0; -} diff --git a/ACEXML/examples/svcconf/main.cpp b/ACEXML/examples/svcconf/main.cpp deleted file mode 100644 index c19ba133d51..00000000000 --- a/ACEXML/examples/svcconf/main.cpp +++ /dev/null @@ -1,77 +0,0 @@ -// $Id$ - -#include "ACEXML/common/FileCharStream.h" -#include "ACEXML/common/StrCharStream.h" -#include "ACEXML/parser/parser/Parser.h" -#include "Svcconf_Handler.h" -#include "ace/Get_Opt.h" -#include "ace/Auto_Ptr.h" - -int -ACE_TMAIN (int argc, ACE_TCHAR *argv[]) -{ - ACE_TCHAR *filename = 0; - - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("f:")); - int c; - - while ((c = get_opt ()) != EOF) - { - switch (c) - { - case 'f': - filename = get_opt.opt_arg (); - break; - default: - ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("Usage: %s [-f <filename>]\n") - ACE_TEXT (" -f: Specify the svcconf filename\n"), - argv[0]), - -1); - } - }; - - if (filename == 0) - ACE_ERROR_RETURN ((LM_ERROR, "No filename specified\n"), -1); - - ACEXML_DefaultHandler *handler = 0; - ACEXML_CharStream *stm = 0; - ACEXML_FileCharStream *fstm = 0; - ACE_NEW_RETURN (fstm, - ACEXML_FileCharStream (), - 1); - - if (fstm->open (filename) != 0) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("Fail to open XML file: %s\n"), - filename), - -1); - stm = fstm; - - ACE_NEW_RETURN (handler, - ACEXML_Svcconf_Handler (), - -1); - - auto_ptr<ACEXML_DefaultHandler> cleanup_handler (handler); - - ACEXML_Parser parser; - ACEXML_InputSource input(stm); - - 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 (); - return -1; - } - ACEXML_ENDTRY; - return 0; -} diff --git a/ACEXML/parser/parser/Makefile.bor b/ACEXML/parser/parser/Makefile.bor index 067cbee6d7d..1aa3b869599 100644 --- a/ACEXML/parser/parser/Makefile.bor +++ b/ACEXML/parser/parser/Makefile.bor @@ -17,4 +17,4 @@ install: $(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f Makefile.ACEXML_Parser.bor install regenerate: - D:\Perl\bin\perl.exe D:\ACE_wrappers\bin\mwc.pl -type borland -recurse + /usr/bin/perl /build/kitty/ACE_wrappers/bin/mwc.pl -type borland ACEXML.mwc diff --git a/ACEXML/examples/svcconf/.depend.Makefile.Svcconf b/ACEXML/tests/.depend.Makefile.ContentHandler_Test index 35ed53eecee..fc6f01d7ac8 100644 --- a/ACEXML/examples/svcconf/.depend.Makefile.Svcconf +++ b/ACEXML/tests/.depend.Makefile.ContentHandler_Test @@ -2,13 +2,18 @@ # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. -.obj/main.o .obj/main.so .shobj/main.o .shobj/main.so: main.cpp $(ACE_ROOT)/ACEXML/common/FileCharStream.h \ +.obj/ContentHandler_Test.o .obj/ContentHandler_Test.so .shobj/ContentHandler_Test.o .shobj/ContentHandler_Test.so: ContentHandler_Test.cpp \ + $(ACE_ROOT)/ACEXML/common/DefaultHandler.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ACEXML/common/ACEXML_Export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ACEXML/common/CharStream.h \ + $(ACE_ROOT)/ACEXML/common/ContentHandler.h \ + $(ACE_ROOT)/ACEXML/common/Env.h \ + $(ACE_ROOT)/ACEXML/common/XML_Macros.h \ + $(ACE_ROOT)/ace/Exception_Macros.h \ + $(ACE_ROOT)/ACEXML/common/Exception.h \ $(ACE_ROOT)/ACEXML/common/XML_Types.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ @@ -98,16 +103,6 @@ $(ACE_ROOT)/ace/Auto_Ptr.i \ $(ACE_ROOT)/ace/Auto_Ptr.cpp \ $(ACE_ROOT)/ace/SString.i \ - $(ACE_ROOT)/ACEXML/common/Encoding.h \ - $(ACE_ROOT)/ACEXML/common/StrCharStream.h \ - $(ACE_ROOT)/ACEXML/parser/parser/Parser.h \ - $(ACE_ROOT)/ACEXML/parser/parser/Parser_export.h \ - $(ACE_ROOT)/ACEXML/common/XMLReader.h \ - $(ACE_ROOT)/ACEXML/common/ContentHandler.h \ - $(ACE_ROOT)/ACEXML/common/Env.h \ - $(ACE_ROOT)/ACEXML/common/XML_Macros.h \ - $(ACE_ROOT)/ace/Exception_Macros.h \ - $(ACE_ROOT)/ACEXML/common/Exception.h \ $(ACE_ROOT)/ACEXML/common/Exception.i \ $(ACE_ROOT)/ACEXML/common/Env.i \ $(ACE_ROOT)/ACEXML/common/SAXExceptions.h \ @@ -117,7 +112,13 @@ $(ACE_ROOT)/ACEXML/common/DTDHandler.h \ $(ACE_ROOT)/ACEXML/common/EntityResolver.h \ $(ACE_ROOT)/ACEXML/common/InputSource.h \ + $(ACE_ROOT)/ACEXML/common/CharStream.h \ $(ACE_ROOT)/ACEXML/common/ErrorHandler.h \ + $(ACE_ROOT)/ACEXML/common/DefaultHandler.i \ + $(ACE_ROOT)/ACEXML/common/StrCharStream.h \ + $(ACE_ROOT)/ACEXML/parser/parser/Parser.h \ + $(ACE_ROOT)/ACEXML/parser/parser/Parser_export.h \ + $(ACE_ROOT)/ACEXML/common/XMLReader.h \ $(ACE_ROOT)/ACEXML/common/LocatorImpl.h \ $(ACE_ROOT)/ACEXML/common/LocatorImpl.i \ $(ACE_ROOT)/ACEXML/common/NamespaceSupport.h \ @@ -172,126 +173,6 @@ $(ACE_ROOT)/ace/Swap.inl \ $(ACE_ROOT)/ace/Swap.cpp \ $(ACE_ROOT)/ACEXML/parser/parser/ParserContext.inl \ - $(ACE_ROOT)/ACEXML/parser/parser/Parser.i \ - Svcconf_Handler.h \ - $(ACE_ROOT)/ACEXML/common/DefaultHandler.h \ - $(ACE_ROOT)/ACEXML/common/DefaultHandler.i \ - Svcconf_Handler.i $(ACE_ROOT)/ace/Get_Opt.h \ - $(ACE_ROOT)/ace/Get_Opt.i - -.obj/Svcconf_Handler.o .obj/Svcconf_Handler.so .shobj/Svcconf_Handler.o .shobj/Svcconf_Handler.so: Svcconf_Handler.cpp Svcconf_Handler.h \ - $(ACE_ROOT)/ACEXML/common/DefaultHandler.h \ - $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ACEXML/common/ACEXML_Export.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ACEXML/common/ContentHandler.h \ - $(ACE_ROOT)/ACEXML/common/Env.h \ - $(ACE_ROOT)/ACEXML/common/XML_Macros.h \ - $(ACE_ROOT)/ace/Exception_Macros.h \ - $(ACE_ROOT)/ACEXML/common/Exception.h \ - $(ACE_ROOT)/ACEXML/common/XML_Types.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ - $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/OS_TLI.inl \ - $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/Default_Constants.h \ - $(ACE_ROOT)/ace/Global_Macros.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SStringfwd.h \ - $(ACE_ROOT)/ace/String_Base.h \ - $(ACE_ROOT)/ace/String_Base_Const.h \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/String_Base.cpp \ - $(ACE_ROOT)/ace/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/Malloc.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Malloc_Allocator.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.i \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Signal.i \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Node.h \ - $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ - $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Auto_Ptr.h \ - $(ACE_ROOT)/ace/Auto_Ptr.i \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp \ - $(ACE_ROOT)/ace/SString.i \ - $(ACE_ROOT)/ACEXML/common/Exception.i \ - $(ACE_ROOT)/ACEXML/common/Env.i \ - $(ACE_ROOT)/ACEXML/common/SAXExceptions.h \ - $(ACE_ROOT)/ACEXML/common/SAXExceptions.i \ - $(ACE_ROOT)/ACEXML/common/Locator.h \ - $(ACE_ROOT)/ACEXML/common/Attributes.h \ - $(ACE_ROOT)/ACEXML/common/DTDHandler.h \ - $(ACE_ROOT)/ACEXML/common/EntityResolver.h \ - $(ACE_ROOT)/ACEXML/common/InputSource.h \ - $(ACE_ROOT)/ACEXML/common/CharStream.h \ - $(ACE_ROOT)/ACEXML/common/ErrorHandler.h \ - $(ACE_ROOT)/ACEXML/common/DefaultHandler.i \ - Svcconf_Handler.i + $(ACE_ROOT)/ACEXML/parser/parser/Parser.i # IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/ACEXML/tests/.depend.Makefile.HttpCharStream_Test b/ACEXML/tests/.depend.Makefile.HttpCharStream_Test new file mode 100644 index 00000000000..9cd2e5541ab --- /dev/null +++ b/ACEXML/tests/.depend.Makefile.HttpCharStream_Test @@ -0,0 +1,227 @@ +# DO NOT DELETE THIS LINE -- g++dep uses it. +# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. + + +.obj/HttpCharStream_Test.o .obj/HttpCharStream_Test.so .shobj/HttpCharStream_Test.o .shobj/HttpCharStream_Test.so: HttpCharStream_Test.cpp \ + $(ACE_ROOT)/ACEXML/common/HttpCharStream.h \ + $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ACEXML/common/ACEXML_Export.h \ + $(ACE_ROOT)/ace/post.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ + $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ACEXML/common/CharStream.h \ + $(ACE_ROOT)/ACEXML/common/XML_Types.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Errno.inl \ + $(ACE_ROOT)/ace/OS_Dirent.inl \ + $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/OS_String.inl \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_Memory.inl \ + $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/OS_TLI.inl \ + $(ACE_ROOT)/ace/Time_Value.h \ + $(ACE_ROOT)/ace/Time_Value.inl \ + $(ACE_ROOT)/ace/Default_Constants.h \ + $(ACE_ROOT)/ace/Global_Macros.h \ + $(ACE_ROOT)/ace/Min_Max.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/OS.i \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SStringfwd.h \ + $(ACE_ROOT)/ace/String_Base.h \ + $(ACE_ROOT)/ace/String_Base_Const.h \ + $(ACE_ROOT)/ace/String_Base.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/String_Base.cpp \ + $(ACE_ROOT)/ace/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/Malloc.h \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/Synch.i \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Malloc_Allocator.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.i \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/Signal.i \ + $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Unbounded_Set.h \ + $(ACE_ROOT)/ace/Node.h \ + $(ACE_ROOT)/ace/Node.cpp \ + $(ACE_ROOT)/ace/Unbounded_Set.inl \ + $(ACE_ROOT)/ace/Unbounded_Set.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.i \ + $(ACE_ROOT)/ace/Auto_Ptr.h \ + $(ACE_ROOT)/ace/Auto_Ptr.i \ + $(ACE_ROOT)/ace/Auto_Ptr.cpp \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ACEXML/common/URL_Addr.h \ + $(ACE_ROOT)/ace/INET_Addr.h \ + $(ACE_ROOT)/ace/Addr.h \ + $(ACE_ROOT)/ace/Addr.i \ + $(ACE_ROOT)/ace/INET_Addr.i \ + $(ACE_ROOT)/ACEXML/common/URL_Addr.inl \ + $(ACE_ROOT)/ACEXML/common/Mem_Map_Stream.h \ + $(ACE_ROOT)/ace/SOCK_Stream.h \ + $(ACE_ROOT)/ace/SOCK_IO.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_IO.i \ + $(ACE_ROOT)/ace/SOCK_Stream.i \ + $(ACE_ROOT)/ace/SOCK_Connector.h \ + $(ACE_ROOT)/ace/SOCK_Connector.i \ + $(ACE_ROOT)/ace/Connector.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.i \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + $(ACE_ROOT)/ace/DLL.h \ + $(ACE_ROOT)/ace/Service_Object.i \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Unbounded_Queue.h \ + $(ACE_ROOT)/ace/Unbounded_Queue.inl \ + $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ + $(ACE_ROOT)/ace/XML_Svc_Conf.h \ + $(ACE_ROOT)/ace/Service_Config.i \ + $(ACE_ROOT)/ace/Reactor.h \ + $(ACE_ROOT)/ace/Handle_Set.h \ + $(ACE_ROOT)/ace/Handle_Set.i \ + $(ACE_ROOT)/ace/Timer_Queue.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.h \ + $(ACE_ROOT)/ace/Test_and_Set.h \ + $(ACE_ROOT)/ace/Test_and_Set.i \ + $(ACE_ROOT)/ace/Test_and_Set.cpp \ + $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Reactor.i \ + $(ACE_ROOT)/ace/Reactor_Impl.h \ + $(ACE_ROOT)/ace/Strategies_T.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/Functor.i \ + $(ACE_ROOT)/ace/Functor_T.h \ + $(ACE_ROOT)/ace/Functor_T.i \ + $(ACE_ROOT)/ace/Functor_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Exit.h \ + $(ACE_ROOT)/ace/Thread_Control.h \ + $(ACE_ROOT)/ace/Thread_Control.inl \ + $(ACE_ROOT)/ace/Containers.h \ + $(ACE_ROOT)/ace/Containers.i \ + $(ACE_ROOT)/ace/Containers_T.h \ + $(ACE_ROOT)/ace/Array_Base.h \ + $(ACE_ROOT)/ace/Array_Base.inl \ + $(ACE_ROOT)/ace/Array_Base.cpp \ + $(ACE_ROOT)/ace/Containers_T.i \ + $(ACE_ROOT)/ace/Containers_T.cpp \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Framework_Component.h \ + $(ACE_ROOT)/ace/Framework_Component.inl \ + $(ACE_ROOT)/ace/Framework_Component_T.h \ + $(ACE_ROOT)/ace/Framework_Component_T.inl \ + $(ACE_ROOT)/ace/Framework_Component_T.cpp \ + $(ACE_ROOT)/ace/Thread_Manager.i \ + $(ACE_ROOT)/ace/Connection_Recycling_Strategy.h \ + $(ACE_ROOT)/ace/Recyclable.h \ + $(ACE_ROOT)/ace/Recyclable.inl \ + $(ACE_ROOT)/ace/Refcountable.h \ + $(ACE_ROOT)/ace/Refcountable.inl \ + $(ACE_ROOT)/ace/Hashable.h \ + $(ACE_ROOT)/ace/Hashable.inl \ + $(ACE_ROOT)/ace/Strategies_T.i \ + $(ACE_ROOT)/ace/Strategies_T.cpp \ + $(ACE_ROOT)/ace/Service_Repository.h \ + $(ACE_ROOT)/ace/Service_Repository.i \ + $(ACE_ROOT)/ace/Service_Types.h \ + $(ACE_ROOT)/ace/Service_Types.i \ + $(ACE_ROOT)/ace/WFMO_Reactor.h \ + $(ACE_ROOT)/ace/Synch_Options.h \ + $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Connector.cpp \ + $(ACE_ROOT)/ace/Svc_Handler.h \ + $(ACE_ROOT)/ace/Task.h \ + $(ACE_ROOT)/ace/Task.i \ + $(ACE_ROOT)/ace/Task_T.h \ + $(ACE_ROOT)/ace/Message_Queue.h \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/Message_Block.i \ + $(ACE_ROOT)/ace/Message_Block_T.h \ + $(ACE_ROOT)/ace/Message_Block_T.i \ + $(ACE_ROOT)/ace/Message_Block_T.cpp \ + $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ + $(ACE_ROOT)/ace/Message_Queue_T.h \ + $(ACE_ROOT)/ace/Message_Queue_T.i \ + $(ACE_ROOT)/ace/Message_Queue_T.cpp \ + $(ACE_ROOT)/ace/Notification_Strategy.h \ + $(ACE_ROOT)/ace/Notification_Strategy.inl \ + $(ACE_ROOT)/ace/Message_Queue.i \ + $(ACE_ROOT)/ace/Task_T.i \ + $(ACE_ROOT)/ace/Task_T.cpp \ + $(ACE_ROOT)/ace/Module.h \ + $(ACE_ROOT)/ace/Module.i \ + $(ACE_ROOT)/ace/Module.cpp \ + $(ACE_ROOT)/ace/Stream_Modules.h \ + $(ACE_ROOT)/ace/Stream_Modules.cpp \ + $(ACE_ROOT)/ace/Svc_Handler.cpp \ + $(ACE_ROOT)/ace/Dynamic.h \ + $(ACE_ROOT)/ace/Dynamic.i + +# IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/ACEXML/tests/.depend.Makefile.NamespaceSupport_Test b/ACEXML/tests/.depend.Makefile.NamespaceSupport_Test new file mode 100644 index 00000000000..c9a44db6753 --- /dev/null +++ b/ACEXML/tests/.depend.Makefile.NamespaceSupport_Test @@ -0,0 +1,139 @@ +# DO NOT DELETE THIS LINE -- g++dep uses it. +# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. + + +.obj/NamespaceSupport_Test.o .obj/NamespaceSupport_Test.so .shobj/NamespaceSupport_Test.o .shobj/NamespaceSupport_Test.so: NamespaceSupport_Test.cpp \ + $(ACE_ROOT)/ACEXML/common/NamespaceSupport.h \ + $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ACEXML/common/ACEXML_Export.h \ + $(ACE_ROOT)/ace/post.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ + $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ACEXML/common/XML_Types.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Errno.inl \ + $(ACE_ROOT)/ace/OS_Dirent.inl \ + $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/OS_String.inl \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_Memory.inl \ + $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/OS_TLI.inl \ + $(ACE_ROOT)/ace/Time_Value.h \ + $(ACE_ROOT)/ace/Time_Value.inl \ + $(ACE_ROOT)/ace/Default_Constants.h \ + $(ACE_ROOT)/ace/Global_Macros.h \ + $(ACE_ROOT)/ace/Min_Max.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/OS.i \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SStringfwd.h \ + $(ACE_ROOT)/ace/String_Base.h \ + $(ACE_ROOT)/ace/String_Base_Const.h \ + $(ACE_ROOT)/ace/String_Base.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/String_Base.cpp \ + $(ACE_ROOT)/ace/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/Malloc.h \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/Synch.i \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Malloc_Allocator.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.i \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/Signal.i \ + $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Unbounded_Set.h \ + $(ACE_ROOT)/ace/Node.h \ + $(ACE_ROOT)/ace/Node.cpp \ + $(ACE_ROOT)/ace/Unbounded_Set.inl \ + $(ACE_ROOT)/ace/Unbounded_Set.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.i \ + $(ACE_ROOT)/ace/Auto_Ptr.h \ + $(ACE_ROOT)/ace/Auto_Ptr.i \ + $(ACE_ROOT)/ace/Auto_Ptr.cpp \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/Functor.i \ + $(ACE_ROOT)/ace/Functor_T.h \ + $(ACE_ROOT)/ace/Functor_T.i \ + $(ACE_ROOT)/ace/Functor_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Unbounded_Queue.h \ + $(ACE_ROOT)/ace/Unbounded_Queue.inl \ + $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ + $(ACE_ROOT)/ace/XML_Svc_Conf.h \ + $(ACE_ROOT)/ace/Service_Config.i \ + $(ACE_ROOT)/ace/Reactor.h \ + $(ACE_ROOT)/ace/Handle_Set.h \ + $(ACE_ROOT)/ace/Handle_Set.i \ + $(ACE_ROOT)/ace/Timer_Queue.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.h \ + $(ACE_ROOT)/ace/Test_and_Set.h \ + $(ACE_ROOT)/ace/Test_and_Set.i \ + $(ACE_ROOT)/ace/Test_and_Set.cpp \ + $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Reactor.i \ + $(ACE_ROOT)/ace/Reactor_Impl.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + $(ACE_ROOT)/ace/Containers_T.h \ + $(ACE_ROOT)/ace/Containers.h \ + $(ACE_ROOT)/ace/Containers.i \ + $(ACE_ROOT)/ace/Array_Base.h \ + $(ACE_ROOT)/ace/Array_Base.inl \ + $(ACE_ROOT)/ace/Array_Base.cpp \ + $(ACE_ROOT)/ace/Containers_T.i \ + $(ACE_ROOT)/ace/Containers_T.cpp \ + $(ACE_ROOT)/ACEXML/common/NamespaceSupport.i + +# IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/ACEXML/tests/.depend.Makefile.Transcoder_Test b/ACEXML/tests/.depend.Makefile.Transcoder_Test new file mode 100644 index 00000000000..93739e8a689 --- /dev/null +++ b/ACEXML/tests/.depend.Makefile.Transcoder_Test @@ -0,0 +1,103 @@ +# DO NOT DELETE THIS LINE -- g++dep uses it. +# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. + + +.obj/Transcoder_Test.o .obj/Transcoder_Test.so .shobj/Transcoder_Test.o .shobj/Transcoder_Test.so: Transcoder_Test.cpp \ + $(ACE_ROOT)/ACEXML/common/Transcode.h \ + $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ACEXML/common/ACEXML_Export.h \ + $(ACE_ROOT)/ace/post.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ + $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ACEXML/common/XML_Types.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Errno.inl \ + $(ACE_ROOT)/ace/OS_Dirent.inl \ + $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/OS_String.inl \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_Memory.inl \ + $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/OS_TLI.inl \ + $(ACE_ROOT)/ace/Time_Value.h \ + $(ACE_ROOT)/ace/Time_Value.inl \ + $(ACE_ROOT)/ace/Default_Constants.h \ + $(ACE_ROOT)/ace/Global_Macros.h \ + $(ACE_ROOT)/ace/Min_Max.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/OS.i \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SStringfwd.h \ + $(ACE_ROOT)/ace/String_Base.h \ + $(ACE_ROOT)/ace/String_Base_Const.h \ + $(ACE_ROOT)/ace/String_Base.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/String_Base.cpp \ + $(ACE_ROOT)/ace/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/Malloc.h \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/Synch.i \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Malloc_Allocator.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.i \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/Signal.i \ + $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Unbounded_Set.h \ + $(ACE_ROOT)/ace/Node.h \ + $(ACE_ROOT)/ace/Node.cpp \ + $(ACE_ROOT)/ace/Unbounded_Set.inl \ + $(ACE_ROOT)/ace/Unbounded_Set.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.i \ + $(ACE_ROOT)/ace/Auto_Ptr.h \ + $(ACE_ROOT)/ace/Auto_Ptr.i \ + $(ACE_ROOT)/ace/Auto_Ptr.cpp \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ACEXML/common/Transcode.i + +# IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/ACEXML/tests/Makefile.ContentHandler_Test b/ACEXML/tests/Makefile.ContentHandler_Test index 3ffdb630d97..c8bc281ba38 100644 --- a/ACEXML/tests/Makefile.ContentHandler_Test +++ b/ACEXML/tests/Makefile.ContentHandler_Test @@ -1,4 +1,3 @@ -# $Id$ #---------------------------------------------------------------------------- # GNU Makefile #---------------------------------------------------------------------------- @@ -49,7 +48,8 @@ LDLIBS = -lACEXML_Parser -lACEXML $(BIN): $(addprefix $(VDIR), $(OBJS)) $(LINK.cc) $(LDFLAGS) $(CC_OUTPUT_FLAG) $@ $^ $(VLDLIBS) $(POSTLINK) -realclean: clean +realclean: clean ifneq ($(GENERATED_DIRTY),) -$(RM) -r $(GENERATED_DIRTY) endif + diff --git a/ACEXML/tests/Makefile.bor b/ACEXML/tests/Makefile.bor index 057b1dfb049..2cde9401c12 100644 --- a/ACEXML/tests/Makefile.bor +++ b/ACEXML/tests/Makefile.bor @@ -29,4 +29,4 @@ install: $(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f Makefile.ContentHandler_Test.bor install regenerate: - D:\Perl\bin\perl.exe D:\ACE_wrappers\bin\mwc.pl -type borland -recurse + /usr/bin/perl /build/kitty/ACE_wrappers/bin/mwc.pl -type borland ACEXML.mwc |