Fixes for Java IceBox services

2 files changed, 7 insertions, 5 deletions

diff --git a/cpp/src/IcePack/Server.cpp b/cpp/src/IcePack/Server.cpp
index 421293ec5fa..3ef27c001fc 100644
--- a/cpp/src/IcePack/Server.cpp
+++ b/cpp/src/IcePack/Server.cpp
@@ -80,11 +80,12 @@ main(int argc, char* argv[])
     //
     // Get the data directory from the IcePack.Data property.
     //
-    PropertiesPtr properties = createProperties(argc, argv);
+    PropertiesPtr defaultProperties = getDefaultProperties(argc, argv);
     StringSeq args = argsToStringSeq(argc, argv);
-    args = properties->parseCommandLineOptions("IcePack", args);
+    args = defaultProperties->parseCommandLineOptions("IcePack", args);
+    stringSeqToArgs(args, argc, argv);
 
-    string dataPath = properties->getProperty("IcePack.Data");
+    string dataPath = defaultProperties->getProperty("IcePack.Data");
     if(dataPath.empty())
     {
 	cerr << argv[0] << ": property `IcePack.Data' is not set" << endl;
diff --git a/cpp/src/IcePack/ServerDeployer.cpp b/cpp/src/IcePack/ServerDeployer.cpp
index 043bfb26a86..1d6d7fa149b 100644
--- a/cpp/src/IcePack/ServerDeployer.cpp
+++ b/cpp/src/IcePack/ServerDeployer.cpp
@@ -204,14 +204,14 @@ IcePack::ServerDeployer::parse(const std::string& descriptor)
     _properties->setProperty("Ice.Default.Locator", props->getProperty("Ice.Default.Locator"));
     _properties->setProperty("Yellow.Query", props->getProperty("IcePack.Yellow.Query"));
 
-    if(_kind == ServerKindJavaServer)
+    if(_kind == ServerKindJavaServer || _kind == ServerKindJavaIceBox)
     {
 	if(!_libraryPath.empty())
 	{
 	    _javaOptions.push_back("-classpath");
 	    _javaOptions.push_back(_libraryPath);
-	    _javaOptions.push_back("-ea");
 	}
+	_javaOptions.push_back("-ea");
 	_javaOptions.push_back(_className);
 
 	for(vector<string>::reverse_iterator p = _javaOptions.rbegin(); p != _javaOptions.rend(); ++p)
@@ -380,6 +380,7 @@ IcePack::ServerDeployer::setKind(ServerDeployer::ServerKind kind)
 	{
 	    _description.path = "java";
 	}
+	_className = "IceBox.Server";
 	createDirectory("/dbs");
 	addProperty("IceBox.Name", _variables["name"]);
 	addAdapter(_variables["name"] + ".ServiceManagerAdapter","");