synced with main repository

wleebo · Jan 28, 2008 · 40e7be0 · 40e7be0
1 parent 239471d
commit 40e7be0
Show file tree

Hide file tree

Showing 113 changed files with 136 additions and 134 deletions.
diff --git a/Util/Makefile b/Util/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile
 #
-# $Id: //poco/Main/Util/Makefile#11 $
+# $Id: //poco/svn/Util/Makefile#1 $
 #
 # Makefile for Poco Util
 #

diff --git a/Util/Util.vmsbuild b/Util/Util.vmsbuild
@@ -1,7 +1,7 @@
 #
 # Util.vmsbuild
 #
-# $Id: //poco/Main/Util/Util.vmsbuild#2 $
+# $Id: //poco/svn/Util/Util.vmsbuild#1 $
 #
 LIB=PocoUtil
 AbstractConfiguration 

diff --git a/Util/Util_vs71.vcproj b/Util/Util_vs71.vcproj
@@ -39,7 +39,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="PocoFoundationd.lib PocoXMLd.lib"
+				AdditionalDependencies="PocoFoundationd.lib PocoXMLd.lib unicows.lib"
 				OutputFile="..\bin\PocoUtild.dll"
 				LinkIncremental="2"
 				SuppressStartupBanner="TRUE"
@@ -104,7 +104,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="PocoFoundation.lib PocoXML.lib"
+				AdditionalDependencies="PocoFoundation.lib PocoXML.lib unicows.lib"
 				OutputFile="..\bin\PocoUtil.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"

diff --git a/Util/include/Poco/Util/AbstractConfiguration.h b/Util/include/Poco/Util/AbstractConfiguration.h
@@ -1,7 +1,7 @@
 //
 // AbstractConfiguration.h
 //
-// $Id: //poco/Main/Util/include/Poco/Util/AbstractConfiguration.h#2 $
+// $Id: //poco/svn/Util/include/Poco/Util/AbstractConfiguration.h#1 $
 //
 // Library: Util
 // Package: Configuration

diff --git a/Util/include/Poco/Util/Application.h b/Util/include/Poco/Util/Application.h
@@ -1,7 +1,7 @@
 //
 // Application.h
 //
-// $Id: //poco/Main/Util/include/Poco/Util/Application.h#15 $
+// $Id: //poco/svn/Util/include/Poco/Util/Application.h#1 $
 //
 // Library: Util
 // Package: Application
@@ -148,7 +148,7 @@ class Util_API Application: public Subsystem
 		/// Initializes the application and all registered subsystems,
 		/// using the given command line arguments.
 
-#if defined(POCO_WIN32_UTF8)
+#if defined(POCO_WIN32_UTF8) && !defined(POCO_NO_WSTRING)
 	void init(int argc, wchar_t* argv[]);
 		/// Initializes the application and all registered subsystems,
 		/// using the given command line arguments.
@@ -445,7 +445,7 @@ inline Poco::Timespan Application::uptime() const
 //
 // Macro to implement main()
 //
