diff --git a/Projects/Win32/VC7/xerces-all/XSerializerTest/XSerializerTest.vcproj b/Projects/Win32/VC7/xerces-all/XSerializerTest/XSerializerTest.vcproj
new file mode 100644
index 0000000000000000000000000000000000000000..777bc1efb8ec77684b63c522e6436b5e43740efb
--- /dev/null
+++ b/Projects/Win32/VC7/xerces-all/XSerializerTest/XSerializerTest.vcproj
@@ -0,0 +1,146 @@
+<?xml version="1.0" encoding = "Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.00"
+	Name="XSerializerTest"
+	ProjectGUID="{4D8FEA60-A74F-4267-852F-C421AF12198D}"
+	SccProjectName=""
+	SccLocalPath="">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC6\Release"
+			IntermediateDirectory=".\..\..\..\..\..\Build\Win32\VC6\Release\obj"
+			ConfigurationType="1"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE">
+			<Tool
+				Name="VCCLCompilerTool"
+				InlineFunctionExpansion="2"
+				OptimizeForProcessor="2"
+				AdditionalIncludeDirectories="..\..\..\..\..\src,..\..\..\..\..\samples\SAXCount"
+				PreprocessorDefinitions="NDEBUG,_CONSOLE,WIN32,_WINDOWS,PLATFORM_WIN32"
+				StringPooling="TRUE"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="TRUE"
+				PrecompiledHeaderFile=".\..\..\..\..\..\Build\Win32\VC6\Release\obj/XSerializerTest.pch"
+				AssemblerListingLocation=".\..\..\..\..\..\Build\Win32\VC6\Release\obj/"
+				ObjectFile=".\..\..\..\..\..\Build\Win32\VC6\Release\obj/"
+				ProgramDataBaseFileName=".\..\..\..\..\..\Build\Win32\VC6\Release\obj/"
+				WarningLevel="3"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions="/MACHINE:I386"
+				AdditionalDependencies="xerces-c_2.lib"
+				OutputFile=".\..\..\..\..\..\Build\Win32\VC7\Release/XSerializerTest.exe"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="..\..\..\..\..\Build\Win32\VC6\Release"
+				ProgramDatabaseFile=".\..\..\..\..\..\Build\Win32\VC6\Release/XSerializerTest.pdb"
+				SubSystem="1"/>
+			<Tool
+				Name="VCMIDLTool"
+				TypeLibraryName=".\..\..\..\..\..\Build\Win32\VC6\Release/XSerializerTest.tlb"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1033"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+		</Configuration>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory=".\..\..\..\..\..\Build\Win32\VC6\Debug"
+			IntermediateDirectory=".\..\..\..\..\..\Build\Win32\VC6\Debug\obj"
+			ConfigurationType="1"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				OptimizeForProcessor="2"
+				AdditionalIncludeDirectories="..\..\..\..\..\src,..\..\..\..\..\samples\SAXCount"
+				PreprocessorDefinitions="_DEBUG,_CONSOLE,WIN32,_WINDOWS,PLATFORM_WIN32"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				PrecompiledHeaderFile=".\..\..\..\..\..\Build\Win32\VC6\Debug\obj/XSerializerTest.pch"
+				AssemblerListingLocation=".\..\..\..\..\..\Build\Win32\VC6\Debug\obj/"
+				ObjectFile=".\..\..\..\..\..\Build\Win32\VC6\Debug\obj/"
+				ProgramDataBaseFileName=".\..\..\..\..\..\Build\Win32\VC6\Debug\obj/"
+				WarningLevel="3"
+				DebugInformationFormat="4"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions="/MACHINE:I386"
+				AdditionalDependencies="xerces-c_2D.lib"
+				OutputFile=".\..\..\..\..\..\Build\Win32\VC7\Debug/XSerializerTest.exe"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="..\..\..\..\..\Build\Win32\VC6\Debug"
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile=".\..\..\..\..\..\Build\Win32\VC6\Debug/XSerializerTest.pdb"
+				SubSystem="1"/>
+			<Tool
+				Name="VCMIDLTool"
+				TypeLibraryName=".\..\..\..\..\..\Build\Win32\VC6\Debug/XSerializerTest.tlb"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1033"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+		</Configuration>
+	</Configurations>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
+			<File
+				RelativePath="..\..\..\..\..\samples\SAXCount\SAXCountHandlers.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\..\tests\XSerializerTest\XSerializerTest.cpp">
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl">
+			<File
+				RelativePath="..\..\..\..\..\samples\SAXCount\SAXCountHandlers.hpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\..\tests\XSerializerTest\XSerializerTest.hpp">
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/Projects/Win32/VC7/xerces-all/xerces-all.sln b/Projects/Win32/VC7/xerces-all/xerces-all.sln
index 2e47110aae0b64ef88edc93677eafc6ba07eae65..5aaf44b7896d95552f6121e86f9b185fa0ef4cec 100644
--- a/Projects/Win32/VC7/xerces-all/xerces-all.sln
+++ b/Projects/Win32/VC7/xerces-all/xerces-all.sln
@@ -53,38 +53,40 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XercesLib", "XercesLib\Xerc
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xml4com", "xerces-com\xerces-com.vcproj", "{9488FCC8-E44D-468C-B805-85001457ECFB}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XSerializerTest", "XSerializerTest\XSerializerTest.vcproj", "{4D8FEA60-A74F-4267-852F-C421AF12198D}"
+EndProject
 Global
 	GlobalSection(SolutionConfiguration) = preSolution
 		ConfigName.0 = Debug
 		ConfigName.1 = Release
 	EndGlobalSection
 	GlobalSection(ProjectDependencies) = postSolution
