Merged android-testsuite branch.

1 files changed, 21 insertions, 35 deletions

diff --git a/java/test/IceSSL/configuration/Client.java b/java/test/IceSSL/configuration/Client.java
index 18a942f22df..6e33aecf467 100644
--- a/java/test/IceSSL/configuration/Client.java
+++ b/java/test/IceSSL/configuration/Client.java
@@ -7,55 +7,41 @@
 //
 // **********************************************************************
 
-public class Client
+package test.IceSSL.configuration;
+
+import java.io.PrintWriter;
+
+import test.IceSSL.configuration.Test.ServerFactoryPrx;
+
+public class Client extends test.Util.Application
 {
-    private static int
-    run(String[] args, Ice.Communicator communicator)
+    public int run(String[] args)
     {
+        PrintWriter out = getWriter();
         if(args.length < 1)
         {
-            System.out.println("Usage: client testdir");
+            out.println("Usage: client testdir");
             return 1;
         }
 
-        Test.ServerFactoryPrx factory;
-
-        factory = AllTests.allTests(communicator, args[0]);
-
+        ServerFactoryPrx factory = AllTests.allTests(this, args[0], out);
         factory.shutdown();
 
         return 0;
     }
 
-    public static void main(String[] args)
+    protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH)
     {
-        int status = 0;
-        Ice.Communicator communicator = null;
-
-        try
-        {
-            Ice.StringSeqHolder argsH = new Ice.StringSeqHolder(args);
-            communicator = Ice.Util.initialize(argsH);
-            status = run(argsH.value, communicator);
-        }
-        catch(Exception ex)
-        {
-            ex.printStackTrace();
-            status = 1;
-        }
+        Ice.InitializationData initData = new Ice.InitializationData();
+        initData.properties = Ice.Util.createProperties(argsH);
+        initData.properties.setProperty("Ice.Package.Test", "test.IceSSL.configuration");
+        return initData;
+    }
 
-        if(communicator != null)
-        {
-            try
-            {
-                communicator.destroy();
-            }
-            catch(Ice.LocalException ex)
-            {
-                ex.printStackTrace();
-                status = 1;
-            }
-        }
+    public static void main(String[] args)
+    {
+        Client c = new Client();
+        int status = c.main("Client", args);
 
         System.gc();
         System.exit(status);