bug 2524 - deprecate Service command-line options; misc perm fixes

11 files changed, 7 insertions, 120 deletions

diff --git a/cpp/src/Glacier2/Glacier2Router.cpp b/cpp/src/Glacier2/Glacier2Router.cpp
index 955badc1c4b..07f626c6177 100644
--- a/cpp/src/Glacier2/Glacier2Router.cpp
+++ b/cpp/src/Glacier2/Glacier2Router.cpp
@@ -570,30 +570,7 @@ Glacier2::RouterService::usage(const string& appName)
         "-h, --help           Show this message.\n"
         "-v, --version        Display the Ice version.\n"
         "--nowarn             Suppress warnings.";
-#ifdef _WIN32
-    if(checkSystem())
-    {
-        options.append(
-        "\n"
-        "\n"
-        "--service NAME       Run as the Windows service NAME.\n"
-        "\n"
-        "--install NAME [--display DISP] [--executable EXEC] [args]\n"
-        "                     Install as Windows service NAME. If DISP is\n"
-        "                     provided, use it as the display name,\n"
-        "                     otherwise NAME is used. If EXEC is provided,\n"
-        "                     use it as the service executable, otherwise\n"
-        "                     this executable is used. Any additional\n"
-        "                     arguments are passed unchanged to the\n"
-        "                     service at startup.\n"
-        "--uninstall NAME     Uninstall Windows service NAME.\n"
-        "--start NAME [args]  Start Windows service NAME. Any additional\n"
-        "                     arguments are passed unchanged to the\n"
-        "                     service.\n"
-        "--stop NAME          Stop Windows service NAME."
-        );
-    }
-#else
+#ifndef _WIN32
     options.append(
         "\n"
         "\n"
diff --git a/cpp/src/Ice/DLLMain.cpp b/cpp/src/Ice/DLLMain.cpp
index 125e5f799dd..125e5f799dd 100755..100644
--- a/cpp/src/Ice/DLLMain.cpp
+++ b/cpp/src/Ice/DLLMain.cpp
diff --git a/cpp/src/Ice/EventLoggerI.cpp b/cpp/src/Ice/EventLoggerI.cpp
index edb6ad4ce89..edb6ad4ce89 100755..100644
--- a/cpp/src/Ice/EventLoggerI.cpp
+++ b/cpp/src/Ice/EventLoggerI.cpp
diff --git a/cpp/src/Ice/GC.cpp b/cpp/src/Ice/GC.cpp
index 04d934cc008..04d934cc008 100755..100644
--- a/cpp/src/Ice/GC.cpp
+++ b/cpp/src/Ice/GC.cpp
diff --git a/cpp/src/Ice/Reference.cpp b/cpp/src/Ice/Reference.cpp
index c4b60bce3e8..c4b60bce3e8 100755..100644
--- a/cpp/src/Ice/Reference.cpp
+++ b/cpp/src/Ice/Reference.cpp
diff --git a/cpp/src/Ice/Service.cpp b/cpp/src/Ice/Service.cpp
index 326c381029e..123083abf27 100755..100644
--- a/cpp/src/Ice/Service.cpp
+++ b/cpp/src/Ice/Service.cpp
@@ -468,6 +468,8 @@ Ice::Service::main(int& argc, char* argv[], const InitializationData& initializa
             op = argv[idx];
             name = argv[idx + 1];
 
+            warning("the " + op + " option is deprecated");
+
             for(int i = idx ; i + 2 < argc ; ++i)
             {
                 argv[i] = argv[i + 2];
diff --git a/cpp/src/Ice/StringConverter.cpp b/cpp/src/Ice/StringConverter.cpp
index 1e750a88e1d..1e750a88e1d 100755..100644
--- a/cpp/src/Ice/StringConverter.cpp
+++ b/cpp/src/Ice/StringConverter.cpp
diff --git a/cpp/src/IceBox/Service.cpp b/cpp/src/IceBox/Service.cpp
index 83f2bda2bfe..f48242c82e2 100644
--- a/cpp/src/IceBox/Service.cpp
+++ b/cpp/src/IceBox/Service.cpp
@@ -121,30 +121,7 @@ IceBox::IceBoxService::usage(const string& appName)
         "Options:\n"
         "-h, --help           Show this message.\n"
         "-v, --version        Display the Ice version.";
-#ifdef _WIN32
-    if(checkSystem())
-    {
-        options.append(
-        "\n"
-        "\n"
-        "--service NAME       Run as the Windows service NAME.\n"
-        "\n"
-        "--install NAME [--display DISP] [--executable EXEC] [args]\n"
-        "                     Install as Windows service NAME. If DISP is\n"
-        "                     provided, use it as the display name,\n"
-        "                     otherwise NAME is used. If EXEC is provided,\n"
-        "                     use it as the service executable, otherwise\n"
-        "                     this executable is used. Any additional\n"
-        "                     arguments are passed unchanged to the\n"
-        "                     service at startup.\n"
-        "--uninstall NAME     Uninstall Windows service NAME.\n"
-        "--start NAME [args]  Start Windows service NAME. Any additional\n"
-        "                     arguments are passed unchanged to the\n"
-        "                     service.\n"
-        "--stop NAME          Stop Windows service NAME."
-        );
-    }
-#else
+#ifndef _WIN32
     options.append(
         "\n"
         "\n"
diff --git a/cpp/src/IceGrid/IceGridNode.cpp b/cpp/src/IceGrid/IceGridNode.cpp
index c8ee67a6d18..5d3362c7322 100644
--- a/cpp/src/IceGrid/IceGridNode.cpp
+++ b/cpp/src/IceGrid/IceGridNode.cpp
@@ -776,30 +776,7 @@ NodeService::usage(const string& appName)
         "--deploy DESCRIPTOR [TARGET1 [TARGET2 ...]]\n"
         "                     Add or update descriptor in file DESCRIPTOR, with\n"
         "                     optional targets.\n";
-#ifdef _WIN32
-    if(checkSystem())
-    {
-        options.append(
-        "\n"
-        "\n"
-        "--service NAME       Run as the Windows service NAME.\n"
-        "\n"
-        "--install NAME [--display DISP] [--executable EXEC] [args]\n"
-        "                     Install as Windows service NAME. If DISP is\n"
-        "                     provided, use it as the display name,\n"
-        "                     otherwise NAME is used. If EXEC is provided,\n"
-        "                     use it as the service executable, otherwise\n"
-        "                     this executable is used. Any additional\n"
-        "                     arguments are passed unchanged to the\n"
-        "                     service at startup.\n"
-        "--uninstall NAME     Uninstall Windows service NAME.\n"
-        "--start NAME [args]  Start Windows service NAME. Any additional\n"
-        "                     arguments are passed unchanged to the\n"
-        "                     service.\n"
-        "--stop NAME          Stop Windows service NAME."
-        );
-    }
-#else
+#ifndef _WIN32
     options.append(
         "\n"
         "\n"
diff --git a/cpp/src/IceGrid/IceGridRegistry.cpp b/cpp/src/IceGrid/IceGridRegistry.cpp
index ef2f30747e4..d7964aee9bc 100644
--- a/cpp/src/IceGrid/IceGridRegistry.cpp
+++ b/cpp/src/IceGrid/IceGridRegistry.cpp
@@ -170,30 +170,7 @@ RegistryService::usage(const string& appName)
         "-h, --help           Show this message.\n"
         "-v, --version        Display the Ice version.\n"
         "--nowarn             Don't print any security warnings.";
-#ifdef _WIN32
-    if(checkSystem())
-    {
-        options.append(
-        "\n"
-        "\n"
-        "--service NAME       Run as the Windows service NAME.\n"
-        "\n"
-        "--install NAME [--display DISP] [--executable EXEC] [args]\n"
-        "                     Install as Windows service NAME. If DISP is\n"
-        "                     provided, use it as the display name,\n"
-        "                     otherwise NAME is used. If EXEC is provided,\n"
-        "                     use it as the service executable, otherwise\n"
-        "                     this executable is used. Any additional\n"
-        "                     arguments are passed unchanged to the\n"
-        "                     service at startup.\n"
-        "--uninstall NAME     Uninstall Windows service NAME.\n"
-        "--start NAME [args]  Start Windows service NAME. Any additional\n"
-        "                     arguments are passed unchanged to the\n"
-        "                     service.\n"
-        "--stop NAME          Stop Windows service NAME."
-        );
-    }
-#else
+#ifndef _WIN32
     options.append(
         "\n"
         "\n"
diff --git a/cpp/src/IcePatch2/Server.cpp b/cpp/src/IcePatch2/Server.cpp
index b316e049eee..b5a7a5f828d 100644
--- a/cpp/src/IcePatch2/Server.cpp
+++ b/cpp/src/IcePatch2/Server.cpp
@@ -195,30 +195,7 @@ IcePatch2::PatcherService::usage(const string& appName)
         "Options:\n"
         "-h, --help           Show this message.\n"
         "-v, --version        Display the Ice version.";
-#ifdef _WIN32
-    if(checkSystem())
-    {
-        options.append(
-        "\n"
-        "\n"
-        "--service NAME       Run as the Windows service NAME.\n"
-        "\n"
-        "--install NAME [--display DISP] [--executable EXEC] [args]\n"
-        "                     Install as Windows service NAME. If DISP is\n"
-        "                     provided, use it as the display name,\n"
-        "                     otherwise NAME is used. If EXEC is provided,\n"
-        "                     use it as the service executable, otherwise\n"
-        "                     this executable is used. Any additional\n"
-        "                     arguments are passed unchanged to the\n"
-        "                     service at startup.\n"
-        "--uninstall NAME     Uninstall Windows service NAME.\n"
-        "--start NAME [args]  Start Windows service NAME. Any additional\n"
-        "                     arguments are passed unchanged to the\n"
-        "                     service.\n"
-        "--stop NAME          Stop Windows service NAME."
-        );
-    }
-#else
+#ifndef _WIN32
     options.append(
         "\n"
         "\n"