fixes for 1.3.3 (see sf bugtracker)

2025-11-02 03:27:56 +00:00 · 2008-09-16 19:04:32 +00:00
parent e80b27bbca
commit 66ef5ab958
215 changed files with 65142 additions and 38656 deletions
--- a/CppUnit/.cdtproject
+++ b/CppUnit/.cdtproject
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse-cdt version="2.0"?>
+
+<cdtproject id="org.eclipse.cdt.make.core.make">
+<extension id="org.eclipse.cdt.core.PE" point="org.eclipse.cdt.core.BinaryParser"/>
+<data>
+<item id="scannerConfiguration">
+<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"/>
+<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
+<buildOutputProvider>
+<openAction enabled="false" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="makefileGenerator">
+<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
+<parser enabled="false"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="false" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="false"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="false" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="false"/>
+</scannerInfoProvider>
+</profile>
+</item>
+<item id="org.eclipse.cdt.core.pathentry">
+<pathentry kind="src" path=""/>
+<pathentry kind="out" path=""/>
+<pathentry kind="con" path="org.eclipse.cdt.make.core.DISCOVERED_SCANNER_INFO"/>
+</item>
+</data>
+</cdtproject>
--- a/CppUnit/.project
+++ b/CppUnit/.project
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>CppUnit</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.cdt.make.core.makeBuilder</name>
+			<triggers>clean,full,incremental,</triggers>
+			<arguments>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.build.arguments</key>
+					<value></value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.core.errorOutputParser</key>
+					<value>org.eclipse.cdt.core.MakeErrorParser;org.eclipse.cdt.core.GCCErrorParser;org.eclipse.cdt.core.GASErrorParser;org.eclipse.cdt.core.GLDErrorParser;org.eclipse.cdt.core.VCErrorParser;</value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.enableAutoBuild</key>
+					<value>false</value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.environment</key>
+					<value></value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.enableFullBuild</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.build.target.inc</key>
+					<value></value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.enabledIncrementalBuild</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.build.location</key>
+					<value></value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.build.target.clean</key>
+					<value>clean</value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.build.command</key>
+					<value>make</value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.enableCleanBuild</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.append_environment</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.useDefaultBuildCmd</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.build.target.auto</key>
+					<value>all</value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.stopOnError</key>
+					<value>true</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.cdt.make.core.ScannerConfigBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.cdt.core.cnature</nature>
+		<nature>org.eclipse.cdt.make.core.makeNature</nature>
+		<nature>org.eclipse.cdt.make.core.ScannerConfigNature</nature>
+		<nature>org.eclipse.cdt.core.ccnature</nature>
+	</natures>
+</projectDescription>
--- a/CppUnit/CppUnit_vs90.sln
+++ b/CppUnit/CppUnit_vs90.sln
@@ -0,0 +1,38 @@
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual Studio 2008
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CppUnit", "CppUnit_vs90.vcproj", "{138BB448-808A-4FE5-A66D-78D1F8770F59}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinTestRunner", "WinTestRunner\WinTestRunner_vs90.vcproj", "{BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}"
+	ProjectSection(ProjectDependencies) = postProject
+		{138BB448-808A-4FE5-A66D-78D1F8770F59} = {138BB448-808A-4FE5-A66D-78D1F8770F59}
+	EndProjectSection
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		debug_shared|Win32 = debug_shared|Win32
+		debug_static|Win32 = debug_static|Win32
+		release_shared|Win32 = release_shared|Win32
+		release_static|Win32 = release_static|Win32
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_shared|Win32.ActiveCfg = debug_shared|Win32
+		{138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_shared|Win32.Build.0 = debug_shared|Win32
+		{138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static|Win32.ActiveCfg = debug_static|Win32
+		{138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static|Win32.Build.0 = debug_static|Win32
+		{138BB448-808A-4FE5-A66D-78D1F8770F59}.release_shared|Win32.ActiveCfg = release_shared|Win32
+		{138BB448-808A-4FE5-A66D-78D1F8770F59}.release_shared|Win32.Build.0 = release_shared|Win32
+		{138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static|Win32.ActiveCfg = release_static|Win32
+		{138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static|Win32.Build.0 = release_static|Win32
+		{BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.debug_shared|Win32.ActiveCfg = debug_shared|Win32
+		{BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.debug_shared|Win32.Build.0 = debug_shared|Win32
+		{BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.debug_static|Win32.ActiveCfg = debug_static|Win32
+		{BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.debug_static|Win32.Build.0 = debug_static|Win32
+		{BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.release_shared|Win32.ActiveCfg = release_shared|Win32
+		{BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.release_shared|Win32.Build.0 = release_shared|Win32
+		{BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.release_static|Win32.ActiveCfg = release_static|Win32
+		{BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.release_static|Win32.Build.0 = release_static|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
--- a/CppUnit/CppUnit_vs90.vcproj
+++ b/CppUnit/CppUnit_vs90.vcproj
@@ -0,0 +1,540 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="CppUnit"
+	ProjectGUID="{138BB448-808A-4FE5-A66D-78D1F8770F59}"
+	Keyword="MFCProj"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="debug_shared|Win32"
+			OutputDirectory=".\obj\debug_shared"
+			IntermediateDirectory=".\obj\debug_shared"
+			ConfigurationType="2"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			UseOfMFC="2"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="_DEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName=".\lib/CppUnit.tlb"
+				HeaderFileName=""
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				InlineFunctionExpansion="0"
+				EnableIntrinsicFunctions="false"
+				AdditionalIncludeDirectories="include"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;CppUnit_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
+				StringPooling="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				BufferSecurityCheck="true"
+				TreatWChar_tAsBuiltInType="true"
+				ForceConformanceInForLoopScope="true"
+				RuntimeTypeInfo="true"
+				PrecompiledHeaderFile=""
+				AssemblerListingLocation=""
+				ObjectFile="$(IntDir)/"
+				ProgramDataBaseFileName="$(IntDir)/vc80.pdb"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="4"
+				CompileAs="0"
+				ShowIncludes="false"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="3079"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				ShowProgress="0"
+				OutputFile="..\bin\CppUnitd.dll"
+				LinkIncremental="2"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories=""
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="..\bin\CppUnitd.pdb"
+				ImportLibrary="..\lib\CppUnitd.lib"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="release_shared|Win32"
+			OutputDirectory=".\obj\release_shared"
+			IntermediateDirectory=".\obj\release_shared"
+			ConfigurationType="2"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName=".\lib/CppUnit.tlb"
+				HeaderFileName=""
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="4"
+				InlineFunctionExpansion="1"
+				EnableIntrinsicFunctions="true"
+				FavorSizeOrSpeed="1"
+				OmitFramePointers="true"
+				AdditionalIncludeDirectories="include"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_AFXDLL;POCO_DLL;CppUnit_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
+				StringPooling="true"
+				RuntimeLibrary="2"
+				BufferSecurityCheck="false"
+				TreatWChar_tAsBuiltInType="true"
+				ForceConformanceInForLoopScope="true"
+				RuntimeTypeInfo="true"
+				PrecompiledHeaderFile=""
+				AssemblerListingLocation=""
+				ObjectFile="$(IntDir)/"
+				ProgramDataBaseFileName="$(IntDir)/vc70.pdb"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+				Detect64BitPortabilityProblems="false"
+				CompileAs="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="3079"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="..\bin\CppUnit.dll"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories=""
+				ProgramDatabaseFile=""
+				ImportLibrary="..\lib\CppUnit.lib"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="debug_static|Win32"
+			OutputDirectory=".\obj\debug_static"
+			IntermediateDirectory=".\obj\debug_static"
+			ConfigurationType="4"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			UseOfMFC="2"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="_DEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName=".\lib/CppUnit.tlb"
+				HeaderFileName=""
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				InlineFunctionExpansion="0"
+				EnableIntrinsicFunctions="false"
+				AdditionalIncludeDirectories="include"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE"
+				StringPooling="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				BufferSecurityCheck="true"
+				TreatWChar_tAsBuiltInType="true"
+				ForceConformanceInForLoopScope="true"
+				RuntimeTypeInfo="true"
+				PrecompiledHeaderFile=""
+				AssemblerListingLocation=""
+				ObjectFile="$(IntDir)/"
+				ProgramDataBaseFileName="$(IntDir)/vc80.pdb"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="4"
+				CompileAs="0"
+				ShowIncludes="false"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="3079"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="..\lib\CppUnitmtd.lib"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="release_static|Win32"
+			OutputDirectory=".\obj\release_static"
+			IntermediateDirectory=".\obj\release_static"
+			ConfigurationType="4"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName=".\lib/CppUnit.tlb"
+				HeaderFileName=""
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="4"
+				InlineFunctionExpansion="1"
+				EnableIntrinsicFunctions="true"
+				FavorSizeOrSpeed="1"
+				OmitFramePointers="true"
+				AdditionalIncludeDirectories="include"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_AFXDLL;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE"
+				StringPooling="true"
+				RuntimeLibrary="2"
+				BufferSecurityCheck="false"
+				TreatWChar_tAsBuiltInType="true"
+				ForceConformanceInForLoopScope="true"
+				RuntimeTypeInfo="true"
+				PrecompiledHeaderFile=""
+				AssemblerListingLocation=""
+				ObjectFile="$(IntDir)/"
+				ProgramDataBaseFileName="$(IntDir)/vc70.pdb"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+				Detect64BitPortabilityProblems="false"
+				CompileAs="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="3079"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="..\lib\CppUnitmt.lib"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+			>
+			<File
+				RelativePath=".\src\CppUnitException.cpp"
+				>
+				<FileConfiguration
+					Name="debug_shared|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)/$(InputName)1.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="release_shared|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)/$(InputName)1.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="debug_static|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)/$(InputName)1.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="release_static|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)/$(InputName)1.obj"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="src\TestCase.cpp"
+				>
+			</File>
+			<File
+				RelativePath="src\TestDecorator.cpp"
+				>
+			</File>
+			<File
+				RelativePath="src\TestFailure.cpp"
+				>
+			</File>
+			<File
+				RelativePath="src\TestResult.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\src\TestRunner.cpp"
+				>
+			</File>
+			<File
+				RelativePath="src\TestSuite.cpp"
+				>
+			</File>
+			<File
+				RelativePath="src\TextTestResult.cpp"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Include Files"
+			Filter="*.h"
+			>
+			<File
+				RelativePath=".\include\CppUnit\CppUnit.h"
+				>
+			</File>
+			<File
+				RelativePath=".\include\CppUnit\CppUnitException.h"
+				>
+			</File>
+			<File
+				RelativePath=".\include\CppUnit\estring.h"
+				>
+			</File>
+			<File
+				RelativePath=".\include\CppUnit\Guards.h"
+				>
+			</File>
+			<File
+				RelativePath=".\include\CppUnit\Orthodox.h"
+				>
+			</File>
+			<File
+				RelativePath=".\include\CppUnit\RepeatedTest.h"
+				>
+			</File>
+			<File
+				RelativePath=".\include\CppUnit\Test.h"
+				>
+			</File>
+			<File
+				RelativePath=".\include\CppUnit\TestCaller.h"
+				>
+			</File>
+			<File
+				RelativePath=".\include\CppUnit\TestCase.h"
+				>
+			</File>
+			<File
+				RelativePath=".\include\CppUnit\TestDecorator.h"
+				>
+			</File>
+			<File
+				RelativePath=".\include\CppUnit\TestFailure.h"
+				>
+			</File>
+			<File
+				RelativePath=".\include\CppUnit\TestResult.h"
+				>
+			</File>
+			<File
+				RelativePath=".\include\CppUnit\TestRunner.h"
+				>
+			</File>
+			<File
+				RelativePath=".\include\CppUnit\TestSetup.h"
+				>
+			</File>
+			<File
+				RelativePath=".\include\CppUnit\TestSuite.h"
+				>
+			</File>
+			<File
+				RelativePath=".\include\CppUnit\TextTestResult.h"
+				>
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
--- a/CppUnit/WinTestRunner/WinTestRunner_vs90.vcproj
+++ b/CppUnit/WinTestRunner/WinTestRunner_vs90.vcproj
@@ -0,0 +1,472 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="WinTestRunner"
+	ProjectGUID="{BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}"
+	Keyword="MFCProj"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="release_shared|Win32"
+			OutputDirectory=".\obj\release_shared"
+			IntermediateDirectory=".\obj\release_shared"
+			ConfigurationType="2"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			UseOfMFC="2"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName=".\lib\wintestrunner.tlb"
+				HeaderFileName=""
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="4"
+				InlineFunctionExpansion="1"
+				EnableIntrinsicFunctions="true"
+				FavorSizeOrSpeed="1"
+				OmitFramePointers="true"
+				AdditionalIncludeDirectories="include;..\include"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WinTestRunner_EXPORTS;WINVER=0x0500;_CRT_SECURE_NO_DEPRECATE"
+				RuntimeLibrary="2"
+				BufferSecurityCheck="false"
+				TreatWChar_tAsBuiltInType="true"
+				ForceConformanceInForLoopScope="true"
+				RuntimeTypeInfo="true"
+				PrecompiledHeaderFile=""
+				AssemblerListingLocation=""
+				ObjectFile="$(IntDir)\"
+				ProgramDataBaseFileName="$(IntDir)/vc70.pdb"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+				Detect64BitPortabilityProblems="false"
+				CompileAs="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="3079"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="cppunit.lib winmm.lib"
+				OutputFile="..\..\bin\WinTestRunner.dll"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories="..\..\lib"
+				ProgramDatabaseFile=""
+				SubSystem="2"
+				ImportLibrary="..\..\lib\WinTestRunner.lib"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="debug_shared|Win32"
+			OutputDirectory=".\obj\debug_shared"
+			IntermediateDirectory=".\obj\debug_shared"
+			ConfigurationType="2"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			UseOfMFC="2"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="_DEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName=".\lib\wintestrunner.tlb"
+				HeaderFileName=""
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				InlineFunctionExpansion="0"
+				EnableIntrinsicFunctions="false"
+				AdditionalIncludeDirectories="include;..\include"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;WinTestRunner_EXPORTS;WINVER=0x0500;_CRT_SECURE_NO_DEPRECATE"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				BufferSecurityCheck="true"
+				TreatWChar_tAsBuiltInType="true"
+				ForceConformanceInForLoopScope="true"
+				RuntimeTypeInfo="true"
+				PrecompiledHeaderFile=""
+				AssemblerListingLocation=""
+				ObjectFile="$(IntDir)\"
+				ProgramDataBaseFileName="$(IntDir)\vc70.pdb"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="4"
+				CompileAs="0"
+				ShowIncludes="false"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="3079"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="cppunitd.lib winmm.lib"
+				ShowProgress="0"
+				OutputFile="..\..\bin\WinTestRunnerd.dll"
+				LinkIncremental="2"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories="..\..\lib"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="..\..\bin\WinTestRunnerd.pdb"
+				SubSystem="2"
+				ImportLibrary="..\..\lib\WinTestRunnerd.lib"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="debug_static|Win32"
+			OutputDirectory=".\obj\debug_static"
+			IntermediateDirectory=".\obj\debug_static"
+			ConfigurationType="4"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			UseOfMFC="2"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="_DEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName=".\lib\wintestrunner.tlb"
+				HeaderFileName=""
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				InlineFunctionExpansion="0"
+				EnableIntrinsicFunctions="false"
+				AdditionalIncludeDirectories="include;..\include"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;POCO_STATIC;WINVER=0x0500;_CRT_SECURE_NO_DEPRECATE"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				BufferSecurityCheck="true"
+				TreatWChar_tAsBuiltInType="true"
+				ForceConformanceInForLoopScope="true"
+				RuntimeTypeInfo="true"
+				PrecompiledHeaderFile=""
+				AssemblerListingLocation=""
+				ObjectFile="$(IntDir)\"
+				ProgramDataBaseFileName="$(IntDir)\vc70.pdb"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="4"
+				CompileAs="0"
+				ShowIncludes="false"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="3079"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="..\..\lib\WinTestRunnermtd.lib"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="release_static|Win32"
+			OutputDirectory=".\obj\release_static"
+			IntermediateDirectory=".\obj\release_static"
+			ConfigurationType="4"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			UseOfMFC="2"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName=".\lib\wintestrunner.tlb"
+				HeaderFileName=""
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="4"
+				InlineFunctionExpansion="1"
+				EnableIntrinsicFunctions="true"
+				FavorSizeOrSpeed="1"
+				OmitFramePointers="true"
+				AdditionalIncludeDirectories="include;..\include"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;POCO_STATIC;WINVER=0x0500;_CRT_SECURE_NO_DEPRECATE"
+				RuntimeLibrary="2"
+				BufferSecurityCheck="false"
+				TreatWChar_tAsBuiltInType="true"
+				ForceConformanceInForLoopScope="true"
+				RuntimeTypeInfo="true"
+				PrecompiledHeaderFile=""
+				AssemblerListingLocation=""
+				ObjectFile="$(IntDir)\"
+				ProgramDataBaseFileName="$(IntDir)/vc70.pdb"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+				Detect64BitPortabilityProblems="false"
+				CompileAs="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="3079"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="..\..\lib\WinTestRunnermt.lib"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+			>
+			<File
+				RelativePath="src\ActiveTest.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\src\DLLMain.cpp"
+				>
+			</File>
+			<File
+				RelativePath="src\GUITestResult.cpp"
+				>
+			</File>
+			<File
+				RelativePath="src\ProgressBar.cpp"
+				>
+			</File>
+			<File
+				RelativePath="src\TestRunnerDlg.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\src\WinTestRunner.cpp"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Include Files"
+			Filter="*.h"
+			>
+			<File
+				RelativePath=".\src\ActiveTest.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\GUITestResult.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\ProgressBar.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\TestRunnerDlg.h"
+				>
+			</File>
+			<File
+				RelativePath=".\include\WinTestRunner\WinTestRunner.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			>
+			<File
+				RelativePath=".\res\Resource.h"
+				>
+			</File>
+			<File
+				RelativePath=".\res\WinTestRunner.rc"
+				>
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+		<Global
+			Name="RESOURCE_FILE"
+			Value="TestRunner.rc"
+		/>
+	</Globals>
+</VisualStudioProject>
--- a/CppUnit/WinTestRunner/res/TestRunner.rc2
+++ b/CppUnit/WinTestRunner/res/TestRunner.rc2
@@ -0,0 +1,13 @@
+//
+// TESTRUNNER.RC2 - resources Microsoft Visual C++ does not edit directly
+//
+
+#ifdef APSTUDIO_INVOKED
+	#error this file is not editable by Microsoft Visual C++
+#endif //APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+// Add manually edited resources here...
+
+/////////////////////////////////////////////////////////////////////////////
--- a/Data/MySQL/Makefile
+++ b/Data/MySQL/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile
 #
-# $Id: //poco/1.3/Data/MySQL/Makefile#3 $
+# $Id: //poco/1.3/Data/MySQL/Makefile#1 $
 #
 # Makefile for Poco MySQL
 #
--- a/Data/MySQL/include/Poco/Data/MySQL/Binder.h
+++ b/Data/MySQL/include/Poco/Data/MySQL/Binder.h
@@ -39,12 +39,14 @@
 #ifndef Data_MySQL_Binder_INCLUDED
 #define Data_MySQL_Binder_INCLUDED

+
 #include "Poco/Data/MySQL/MySQL.h"
 #include "Poco/Data/AbstractBinder.h"
 #include "Poco/Data/BLOB.h"
 #include "Poco/Data/MySQL/MySQLException.h"
 #include <mysql.h>

+
 namespace Poco {
 namespace Data {
 namespace MySQL {
@@ -54,7 +56,6 @@ class MySQL_API Binder: public Poco::Data::AbstractBinder
 	/// Binds placeholders in the sql query to the provided values. Performs data types mapping.
 {
 public:
-
 	Binder();
 		/// Creates the Binder.
 		
@@ -110,7 +111,6 @@ public:
 		/// Return array

 private:
-
 	virtual void bind(std::size_t, const char* const&)
 		/// Binds a const char ptr. 
 		/// This is a private no-op in this implementation
@@ -122,7 +122,6 @@ private:
 		/// Common bind implementation

 private:
-
 	std::vector<MYSQL_BIND> _bindArray;
 };

--- a/Data/MySQL/include/Poco/Data/MySQL/Connector.h
+++ b/Data/MySQL/include/Poco/Data/MySQL/Connector.h
@@ -39,18 +39,20 @@
 #ifndef Data_MySQL_Connector_INCLUDED
 #define Data_MySQL_Connector_INCLUDED

+
 #include "MySQL.h"
 #include "Poco/Data/Connector.h"

+
 namespace Poco {
 namespace Data {
 namespace MySQL {

+
 class MySQL_API Connector: public Poco::Data::Connector
 	/// Connector instantiates MySQL SessionImpl objects.
 {
 public:
-
 	static std::string KEY;

 	Connector();
@@ -63,10 +65,10 @@ public:
 		/// Creates a MySQL SessionImpl object and initializes it with the given connectionString.
 		
 	static void registerConnector();
-		/// Registers the Connector under the Keyword Connector::KEY at the Poco::Data::SessionFactory
+		/// Registers the Connector under the Keyword Connector::KEY at the Poco::Data::SessionFactory.
 		
 	static void unregisterConnector();
-		/// Unregisters the Connector under the Keyword Connector::KEY at the Poco::Data::SessionFactory
+		/// Unregisters the Connector under the Keyword Connector::KEY at the Poco::Data::SessionFactory.
 };


--- a/Data/MySQL/include/Poco/Data/MySQL/Extractor.h
+++ b/Data/MySQL/include/Poco/Data/MySQL/Extractor.h
@@ -106,18 +106,17 @@ public:
 		/// Extracts a BLOB.

 private:
-
 	bool realExtractFixed(std::size_t pos, enum_field_types type, void* buffer, size_t length = 0);

 	// Prevent VC8 warning "operator= could not be generated"
 	Extractor& operator=(const Extractor&);

 private:
-
 	StatementExecutor& _stmt;
 	ResultMetadata& _metadata;
 };

+
 } } } // namespace Poco::Data::MySQL


--- a/Data/MySQL/include/Poco/Data/MySQL/MySQLException.h
+++ b/Data/MySQL/include/Poco/Data/MySQL/MySQLException.h
@@ -39,6 +39,7 @@
 #ifndef Data_MySQL_MySQLException_INCLUDED
 #define Data_MySQL_MySQLException_INCLUDED

+
 #include "Poco/Data/MySQL/MySQL.h"
 #include "Poco/Data/DataException.h"
 #include <typeinfo>
@@ -53,14 +54,11 @@ namespace Poco {
 namespace Data {
 namespace MySQL {

-// End-user include this file and use in code ConnectionException/StatementException
-// So it need not know 

 class MySQL_API MySQLException: public Poco::Data::DataException
 	/// Base class for all MySQL exceptions
 {
 public:
-
 	MySQLException(const std::string& msg);
 		/// Creates MySQLException.

@@ -98,7 +96,6 @@ class ConnectionException : public MySQLException
 	/// ConnectionException
 {
 public:
-
 	ConnectionException(const std::string& msg);
 		/// Creates ConnectionException.

@@ -106,7 +103,6 @@ public:
 		/// Destroys ConnectionException.

 private:
-
 	static std::string compose(const std::string& text, MYSQL* h);

 };
@@ -116,7 +112,6 @@ class StatementException : public MySQLException
 	/// StatementException
 {
 public:
-
 	StatementException(const std::string& msg);
 		/// Creates StatementException.

@@ -124,7 +119,6 @@ public:
 		/// Destroys StatementException.

 private:
-
 	static std::string compose(const std::string& text, MYSQL_STMT* h, const std::string& stmt);
 };

@@ -132,28 +126,31 @@ private:
 //
 // inlines
 //
-
 inline MySQLException& MySQLException::operator=(const MySQLException& exc)
 {
 	Poco::Data::DataException::operator=(exc);
 	return *this;
 }

+
 inline const char* MySQLException::name() const throw()
 {
 	return "MySQL";
 }

+
 inline const char* MySQLException::className() const throw()
 {
 	return typeid(*this).name();
 }

+
 inline Poco::Exception* MySQLException::clone() const
 {
 	return new MySQLException(*this);
 }

+
 inline void MySQLException::rethrow() const
 {
 	throw *this;
@@ -162,4 +159,5 @@ inline void MySQLException::rethrow() const

 } } } // namespace Poco::Data::MySQL

+
 #endif //Data_MySQL_MySQLException_INCLUDED
--- a/Data/MySQL/include/Poco/Data/MySQL/MySQLStatementImpl.h
+++ b/Data/MySQL/include/Poco/Data/MySQL/MySQLStatementImpl.h
@@ -39,6 +39,7 @@
 #ifndef Data_MySQL_MySQLStatementImpl_INCLUDED
 #define Data_MySQL_MySQLStatementImpl_INCLUDED

+
 #include "Poco/Data/MySQL/MySQL.h"
 #include "Poco/Data/MySQL/SessionImpl.h"
 #include "Poco/Data/MySQL/Binder.h"
@@ -59,7 +60,6 @@ class MySQL_API MySQLStatementImpl: public Poco::Data::StatementImpl
 	/// Implements statement functionality needed for MySQL
 {
 public:
-
 	MySQLStatementImpl(SessionHandle& h);
 		/// Creates the MySQLStatementImpl.
 		
@@ -67,7 +67,6 @@ public:
 		/// Destroys the MySQLStatementImpl.
 		
 protected:
-
 	virtual Poco::UInt32 columnsReturned() const;
 		/// Returns number of columns returned by query.		
 	
--- a/Data/MySQL/include/Poco/Data/MySQL/ResultMetadata.h
+++ b/Data/MySQL/include/Poco/Data/MySQL/ResultMetadata.h
@@ -39,19 +39,21 @@
 #ifndef Data_MySQL_ResultMetadata_INCLUDED
 #define Data_MySQL_ResultMetadata_INCLUDED

+
 #include <mysql.h>
 #include <vector>
 #include "Poco/Data/MetaColumn.h"

+
 namespace Poco {
 namespace Data {
 namespace MySQL {

+
 class ResultMetadata
 	/// MySQL result metadata
 {
 public:
-
 	void reset();
 		/// Resets the metadata.

@@ -84,6 +86,8 @@ private:
    std::vector<my_bool>       _isNull;
 };

-}}}
+
+} } } // namespace Poco::Data::MySQL
+

 #endif //Data_MySQL_ResultMetadata_INCLUDED
--- a/Data/MySQL/include/Poco/Data/MySQL/SessionHandle.h
+++ b/Data/MySQL/include/Poco/Data/MySQL/SessionHandle.h
@@ -39,20 +39,21 @@
 #ifndef Data_MySQL_SessionHandle_INCLUDED
 #define Data_MySQL_SessionHandle_INCLUDED

+
 #include <mysql.h>
 #include "Poco/Data/MySQL/MySQLException.h"
-
 #include <vector>

+
 namespace Poco {
 namespace Data {
 namespace MySQL {

+
 class SessionHandle
 	/// MySQL session handle
 {
 public:
-
 	explicit SessionHandle(MYSQL* mysql);

 	~SessionHandle();
@@ -70,12 +71,10 @@ public:
 	operator MYSQL* ();

 private:
-
 	SessionHandle(const SessionHandle&);
 	SessionHandle& operator=(const SessionHandle&);

 private:
-
 	MYSQL* h;
 };

@@ -83,13 +82,13 @@ private:
 //
 // inlines
 //
-
 inline SessionHandle::operator MYSQL* ()
 {
 	return h;
 }


-}}}
+} } } // namespace Poco::Data::MySQL
+

 #endif // Data_MySQL_SessionHandle_INCLUDED
--- a/Data/MySQL/include/Poco/Data/MySQL/SessionImpl.h
+++ b/Data/MySQL/include/Poco/Data/MySQL/SessionImpl.h
@@ -54,7 +54,6 @@ class MySQL_API SessionImpl: public Poco::Data::AbstractSessionImpl<SessionImpl>
 	/// Implements SessionImpl interface
 {
 public:
-
 	SessionImpl(const std::string& connectionString);
 		/// Creates the SessionImpl. Opens a connection to the database
 		///
@@ -99,7 +98,6 @@ public:
 		/// Get insert id

 private:
-
 	SessionHandle _mysql;
 	bool          _connected;
 	int           _inTransaction;
@@ -109,7 +107,6 @@ private:
 //
 // inlines
 //
-
 inline void SessionImpl::setInsertId(const std::string&, const Poco::Any&)
 {
 }
--- a/Data/MySQL/include/Poco/Data/MySQL/StatementExecutor.h
+++ b/Data/MySQL/include/Poco/Data/MySQL/StatementExecutor.h
@@ -39,15 +39,17 @@
 #ifndef Data_MySQL_StatementHandle_INCLUDED
 #define Data_MySQL_StatementHandle_INCLUDED

+
 #include <mysql.h>
 #include "Poco/Data/MySQL/MySQLException.h"
-
 #include <vector>

+
 namespace Poco {
 namespace Data {
 namespace MySQL {

+
 class StatementExecutor
 	/// MySQL statement executor.
 {
@@ -90,12 +92,10 @@ public:
 		/// Cast operator to native handle type.

 private:
-
 	StatementExecutor(const StatementExecutor&);
 	StatementExecutor& operator=(const StatementExecutor&);

 private:
-
 	MYSQL_STMT* h;
 	int _state;
 	std::string _query;
@@ -105,14 +105,13 @@ private:
 //
 // inlines
 //
-
 inline StatementExecutor::operator MYSQL_STMT* ()
 {
 	return h;
 }


-}}}
+} } } // namespace Poco::Data::MySQL


 #endif // Data_MySQL_StatementHandle_INCLUDED
--- a/Data/MySQL/src/Connector.cpp
+++ b/Data/MySQL/src/Connector.cpp
@@ -38,7 +38,6 @@
 #include "Poco/Data/MySQL/SessionImpl.h"
 #include "Poco/Data/SessionFactory.h"
 #include "Poco/Exception.h"
-
 #include <mysql.h>


--- a/Data/MySQL/src/ResultMetadata.cpp
+++ b/Data/MySQL/src/ResultMetadata.cpp
@@ -37,6 +37,7 @@
 #include "Poco/Data/MySQL/ResultMetadata.h"
 #include "Poco/Data/MySQL/MySQLException.h"

+
 namespace
 {
 	class ResultMetadataHandle
@@ -174,6 +175,7 @@ namespace Poco {
 namespace Data {
 namespace MySQL {

+
 void ResultMetadata::reset()
 {
 	_columns.resize(0);
@@ -183,6 +185,7 @@ void ResultMetadata::reset()
    _isNull.resize(0);
 }

+
 void ResultMetadata::init(MYSQL_STMT* stmt)
 {
 	ResultMetadataHandle h(stmt);
@@ -201,7 +204,7 @@ void ResultMetadata::init(MYSQL_STMT* stmt)
 	size_t commonSize = 0;
 	_columns.reserve(count);

-	{for (size_t i = 0; i < count; i++)
+	for (size_t i = 0; i < count; i++)
 	{
 		_columns.push_back(MetaColumn(
 			i,                               // position
@@ -213,7 +216,7 @@ void ResultMetadata::init(MYSQL_STMT* stmt)
 			));

 		commonSize += _columns[i].length();
-	}}
+	}

 	_buffer.resize(commonSize);
 	_row.resize(count);
@@ -222,7 +225,7 @@ void ResultMetadata::init(MYSQL_STMT* stmt)

 	size_t offset = 0;

-	{for (size_t i = 0; i < count; i++)
+	for (size_t i = 0; i < count; i++)
 	{
 		memset(&_row[i], 0, sizeof(MYSQL_BIND));

@@ -233,37 +236,44 @@ void ResultMetadata::init(MYSQL_STMT* stmt)
        _row[i].is_null       = &_isNull[i];
 		
 		offset += _row[i].buffer_length;
-	}}
+	}
 }

+
 Poco::UInt32 ResultMetadata::columnsReturned() const
 {
 	return static_cast<Poco::UInt32>(_columns.size());
 }

+
 const MetaColumn& ResultMetadata::metaColumn(Poco::UInt32 pos) const
 {
 	return _columns[pos];
 }

+
 MYSQL_BIND* ResultMetadata::row()
 {
 	return &_row[0];
 }

+
 size_t ResultMetadata::length(size_t pos) const
 {
 	return _lengths[pos];
 }

+
 const char* ResultMetadata::rawData(size_t pos) const 
 {
 	return reinterpret_cast<const char*>(_row[pos].buffer);
 }

+
 bool ResultMetadata::isNull(size_t pos) const 
 {
    return (_isNull[pos] != 0);
 }

-}}} // namespace Poco::Data::MySQL
+
+} } } // namespace Poco::Data::MySQL
--- a/Data/MySQL/src/SessionHandle.cpp
+++ b/Data/MySQL/src/SessionHandle.cpp
@@ -116,4 +116,4 @@ void SessionHandle::query(const char* str)
 }


-}}} // Poco::Data::MySQL
+} } } // namespace Poco::Data::MySQL
--- a/Data/MySQL/src/SessionImpl.cpp
+++ b/Data/MySQL/src/SessionImpl.cpp
@@ -229,4 +229,4 @@ bool SessionImpl::isTransaction()
 }


