More gradle changes.

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

1 files changed, 0 insertions, 52 deletions

diff --git a/java/test/Ice/metrics/AMDServer.java b/java/test/Ice/metrics/AMDServer.java
deleted file mode 100644
index dc559764811..00000000000
--- a/java/test/Ice/metrics/AMDServer.java
+++ /dev/null
@@ -1,52 +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.metrics;
-
-public class AMDServer extends test.Util.Application
-{
-    @Override
-    public int run(String[] args)
-    {
-        Ice.Communicator communicator = communicator();
-        Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
-        adapter.add(new AMDMetricsI(), communicator.stringToIdentity("metrics"));
-        adapter.activate();
-        
-        communicator.getProperties().setProperty("ControllerAdapter.Endpoints", "default -p 12011");
-        Ice.ObjectAdapter controllerAdapter = communicator.createObjectAdapter("ControllerAdapter");
-        controllerAdapter.add(new ControllerI(adapter), communicator.stringToIdentity("controller"));
-        controllerAdapter.activate();
-
-        return WAIT;
-    }
-
-    @Override
-    protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH)
-    {
-        Ice.InitializationData initData = new Ice.InitializationData();
-        initData.properties = Ice.Util.createProperties(argsH);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.retry");
-        initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010");
-        initData.properties.setProperty("Ice.Admin.Endpoints", "tcp");
-        initData.properties.setProperty("Ice.Admin.InstanceName", "server");
-        initData.properties.setProperty("Ice.Warn.Connections", "0");
-        initData.properties.setProperty("Ice.Warn.Dispatch", "0");
-        initData.properties.setProperty("Ice.MessageSizeMax", "50000");
-        return initData;
-    }
-
-    public static void main(String[] args)
-    {
-        AMDServer app = new AMDServer();
-        int result = app.main("Server", args);
-        System.gc();
-        System.exit(result);
-    }
-}