More gradle changes.

Moved android stuff to its own package.
Moved java tests to src/main/java/test subdirectory.

1 files changed, 0 insertions, 70 deletions

diff --git a/java/test/Ice/dispatcher/Server.java b/java/test/Ice/dispatcher/Server.java
deleted file mode 100644
index c4ef87e7451..00000000000
--- a/java/test/Ice/dispatcher/Server.java
+++ /dev/null
@@ -1,70 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-package test.Ice.dispatcher;
-
-public class Server extends test.Util.Application
-{
-    @Override
-    public int
-    run(String[] args)
-    {
-        Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
-        Ice.ObjectAdapter adapter2 = communicator().createObjectAdapter("ControllerAdapter");
-
-        assert(_dispatcher != null);
-        adapter.add(new TestI(_dispatcher), communicator().stringToIdentity("test"));
-        adapter.activate();
-        adapter2.add(new TestControllerI(adapter), communicator().stringToIdentity("testController"));
-        adapter2.activate();
-
-        return WAIT;
-    }
-
-    @Override
-    protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH)
-    {
-        assert(_dispatcher == null);
-        _dispatcher = new Dispatcher();
-        Ice.InitializationData initData = new Ice.InitializationData();
-        initData.properties = Ice.Util.createProperties(argsH);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.dispatcher");
-        initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010");
-        initData.properties.setProperty("ControllerAdapter.Endpoints", "tcp -p 12011");
-        initData.properties.setProperty("ControllerAdapter.ThreadPool.Size", "1");
-        initData.dispatcher = _dispatcher;
-        return initData;
-    }
-
-    public void terminate()
-    {
-        if(_dispatcher != null)
-        {
-            _dispatcher.terminate();
-        }
-    }
-
-    public static void
-    main(String[] args)
-    {
-        Server app = new Server();
-        int result = app.main("Server", args);
-        app.terminate();
-        System.gc();
-        System.exit(result);
-    }
-
-    //
-    // The Dispatcher class uses a static "_instance" member in other language
-    // mappings. In Java, we avoid the use of static members because we need to
-    // maintain support for Android (in which the client and server run in the
-    // same process).
-    //
-    private Dispatcher _dispatcher;
-}