-}}}
+} } } // namespace Poco::Data::MySQL
--- a/Data/MySQL/src/StatementExecutor.cpp
+++ b/Data/MySQL/src/StatementExecutor.cpp
@@ -192,4 +192,4 @@ bool StatementExecutor::fetchColumn(size_t n, MYSQL_BIND *bind)
 }


-}}}
+} } } // namespace Poco::Data::MySQL
--- a/Data/MySQL/testsuite/src/Driver.cpp
+++ b/Data/MySQL/testsuite/src/Driver.cpp
@@ -1,7 +1,7 @@
 //
 // Driver.cpp
 //
-// $Id: //poco/1.3/Data/ODBC/testsuite/src/Driver.cpp#2 $
+// $Id: //poco/1.3/Data/MySQL/testsuite/src/Driver.cpp#1 $
 //
 // Console-based test driver for Poco SQLite.
 //
--- a/Data/MySQL/testsuite/src/MySQLTest.cpp
+++ b/Data/MySQL/testsuite/src/MySQLTest.cpp
@@ -1,7 +1,7 @@
 //
 // MySQLTest.cpp
 //
-// $Id: //poco/1.3/Data/MySQL/testsuite/src/MySQLTest.cpp#4 $
+// $Id: //poco/1.3/Data/MySQL/testsuite/src/MySQLTest.cpp#1 $
 //
 // Copyright (c) 2008, Applied Informatics Software Engineering GmbH.
 // and Contributors.
