1 files changed, 18 insertions, 13 deletions
diff --git a/java/test/Ice/servantLocator/Client.java b/java/test/Ice/servantLocator/Client.java
index 963c404b88d..5ef68d327e9 100644
--- a/java/test/Ice/servantLocator/Client.java
+++ b/java/test/Ice/servantLocator/Client.java
@@ -7,25 +7,30 @@
 //
 // **********************************************************************
 
-import Test.*;
+package test.Ice.servantLocator;
 
-public class Client
+import test.Ice.servantLocator.Test.TestIntfPrx;
+
+public class Client extends test.Util.Application
 {
-    static class TestClient extends Ice.Application
+    public int run(String[] args)
+    {
+        TestIntfPrx obj = AllTests.allTests(communicator(), false, getWriter());
+        obj.shutdown();
+        return 0;
+    }
+
+    protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH)
     {
-        public int
-        run(String[] args)
-        {
-            TestIntfPrx obj = AllTests.allTests(communicator(), false);
-            obj.shutdown();
-            return 0;
-        }
+        Ice.InitializationData initData = new Ice.InitializationData();
+        initData.properties = Ice.Util.createProperties(argsH);
+        initData.properties.setProperty("Ice.Package.Test", "test.Ice.servantLocator");
+        return initData;
     }
 
-    public static void
-    main(String[] args)
+    public static void main(String[] args)
     {
-        TestClient app = new TestClient();
+        Client app = new Client();
         int result = app.main("Client", args);
         System.gc();
         System.exit(result);