-		{E305E46C-9D74-4755-BF57-29DEAEF4DCDD}.0 = {152CE948-F659-4206-A50A-1D2B9658EF96}
-		{E305E46C-9D74-4755-BF57-29DEAEF4DCDD}.1 = {792C0625-DE93-4756-AAFA-23CCED2157B0}
-		{E305E46C-9D74-4755-BF57-29DEAEF4DCDD}.2 = {D2D5D167-5DBC-4B68-9AF0-B7A9EBE86284}
-		{E305E46C-9D74-4755-BF57-29DEAEF4DCDD}.3 = {9488FCC8-E44D-468C-B805-85001457ECFB}
-		{E305E46C-9D74-4755-BF57-29DEAEF4DCDD}.4 = {160AC448-AD35-4FA9-8C4D-FF46A0E5BE5D}
-		{E305E46C-9D74-4755-BF57-29DEAEF4DCDD}.5 = {69220042-712E-41B5-A658-4CCF9D5B5FDF}
-		{E305E46C-9D74-4755-BF57-29DEAEF4DCDD}.6 = {8709DC2A-0EC9-4B67-9E98-95D5174B2C3F}
-		{E305E46C-9D74-4755-BF57-29DEAEF4DCDD}.7 = {57E8C0FF-3B2D-4322-A64D-5DE7893A667C}
-		{E305E46C-9D74-4755-BF57-29DEAEF4DCDD}.8 = {60E3008A-0D78-4B25-A12E-9D7A3921F67C}
-		{E305E46C-9D74-4755-BF57-29DEAEF4DCDD}.9 = {0D9CB6CF-DB0B-495D-B674-8FC3DD3C12C2}
-		{E305E46C-9D74-4755-BF57-29DEAEF4DCDD}.10 = {056463A8-AEDD-4B92-BC24-C0C154C0379C}
-		{E305E46C-9D74-4755-BF57-29DEAEF4DCDD}.11 = {69220042-712E-41B5-A658-4CCF9D5B5FDF}
-		{E305E46C-9D74-4755-BF57-29DEAEF4DCDD}.12 = {DFC196B9-2146-4CDA-AC0A-632BD38FA41D}
-		{E305E46C-9D74-4755-BF57-29DEAEF4DCDD}.13 = {15A10DF2-F551-4306-A4CC-690F58C58081}
-		{E305E46C-9D74-4755-BF57-29DEAEF4DCDD}.14 = {B8B50FE7-B620-4D19-A147-B167D087DD53}
-		{E305E46C-9D74-4755-BF57-29DEAEF4DCDD}.15 = {26A4FA00-DB6E-43FA-83D4-0FC3A5472A27}
-		{E305E46C-9D74-4755-BF57-29DEAEF4DCDD}.16 = {2682B2AB-E341-4528-85AB-BE95DE77A9BC}
-		{E305E46C-9D74-4755-BF57-29DEAEF4DCDD}.17 = {6F412978-851F-494D-8C3D-DF97A515EDF5}
-		{E305E46C-9D74-4755-BF57-29DEAEF4DCDD}.18 = {65BE6CCA-6F7F-4DB9-A6FD-C220E9FE87AD}
-		{E305E46C-9D74-4755-BF57-29DEAEF4DCDD}.19 = {BBD46C34-DEA0-42AB-96AB-E87C6371A6C2}
-		{E305E46C-9D74-4755-BF57-29DEAEF4DCDD}.20 = {569D5A1E-C582-40B7-8BFC-FC7B5D4DDA75}
-		{E305E46C-9D74-4755-BF57-29DEAEF4DCDD}.21 = {FB794093-CA26-4DBF-A7DF-1A62B7C872D5}
-		{E305E46C-9D74-4755-BF57-29DEAEF4DCDD}.22 = {7259B5D2-54FE-4142-9321-0572C615F0A2}
-		{E305E46C-9D74-4755-BF57-29DEAEF4DCDD}.23 = {2AB767A9-6A3B-4993-8FDB-3E6A30560739}
-		{E305E46C-9D74-4755-BF57-29DEAEF4DCDD}.24 = {959445AC-9081-4590-B457-C96164CF4BFA}
-		{E305E46C-9D74-4755-BF57-29DEAEF4DCDD}.25 = {2230D938-8908-4C12-9E96-9C6C4048A52D}
+		{E305E46C-9D74-4755-BF57-29DEAEF4DCDD}.0 = {2230D938-8908-4C12-9E96-9C6C4048A52D}
+		{E305E46C-9D74-4755-BF57-29DEAEF4DCDD}.1 = {959445AC-9081-4590-B457-C96164CF4BFA}
+		{E305E46C-9D74-4755-BF57-29DEAEF4DCDD}.2 = {2AB767A9-6A3B-4993-8FDB-3E6A30560739}
+		{E305E46C-9D74-4755-BF57-29DEAEF4DCDD}.3 = {7259B5D2-54FE-4142-9321-0572C615F0A2}
+		{E305E46C-9D74-4755-BF57-29DEAEF4DCDD}.4 = {FB794093-CA26-4DBF-A7DF-1A62B7C872D5}
+		{E305E46C-9D74-4755-BF57-29DEAEF4DCDD}.5 = {569D5A1E-C582-40B7-8BFC-FC7B5D4DDA75}
+		{E305E46C-9D74-4755-BF57-29DEAEF4DCDD}.6 = {BBD46C34-DEA0-42AB-96AB-E87C6371A6C2}
+		{E305E46C-9D74-4755-BF57-29DEAEF4DCDD}.7 = {65BE6CCA-6F7F-4DB9-A6FD-C220E9FE87AD}
+		{E305E46C-9D74-4755-BF57-29DEAEF4DCDD}.8 = {6F412978-851F-494D-8C3D-DF97A515EDF5}
+		{E305E46C-9D74-4755-BF57-29DEAEF4DCDD}.9 = {2682B2AB-E341-4528-85AB-BE95DE77A9BC}
+		{E305E46C-9D74-4755-BF57-29DEAEF4DCDD}.10 = {26A4FA00-DB6E-43FA-83D4-0FC3A5472A27}
+		{E305E46C-9D74-4755-BF57-29DEAEF4DCDD}.11 = {B8B50FE7-B620-4D19-A147-B167D087DD53}
+		{E305E46C-9D74-4755-BF57-29DEAEF4DCDD}.12 = {15A10DF2-F551-4306-A4CC-690F58C58081}
+		{E305E46C-9D74-4755-BF57-29DEAEF4DCDD}.13 = {DFC196B9-2146-4CDA-AC0A-632BD38FA41D}
+		{E305E46C-9D74-4755-BF57-29DEAEF4DCDD}.14 = {69220042-712E-41B5-A658-4CCF9D5B5FDF}
+		{E305E46C-9D74-4755-BF57-29DEAEF4DCDD}.15 = {056463A8-AEDD-4B92-BC24-C0C154C0379C}
+		{E305E46C-9D74-4755-BF57-29DEAEF4DCDD}.16 = {0D9CB6CF-DB0B-495D-B674-8FC3DD3C12C2}
+		{E305E46C-9D74-4755-BF57-29DEAEF4DCDD}.17 = {60E3008A-0D78-4B25-A12E-9D7A3921F67C}
+		{E305E46C-9D74-4755-BF57-29DEAEF4DCDD}.18 = {57E8C0FF-3B2D-4322-A64D-5DE7893A667C}
+		{E305E46C-9D74-4755-BF57-29DEAEF4DCDD}.19 = {8709DC2A-0EC9-4B67-9E98-95D5174B2C3F}
+		{E305E46C-9D74-4755-BF57-29DEAEF4DCDD}.20 = {69220042-712E-41B5-A658-4CCF9D5B5FDF}
+		{E305E46C-9D74-4755-BF57-29DEAEF4DCDD}.21 = {160AC448-AD35-4FA9-8C4D-FF46A0E5BE5D}
+		{E305E46C-9D74-4755-BF57-29DEAEF4DCDD}.22 = {9488FCC8-E44D-468C-B805-85001457ECFB}
+		{E305E46C-9D74-4755-BF57-29DEAEF4DCDD}.23 = {D2D5D167-5DBC-4B68-9AF0-B7A9EBE86284}
+		{E305E46C-9D74-4755-BF57-29DEAEF4DCDD}.24 = {792C0625-DE93-4756-AAFA-23CCED2157B0}
+		{E305E46C-9D74-4755-BF57-29DEAEF4DCDD}.25 = {152CE948-F659-4206-A50A-1D2B9658EF96}
 		{8709DC2A-0EC9-4B67-9E98-95D5174B2C3F}.0 = {152CE948-F659-4206-A50A-1D2B9658EF96}
 		{60E3008A-0D78-4B25-A12E-9D7A3921F67C}.0 = {152CE948-F659-4206-A50A-1D2B9658EF96}
 		{0D9CB6CF-DB0B-495D-B674-8FC3DD3C12C2}.0 = {152CE948-F659-4206-A50A-1D2B9658EF96}