@@ -43,15 +43,18 @@
 #include "Poco/Data/MySQL/MySQLException.h"
 #include <iostream>

+
 using namespace Poco::Data;
 using Poco::Data::MySQL::ConnectionException;
 using Poco::Data::MySQL::StatementException;
 using Poco::format;
 using Poco::NotFoundException;

+
 Poco::SharedPtr<Poco::Data::Session> MySQLTest::_pSession = 0;
 Poco::SharedPtr<SQLExecutor> MySQLTest::_pExecutor = 0;

+
 // Parameters for barebone-test
 #define MYSQL_USER "root"
 #define MYSQL_PWD  ""
@@ -59,6 +62,7 @@ Poco::SharedPtr<SQLExecutor> MySQLTest::_pExecutor = 0;
 #define MYSQL_PORT 3306
 #define MYSQL_DB   "test"

+
 // Connection string to POCO
 std::string MySQLTest::_dbConnString = "user=root;password=;db=test;compress=true;auto-reconnect=true";

@@ -363,7 +367,6 @@ void MySQLTest::testCombinedLimits()
 }


-
 void MySQLTest::testRange()
 {
 	if (!_pSession) fail ("Test not available.");
--- a/Data/MySQL/testsuite/src/MySQLTest.h
+++ b/Data/MySQL/testsuite/src/MySQLTest.h
@@ -1,7 +1,7 @@
 //
 // ODBCMySQLTest.h
 //
-// $Id: //poco/1.3/Data/MySQL/testsuite/src/ODBCMySQLTest.h#2 $
+// $Id: //poco/1.3/Data/MySQL/testsuite/src/MySQLTest.h#1 $
 //
 // Definition of the MySQLTest class.
 //
@@ -51,7 +51,6 @@ class MySQLTest: public CppUnit::TestCase
 	/// ----------------+---------------------------+------------------------------------------
 	/// 03.51.12.00		| MySQL 5.0.27-community-nt	| MS Windows XP Professional x64 v.2003/SP1
 	///
-
 {
 public:
 	MySQLTest(const std::string& name);
--- a/Data/MySQL/testsuite/src/MySQLTestSuite.cpp
+++ b/Data/MySQL/testsuite/src/MySQLTestSuite.cpp
@@ -1,7 +1,7 @@
 //
 // ODBCTestSuite.cpp
 //
-// $Id: //poco/1.3/Data/ODBC/testsuite/src/ODBCTestSuite.cpp#2 $
+// $Id: //poco/1.3/Data/MySQL/testsuite/src/MySQLTestSuite.cpp#1 $
 //
 // Copyright (c) 2008, Applied Informatics Software Engineering GmbH.
 // and Contributors.
@@ -33,6 +33,7 @@
 #include "MySQLTestSuite.h"
 #include "MySQLTest.h"

+
 CppUnit::Test* MySQLTestSuite::suite()
 {
 	CppUnit::TestSuite* pSuite = new CppUnit::TestSuite("MySQLTestSuite");
--- a/Data/MySQL/testsuite/src/MySQLTestSuite.h
+++ b/Data/MySQL/testsuite/src/MySQLTestSuite.h
@@ -1,7 +1,7 @@
 //
 // ODBCTestSuite.h
 //
-// $Id: //poco/1.3/Data/ODBC/testsuite/src/ODBCTestSuite.h#2 $
+// $Id: //poco/1.3/Data/MySQL/testsuite/src/MySQLTestSuite.h#1 $
 //
 // Definition of the ODBCTestSuite class.
 //
--- a/Data/MySQL/testsuite/src/SQLExecutor.cpp
+++ b/Data/MySQL/testsuite/src/SQLExecutor.cpp
@@ -1,7 +1,7 @@
 //
 // SQLExecutor.cpp
 //
-// $Id: //poco/Main/DataConnectors/ODBC/testsuite/src/SQLExecutor.cpp#14 $
+// $Id: //poco/1.3/Data/MySQL/testsuite/src/SQLExecutor.cpp#1 $
 //
 // Copyright (c) 2008, Applied Informatics Software Engineering GmbH.
 // and Contributors.
@@ -43,11 +43,9 @@
 #include "Poco/Data/RecordSet.h"
 #include "Poco/Data/MySQL/Connector.h"
 #include "Poco/Data/MySQL/MySQLException.h"
-
 #ifdef _WIN32
 #include <Winsock2.h>
 #endif 
-
 #include <mysql.h>
 #include <iostream>

@@ -678,7 +676,6 @@ void SQLExecutor::limitPrepare()
 }


-
 void SQLExecutor::prepare()
 {
 	std::string funct = "prepare()";
--- a/Data/MySQL/testsuite/src/SQLExecutor.h
+++ b/Data/MySQL/testsuite/src/SQLExecutor.h
@@ -1,7 +1,7 @@
 //
 // SQLExecutor.h
 //
-// $Id: //poco/1.3/Data/MySQL/testsuite/src/SQLExecutor.h#2 $
+// $Id: //poco/1.3/Data/MySQL/testsuite/src/SQLExecutor.h#1 $
 //
 // Definition of the SQLExecutor class.
 //
@@ -39,6 +39,7 @@
 #include "Poco/Data/MySQL/MySQL.h"
 #include "Poco/Data/Session.h"

+
 class SQLExecutor: public CppUnit::TestCase
 {
 public:
--- a/Data/MySQL/testsuite/src/WinDriver.cpp
+++ b/Data/MySQL/testsuite/src/WinDriver.cpp
@@ -1,7 +1,7 @@
 //
 // WinDriver.cpp
 //
-// $Id: //poco/1.3/Data/MySQL/testsuite/src/WinDriver.cpp#2 $
+// $Id: //poco/1.3/Data/MySQL/testsuite/src/WinDriver.cpp#1 $
 //
 // Windows test driver for Poco MySQL.
 //
--- a/Data/ODBC/dependencies
+++ b/Data/ODBC/dependencies
@@ -0,0 +1,2 @@
+Foundation
+Data
--- a/Data/ODBC/include/Poco/Data/ODBC/Binder.h
+++ b/Data/ODBC/include/Poco/Data/ODBC/Binder.h
@@ -1,7 +1,7 @@
 //
 // Binder.h
 //
-// $Id: //poco/1.3/Data/ODBC/include/Poco/Data/ODBC/Binder.h#2 $
+// $Id: //poco/1.3/Data/ODBC/include/Poco/Data/ODBC/Binder.h#3 $
 //
 // Library: ODBC
 // Package: ODBC
--- a/Data/ODBC/include/Poco/Data/ODBC/Diagnostics.h
+++ b/Data/ODBC/include/Poco/Data/ODBC/Diagnostics.h
@@ -1,7 +1,7 @@
 //
 // Diagnostics.h
 //
-// $Id: //poco/1.3/Data/ODBC/include/Poco/Data/ODBC/Diagnostics.h#2 $
+// $Id: //poco/1.3/Data/ODBC/include/Poco/Data/ODBC/Diagnostics.h#3 $
 //
 // Library: ODBC
 // Package: ODBC
--- a/Data/ODBC/include/Poco/Data/ODBC/Extractor.h
+++ b/Data/ODBC/include/Poco/Data/ODBC/Extractor.h
@@ -1,7 +1,7 @@
 //
 // Extractor.h
 //
-// $Id: //poco/1.3/Data/ODBC/include/Poco/Data/ODBC/Extractor.h#2 $
+// $Id: //poco/1.3/Data/ODBC/include/Poco/Data/ODBC/Extractor.h#3 $
 //
 // Library: ODBC
 // Package: ODBC
--- a/Data/ODBC/include/Poco/Data/ODBC/ODBCColumn.h
+++ b/Data/ODBC/include/Poco/Data/ODBC/ODBCColumn.h
@@ -1,7 +1,7 @@
 //
 // ODBCColumn.h
 //
-// $Id: //poco/1.3/Data/ODBC/include/Poco/Data/ODBC/ODBCColumn.h#2 $
+// $Id: //poco/1.3/Data/ODBC/include/Poco/Data/ODBC/ODBCColumn.h#3 $
 //
 // Library: ODBC
 // Package: ODBC
--- a/Data/ODBC/include/Poco/Data/ODBC/Preparation.h
+++ b/Data/ODBC/include/Poco/Data/ODBC/Preparation.h
@@ -1,7 +1,7 @@
 //
 // Preparation.h
 //
-// $Id: //poco/1.3/Data/ODBC/include/Poco/Data/ODBC/Preparation.h#2 $
+// $Id: //poco/1.3/Data/ODBC/include/Poco/Data/ODBC/Preparation.h#3 $
 //
 // Library: Data
 // Package: DataCore
--- a/Data/ODBC/src/Binder.cpp
+++ b/Data/ODBC/src/Binder.cpp
@@ -1,7 +1,7 @@
 //
 // Binder.cpp
 //
-// $Id: //poco/1.3/Data/ODBC/src/Binder.cpp#2 $
+// $Id: //poco/1.3/Data/ODBC/src/Binder.cpp#3 $
 //
 // Library: ODBC
 // Package: ODBC
--- a/Data/ODBC/src/DataTypes.cpp
+++ b/Data/ODBC/src/DataTypes.cpp
@@ -1,7 +1,7 @@
 //
 // DataTypes.cpp
 //
-// $Id: //poco/1.3/Data/ODBC/src/DataTypes.cpp#2 $
+// $Id: //poco/1.3/Data/ODBC/src/DataTypes.cpp#3 $
 //
 // Library: ODBC
 // Package: ODBC
--- a/Data/ODBC/src/Extractor.cpp
+++ b/Data/ODBC/src/Extractor.cpp
@@ -1,7 +1,7 @@
 //
 // Extractor.cpp
 //
-// $Id: //poco/1.3/Data/ODBC/src/Extractor.cpp#2 $
+// $Id: //poco/1.3/Data/ODBC/src/Extractor.cpp#4 $
 //
 // Library: ODBC
 // Package: ODBC
--- a/Data/ODBC/src/ODBCColumn.cpp
+++ b/Data/ODBC/src/ODBCColumn.cpp
@@ -1,7 +1,7 @@
 //
 // ODBCColumn.cpp
 //
-// $Id: //poco/1.3/Data/ODBC/src/ODBCColumn.cpp#3 $
+// $Id: //poco/1.3/Data/ODBC/src/ODBCColumn.cpp#5 $
 //
 // Library: ODBC
 // Package: ODBC
--- a/Data/ODBC/src/ODBCStatementImpl.cpp
+++ b/Data/ODBC/src/ODBCStatementImpl.cpp
@@ -1,7 +1,7 @@
 //
 // ODBCStatementImpl.cpp
 //
-// $Id: //poco/1.3/Data/ODBC/src/ODBCStatementImpl.cpp#3 $
+// $Id: //poco/1.3/Data/ODBC/src/ODBCStatementImpl.cpp#4 $
 //
 // Library: ODBC
 // Package: ODBC
--- a/Data/ODBC/src/Parameter.cpp
+++ b/Data/ODBC/src/Parameter.cpp
@@ -1,7 +1,7 @@
 //
 // Parameter.cpp
 //
-// $Id: //poco/1.3/Data/ODBC/src/Parameter.cpp#2 $
+// $Id: //poco/1.3/Data/ODBC/src/Parameter.cpp#3 $
 //
 // Library: ODBC
 // Package: ODBC
--- a/Data/ODBC/src/Preparation.cpp
+++ b/Data/ODBC/src/Preparation.cpp
@@ -1,7 +1,7 @@
 //
 // Preparation.cpp
 //
-// $Id: //poco/1.3/Data/ODBC/src/Preparation.cpp#2 $
+// $Id: //poco/1.3/Data/ODBC/src/Preparation.cpp#3 $
 //
 // Library: Data
 // Package: DataCore
--- a/Data/ODBC/testsuite/src/ODBCDB2Test.cpp
+++ b/Data/ODBC/testsuite/src/ODBCDB2Test.cpp
@@ -1,7 +1,7 @@
 //
 // ODBCDB2Test.cpp
 //
-// $Id: //poco/1.3/Data/ODBC/testsuite/src/ODBCDB2Test.cpp#3 $
+// $Id: //poco/1.3/Data/ODBC/testsuite/src/ODBCDB2Test.cpp#4 $
 //
 // Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
 // and Contributors.
--- a/Data/ODBC/testsuite/src/ODBCMySQLTest.cpp
+++ b/Data/ODBC/testsuite/src/ODBCMySQLTest.cpp
@@ -1,7 +1,7 @@
 //
 // ODBCMySQLTest.cpp
 //
-// $Id: //poco/1.3/Data/ODBC/testsuite/src/ODBCMySQLTest.cpp#3 $
+// $Id: //poco/1.3/Data/ODBC/testsuite/src/ODBCMySQLTest.cpp#4 $
 //
 // Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
 // and Contributors.
--- a/Data/ODBC/testsuite/src/ODBCOracleTest.cpp
+++ b/Data/ODBC/testsuite/src/ODBCOracleTest.cpp
@@ -1,7 +1,7 @@
 //
 // ODBCOracleTest.cpp
 //
-// $Id: //poco/1.3/Data/ODBC/testsuite/src/ODBCOracleTest.cpp#3 $
+// $Id: //poco/1.3/Data/ODBC/testsuite/src/ODBCOracleTest.cpp#4 $
 //
 // Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
 // and Contributors.
--- a/Data/ODBC/testsuite/src/ODBCPostgreSQLTest.cpp
+++ b/Data/ODBC/testsuite/src/ODBCPostgreSQLTest.cpp
@@ -1,7 +1,7 @@
 //
 // ODBCPostgreSQLTest.cpp
 //
-// $Id: //poco/1.3/Data/ODBC/testsuite/src/ODBCPostgreSQLTest.cpp#3 $
+// $Id: //poco/1.3/Data/ODBC/testsuite/src/ODBCPostgreSQLTest.cpp#4 $
 //
 // Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
 // and Contributors.
--- a/Data/ODBC/testsuite/src/ODBCSQLServerTest.cpp
+++ b/Data/ODBC/testsuite/src/ODBCSQLServerTest.cpp
@@ -1,7 +1,7 @@
 //
 // ODBCSQLServerTest.cpp
 //
-// $Id: //poco/1.3/Data/ODBC/testsuite/src/ODBCSQLServerTest.cpp#3 $
+// $Id: //poco/1.3/Data/ODBC/testsuite/src/ODBCSQLServerTest.cpp#4 $
 //
 // Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
 // and Contributors.
--- a/Data/ODBC/testsuite/src/ODBCSQLiteTest.cpp
+++ b/Data/ODBC/testsuite/src/ODBCSQLiteTest.cpp
@@ -1,7 +1,7 @@
 //
 // ODBCSQLiteTest.cpp
 //
-// $Id: //poco/1.3/Data/ODBC/testsuite/src/ODBCSQLiteTest.cpp#3 $
+// $Id: //poco/1.3/Data/ODBC/testsuite/src/ODBCSQLiteTest.cpp#4 $
 //
 // Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
 // and Contributors.
--- a/Data/SQLite/Makefile
+++ b/Data/SQLite/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile
 #
-# $Id: //poco/1.3/Data/SQLite/Makefile#3 $
+# $Id: //poco/1.3/Data/SQLite/Makefile#5 $
 #
 # Makefile for Poco SQLite
 #
--- a/Data/SQLite/dependencies
+++ b/Data/SQLite/dependencies
@@ -0,0 +1,2 @@
+Foundation
+Data
--- a/Data/SQLite/include/Poco/Data/SQLite/Connector.h
+++ b/Data/SQLite/include/Poco/Data/SQLite/Connector.h
@@ -1,7 +1,7 @@
 //
 // Connector.h
 //
-// $Id: //poco/1.3/Data/SQLite/include/Poco/Data/SQLite/Connector.h#1 $
+// $Id: //poco/1.3/Data/SQLite/include/Poco/Data/SQLite/Connector.h#2 $
 //
 // Library: SQLite
 // Package: SQLite
@@ -70,6 +70,10 @@ public:

 	static void unregisterConnector();
 		/// Unregisters the Connector under the Keyword Connector::KEY at the Poco::Data::SessionFactory.
+
+	static void enableSharedCache(bool flag = true);
+		/// Enables or disables SQlite shared cache mode
+		/// (see http://www.sqlite.org/sharedcache.html for a discussion).
 };


--- a/Data/SQLite/include/Poco/Data/SQLite/SQLiteException.h
+++ b/Data/SQLite/include/Poco/Data/SQLite/SQLiteException.h
@@ -1,7 +1,7 @@
 //
 // SQLiteException.h
 //
-// $Id: //poco/1.3/Data/SQLite/include/Poco/Data/SQLite/SQLiteException.h#2 $
+// $Id: //poco/1.3/Data/SQLite/include/Poco/Data/SQLite/SQLiteException.h#3 $
 //
 // Library: SQLite
 // Package: SQLite
--- a/Data/SQLite/src/Connector.cpp
+++ b/Data/SQLite/src/Connector.cpp
@@ -1,7 +1,7 @@
 //
 // Connector.cpp
 //
-// $Id: //poco/1.3/Data/SQLite/src/Connector.cpp#1 $
+// $Id: //poco/1.3/Data/SQLite/src/Connector.cpp#3 $
 //
 // Library: SQLite
 // Package: SQLite
@@ -37,6 +37,7 @@
 #include "Poco/Data/SQLite/Connector.h"
 #include "Poco/Data/SQLite/SessionImpl.h"
 #include "Poco/Data/SessionFactory.h"
+#include "sqlite3.h"


 namespace Poco {
@@ -75,4 +76,10 @@ void Connector::unregisterConnector()
 }


+void Connector::enableSharedCache(bool flag)
+{
+	sqlite3_enable_shared_cache(flag ? 1 : 0);
+}
+
+
 } } } // namespace Poco::Data::SQLite
