Merged android-testsuite branch.

1 files changed, 28 insertions, 49 deletions

diff --git a/java/test/Ice/udp/Server.java b/java/test/Ice/udp/Server.java
index bedd63218bb..9ce5a7869c8 100644
--- a/java/test/Ice/udp/Server.java
+++ b/java/test/Ice/udp/Server.java
@@ -7,74 +7,53 @@
 //
 // **********************************************************************
 
-public class Server
+package test.Ice.udp;
+
+public class Server extends test.Util.Application
 {
-    private static int
-    run(String[] args, Ice.Communicator communicator)
+    public int run(String[] args)
     {
-        Ice.Properties properties = communicator.getProperties();
+        Ice.Properties properties = communicator().getProperties();
         if(args.length == 1 && args[0].equals("1"))
         {
             properties.setProperty("TestAdapter.Endpoints", "udp -p 12010");
-            Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
-            adapter.add(new TestIntfI(), communicator.stringToIdentity("test"));
+            Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
+            adapter.add(new TestIntfI(), communicator().stringToIdentity("test"));
             adapter.activate();
         }
 
-        String host;
-        if(properties.getProperty("Ice.IPv6") == "1")
-        {
-            host = "\"ff01::1:1\"";
-        }
-        else
-        {
-            host = "239.255.1.1";
-        }
-        properties.setProperty("McastTestAdapter.Endpoints", "udp -h " + host + " -p 12020");
-        Ice.ObjectAdapter mcastAdapter = communicator.createObjectAdapter("McastTestAdapter");
-        mcastAdapter.add(new TestIntfI(), communicator.stringToIdentity("test"));
+        Ice.ObjectAdapter mcastAdapter = communicator().createObjectAdapter("McastTestAdapter");
+        mcastAdapter.add(new TestIntfI(), communicator().stringToIdentity("test"));
         mcastAdapter.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;
+        Ice.InitializationData initData = new Ice.InitializationData();
+	initData.properties = Ice.Util.createProperties(argsH);
+        initData.properties.setProperty("Ice.Package.Test", "test.Ice.udp");
+        initData.properties.setProperty("Ice.Warn.Connections", "0");
+        initData.properties.setProperty("Ice.UDP.RcvSize", "16384");
 
-        try
+        String host;
+        if(initData.properties.getProperty("Ice.IPv6") == "1")
         {
-            Ice.StringSeqHolder argHolder = new Ice.StringSeqHolder(args);
-            Ice.InitializationData initData = new Ice.InitializationData();
-            initData.properties = Ice.Util.createProperties(argHolder);
-        
-            initData.properties.setProperty("Ice.Warn.Connections", "0");
-            initData.properties.setProperty("Ice.UDP.RcvSize", "16384");
-
-            communicator = Ice.Util.initialize(argHolder, initData);
-            status = run(argHolder.value, communicator);
+            host = "\"ff01::1:1\"";
         }
-        catch(Exception ex)
+        else
         {
-            ex.printStackTrace();
-            status = 1;
+            host = "239.255.1.1";
         }
+        initData.properties.setProperty("McastTestAdapter.Endpoints", "udp -h " + host + " -p 12020");
+        return initData;
+    }
 
-        if(communicator != null)
-        {
-            try
-            {
-                communicator.destroy();
-            }
-            catch(Ice.LocalException ex)
-            {
-                ex.printStackTrace();
-                status = 1;
-            }
-        }
+    public static void main(String[] args)
+    {
+        Server c = new Server();
+        int status = c.main("Server", args);
 
         System.gc();
         System.exit(status);