@@ -219,6 +221,10 @@ Global
 		{9488FCC8-E44D-468C-B805-85001457ECFB}.Debug.Build.0 = Debug|Win32
 		{9488FCC8-E44D-468C-B805-85001457ECFB}.Release.ActiveCfg = Release|Win32
 		{9488FCC8-E44D-468C-B805-85001457ECFB}.Release.Build.0 = Release|Win32
+		{4D8FEA60-A74F-4267-852F-C421AF12198D}.Debug.ActiveCfg = Debug|Win32
+		{4D8FEA60-A74F-4267-852F-C421AF12198D}.Debug.Build.0 = Debug|Win32
+		{4D8FEA60-A74F-4267-852F-C421AF12198D}.Release.ActiveCfg = Release|Win32
+		{4D8FEA60-A74F-4267-852F-C421AF12198D}.Release.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 	EndGlobalSection
diff --git a/tests/Makefile.in b/tests/Makefile.in
index fa07efde8b13223a79d17717fd1cde27785b1547..7fd993e5c04cc8a342bce00a0ecd148fdc792d23 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -67,6 +67,7 @@ MemHandlerTest_DIR=MemHandlerTest
 EncodingTest_DIR=EncodingTest
 DOMRange_DIR=DOM/RangeTest
 InitTermTest_DIR=InitTermTest