-#if defined(_WIN32) && defined(POCO_WIN32_UTF8)
+#if defined(_WIN32) && defined(POCO_WIN32_UTF8) && !defined(POCO_NO_WSTRING)
 	#define POCO_APP_MAIN(App) \
 	int wmain(int argc, wchar_t** argv)		\
 	{										\

diff --git a/Util/include/Poco/Util/ConfigurationMapper.h b/Util/include/Poco/Util/ConfigurationMapper.h
@@ -1,7 +1,7 @@
 //
 // ConfigurationMapper.h
 //
-// $Id: //poco/Main/Util/include/Poco/Util/ConfigurationMapper.h#2 $
+// $Id: //poco/svn/Util/include/Poco/Util/ConfigurationMapper.h#1 $
 //
 // Library: Util
 // Package: Configuration

diff --git a/Util/include/Poco/Util/ConfigurationView.h b/Util/include/Poco/Util/ConfigurationView.h
@@ -1,7 +1,7 @@
 //
 // ConfigurationView.h
 //
-// $Id: //poco/Main/Util/include/Poco/Util/ConfigurationView.h#2 $
+// $Id: //poco/svn/Util/include/Poco/Util/ConfigurationView.h#1 $
 //
 // Library: Util
 // Package: Configuration

diff --git a/Util/include/Poco/Util/FilesystemConfiguration.h b/Util/include/Poco/Util/FilesystemConfiguration.h
@@ -1,7 +1,7 @@
 //
 // FilesystemConfiguration.h
 //
-// $Id: //poco/Main/Util/include/Poco/Util/FilesystemConfiguration.h#2 $
+// $Id: //poco/svn/Util/include/Poco/Util/FilesystemConfiguration.h#1 $
 //
 // Library: Util
 // Package: Configuration

diff --git a/Util/include/Poco/Util/HelpFormatter.h b/Util/include/Poco/Util/HelpFormatter.h
@@ -1,7 +1,7 @@
 //
 // HelpFormatter.h
 //
-// $Id: //poco/Main/Util/include/Poco/Util/HelpFormatter.h#2 $
+// $Id: //poco/svn/Util/include/Poco/Util/HelpFormatter.h#1 $
 //
 // Library: Util
 // Package: Options

diff --git a/Util/include/Poco/Util/IniFileConfiguration.h b/Util/include/Poco/Util/IniFileConfiguration.h
@@ -1,7 +1,7 @@
 //
 // IniFileConfiguration.h
 //
-// $Id: //poco/Main/Util/include/Poco/Util/IniFileConfiguration.h#2 $
+// $Id: //poco/svn/Util/include/Poco/Util/IniFileConfiguration.h#1 $
 //
 // Library: Util
 // Package: Configuration

diff --git a/Util/include/Poco/Util/IntValidator.h b/Util/include/Poco/Util/IntValidator.h
@@ -1,7 +1,7 @@
 //
 // IntValidator.h
 //
-// $Id: //poco/Main/Util/include/Poco/Util/IntValidator.h#1 $
+// $Id: //poco/svn/Util/include/Poco/Util/IntValidator.h#1 $
 //
 // Library: Util
 // Package: Options

diff --git a/Util/include/Poco/Util/LayeredConfiguration.h b/Util/include/Poco/Util/LayeredConfiguration.h
@@ -1,7 +1,7 @@
 //
 // LayeredConfiguration.h
 //
-// $Id: //poco/Main/Util/include/Poco/Util/LayeredConfiguration.h#3 $
+// $Id: //poco/svn/Util/include/Poco/Util/LayeredConfiguration.h#1 $
 //
 // Library: Util
 // Package: Configuration

diff --git a/Util/include/Poco/Util/LoggingConfigurator.h b/Util/include/Poco/Util/LoggingConfigurator.h
@@ -1,7 +1,7 @@
 //
 // LoggingConfigurator.h
 //
-// $Id: //poco/Main/Util/include/Poco/Util/LoggingConfigurator.h#3 $
+// $Id: //poco/svn/Util/include/Poco/Util/LoggingConfigurator.h#1 $
 //
 // Library: Util
 // Package: Configuration

diff --git a/Util/include/Poco/Util/LoggingSubsystem.h b/Util/include/Poco/Util/LoggingSubsystem.h
@@ -1,7 +1,7 @@
 //
 // LoggingSubsystem.h
 //
-// $Id: //poco/Main/Util/include/Poco/Util/LoggingSubsystem.h#2 $
+// $Id: //poco/svn/Util/include/Poco/Util/LoggingSubsystem.h#1 $
 //
 // Library: Util
 // Package: Application

diff --git a/Util/include/Poco/Util/MapConfiguration.h b/Util/include/Poco/Util/MapConfiguration.h
@@ -1,7 +1,7 @@
 //
 // MapConfiguration.h
 //
-// $Id: //poco/Main/Util/include/Poco/Util/MapConfiguration.h#2 $
+// $Id: //poco/svn/Util/include/Poco/Util/MapConfiguration.h#1 $
 //
 // Library: Util
 // Package: Configuration

diff --git a/Util/include/Poco/Util/Option.h b/Util/include/Poco/Util/Option.h
@@ -1,7 +1,7 @@
 //
 // Option.h
 //
-// $Id: //poco/Main/Util/include/Poco/Util/Option.h#5 $
+// $Id: //poco/svn/Util/include/Poco/Util/Option.h#2 $
 //
 // Library: Util
 // Package: Options
@@ -104,7 +104,7 @@ class Util_API Option
 	Option(const std::string& fullName, const std::string& shortName, const std::string& description, bool required = false);
 		/// Creates an option with the given properties.
 
-	Option(const std::string& fullName, const std::string& shortName, const std::string& description, bool required, const std::string& argName, bool argOptional = false);
+	Option(const std::string& fullName, const std::string& shortName, const std::string& description, bool required, const std::string& argName, bool argRequired = false);
 		/// Creates an option with the given properties.
 
 	~Option();

diff --git a/Util/include/Poco/Util/OptionCallback.h b/Util/include/Poco/Util/OptionCallback.h
@@ -1,7 +1,7 @@
 //
 // OptionCallback.h
 //
-// $Id: //poco/Main/Util/include/Poco/Util/OptionCallback.h#3 $
+// $Id: //poco/svn/Util/include/Poco/Util/OptionCallback.h#1 $
 //
 // Library: Util
 // Package: Options

diff --git a/Util/include/Poco/Util/OptionException.h b/Util/include/Poco/Util/OptionException.h
@@ -1,7 +1,7 @@
 //
 // OptionException.h
 //
-// $Id: //poco/Main/Util/include/Poco/Util/OptionException.h#3 $
+// $Id: //poco/svn/Util/include/Poco/Util/OptionException.h#1 $
 //
 // Library: Util
 // Package: Options

diff --git a/Util/include/Poco/Util/OptionProcessor.h b/Util/include/Poco/Util/OptionProcessor.h
@@ -1,7 +1,7 @@
 //
 // OptionProcessor.h
 //
-// $Id: //poco/Main/Util/include/Poco/Util/OptionProcessor.h#3 $
+// $Id: //poco/svn/Util/include/Poco/Util/OptionProcessor.h#1 $
 //
 // Library: Util
 // Package: Options

diff --git a/Util/include/Poco/Util/OptionSet.h b/Util/include/Poco/Util/OptionSet.h
@@ -1,7 +1,7 @@
 //
 // OptionSet.h
 //
-// $Id: //poco/Main/Util/include/Poco/Util/OptionSet.h#2 $
+// $Id: //poco/svn/Util/include/Poco/Util/OptionSet.h#1 $
 //
 // Library: Util
 // Package: Options

diff --git a/Util/include/Poco/Util/PropertyFileConfiguration.h b/Util/include/Poco/Util/PropertyFileConfiguration.h
@@ -1,7 +1,7 @@
 //
 // PropertyFileConfiguration.h
 //
-// $Id: //poco/Main/Util/include/Poco/Util/PropertyFileConfiguration.h#2 $
+// $Id: //poco/svn/Util/include/Poco/Util/PropertyFileConfiguration.h#1 $
 //
 // Library: Util
 // Package: Configuration

diff --git a/Util/include/Poco/Util/RegExpValidator.h b/Util/include/Poco/Util/RegExpValidator.h
@@ -1,7 +1,7 @@
 //
 // RegExpValidator.h
 //
-// $Id: //poco/Main/Util/include/Poco/Util/RegExpValidator.h#1 $
+// $Id: //poco/svn/Util/include/Poco/Util/RegExpValidator.h#1 $
 //
 // Library: Util
 // Package: Options

diff --git a/Util/include/Poco/Util/ServerApplication.h b/Util/include/Poco/Util/ServerApplication.h
@@ -1,7 +1,7 @@
 //
 // ServerApplication.h
 //
-// $Id: //poco/Main/Util/include/Poco/Util/ServerApplication.h#5 $
+// $Id: //poco/svn/Util/include/Poco/Util/ServerApplication.h#1 $
 //
 // Library: Util
 // Package: Application
@@ -141,7 +141,7 @@ class Util_API ServerApplication: public Application
 		/// Runs the application by performing additional initializations
 		/// and calling the main() method.
 
-#if defined(POCO_WIN32_UTF8)
+#if defined(POCO_WIN32_UTF8) && !defined(POCO_NO_WSTRING)
 	int run(int argc, wchar_t** argv);
 		/// Runs the application by performing additional initializations
 		/// and calling the main() method.
@@ -170,7 +170,7 @@ class Util_API ServerApplication: public Application
 	};
 	static BOOL __stdcall ConsoleCtrlHandler(DWORD ctrlType);
 	static void __stdcall ServiceControlHandler(DWORD control);