--- a/Data/SQLite/src/SQLiteException.cpp
+++ b/Data/SQLite/src/SQLiteException.cpp
@@ -1,7 +1,7 @@
 //
 // SQLiteException.cpp
 //
-// $Id: //poco/1.3/Data/SQLite/src/SQLiteException.cpp#2 $
+// $Id: //poco/1.3/Data/SQLite/src/SQLiteException.cpp#3 $
 //
 // Library: SQLite
 // Package: SQLite
--- a/Data/SQLite/src/SQLiteStatementImpl.cpp
+++ b/Data/SQLite/src/SQLiteStatementImpl.cpp
@@ -1,7 +1,7 @@
 //
 // SQLiteStatementImpl.cpp
 //
-// $Id: //poco/1.3/Data/SQLite/src/SQLiteStatementImpl.cpp#3 $
+// $Id: //poco/1.3/Data/SQLite/src/SQLiteStatementImpl.cpp#4 $
 //
 // Library: SQLite
 // Package: SQLite
--- a/Data/SQLite/testsuite/src/SQLiteTest.cpp
+++ b/Data/SQLite/testsuite/src/SQLiteTest.cpp
@@ -1,7 +1,7 @@
 //
 // SQLiteTest.cpp
 //
-// $Id: //poco/1.3/Data/SQLite/testsuite/src/SQLiteTest.cpp#3 $
+// $Id: //poco/1.3/Data/SQLite/testsuite/src/SQLiteTest.cpp#4 $
 //
 // Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
 // and Contributors.