+XSerializerTest_DIR=XSerializerTest
 
 LIB_DIR=${XERCESCROOT}/lib
 
@@ -83,12 +84,12 @@ BITSTOBUILD = @bitstobuild@
 
 ifeq (${PLATFORM},HPUX)
   ifeq (${OSVER}, HPUX10)
-      all::	bindir threadtest memhandlertest encodingtest traversal
+      all::	bindir threadtest memhandlertest encodingtest traversal xserializertest
   else
-      all::	bindir dommemtest deprecateddomcount domtest domtypeinfo threadtest encodingtest traversal rangetest inittermtest memhandlertest  
+      all::	bindir dommemtest deprecateddomcount domtest domtypeinfo threadtest encodingtest traversal rangetest inittermtest memhandlertest xserializertest
   endif
 else
-    all::	bindir dommemtest deprecateddomcount domtest domtypeinfo encodingtest traversal rangetest inittermtest memhandlertest 
+    all::	bindir dommemtest deprecateddomcount domtest domtypeinfo encodingtest traversal rangetest inittermtest memhandlertest xserializertest
   ifneq (${THREADS},none)
     all::	threadtest
   endif
@@ -138,6 +139,10 @@ inittermtest::
 	@echo Building "InitTermTest"
 	${MAKE} -C $(InitTermTest_DIR) $(MAKE_FLAGS)
 