-#if defined(POCO_WIN32_UTF8)
+#if defined(POCO_WIN32_UTF8) && !defined(POCO_NO_WSTRING)
 	static void __stdcall ServiceMain(DWORD argc, LPWSTR* argv);
 #else
 	static void __stdcall ServiceMain(DWORD argc, LPTSTR* argv);

diff --git a/Util/include/Poco/Util/Subsystem.h b/Util/include/Poco/Util/Subsystem.h
@@ -1,7 +1,7 @@
 //
 // Subsystem.h
 //
-// $Id: //poco/Main/Util/include/Poco/Util/Subsystem.h#4 $
+// $Id: //poco/svn/Util/include/Poco/Util/Subsystem.h#1 $
 //
 // Library: Util
 // Package: Application

diff --git a/Util/include/Poco/Util/SystemConfiguration.h b/Util/include/Poco/Util/SystemConfiguration.h
@@ -1,7 +1,7 @@
 //
 // SystemConfiguration.h
 //
-// $Id: //poco/Main/Util/include/Poco/Util/SystemConfiguration.h#3 $
+// $Id: //poco/svn/Util/include/Poco/Util/SystemConfiguration.h#1 $
 //
 // Library: Util
 // Package: Configuration

diff --git a/Util/include/Poco/Util/Util.h b/Util/include/Poco/Util/Util.h
@@ -1,7 +1,7 @@
 //
 // Util.h
 //