--- a/Data/SQLite/testsuite/src/SQLiteTest.h
+++ b/Data/SQLite/testsuite/src/SQLiteTest.h
@@ -1,7 +1,7 @@
 //
 // SQLiteTest.h
 //
-// $Id: //poco/1.3/Data/SQLite/testsuite/src/SQLiteTest.h#3 $
+// $Id: //poco/1.3/Data/SQLite/testsuite/src/SQLiteTest.h#4 $
 //
 // Definition of the SQLiteTest class.
 //
--- a/Data/dependencies
+++ b/Data/dependencies
@@ -0,0 +1 @@
+Foundation
--- a/Data/doc/DataReleaseNotes.page
+++ b/Data/doc/DataReleaseNotes.page
@@ -1,7 +1,7 @@
 POCO Data Release Notes
 Data

-!!!Release 1.3
+!!!Release 1.3.2

 Release 1.3 of the POCO C++ Libraries is the first official release containing the Data library.
 The Data library has been available in a development state for the 1.2 release. For the 1.3
@@ -10,6 +10,21 @@ to existing code.

 !!Summary of Changes

+!Changes in 1.3.2
+  - fixed SF# 1724388: ODBC Diagnostics
+  - fixed SF# 1804797: ODBC Statement multiple execution fails
+  - fixed SF# 1803435: SessionPool onJanitorTimer called too often?
+  - fixed SF# 1851997: Undefined Behavior in ODBC::Preparation
+  - updated SQlite to 3.5.5
+
+
+!Changes in 1.3.1
+  - fixed SF# 1739989: Data::RecordSet::operator = () 
+  - fixed SF# 1747525: SQLite, Transactions and Session Pooling
+  - upgraded to SQLite 3.4.1
+
+
+!Changes in 1.3.0
  - Class Poco::Data::RecordSet has been added providing generic access
    to arbitrary tables.
  - SessionInstantiator has been renamed Poco::Data::Connector.
--- a/Data/include/Poco/Data/BLOB.h
+++ b/Data/include/Poco/Data/BLOB.h
@@ -1,7 +1,7 @@
 //
 // BLOB.h
 //
-// $Id: //poco/1.3/Data/include/Poco/Data/BLOB.h#3 $
+// $Id: //poco/1.3/Data/include/Poco/Data/BLOB.h#5 $
 //
 // Library: Data
 // Package: DataCore
--- a/Data/samples/Binding/src/Binding.cpp
+++ b/Data/samples/Binding/src/Binding.cpp
@@ -1,7 +1,7 @@
 //
 // Binding.cpp
 //
-// $Id: //poco/1.3/Data/samples/Binding/src/Binding.cpp#2 $
+// $Id: //poco/1.3/Data/samples/Binding/src/Binding.cpp#3 $
 //
 // This sample demonstrates the Data library.
 //
--- a/Data/samples/RecordSet/src/RecordSet.cpp
+++ b/Data/samples/RecordSet/src/RecordSet.cpp
@@ -1,7 +1,7 @@
 //
 // RecordSet.cpp
 //
-// $Id: //poco/1.3/Data/samples/RecordSet/src/RecordSet.cpp#1 $
+// $Id: //poco/1.3/Data/samples/RecordSet/src/RecordSet.cpp#2 $
 //
 // This sample demonstrates the Data library.
 //
--- a/Data/samples/Tuple/src/Tuple.cpp
+++ b/Data/samples/Tuple/src/Tuple.cpp
@@ -1,7 +1,7 @@
 //
 // Tuple.cpp
 //
-// $Id: //poco/1.3/Data/samples/Tuple/src/Tuple.cpp#2 $
+// $Id: //poco/1.3/Data/samples/Tuple/src/Tuple.cpp#3 $
 //
 // This sample demonstrates the Data library.
 //
--- a/Data/samples/TypeHandler/src/TypeHandler.cpp
+++ b/Data/samples/TypeHandler/src/TypeHandler.cpp
@@ -1,7 +1,7 @@
 //
 // Binding.cpp
 //
-// $Id: //poco/1.3/Data/samples/TypeHandler/src/TypeHandler.cpp#2 $
+// $Id: //poco/1.3/Data/samples/TypeHandler/src/TypeHandler.cpp#3 $
 //
 // This sample demonstrates the Data library.
 //
--- a/Data/samples/dependencies
+++ b/Data/samples/dependencies
@@ -0,0 +1,2 @@
+Data
+Data/SQLite
--- a/Data/src/SessionPool.cpp
+++ b/Data/src/SessionPool.cpp
@@ -1,7 +1,7 @@
 //
 // SessionPool.cpp
 //
-// $Id: //poco/1.3/Data/src/SessionPool.cpp#2 $
+// $Id: //poco/1.3/Data/src/SessionPool.cpp#3 $
 //
 // Library: Data
 // Package: SessionPooling
--- a/Data/src/StatementImpl.cpp
+++ b/Data/src/StatementImpl.cpp
@@ -1,7 +1,7 @@
 //
 // StatementImpl.cpp
 //
-// $Id: //poco/1.3/Data/src/StatementImpl.cpp#3 $
+// $Id: //poco/1.3/Data/src/StatementImpl.cpp#4 $
 //
 // Library: Data
 // Package: DataCore
--- a/Data/testsuite/src/DataTest.cpp
+++ b/Data/testsuite/src/DataTest.cpp
@@ -1,7 +1,7 @@
 //
 // DataTest.cpp
 //
-// $Id: //poco/1.3/Data/testsuite/src/DataTest.cpp#3 $
+// $Id: //poco/1.3/Data/testsuite/src/DataTest.cpp#4 $
 //
 // Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
 // and Contributors.
--- a/Foundation/Foundation_vs71.vcproj
+++ b/Foundation/Foundation_vs71.vcproj
@@ -164,6 +164,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLibrarianTool"
+				AdditionalDependencies="ws2_32.lib"
 				OutputFile="..\lib\PocoFoundationmtd.lib"/>
 			<Tool
 				Name="VCMIDLTool"/>
