Merged android-testsuite branch.

1 files changed, 18 insertions, 35 deletions

diff --git a/java/test/Ice/facets/Server.java b/java/test/Ice/facets/Server.java
index f4921b1ee5e..cf16c8fad62 100644
--- a/java/test/Ice/facets/Server.java
+++ b/java/test/Ice/facets/Server.java
@@ -7,12 +7,13 @@
 //
 // **********************************************************************
 
-public class Server
+package test.Ice.facets;
+
+public class Server extends test.Util.Application
 {
-    private static int
-    run(String[] args, Ice.Communicator communicator)
+    public int run(String[] args)
     {
-        communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000");
+        Ice.Communicator communicator = communicator();
         Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
         Ice.Object d = new DI();
         adapter.add(d, communicator.stringToIdentity("d"));
@@ -23,42 +24,24 @@ public class Server
         adapter.addFacet(h, communicator.stringToIdentity("d"), "facetGH");
 
         adapter.activate();
-        communicator.waitForShutdown();
 
-        return 0;
+        return WAIT;
     }
 
-    public static void
-    main(String[] args)
+    protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH)
     {
-        int status = 0;
-        Ice.Communicator communicator = null;
-
-        try
-        {
-            communicator = Ice.Util.initialize(args);
-            status = run(args, communicator);
-        }
-        catch(Exception ex)
-        {
-            ex.printStackTrace();
-            status = 1;
-        }
-
-        if(communicator != null)
-        {
-            try
-            {
-                communicator.destroy();
-            }
-            catch(Ice.LocalException ex)
-            {
-                ex.printStackTrace();
-                status = 1;
-            }
-        }
+        Ice.InitializationData initData = new Ice.InitializationData();
+        initData.properties = Ice.Util.createProperties(argsH);
+        initData.properties.setProperty("Ice.Package.Test", "test.Ice.facets");
+        initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000");
+        return initData;
+    }
 
+    public static void main(String[] args)
+    {
+        Server app = new Server();
+        int result = app.main("Server", args);
         System.gc();
-        System.exit(status);
+        System.exit(result);
     }
 }