-// $Id: //poco/Main/Util/include/Poco/Util/Util.h#3 $
+// $Id: //poco/svn/Util/include/Poco/Util/Util.h#1 $
 //
 // Library: Util
 // Package: Util

diff --git a/Util/include/Poco/Util/Validator.h b/Util/include/Poco/Util/Validator.h
@@ -1,7 +1,7 @@
 //
 // Validator.h
 //
-// $Id: //poco/Main/Util/include/Poco/Util/Validator.h#1 $
+// $Id: //poco/svn/Util/include/Poco/Util/Validator.h#1 $
 //
 // Library: Util
 // Package: Options

diff --git a/Util/include/Poco/Util/WinRegistryConfiguration.h b/Util/include/Poco/Util/WinRegistryConfiguration.h
@@ -1,7 +1,7 @@
 //
 // WinRegistryConfiguration.h
 //
-// $Id: //poco/Main/Util/include/Poco/Util/WinRegistryConfiguration.h#2 $
+// $Id: //poco/svn/Util/include/Poco/Util/WinRegistryConfiguration.h#1 $
 //
 // Library: Util
 // Package: Windows

diff --git a/Util/include/Poco/Util/WinRegistryKey.h b/Util/include/Poco/Util/WinRegistryKey.h
@@ -1,7 +1,7 @@
 //
 // WinRegistryKey.h
 //