@@ -217,6 +218,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLibrarianTool"
+				AdditionalDependencies="ws2_32.lib"
 				OutputFile="..\lib\PocoFoundationmt.lib"/>
 			<Tool
 				Name="VCMIDLTool"/>
--- a/Foundation/Foundation_vs80.vcproj
+++ b/Foundation/Foundation_vs80.vcproj
@@ -256,6 +256,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
+				AdditionalDependencies="ws2_32.lib"
 				OutputFile="..\lib\PocoFoundationmt.lib"
 			/>
 			<Tool
@@ -327,6 +328,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
+				AdditionalDependencies="ws2_32.lib"
 				OutputFile="..\lib\PocoFoundationmtd.lib"
 			/>
 			<Tool
--- a/Foundation/Foundation_vs90.sln
+++ b/Foundation/Foundation_vs90.sln
@@ -0,0 +1,63 @@
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual Studio 2008
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Foundation", "Foundation_vs90.vcproj", "{8164D41D-B053-405B-826C-CF37AC0EF176}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_vs90.vcproj", "{F1EE93DF-347F-4CB3-B191-C4E63F38E972}"
+	ProjectSection(ProjectDependencies) = postProject
+		{0955EB03-544B-4BD4-9C10-89CF38078F5F} = {0955EB03-544B-4BD4-9C10-89CF38078F5F}
+		{8164D41D-B053-405B-826C-CF37AC0EF176} = {8164D41D-B053-405B-826C-CF37AC0EF176}
+		{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A} = {6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestLibrary", "testsuite\TestLibrary_vs90.vcproj", "{0955EB03-544B-4BD4-9C10-89CF38078F5F}"
+	ProjectSection(ProjectDependencies) = postProject
+		{8164D41D-B053-405B-826C-CF37AC0EF176} = {8164D41D-B053-405B-826C-CF37AC0EF176}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestApp", "testsuite\TestApp_vs90.vcproj", "{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		debug_shared|Win32 = debug_shared|Win32
+		debug_static|Win32 = debug_static|Win32
+		release_shared|Win32 = release_shared|Win32
+		release_static|Win32 = release_static|Win32
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{8164D41D-B053-405B-826C-CF37AC0EF176}.debug_shared|Win32.ActiveCfg = debug_shared|Win32
+		{8164D41D-B053-405B-826C-CF37AC0EF176}.debug_shared|Win32.Build.0 = debug_shared|Win32
+		{8164D41D-B053-405B-826C-CF37AC0EF176}.debug_static|Win32.ActiveCfg = debug_static|Win32
+		{8164D41D-B053-405B-826C-CF37AC0EF176}.debug_static|Win32.Build.0 = debug_static|Win32
+		{8164D41D-B053-405B-826C-CF37AC0EF176}.release_shared|Win32.ActiveCfg = release_shared|Win32
+		{8164D41D-B053-405B-826C-CF37AC0EF176}.release_shared|Win32.Build.0 = release_shared|Win32
+		{8164D41D-B053-405B-826C-CF37AC0EF176}.release_static|Win32.ActiveCfg = release_static|Win32
+		{8164D41D-B053-405B-826C-CF37AC0EF176}.release_static|Win32.Build.0 = release_static|Win32
+		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_shared|Win32.ActiveCfg = debug_shared|Win32
+		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_shared|Win32.Build.0 = debug_shared|Win32
+		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_static|Win32.ActiveCfg = debug_static|Win32
+		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_static|Win32.Build.0 = debug_static|Win32
+		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_shared|Win32.ActiveCfg = release_shared|Win32
+		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_shared|Win32.Build.0 = release_shared|Win32
+		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_static|Win32.ActiveCfg = release_static|Win32
+		{F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_static|Win32.Build.0 = release_static|Win32
+		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.debug_shared|Win32.ActiveCfg = debug_shared|Win32
+		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.debug_shared|Win32.Build.0 = debug_shared|Win32
+		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.debug_static|Win32.ActiveCfg = debug_shared|Win32
+		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.debug_static|Win32.Build.0 = debug_shared|Win32
+		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.release_shared|Win32.ActiveCfg = release_shared|Win32
+		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.release_shared|Win32.Build.0 = release_shared|Win32
+		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.release_static|Win32.ActiveCfg = release_shared|Win32
+		{0955EB03-544B-4BD4-9C10-89CF38078F5F}.release_static|Win32.Build.0 = release_shared|Win32
+		{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.debug_shared|Win32.ActiveCfg = debug_shared|Win32
+		{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.debug_shared|Win32.Build.0 = debug_shared|Win32
+		{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.debug_static|Win32.ActiveCfg = debug_static|Win32
+		{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.debug_static|Win32.Build.0 = debug_static|Win32
+		{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.release_shared|Win32.ActiveCfg = release_shared|Win32
+		{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.release_shared|Win32.Build.0 = release_shared|Win32
+		{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.release_static|Win32.ActiveCfg = release_static|Win32
+		{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.release_static|Win32.Build.0 = release_static|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
--- a/Foundation/Foundation_vs90.vcproj
+++ b/Foundation/Foundation_vs90.vcproj
--- a/Foundation/Makefile
+++ b/Foundation/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile
 #
-# $Id: //poco/1.3/Foundation/Makefile#3 $
+# $Id: //poco/1.3/Foundation/Makefile#4 $
 #
 # Makefile for Poco Foundation
 #
--- a/Foundation/include/Poco/ArchiveStrategy.h
+++ b/Foundation/include/Poco/ArchiveStrategy.h
@@ -1,7 +1,7 @@
 //
 // ArchiveStrategy.h
 //
-// $Id: //poco/1.3/Foundation/include/Poco/ArchiveStrategy.h#2 $
+// $Id: //poco/1.3/Foundation/include/Poco/ArchiveStrategy.h#4 $
 //
 // Library: Foundation
 // Package: Logging
@@ -9,7 +9,7 @@
 //
 // Definition of the ArchiveStrategy class and subclasses.
 //
-// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
+// Copyright (c) 2004-2008, Applied Informatics Software Engineering GmbH.
 // and Contributors.
 //
 // Permission is hereby granted, free of charge, to any person or organization
@@ -129,7 +129,6 @@ public:
 	}

 private:
-
 	void archiveByNumber(const std::string& basePath)
 		/// A monotonic increasing number is appended to the
 		/// log file name. The most recent archived file
@@ -160,7 +159,6 @@ private:
 			--n;
 		}
 	}
-
 };


--- a/Foundation/include/Poco/Buffer.h
+++ b/Foundation/include/Poco/Buffer.h
@@ -1,7 +1,7 @@
 //
 // Buffer.h
 //
-// $Id: //poco/1.3/Foundation/include/Poco/Buffer.h#1 $
+// $Id: //poco/1.3/Foundation/include/Poco/Buffer.h#3 $
 //
 // Library: Foundation
 // Package: Core
--- a/Foundation/include/Poco/Config.h
+++ b/Foundation/include/Poco/Config.h
@@ -1,7 +1,7 @@
 //
 // Config.h
 //
-// $Id: //poco/1.3/Foundation/include/Poco/Config.h#6 $
+// $Id: //poco/1.3/Foundation/include/Poco/Config.h#8 $
 //
 // Library: Foundation
 // Package: Core
--- a/Foundation/include/Poco/DynamicAny.h
+++ b/Foundation/include/Poco/DynamicAny.h
--- a/Foundation/include/Poco/DynamicAnyHolder.h
+++ b/Foundation/include/Poco/DynamicAnyHolder.h
--- a/Foundation/include/Poco/FIFOStrategy.h
+++ b/Foundation/include/Poco/FIFOStrategy.h
@@ -1,7 +1,7 @@
 //
 // FIFOStrategy.h
 //
-// $Id: //poco/1.3/Foundation/include/Poco/FIFOStrategy.h#1 $
+// $Id: //poco/1.3/Foundation/include/Poco/FIFOStrategy.h#3 $
 //
 // Library: Foundation
 // Package: Events
--- a/Foundation/include/Poco/HashTable.h
+++ b/Foundation/include/Poco/HashTable.h
@@ -1,7 +1,7 @@
 //
 // HashTable.h
 //
-// $Id: //poco/1.3/Foundation/include/Poco/HashTable.h#2 $
+// $Id: //poco/1.3/Foundation/include/Poco/HashTable.h#4 $
 //
 // Library: Foundation
 // Package: Hashing
--- a/Foundation/include/Poco/LinearHashTable.h
+++ b/Foundation/include/Poco/LinearHashTable.h
@@ -1,7 +1,7 @@
 //
 // LinearHashTable.h
 //
-// $Id: //poco/1.3/Foundation/include/Poco/LinearHashTable.h#4 $
+// $Id: //poco/1.3/Foundation/include/Poco/LinearHashTable.h#5 $
 //
 // Library: Foundation
 // Package: Hashing
@@ -89,7 +89,7 @@ public:
 	typedef typename Bucket::iterator    BucketIterator;
 	typedef typename BucketVec::iterator BucketVecIterator;

-	class ConstIterator
+	class ConstIterator: public std::iterator<std::forward_iterator_tag, Value>
 	{
 	public:
 		ConstIterator()
--- a/Foundation/include/Poco/Platform.h
+++ b/Foundation/include/Poco/Platform.h
@@ -1,7 +1,7 @@
 //
 // Platform.h
 //
-// $Id: //poco/1.3/Foundation/include/Poco/Platform.h#2 $
+// $Id: //poco/1.3/Foundation/include/Poco/Platform.h#4 $
 //
 // Library: Foundation
 // Package: Core
@@ -136,6 +136,7 @@
 #define POCO_ARCH_M68K    0x0b
 #define POCO_ARCH_S390    0x0c

+
 #if defined(__ALPHA) || defined(__alpha) || defined(__alpha__) || defined(_M_ALPHA)
 	#define POCO_ARCH POCO_ARCH_ALPHA
 	#define POCO_ARCH_LITTLE_ENDIAN 1
--- a/Foundation/include/Poco/RunnableAdapter.h
+++ b/Foundation/include/Poco/RunnableAdapter.h
@@ -1,7 +1,7 @@
 //
 // RunnableAdapter.h
 //
-// $Id: //poco/1.3/Foundation/include/Poco/RunnableAdapter.h#2 $
+// $Id: //poco/1.3/Foundation/include/Poco/RunnableAdapter.h#3 $
 //
 // Library: Foundation
 // Package: Threading
@@ -55,6 +55,9 @@ class RunnableAdapter: public Runnable
 	///    RunnableAdapter<MyClass> ra(myObject, &MyObject::doSomething));
 	///    Thread thr;
 	///    thr.Start(ra);
+	///
+	/// For using a freestanding or static member function as a thread
+	/// target, please see the ThreadTarget class.
 {
 public:
 	typedef void (C::*Callback)();
--- a/Foundation/include/Poco/SharedPtr.h
+++ b/Foundation/include/Poco/SharedPtr.h
@@ -1,7 +1,7 @@
 //
 // SharedPtr.h
 //
-// $Id: //poco/1.3/Foundation/include/Poco/SharedPtr.h#2 $
+// $Id: //poco/1.3/Foundation/include/Poco/SharedPtr.h#4 $
 //
 // Library: Foundation
 // Package: Core
--- a/Foundation/include/Poco/Thread.h
+++ b/Foundation/include/Poco/Thread.h
@@ -1,7 +1,7 @@
 //
 // Thread.h
 //
-// $Id: //poco/1.3/Foundation/include/Poco/Thread.h#2 $
+// $Id: //poco/1.3/Foundation/include/Poco/Thread.h#5 $
 //
 // Library: Foundation
 // Package: Threading
--- a/Foundation/include/Poco/ThreadPool.h
+++ b/Foundation/include/Poco/ThreadPool.h
@@ -1,7 +1,7 @@
 //
 // ThreadPool.h
 //
-// $Id: //poco/1.3/Foundation/include/Poco/ThreadPool.h#1 $
+// $Id: //poco/1.3/Foundation/include/Poco/ThreadPool.h#3 $
 //
 // Library: Foundation
 // Package: Threading
@@ -179,8 +179,9 @@ private:
 };


+//
 // inlines
-
+//
 inline void ThreadPool::setStackSize(int stackSize)
 {
 	_stackSize = stackSize;
--- a/Foundation/include/Poco/ThreadTarget.h
+++ b/Foundation/include/Poco/ThreadTarget.h
@@ -9,7 +9,7 @@
 //
 // Definition of the ThreadTarget class.
 //
-// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
+// Copyright (c) 2008, Applied Informatics Software Engineering GmbH.
 // and Contributors.
 //
 // Permission is hereby granted, free of charge, to any person or organization
@@ -54,6 +54,9 @@ class Foundation_API ThreadTarget: public Runnable
 	/// This adapter is provided as a convenience for higher abstraction level
 	/// scenarios where Runnable abstract class is used.
 	///
+	/// For using a non-static member function as a thread target, please
+	/// see the RunnableAdapter class.
+	/// 
 	/// Usage:
 	///    class MyObject
 	///    {
@@ -70,7 +73,6 @@ class Foundation_API ThreadTarget: public Runnable
 	///    ThreadTarget ra(doSomething));
 	///    Thread thr;
 	///    thr.start(ra);
-
 {
 public:
 	typedef void (*Callback)();
@@ -92,6 +94,9 @@ private:
 };


+//
+// inlines
+//
 inline void ThreadTarget::run()
 {
 	_method();
--- a/Foundation/include/Poco/Thread_POSIX.h
+++ b/Foundation/include/Poco/Thread_POSIX.h
@@ -1,7 +1,7 @@
 //
 // Thread_POSIX.h
 //
-// $Id: //poco/1.3/Foundation/include/Poco/Thread_POSIX.h#2 $
+// $Id: //poco/1.3/Foundation/include/Poco/Thread_POSIX.h#5 $
 //
 // Library: Foundation
 // Package: Threading
--- a/Foundation/include/Poco/Thread_WIN32.h
+++ b/Foundation/include/Poco/Thread_WIN32.h
@@ -1,7 +1,7 @@
 //
 // Thread_WIN32.h
 //
-// $Id: //poco/1.3/Foundation/include/Poco/Thread_WIN32.h#4 $
+// $Id: //poco/1.3/Foundation/include/Poco/Thread_WIN32.h#7 $
 //
 // Library: Foundation
 // Package: Threading
--- a/Foundation/include/Poco/Tuple.h
+++ b/Foundation/include/Poco/Tuple.h
@@ -1,7 +1,7 @@
 //
 // Tuple.h
 //
-// $Id: //poco/1.3/Foundation/include/Poco/Tuple.h#5 $
+// $Id: //poco/1.3/Foundation/include/Poco/Tuple.h#7 $
 //
 // Library: Foundation
 // Package: Core
@@ -47,7 +47,7 @@
 namespace Poco {


-#if defined(POCO_OS_FAMILY_WINDOWS) && !defined(MINGW32) 
+#if defined(_MSC_VER) 
 #define POCO_TYPEWRAPPER_DEFAULTVALUE(T) TypeWrapper<T>::TYPE()
 #else
 #define POCO_TYPEWRAPPER_DEFAULTVALUE(T) typename TypeWrapper<T>::TYPE()
--- a/Foundation/samples/ActiveMethod/ActiveMethod_vs90.vcproj
+++ b/Foundation/samples/ActiveMethod/ActiveMethod_vs90.vcproj
@@ -0,0 +1,213 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="ActiveMethod"
+	ProjectGUID="{0A3E3912-4205-41CA-BCCE-261FA564D3C7}"
+	Keyword="Win32Proj"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="debug_shared|Win32"
+			OutputDirectory="obj\debug_shared"
+			IntermediateDirectory="obj\debug_shared"
+			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			UseOfMFC="2"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories=".\include;..\..\..\Foundation\include;..\..\..\XML\include"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;POCO_DLL;WINVER=0x0500"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				BufferSecurityCheck="true"
+				TreatWChar_tAsBuiltInType="true"
+				ForceConformanceInForLoopScope="true"
+				RuntimeTypeInfo="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="PocoFoundationd.lib"
+				OutputFile="bin/ActiveMethodd.exe"
+				LinkIncremental="2"
+				AdditionalLibraryDirectories="..\..\..\lib"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="bin/ActiveMethodd.pdb"
+				SubSystem="1"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="release_shared|Win32"
+			OutputDirectory="obj\release_shared"
+			IntermediateDirectory="obj\release_shared"
+			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			UseOfMFC="2"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="4"
+				InlineFunctionExpansion="1"
+				EnableIntrinsicFunctions="true"
+				FavorSizeOrSpeed="1"
+				OmitFramePointers="true"
+				AdditionalIncludeDirectories=".\include;..\..\..\Foundation\include;..\..\..\XML\include"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;POCO_DLL;WINVER=0x0500"
+				StringPooling="true"
+				RuntimeLibrary="2"
+				BufferSecurityCheck="false"
+				TreatWChar_tAsBuiltInType="true"
+				ForceConformanceInForLoopScope="true"
+				RuntimeTypeInfo="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="PocoFoundation.lib"
+				OutputFile="bin/ActiveMethod.exe"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="..\..\..\lib"
+				GenerateDebugInformation="false"
+				ProgramDatabaseFile=""
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Header Files"
+			>
+		</Filter>
+		<Filter
+			Name="Source Files"
+			>
+			<File
+				RelativePath=".\src\ActiveMethod.cpp"
+				>
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
--- a/Foundation/samples/Activity/Activity_vs90.vcproj
+++ b/Foundation/samples/Activity/Activity_vs90.vcproj
@@ -0,0 +1,213 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="Activity"
+	ProjectGUID="{53851B48-4DAD-4B38-9BB4-5C747F9C62B1}"
+	Keyword="Win32Proj"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="debug_shared|Win32"
+			OutputDirectory="obj\debug_shared"
+			IntermediateDirectory="obj\debug_shared"
+			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			UseOfMFC="2"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories=".\include;..\..\..\Foundation\include;..\..\..\XML\include"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;POCO_DLL;WINVER=0x0500"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				BufferSecurityCheck="true"
+				TreatWChar_tAsBuiltInType="true"
+				ForceConformanceInForLoopScope="true"
+				RuntimeTypeInfo="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="PocoFoundationd.lib"
+				OutputFile="bin/Activityd.exe"
+				LinkIncremental="2"
+				AdditionalLibraryDirectories="..\..\..\lib"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="bin/Activityd.pdb"
+				SubSystem="1"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="release_shared|Win32"
+			OutputDirectory="obj\release_shared"
+			IntermediateDirectory="obj\release_shared"
+			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			UseOfMFC="2"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="4"
+				InlineFunctionExpansion="1"
+				EnableIntrinsicFunctions="true"
+				FavorSizeOrSpeed="1"
+				OmitFramePointers="true"
+				AdditionalIncludeDirectories=".\include;..\..\..\Foundation\include;..\..\..\XML\include"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;POCO_DLL;WINVER=0x0500"
+				StringPooling="true"
+				RuntimeLibrary="2"
+				BufferSecurityCheck="false"
+				TreatWChar_tAsBuiltInType="true"
+				ForceConformanceInForLoopScope="true"
+				RuntimeTypeInfo="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="PocoFoundation.lib"
+				OutputFile="bin/Activity.exe"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="..\..\..\lib"
+				GenerateDebugInformation="false"
+				ProgramDatabaseFile=""
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Header Files"
+			>
+		</Filter>
+		<Filter
+			Name="Source Files"
+			>
+			<File
+				RelativePath=".\src\Activity.cpp"
+				>
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
--- a/Foundation/samples/BinaryReaderWriter/BinaryReaderWriter_vs90.vcproj
+++ b/Foundation/samples/BinaryReaderWriter/BinaryReaderWriter_vs90.vcproj
@@ -0,0 +1,213 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="BinaryReaderWriter"
+	ProjectGUID="{9FFF12D2-4DCC-4AC2-AF3D-7FADBE7EE711}"
+	Keyword="Win32Proj"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="debug_shared|Win32"
+			OutputDirectory="obj\debug_shared"
+			IntermediateDirectory="obj\debug_shared"
+			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			UseOfMFC="2"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories=".\include;..\..\..\Foundation\include;..\..\..\XML\include"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;POCO_DLL;WINVER=0x0500"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				BufferSecurityCheck="true"
+				TreatWChar_tAsBuiltInType="true"
+				ForceConformanceInForLoopScope="true"
+				RuntimeTypeInfo="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="PocoFoundationd.lib"
+				OutputFile="bin/BinaryReaderWriterd.exe"
+				LinkIncremental="2"
+				AdditionalLibraryDirectories="..\..\..\lib"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="bin/BinaryReaderWriterd.pdb"
+				SubSystem="1"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="release_shared|Win32"
+			OutputDirectory="obj\release_shared"
+			IntermediateDirectory="obj\release_shared"
+			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			UseOfMFC="2"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="4"
+				InlineFunctionExpansion="1"
+				EnableIntrinsicFunctions="true"
+				FavorSizeOrSpeed="1"
+				OmitFramePointers="true"
+				AdditionalIncludeDirectories=".\include;..\..\..\Foundation\include;..\..\..\XML\include"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;POCO_DLL;WINVER=0x0500"
+				StringPooling="true"
+				RuntimeLibrary="2"
+				BufferSecurityCheck="false"
+				TreatWChar_tAsBuiltInType="true"
+				ForceConformanceInForLoopScope="true"
+				RuntimeTypeInfo="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="PocoFoundation.lib"
+				OutputFile="bin/BinaryReaderWriter.exe"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="..\..\..\lib"
+				GenerateDebugInformation="false"
+				ProgramDatabaseFile=""
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Header Files"
+			>
+		</Filter>
+		<Filter
+			Name="Source Files"
+			>
+			<File
+				RelativePath=".\src\BinaryReaderWriter.cpp"
+				>
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
--- a/Foundation/samples/DateTime/DateTime_vs90.vcproj
+++ b/Foundation/samples/DateTime/DateTime_vs90.vcproj
@@ -0,0 +1,213 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="DateTime"
+	ProjectGUID="{1413EE43-C5FC-45C2-AF6E-4EF10C8BF34E}"
+	Keyword="Win32Proj"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="debug_shared|Win32"
+			OutputDirectory="obj\debug_shared"
+			IntermediateDirectory="obj\debug_shared"
+			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			UseOfMFC="2"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories=".\include;..\..\..\Foundation\include;..\..\..\XML\include"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;POCO_DLL;WINVER=0x0500"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				BufferSecurityCheck="true"
+				TreatWChar_tAsBuiltInType="true"
+				ForceConformanceInForLoopScope="true"
+				RuntimeTypeInfo="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="PocoFoundationd.lib"
+				OutputFile="bin/DateTimed.exe"
+				LinkIncremental="2"
+				AdditionalLibraryDirectories="..\..\..\lib"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="bin/DateTimed.pdb"
+				SubSystem="1"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="release_shared|Win32"
+			OutputDirectory="obj\release_shared"
+			IntermediateDirectory="obj\release_shared"
+			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			UseOfMFC="2"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="4"
+				InlineFunctionExpansion="1"
+				EnableIntrinsicFunctions="true"
+				FavorSizeOrSpeed="1"
+				OmitFramePointers="true"
+				AdditionalIncludeDirectories=".\include;..\..\..\Foundation\include;..\..\..\XML\include"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;POCO_DLL;WINVER=0x0500"
+				StringPooling="true"
+				RuntimeLibrary="2"
+				BufferSecurityCheck="false"
+				TreatWChar_tAsBuiltInType="true"
+				ForceConformanceInForLoopScope="true"
+				RuntimeTypeInfo="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="PocoFoundation.lib"
+				OutputFile="bin/DateTime.exe"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="..\..\..\lib"
+				GenerateDebugInformation="false"
+				ProgramDatabaseFile=""
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Header Files"
+			>
+		</Filter>
+		<Filter
+			Name="Source Files"
+			>
+			<File
+				RelativePath=".\src\DateTime.cpp"
+				>
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
--- a/Foundation/samples/LogRotation/LogRotation.vmsbuild
+++ b/Foundation/samples/LogRotation/LogRotation.vmsbuild
@@ -1,7 +1,7 @@
 #
 # sample.vmsbuild
 #
-# $Id: //poco/svn/Foundation/samples/LogRotation/LogRotation.vmsbuild#1 $
+# $Id: //poco/1.3/Foundation/samples/LogRotation/LogRotation.vmsbuild#1 $
 #
 EXE=Logrotation
 LogRotation
--- a/Foundation/samples/LogRotation/LogRotation_vs90.vcproj
+++ b/Foundation/samples/LogRotation/LogRotation_vs90.vcproj
@@ -3,9 +3,8 @@
 	ProjectType="Visual C++"
 	Version="9.00"
 	Name="LogRotation"
-	ProjectGUID="{E7CE21A7-3D50-485E-9B68-E1BEC97ED2E3}"
+	ProjectGUID="{748FFA39-8C89-4968-9CF3-54A28A364F27}"
 	Keyword="Win32Proj"
-	TargetFrameworkVersion="0"
 	>
 	<Platforms>
 		<Platform
@@ -20,6 +19,7 @@
 			OutputDirectory="obj\debug_shared"
 			IntermediateDirectory="obj\debug_shared"
 			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
 			CharacterSet="2"
 			>
@@ -52,6 +52,7 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="4"
 			/>
 			<Tool
@@ -70,10 +71,8 @@
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="..\..\..\lib"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="bin/$(ProjectName)d.pdb"
+				ProgramDatabaseFile="bin/Loggerd.pdb"
 				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -94,6 +93,9 @@
 			<Tool
 				Name="VCAppVerifierTool"
 			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
@@ -103,6 +105,7 @@
 			OutputDirectory="obj\release_shared"
 			IntermediateDirectory="obj\release_shared"
 			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
 			CharacterSet="2"
 			>
@@ -138,6 +141,7 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="3"
 			/>
 			<Tool
@@ -160,8 +164,6 @@
 				SubSystem="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -182,6 +184,9 @@
 			<Tool
 				Name="VCAppVerifierTool"
 			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
@@ -191,6 +196,7 @@
 			OutputDirectory=".\obj\debug_static"
 			IntermediateDirectory=".\obj\debug_static"
 			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
 			CharacterSet="2"
 			>
@@ -223,6 +229,7 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="4"
 			/>
 			<Tool
@@ -241,10 +248,8 @@
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="..\..\..\lib"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="bin/$(ProjectName)mtd.pdb"
+				ProgramDatabaseFile="bin/Loggerd.pdb"
 				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -265,6 +270,9 @@
 			<Tool
 				Name="VCAppVerifierTool"
 			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
@@ -274,6 +282,7 @@
 			OutputDirectory=".\obj\release_static"
 			IntermediateDirectory=".\obj\release_static"
 			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
 			CharacterSet="2"
 			>
@@ -309,6 +318,7 @@
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="3"
 			/>
 			<Tool
@@ -331,8 +341,6 @@
 				SubSystem="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -353,6 +361,9 @@
 			<Tool
 				Name="VCAppVerifierTool"
 			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
--- a/Foundation/samples/Logger/Logger_vs90.vcproj
+++ b/Foundation/samples/Logger/Logger_vs90.vcproj
@@ -0,0 +1,213 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="Logger"
+	ProjectGUID="{E7CE21A7-3D50-485E-9B68-E1BEC97ED2E3}"
+	Keyword="Win32Proj"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="debug_shared|Win32"
+			OutputDirectory="obj\debug_shared"
+			IntermediateDirectory="obj\debug_shared"
+			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			UseOfMFC="2"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories=".\include;..\..\..\Foundation\include;..\..\..\XML\include"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;POCO_DLL;WINVER=0x0500"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				BufferSecurityCheck="true"
+				TreatWChar_tAsBuiltInType="true"
+				ForceConformanceInForLoopScope="true"
+				RuntimeTypeInfo="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="PocoFoundationd.lib"
+				OutputFile="bin/Loggerd.exe"
+				LinkIncremental="2"
+				AdditionalLibraryDirectories="..\..\..\lib"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="bin/Loggerd.pdb"
+				SubSystem="1"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="release_shared|Win32"
+			OutputDirectory="obj\release_shared"
+			IntermediateDirectory="obj\release_shared"
+			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			UseOfMFC="2"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="4"
+				InlineFunctionExpansion="1"
+				EnableIntrinsicFunctions="true"
+				FavorSizeOrSpeed="1"
+				OmitFramePointers="true"
+				AdditionalIncludeDirectories=".\include;..\..\..\Foundation\include;..\..\..\XML\include"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;POCO_DLL;WINVER=0x0500"
+				StringPooling="true"
+				RuntimeLibrary="2"
+				BufferSecurityCheck="false"
+				TreatWChar_tAsBuiltInType="true"
+				ForceConformanceInForLoopScope="true"
+				RuntimeTypeInfo="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="PocoFoundation.lib"
+				OutputFile="bin/Logger.exe"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="..\..\..\lib"
+				GenerateDebugInformation="false"
+				ProgramDatabaseFile=""
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Header Files"
+			>
+		</Filter>
+		<Filter
+			Name="Source Files"
+			>
+			<File
+				RelativePath=".\src\Logger.cpp"
+				>
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
--- a/Foundation/samples/NotificationQueue/NotificationQueue_vs90.vcproj
+++ b/Foundation/samples/NotificationQueue/NotificationQueue_vs90.vcproj
@@ -0,0 +1,213 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="NotificationQueue"
+	ProjectGUID="{DB9948BB-A40E-4010-8E5E-DDCDFC1B8EFD}"
+	Keyword="Win32Proj"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="debug_shared|Win32"
+			OutputDirectory="obj\debug_shared"
+			IntermediateDirectory="obj\debug_shared"
+			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			UseOfMFC="2"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories=".\include;..\..\..\Foundation\include;..\..\..\XML\include"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;POCO_DLL;WINVER=0x0500"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				BufferSecurityCheck="true"
+				TreatWChar_tAsBuiltInType="true"
+				ForceConformanceInForLoopScope="true"
+				RuntimeTypeInfo="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="PocoFoundationd.lib"
+				OutputFile="bin/NotificationQueued.exe"
+				LinkIncremental="2"
+				AdditionalLibraryDirectories="..\..\..\lib"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="bin/NotificationQueued.pdb"
+				SubSystem="1"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="release_shared|Win32"
+			OutputDirectory="obj\release_shared"
+			IntermediateDirectory="obj\release_shared"
+			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			UseOfMFC="2"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="4"
+				InlineFunctionExpansion="1"
+				EnableIntrinsicFunctions="true"
+				FavorSizeOrSpeed="1"
+				OmitFramePointers="true"
+				AdditionalIncludeDirectories=".\include;..\..\..\Foundation\include;..\..\..\XML\include"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;POCO_DLL;WINVER=0x0500"
+				StringPooling="true"
+				RuntimeLibrary="2"
+				BufferSecurityCheck="false"
+				TreatWChar_tAsBuiltInType="true"
+				ForceConformanceInForLoopScope="true"
+				RuntimeTypeInfo="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="PocoFoundation.lib"
+				OutputFile="bin/NotificationQueue.exe"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="..\..\..\lib"
+				GenerateDebugInformation="false"
+				ProgramDatabaseFile=""
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Header Files"
+			>
+		</Filter>
+		<Filter
+			Name="Source Files"
+			>
+			<File
+				RelativePath=".\src\NotificationQueue.cpp"
+				>
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
--- a/Foundation/samples/StringTokenizer/StringTokenizer_vs90.vcproj
+++ b/Foundation/samples/StringTokenizer/StringTokenizer_vs90.vcproj
@@ -0,0 +1,213 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="StringTokenizer"
+	ProjectGUID="{D49346E0-4F69-4BEC-9380-32D55D48063F}"
+	Keyword="Win32Proj"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="debug_shared|Win32"
+			OutputDirectory="obj\debug_shared"
+			IntermediateDirectory="obj\debug_shared"
+			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			UseOfMFC="0"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories=".\include;..\..\..\Foundation\include;..\..\..\XML\include"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;POCO_DLL;WINVER=0x0500"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				BufferSecurityCheck="true"
+				TreatWChar_tAsBuiltInType="true"
+				ForceConformanceInForLoopScope="true"
+				RuntimeTypeInfo="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="PocoFoundationd.lib"
+				OutputFile="bin/StringTokenizerd.exe"
+				LinkIncremental="2"
+				AdditionalLibraryDirectories="..\..\..\lib"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="bin/StringTokenizerd.pdb"
+				SubSystem="1"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="release_shared|Win32"
+			OutputDirectory="obj\release_shared"
+			IntermediateDirectory="obj\release_shared"
+			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			UseOfMFC="0"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="4"
+				InlineFunctionExpansion="1"
+				EnableIntrinsicFunctions="true"
+				FavorSizeOrSpeed="1"
+				OmitFramePointers="true"
+				AdditionalIncludeDirectories=".\include;..\..\..\Foundation\include;..\..\..\XML\include"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;POCO_DLL;WINVER=0x0500"
+				StringPooling="true"
+				RuntimeLibrary="2"
+				BufferSecurityCheck="false"
+				TreatWChar_tAsBuiltInType="true"
+				ForceConformanceInForLoopScope="true"
+				RuntimeTypeInfo="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="PocoFoundation.lib"
+				OutputFile="bin/StringTokenizer.exe"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="..\..\..\lib"
+				GenerateDebugInformation="false"
+				ProgramDatabaseFile=""
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Header Files"
+			>
+		</Filter>
+		<Filter
+			Name="Source Files"
+			>
+			<File
+				RelativePath=".\src\StringTokenizer.cpp"
+				>
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
--- a/Foundation/samples/Timer/Timer_vs90.vcproj
+++ b/Foundation/samples/Timer/Timer_vs90.vcproj
@@ -0,0 +1,213 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="Timer"
+	ProjectGUID="{DE2611F3-CC74-433C-9020-B9BB162CE89F}"
+	Keyword="Win32Proj"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="debug_shared|Win32"
+			OutputDirectory="obj\debug_shared"
+			IntermediateDirectory="obj\debug_shared"
+			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			UseOfMFC="2"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories=".\include;..\..\..\Foundation\include;..\..\..\XML\include"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;POCO_DLL;WINVER=0x0500"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				BufferSecurityCheck="true"
+				TreatWChar_tAsBuiltInType="true"
+				ForceConformanceInForLoopScope="true"
+				RuntimeTypeInfo="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="PocoFoundationd.lib"
+				OutputFile="bin/Timerd.exe"
+				LinkIncremental="2"
+				AdditionalLibraryDirectories="..\..\..\lib"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="bin/Timerd.pdb"
+				SubSystem="1"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="release_shared|Win32"
+			OutputDirectory="obj\release_shared"
+			IntermediateDirectory="obj\release_shared"
+			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			UseOfMFC="2"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="4"
+				InlineFunctionExpansion="1"
+				EnableIntrinsicFunctions="true"
+				FavorSizeOrSpeed="1"
+				OmitFramePointers="true"
+				AdditionalIncludeDirectories=".\include;..\..\..\Foundation\include;..\..\..\XML\include"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;POCO_DLL;WINVER=0x0500"
+				StringPooling="true"
+				RuntimeLibrary="2"
+				BufferSecurityCheck="false"
+				TreatWChar_tAsBuiltInType="true"
+				ForceConformanceInForLoopScope="true"
+				RuntimeTypeInfo="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="PocoFoundation.lib"
+				OutputFile="bin/Timer.exe"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="..\..\..\lib"
+				GenerateDebugInformation="false"
+				ProgramDatabaseFile=""
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Header Files"
+			>
+		</Filter>
+		<Filter
+			Name="Source Files"
+			>
+			<File
+				RelativePath=".\src\Timer.cpp"
+				>
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
--- a/Show More
+++ b/Show More