merging from plugins branch

1 files changed, 6 insertions, 2 deletions

diff --git a/cpp/src/IceBox/Server.cpp b/cpp/src/IceBox/Server.cpp
index edb4ad5d01a..56b3b58680e 100644
--- a/cpp/src/IceBox/Server.cpp
+++ b/cpp/src/IceBox/Server.cpp
@@ -22,11 +22,15 @@ main(int argc, char* argv[])
     ServiceManagerPtr serviceManager;
     int status;
 
-    addArgumentPrefix("IceBox");
-
     try
     {
         communicator = initialize(argc, argv);
+
+        PropertiesPtr properties = communicator->getProperties();
+        StringSeq args = argsToStringSeq(argc, argv);
+        args = properties->parseCommandLineOptions("IceBox", args);
+        stringSeqToArgs(args, argc, argv);
+
         ServiceManagerI* serviceManagerImpl = new ServiceManagerI(communicator, argc, argv);
         serviceManager = serviceManagerImpl;
         status = serviceManagerImpl->run();