+xserializertest::
+	@echo Building "XSerializerTest"
+	${MAKE} -C $(XSerializerTest_DIR) $(MAKE_FLAGS)
+	
 clean::
 	${MAKE} -C $(DOMMemTest_DIR) $@
 	${MAKE} -C $(DeprecatedDOMCount_DIR) $@
@@ -149,6 +154,7 @@ clean::
 	${MAKE} -C $(Traversal_DIR) $@
 	${MAKE} -C $(DOMRange_DIR) $@
 	${MAKE} -C $(InitTermTest_DIR) $@
+	${MAKE} -C $(XSerializerTest_DIR) $@
 
 distclean::
 	${MAKE} -C $(DOMMemTest_DIR) $@
@@ -161,6 +167,7 @@ distclean::
 	${MAKE} -C $(Traversal_DIR) $@
 	${MAKE} -C $(DOMRange_DIR) $@
 	${MAKE} -C $(InitTermTest_DIR) $@
+	${MAKE} -C $(XSerializerTest_DIR) $@
 	rm -f Makefile config.cache config.log config.status
 	rm -f *~ core
 
diff --git a/tests/XSerializerTest/Makefile.in b/tests/XSerializerTest/Makefile.in
new file mode 100644
index 0000000000000000000000000000000000000000..051706b3e97831bef31812f420e840648abc9e65
--- /dev/null
+++ b/tests/XSerializerTest/Makefile.in
@@ -0,0 +1,121 @@
+#
+# The Apache Software License, Version 1.1
+#
+# Copyright (c) 1999-2000 The Apache Software Foundation.  All rights
+# reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in
+#    the documentation and/or other materials provided with the
+#    distribution.
+#
+# 3. The end-user documentation included with the redistribution,
+#    if any, must include the following acknowledgment:
+#       "This product includes software developed by the
+#        Apache Software Foundation (http://www.apache.org/)."
+#    Alternately, this acknowledgment may appear in the software itself,
+#    if and wherever such third-party acknowledgments normally appear.
+#
+# 4. The names "Xerces" and "Apache Software Foundation" must
+#    not be used to endorse or promote products derived from this
+#    software without prior written permission. For written
+#    permission, please contact apache\@apache.org.
+#
+# 5. Products derived from this software may not be called "Apache",
+#    nor may "Apache" appear in their name, without prior written
+#    permission of the Apache Software Foundation.
+#
+# THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+# ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+# USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+# ====================================================================
+#
+# This software consists of voluntary contributions made by many
+# individuals on behalf of the Apache Software Foundation, and was
+# originally based on software copyright (c) 1999, International
+# Business Machines, Inc., http://www.ibm.com .  For more information
+# on the Apache Software Foundation, please see
+# <http://www.apache.org/>.
+#
+#
+# $Id$
+#
+
+###################################################################
+#                    IMPORTANT NOTE                               #
+###################################################################
+# If you are going to do the OS390BATCH build, make sure you have #
+# the OS390BATCH environment variable set.                        #
+#                                                                 #
+#   export OS390BATCH=1                                           #
+#                                                                 #
+###################################################################
+
+PLATFORM = @platform@
+COMPILER = @compiler@
+GCC = @GCC@
+GXX = @GXX@
+CXXFLAGS = @cxxflags@
+CFLAGS = @cflags@
+LDFLAGS = @ldflags@
+PREFIX = @prefix@
+THREADS = @threads@
+EXTRA_LIBS = @extra_libs@
+
+include ../../version.incl
+include ../Makefile.incl
+
+APP_NAME=XSerializerTest
+APP_DIR=XSerializerTest
+
+OUTDIR= ${XERCESCROOT}/tests/${APP_DIR}
+EXEC=	${XERCESCROOT}/bin
+OBJS=	${OUTDIR}/XSerializerTest.o ${OUTDIR}/SAXCountHandlers.o
+SRC=	${XERCESCROOT}/tests/${APP_DIR}
+EXTSRC= ${XERCESCROOT}/samples/SAXCount
+HEADER_FILES= ${SRC}/XSerializerTest.hpp ${EXTSRC}/SAXCountHandlers.hpp
+
+## OS390BATCH
+ifeq (${OS390BATCH},1)
+BATCH_TARGET= "//'${LOADMOD}(THREDTST)'"
+all:: makedir ${BATCH_TARGET}
+else
+all:: makedir ${EXEC}/${APP_NAME}
+endif
+
+makedir::
+	-mkdir -p $(OUTDIR)
+
+${EXEC}/${APP_NAME}:: ${OBJS}
+	${LINK} ${PLATFORM_LIB_LINK_OPTIONS} ${OBJS} -o $@ ${LIBRARY_SEARCH_PATHS} ${LIBRARY_NAMES} ${EXTRA_LINK_OPTIONS} ${LIBS}
+
+${BATCH_TARGET}:: ${OBJS}
+	${LINK} ${PLATFORM_LIB_LINK_OPTIONS} ${OBJS} -o $@ ${LIBRARY_SEARCH_PATHS} ${LIBRARY_NAMES} ${EXTRA_LINK_OPTIONS}
+
+$(OUTDIR)/XSerializerTest.o:: ${SRC}/XSerializerTest.cpp ${HEADER_FILES}
+	${CC} ${INCLUDES} ${CMP} -o $(OUTDIR)/XSerializerTest.o ${SRC}/XSerializerTest.cpp
+
+$(OUTDIR)/SAXCountHandlers.o:: ${EXTSRC}/SAXCountHandlers.cpp ${HEADER_FILES}
+	${CC} ${INCLUDES} ${CMP} -o $(OUTDIR)/SAXCountHandlers.o ${SRC}/SAXCountHandlers.cpp
+
+clean::
+	rm -f ${OBJS} ${EXEC}/${APP_NAME}
+
+distclean::	clean
+	rm -f Makefile