More gradle changes.

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

1 files changed, 0 insertions, 45 deletions

diff --git a/java/test/Ice/proxy/Collocated.java b/java/test/Ice/proxy/Collocated.java
deleted file mode 100644
index 26e71003545..00000000000
--- a/java/test/Ice/proxy/Collocated.java
+++ /dev/null
@@ -1,45 +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.proxy;
-
-public class Collocated extends test.Util.Application
-{
-    @Override
-    public int run(String[] args)
-    {
-        Ice.Communicator communicator = communicator();
-        communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010");
-        Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
-        adapter.add(new MyDerivedClassI(), communicator.stringToIdentity("test"));
-        adapter.activate();
-
-        AllTests.allTests(communicator, getWriter());
-
-        return 0;
-    }
-
-    @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.proxy");
-        initData.properties.setProperty("Ice.Warn.Dispatch", "0");
-        return initData;
-    }
-
-    public static void main(String[] args)
-    {
-        Collocated app = new Collocated();
-        int result = app.main(" extends", args);
-        System.gc();
-        System.exit(result);
-    }
-}