-// $Id: //poco/Main/Util/include/Poco/Util/WinRegistryKey.h#3 $
+// $Id: //poco/svn/Util/include/Poco/Util/WinRegistryKey.h#1 $
 //
 // Library: Util
 // Package: Windows

diff --git a/Util/include/Poco/Util/WinService.h b/Util/include/Poco/Util/WinService.h
@@ -1,7 +1,7 @@
 //
 // WinService.h
 //
-// $Id: //poco/Main/Util/include/Poco/Util/WinService.h#4 $
+// $Id: //poco/svn/Util/include/Poco/Util/WinService.h#1 $
 //
 // Library: Util
 // Package: Windows

diff --git a/Util/include/Poco/Util/XMLConfiguration.h b/Util/include/Poco/Util/XMLConfiguration.h
@@ -1,7 +1,7 @@
 //
 // XMLConfiguration.h
 //
-// $Id: //poco/Main/Util/include/Poco/Util/XMLConfiguration.h#2 $
+// $Id: //poco/svn/Util/include/Poco/Util/XMLConfiguration.h#1 $
 //
 // Library: Util
 // Package: Configuration

diff --git a/Util/samples/Makefile b/Util/samples/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile
 #
-# $Id: //poco/Main/Util/samples/Makefile#3 $
+# $Id: //poco/svn/Util/samples/Makefile#1 $
 #
 # Makefile for Poco Util Samples
 #

diff --git a/Util/samples/SampleApp/Makefile b/Util/samples/SampleApp/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile
 #
-# $Id: //poco/Main/Util/samples/SampleApp/Makefile#3 $
+# $Id: //poco/svn/Util/samples/SampleApp/Makefile#1 $
 #
 # Makefile for Poco SampleApp
 #

diff --git a/Util/samples/SampleApp/SampleApp.vmsbuild b/Util/samples/SampleApp/SampleApp.vmsbuild
@@ -1,7 +1,7 @@
 #
 # sample.vmsbuild
 #
-# $Id: //poco/Main/Util/samples/SampleApp/SampleApp.vmsbuild#2 $
+# $Id: //poco/svn/Util/samples/SampleApp/SampleApp.vmsbuild#1 $
 #
 EXE=SampleApp
 SampleApp
diff --git a/Util/samples/SampleApp/src/SampleApp.cpp b/Util/samples/SampleApp/src/SampleApp.cpp
@@ -1,7 +1,7 @@
 //
 // SampleApp.cpp
 //
-// $Id: //poco/Main/Util/samples/SampleApp/src/SampleApp.cpp#10 $
+// $Id: //poco/svn/Util/samples/SampleApp/src/SampleApp.cpp#1 $
 //
 // This sample demonstrates the Application class.
 //

diff --git a/Util/samples/SampleServer/Makefile b/Util/samples/SampleServer/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile
 #
-# $Id: //poco/Main/Util/samples/SampleServer/Makefile#3 $
+# $Id: //poco/svn/Util/samples/SampleServer/Makefile#1 $
 #
 # Makefile for Poco SampleServer
 #

diff --git a/Util/samples/SampleServer/SampleServer.vmsbuild b/Util/samples/SampleServer/SampleServer.vmsbuild
@@ -1,7 +1,7 @@
 #
 # sample.vmsbuild
 #
-# $Id: //poco/Main/Util/samples/SampleServer/SampleServer.vmsbuild#1 $
+# $Id: //poco/svn/Util/samples/SampleServer/SampleServer.vmsbuild#1 $
 #
 EXE=SampleServer
 SampleServer

diff --git a/Util/samples/SampleServer/src/SampleServer.cpp b/Util/samples/SampleServer/src/SampleServer.cpp
@@ -1,7 +1,7 @@
 //
 // SampleServer.cpp
 //
-// $Id: //poco/Main/Util/samples/SampleServer/src/SampleServer.cpp#9 $
+// $Id: //poco/svn/Util/samples/SampleServer/src/SampleServer.cpp#1 $
 //
 // This sample demonstrates the ServerApplication class.
 //