Removed IceBox two phase initialization. Use Ice.ProgramName in the

    standard logger as a prefix. Changed IcePack to pass --Ice.ProgramName
    to servers.

1 files changed, 10 insertions, 17 deletions

diff --git a/cpp/src/IceStorm/Service.cpp b/cpp/src/IceStorm/Service.cpp
index 7effd2f9cfa..b97a01730a3 100644
--- a/cpp/src/IceStorm/Service.cpp
+++ b/cpp/src/IceStorm/Service.cpp
@@ -26,13 +26,11 @@ public:
     Service();
     virtual ~Service();
 
-    virtual void init(const ::std::string&,
-                      const ::Ice::CommunicatorPtr&,
-                      const ::Ice::PropertiesPtr&,
-                      const ::Ice::StringSeq&,
-                      const ::Freeze::DBEnvironmentPtr&);
-
-    virtual void start();
+    virtual void start(const ::std::string&,
+		       const ::Ice::CommunicatorPtr&,
+		       const ::Ice::PropertiesPtr&,
+		       const ::Ice::StringSeq&,
+		       const ::Freeze::DBEnvironmentPtr&);
 
     virtual void stop();
 
@@ -67,11 +65,11 @@ IceStorm::Service::~Service()
 }
 
 void
-IceStorm::Service::init(const string& name,
-			const ::Ice::CommunicatorPtr& communicator,
-			const ::Ice::PropertiesPtr& properties,
-			const ::Ice::StringSeq& args,
-			const ::Freeze::DBEnvironmentPtr& dbEnv)
+IceStorm::Service::start(const string& name,
+			 const ::Ice::CommunicatorPtr& communicator,
+			 const ::Ice::PropertiesPtr& properties,
+			 const ::Ice::StringSeq& args,
+			 const ::Freeze::DBEnvironmentPtr& dbEnv)
 {
     Freeze::DBPtr dbTopicManager = dbEnv->openDB("topicmanager", true);
 
@@ -84,11 +82,6 @@ IceStorm::Service::init(const string& name,
 }
 
 void
-IceStorm::Service::start()
-{
-}
-
-void
 IceStorm::Service::stop()
 {
     _adapter->deactivate();