- Cleaned up test/Ice/operations test

- Added test/Ice/ami test
- sent callback is now always called

1 files changed, 49 insertions, 0 deletions

diff --git a/java/test/Ice/ami/Server.java b/java/test/Ice/ami/Server.java
new file mode 100644
index 00000000000..cbcdd708fda
--- /dev/null
+++ b/java/test/Ice/ami/Server.java
@@ -0,0 +1,49 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2009 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.ami;
+
+public class Server extends test.Util.Application
+{
+    public int
+    run(String[] args)
+    {
+    	Ice.Communicator communicator = communicator();
+
+        Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
+        Ice.ObjectAdapter adapter2 = communicator().createObjectAdapter("ControllerAdapter");
+
+        adapter.add(new TestI(), communicator().stringToIdentity("test"));
+        adapter.activate();
+        adapter2.add(new TestControllerI(adapter), communicator().stringToIdentity("testController"));
+        adapter2.activate();
+
+        return WAIT;
+    }
+
+    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.ami");
+        initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010");
+        initData.properties.setProperty("ControllerAdapter.Endpoints", "tcp -p 12011");
+        initData.properties.setProperty("ControllerAdapter.ThreadPool.Size", "1");
+        return initData;
+    }
+
+    public static void
+    main(String[] args)
+    {
+    	Server app = new Server();
+        int result = app.main("Server", args);
+        System.gc();
+        System.exit(result);
+    }
+}