ICE-4809 - AMI metadata in Ice services internal definitions

13 files changed, 164 insertions, 202 deletions

diff --git a/java/src/Glacier2/Application.java b/java/src/Glacier2/Application.java
index 2698aad72d8..450ce5b0dab 100644
--- a/java/src/Glacier2/Application.java
+++ b/java/src/Glacier2/Application.java
@@ -247,15 +247,15 @@ public abstract class Application extends Ice.Application
             {
                 try
                 {
-                    _router.refreshSession_async(new Glacier2.AMI_Router_refreshSession()
+                    _router.begin_refreshSession(new Glacier2.Callback_Router_refreshSession()
                         {
                             public void
-                            ice_response()
+                            response()
                             {
                             }
 
                             public void
-                            ice_exception(Ice.LocalException ex)
+                            exception(Ice.LocalException ex)
                             {
                                 //
                                 // Here the session has gone. The thread terminates, and we notify the
@@ -266,7 +266,7 @@ public abstract class Application extends Ice.Application
                             }
 
                             public void
-                            ice_exception(Ice.UserException ex)
+                            exception(Ice.UserException ex)
                             {
                                 //
                                 // Here the session has gone. The thread terminates, and we notify the
diff --git a/java/src/Glacier2/SessionHelper.java b/java/src/Glacier2/SessionHelper.java
index 71ec43c8daa..e4026d6bcb0 100644
--- a/java/src/Glacier2/SessionHelper.java
+++ b/java/src/Glacier2/SessionHelper.java
@@ -30,19 +30,19 @@ public class SessionHelper
             {
                 try
                 {
-                    _router.refreshSession_async(new Glacier2.AMI_Router_refreshSession()
+                    _router.begin_refreshSession(new Glacier2.Callback_Router_refreshSession()
                     {
-                        public void ice_response()
+                        public void response()
                         {
                         }
 
-                        public void ice_exception(Ice.LocalException ex)
+                        public void exception(Ice.LocalException ex)
                         {
                             done();
                             SessionHelper.this.destroy();
                         }
 
-                        public void ice_exception(Ice.UserException ex)
+                        public void exception(Ice.UserException ex)
                         {
                             done();
                             SessionHelper.this.destroy();
diff --git a/java/src/IceBox/ServiceManagerI.java b/java/src/IceBox/ServiceManagerI.java
index c25ab642207..8811bb84932 100644
--- a/java/src/IceBox/ServiceManagerI.java
+++ b/java/src/IceBox/ServiceManagerI.java
@@ -22,6 +22,27 @@ public class ServiceManagerI extends _ServiceManagerDisp
         _logger = _communicator.getLogger();
         _argv = args;
         _traceServiceObserver = _communicator.getProperties().getPropertyAsInt("IceBox.Trace.ServiceObserver");
+        _observerCompletedCB = new Ice.Callback()
+            {
+                public void completed(Ice.AsyncResult result)
+                {
+                    try
+                    {
+                        result.throwLocalException();
+                    }
+                    catch(Ice.LocalException ex)
+                    {
+                        ServiceObserverPrx observer = ServiceObserverPrxHelper.uncheckedCast(result.getProxy());
+                        synchronized(ServiceManagerI.this)
+                        {
+                            if(_observers.remove(observer))
+                            {
+                                observerRemoved(observer, ex);
+                            }
+                        }
+                    }
+                }
+            };
     }
 
     public java.util.Map<String, String>
@@ -207,23 +228,7 @@ public class ServiceManagerI extends _ServiceManagerDisp
 
         if(activeServices.size() > 0)
         {
-            AMI_ServiceObserver_servicesStarted cb = new AMI_ServiceObserver_servicesStarted()
-                {
-                    public void ice_response()
-                    {
-                        // ok, success
-                    }
-
-                    public void ice_exception(Ice.LocalException ex)
-                    {
-                        //
-                        // Drop this observer
-                        //
-                        removeObserver(observer, ex);
-                    }
-                };
-
-            observer.servicesStarted_async(cb, activeServices.toArray(new String[0]));
+            observer.begin_servicesStarted(activeServices.toArray(new String[0]), _observerCompletedCB);
         }
     }
 
@@ -794,23 +799,7 @@ public class ServiceManagerI extends _ServiceManagerDisp
 
             for(final ServiceObserverPrx observer: observers)
             {
-                AMI_ServiceObserver_servicesStarted cb = new AMI_ServiceObserver_servicesStarted()
-                    {
-                        public void ice_response()
-                        {
-                            // ok, success
-                        }
-
-                        public void ice_exception(Ice.LocalException ex)
-                        {
-                            //
-                            // Drop this observer
-                            //
-                            removeObserver(observer, ex);
-                        }
-                    };
-
-                observer.servicesStarted_async(cb, servicesArray);
+                observer.begin_servicesStarted(servicesArray, _observerCompletedCB);
             }
         }
     }
@@ -824,36 +813,11 @@ public class ServiceManagerI extends _ServiceManagerDisp
 
             for(final ServiceObserverPrx observer: observers)
             {
-                AMI_ServiceObserver_servicesStopped cb = new AMI_ServiceObserver_servicesStopped()
-                    {
-                        public void ice_response()
-                        {
-                            // ok, success
-                        }
-
-                        public void ice_exception(Ice.LocalException ex)
-                        {
-                            //
-                            // Drop this observer
-                            //
-                            removeObserver(observer, ex);
-                        }
-                    };
-
-                observer.servicesStopped_async(cb, servicesArray);
+                observer.begin_servicesStopped(servicesArray, _observerCompletedCB);
             }
         }
     }
 
-    private synchronized void
-    removeObserver(ServiceObserverPrx observer, Ice.LocalException ex)
-    {
-        if(_observers.remove(observer))
-        {
-            observerRemoved(observer, ex);
-        }
-    }
-
     private void
     observerRemoved(ServiceObserverPrx observer, RuntimeException ex)
     {
@@ -1004,7 +968,7 @@ public class ServiceManagerI extends _ServiceManagerDisp
     private String[] _argv; // Filtered server argument vector
     private java.util.List<ServiceInfo> _services = new java.util.LinkedList<ServiceInfo>();
     private boolean _pendingStatusChanges = false;
-
+    private Ice.Callback _observerCompletedCB;
     java.util.HashSet<ServiceObserverPrx> _observers = new java.util.HashSet<ServiceObserverPrx>();
     int _traceServiceObserver = 0;
 }
diff --git a/java/src/IceGridGUI/Application/Root.java b/java/src/IceGridGUI/Application/Root.java
index a265827d333..193dbb21569 100644
--- a/java/src/IceGridGUI/Application/Root.java
+++ b/java/src/IceGridGUI/Application/Root.java
@@ -421,9 +421,9 @@ public class Root extends ListTreeNode
                                 final String prefix = "Updating application '" + _id + "'...";
                                 _coordinator.getStatusBar().setText(prefix);
 
-                                AMI_Admin_updateApplication cb = new AMI_Admin_updateApplication()
+                                Callback_Admin_updateApplication cb = new Callback_Admin_updateApplication()
                                     {
-                                        public void ice_response()
+                                        public void response()
                                         {
                                             if(_traceSaveToRegistry)
                                             {
@@ -442,7 +442,7 @@ public class Root extends ListTreeNode
                                                 });
                                         }
 
-                                        public void ice_exception(final Ice.UserException e)
+                                        public void exception(final Ice.UserException e)
                                         {
                                             if(_traceSaveToRegistry)
                                             {
@@ -462,7 +462,7 @@ public class Root extends ListTreeNode
                                                 });
                                         }
 
-                                        public void ice_exception(final Ice.LocalException e)
+                                        public void exception(final Ice.LocalException e)
                                         {
                                             if(_traceSaveToRegistry)
                                             {
@@ -489,7 +489,7 @@ public class Root extends ListTreeNode
                                                                      _id);
                                 }
 
-                                _coordinator.getAdmin().updateApplication_async(cb, updateDescriptor);
+                                _coordinator.getAdmin().begin_updateApplication(updateDescriptor, cb);
                                 asyncRelease = true;
 
                                 //
@@ -517,9 +517,9 @@ public class Root extends ListTreeNode
                                 final String prefix = "Adding application '" + _id + "'...";
                                 _coordinator.getStatusBar().setText(prefix);
 
-                                AMI_Admin_addApplication cb = new AMI_Admin_addApplication()
+                                Callback_Admin_addApplication cb = new Callback_Admin_addApplication()
                                     {
-                                        public void ice_response()
+                                        public void response()
                                         {
                                             if(_traceSaveToRegistry)
                                             {
@@ -540,7 +540,7 @@ public class Root extends ListTreeNode
                                                 });
                                         }
 
-                                        public void ice_exception(final Ice.UserException e)
+                                        public void exception(final Ice.UserException e)
                                         {
                                             if(_traceSaveToRegistry)
                                             {
@@ -559,7 +559,7 @@ public class Root extends ListTreeNode
                                                 });
                                         }
 
-                                        public void ice_exception(final Ice.LocalException e)
+                                        public void exception(final Ice.LocalException e)
                                         {
                                             if(_traceSaveToRegistry)
                                             {
@@ -584,7 +584,7 @@ public class Root extends ListTreeNode
                                     _coordinator.traceSaveToRegistry("sending addApplication for application " + _id);
                                 }
 
-                                _coordinator.getAdmin().addApplication_async(cb, _descriptor);
+                                _coordinator.getAdmin().begin_addApplication(_descriptor, cb);
                                 asyncRelease = true;
                             }
                             else
@@ -592,9 +592,9 @@ public class Root extends ListTreeNode
                                 final String prefix = "Synchronizing application '" + _id + "'...";
                                 _coordinator.getStatusBar().setText(prefix);
 
-                                AMI_Admin_syncApplication cb = new AMI_Admin_syncApplication()
+                                Callback_Admin_syncApplication cb = new Callback_Admin_syncApplication()
                                     {
-                                        public void ice_response()
+                                        public void response()
                                         {
                                             if(_traceSaveToRegistry)
                                             {
@@ -637,7 +637,7 @@ public class Root extends ListTreeNode
                                                 });
                                         }
 
-                                        public void ice_exception(final Ice.UserException e)
+                                        public void exception(final Ice.UserException e)
                                         {
                                             if(_traceSaveToRegistry)
                                             {
@@ -661,7 +661,7 @@ public class Root extends ListTreeNode
                                                 });
                                         }
 
-                                        public void ice_exception(final Ice.LocalException e)
+                                        public void exception(final Ice.LocalException e)
                                         {
                                             if(_traceSaveToRegistry)
                                             {
@@ -691,7 +691,7 @@ public class Root extends ListTreeNode
                                     _coordinator.traceSaveToRegistry("sending syncApplication for application " + _id);
                                 }
 
-                                _coordinator.getAdmin().syncApplication_async(cb, _descriptor);
+                                _coordinator.getAdmin().begin_syncApplication(_descriptor, cb);
                                 asyncRelease = true;
                                 if(_live)
                                 {
diff --git a/java/src/IceGridGUI/Coordinator.java b/java/src/IceGridGUI/Coordinator.java
index 8f7aa631233..208093d2ab5 100755
--- a/java/src/IceGridGUI/Coordinator.java
+++ b/java/src/IceGridGUI/Coordinator.java
@@ -905,9 +905,9 @@ public class Coordinator
                         boolean asyncRelease = false;
 
                         final String prefix = "Deleting application '" + name + "'...";
-                        AMI_Admin_removeApplication cb = new AMI_Admin_removeApplication()
+                        Callback_Admin_removeApplication cb = new Callback_Admin_removeApplication()
                             {
-                                public void ice_response()
+                                public void response()
                                 {
                                     if(_traceSaveToRegistry)
                                     {
@@ -924,7 +924,7 @@ public class Coordinator
                                         });
                                 }
 
-                                public void ice_exception(final Ice.UserException e)
+                                public void exception(final Ice.UserException e)
                                 {
                                     if(_traceSaveToRegistry)
                                     {
@@ -942,7 +942,7 @@ public class Coordinator
                                         });
                                 }
 
-                                public void ice_exception(final Ice.LocalException e)
+                                public void exception(final Ice.LocalException e)
                                 {
                                     if(_traceSaveToRegistry)
                                     {
@@ -967,7 +967,7 @@ public class Coordinator
 
                         try
                         {
-                            _sessionKeeper.getAdmin().removeApplication_async(cb, name);
+                            _sessionKeeper.getAdmin().begin_removeApplication(name, cb);
                             asyncRelease = true;
                         }
                         catch(Ice.LocalException e)
@@ -1527,22 +1527,22 @@ public class Coordinator
             {
                 Glacier2.RouterPrx gr = Glacier2.RouterPrxHelper.uncheckedCast(router);
 
-                Glacier2.AMI_Router_destroySession cb = new Glacier2.AMI_Router_destroySession()
+                Glacier2.Callback_Router_destroySession cb = new Glacier2.Callback_Router_destroySession()
                     {
-                        public void ice_response()
+                        public void response()
                         {
                         }
 
-                        public void ice_exception(Ice.LocalException ex)
+                        public void exception(Ice.LocalException ex)
                         {
                         }
 
-                        public void ice_exception(Ice.UserException ex)
+                        public void exception(Ice.UserException ex)
                         {
                         }
                     };
 
-                gr.destroySession_async(cb);
+                gr.begin_destroySession(cb);
             }
         }
         catch(Ice.LocalException e)
diff --git a/java/src/IceGridGUI/LiveDeployment/Node.java b/java/src/IceGridGUI/LiveDeployment/Node.java
index af02edc759e..41eda9e05d6 100644
--- a/java/src/IceGridGUI/LiveDeployment/Node.java
+++ b/java/src/IceGridGUI/LiveDeployment/Node.java
@@ -79,22 +79,22 @@ class Node extends ListTreeNode
         final String prefix = "Shutting down node '" + _id + "'...";
         getCoordinator().getStatusBar().setText(prefix);
 
-        AMI_Admin_shutdownNode cb = new AMI_Admin_shutdownNode()
+        Callback_Admin_shutdownNode cb = new Callback_Admin_shutdownNode()
             {
                 //
                 // Called by another thread!
                 //
-                public void ice_response()
+                public void response()
                 {
                     amiSuccess(prefix);
                 }
 
-                public void ice_exception(Ice.UserException e)
+                public void exception(Ice.UserException e)
                 {
                     amiFailure(prefix, "Failed to shutdown " + _id, e);
                 }
 
-                public void ice_exception(Ice.LocalException e)
+                public void exception(Ice.LocalException e)
                 {
                     amiFailure(prefix, "Failed to shutdown " + _id,
                                e.toString());
@@ -106,7 +106,7 @@ class Node extends ListTreeNode
             getCoordinator().getMainFrame().setCursor(
                 Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
 
-            getCoordinator().getAdmin().shutdownNode_async(cb, _id);
+            getCoordinator().getAdmin().begin_shutdownNode(_id, cb);
         }
         catch(Ice.LocalException e)
         {
@@ -664,9 +664,9 @@ class Node extends ListTreeNode
 
     void showLoad()
     {
-        AMI_Admin_getNodeLoad cb = new AMI_Admin_getNodeLoad()
+        Callback_Admin_getNodeLoad cb = new Callback_Admin_getNodeLoad()
             {
-                public void ice_response(LoadInfo loadInfo)
+                public void response(LoadInfo loadInfo)
                 {
                     NumberFormat format;
                     if(_windows)
@@ -696,7 +696,7 @@ class Node extends ListTreeNode
                         });
                 }
 
-                public void ice_exception(final Ice.UserException e)
+                public void exception(final Ice.UserException e)
                 {
                     SwingUtilities.invokeLater(new Runnable()
                         {
@@ -720,7 +720,7 @@ class Node extends ListTreeNode
                         });
                 }
 
-                public void ice_exception(final Ice.LocalException e)
+                public void exception(final Ice.LocalException e)
                 {
                     SwingUtilities.invokeLater(new Runnable()
                         {
@@ -744,7 +744,7 @@ class Node extends ListTreeNode
             }
             else
             {
-                admin.getNodeLoad_async(cb, _id);
+                admin.begin_getNodeLoad(_id, cb);
             }
         }
         catch(Ice.LocalException e)
diff --git a/java/src/IceGridGUI/LiveDeployment/Root.java b/java/src/IceGridGUI/LiveDeployment/Root.java
index 2d793706460..09beac80bac 100644
--- a/java/src/IceGridGUI/LiveDeployment/Root.java
+++ b/java/src/IceGridGUI/LiveDeployment/Root.java
@@ -201,22 +201,22 @@ public class Root extends ListArrayTreeNode
         final String prefix = "Shutting down registry '" + _replicaName + "'...";
         getCoordinator().getStatusBar().setText(prefix);
 
-        AMI_Admin_shutdownRegistry cb = new AMI_Admin_shutdownRegistry()
+        Callback_Admin_shutdownRegistry cb = new Callback_Admin_shutdownRegistry()
             {
                 //
                 // Called by another thread!
                 //
-                public void ice_response()
+                public void response()
                 {
                     amiSuccess(prefix);
                 }
 
-                public void ice_exception(Ice.UserException e)
+                public void exception(Ice.UserException e)
                 {
                     amiFailure(prefix, "Failed to shutdown " + _replicaName, e);
                 }
 
-                public void ice_exception(Ice.LocalException e)
+                public void exception(Ice.LocalException e)
                 {
                     amiFailure(prefix, "Failed to shutdown " + _replicaName,
                                e.toString());
@@ -227,7 +227,7 @@ public class Root extends ListArrayTreeNode
         {
             _coordinator.getMainFrame().setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
 
-            _coordinator.getAdmin().shutdownRegistry_async(cb, _replicaName);
+            _coordinator.getAdmin().begin_shutdownRegistry(_replicaName, cb);
         }
         catch(Ice.LocalException e)
         {
@@ -370,23 +370,23 @@ public class Root extends ListArrayTreeNode
         final String prefix = "Patching application '" + applicationName + "'...";
 
         _coordinator.getStatusBar().setText(prefix);
-        AMI_Admin_patchApplication cb = new AMI_Admin_patchApplication()
+        Callback_Admin_patchApplication cb = new Callback_Admin_patchApplication()
             {
                 //
                 // Called by another thread!
                 //
-                public void ice_response()
+                public void response()
                 {
                     amiSuccess(prefix);
                 }
 
-                public void ice_exception(Ice.UserException e)
+                public void exception(Ice.UserException e)
                 {
                     amiFailure(prefix, "Failed to patch '"
                                + applicationName + "'", e);
                 }
 
-                public void ice_exception(Ice.LocalException e)
+                public void exception(Ice.LocalException e)
                 {
                     amiFailure(prefix, "Failed to patch '" +
                                applicationName + "'", e.toString());
@@ -396,7 +396,7 @@ public class Root extends ListArrayTreeNode
         try
         {
             _coordinator.getMainFrame().setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
-            _coordinator.getAdmin().patchApplication_async(cb, applicationName, shutdown == JOptionPane.YES_OPTION);
+            _coordinator.getAdmin().begin_patchApplication(applicationName, shutdown == JOptionPane.YES_OPTION, cb);
         }
         catch(Ice.LocalException e)
         {
@@ -925,22 +925,22 @@ public class Root extends ListArrayTreeNode
         final String prefix = "Removing well-known object '" + strIdentity + "'...";
         _coordinator.getStatusBar().setText(prefix);
 
-        AMI_Admin_removeObject cb = new AMI_Admin_removeObject()
+        Callback_Admin_removeObject cb = new Callback_Admin_removeObject()
             {
                 //
                 // Called by another thread!
                 //
-                public void ice_response()
+                public void response()
                 {
                     amiSuccess(prefix);
                 }
 
-                public void ice_exception(Ice.UserException e)
+                public void exception(Ice.UserException e)
                 {
                     amiFailure(prefix, "Failed to remove object '" + strIdentity + "'", e);
                 }
 
-                public void ice_exception(Ice.LocalException e)
+                public void exception(Ice.LocalException e)
                 {
                     amiFailure(prefix, "Failed to remove object '" + strIdentity + "'",
                                e.toString());
@@ -950,7 +950,7 @@ public class Root extends ListArrayTreeNode
         try
         {
             _coordinator.getMainFrame().setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
-            _coordinator.getAdmin().removeObject_async(cb, identity);
+            _coordinator.getAdmin().begin_removeObject(identity, cb);
         }
         catch(Ice.LocalException e)
         {
@@ -967,22 +967,22 @@ public class Root extends ListArrayTreeNode
         final String prefix = "Removing adapter '" + adapterId + "'...";
         _coordinator.getStatusBar().setText(prefix);
 
-        AMI_Admin_removeAdapter cb = new AMI_Admin_removeAdapter()
+        Callback_Admin_removeAdapter cb = new Callback_Admin_removeAdapter()
             {
                 //
                 // Called by another thread!
                 //
-                public void ice_response()
+                public void response()
                 {
                     amiSuccess(prefix);
                 }
 
-                public void ice_exception(Ice.UserException e)
+                public void exception(Ice.UserException e)
                 {
                     amiFailure(prefix, "Failed to remove adapter '" + adapterId + "'", e);
                 }
 
-                public void ice_exception(Ice.LocalException e)
+                public void exception(Ice.LocalException e)
                 {
                     amiFailure(prefix, "Failed to remove adapter '" + adapterId + "'",
                                e.toString());
@@ -992,7 +992,7 @@ public class Root extends ListArrayTreeNode
         try
         {
             _coordinator.getMainFrame().setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
-            _coordinator.getAdmin().removeAdapter_async(cb, adapterId);
+            _coordinator.getAdmin().begin_removeAdapter(adapterId, cb);
         }
         catch(Ice.LocalException e)
         {
diff --git a/java/src/IceGridGUI/LiveDeployment/Server.java b/java/src/IceGridGUI/LiveDeployment/Server.java
index 7f4c2f98630..43a0d74322d 100644
--- a/java/src/IceGridGUI/LiveDeployment/Server.java
+++ b/java/src/IceGridGUI/LiveDeployment/Server.java
@@ -74,22 +74,22 @@ class Server extends ListArrayTreeNode
         final String prefix = "Starting server '" + _id + "'...";
         getCoordinator().getStatusBar().setText(prefix);
 
-        AMI_Admin_startServer cb = new AMI_Admin_startServer()
+        Callback_Admin_startServer cb = new Callback_Admin_startServer()
             {
                 //
                 // Called by another thread!
                 //
-                public void ice_response()
+                public void response()
                 {
                     amiSuccess(prefix);
                 }
 
-                public void ice_exception(Ice.UserException e)
+                public void exception(Ice.UserException e)
                 {
                     amiFailure(prefix, "Failed to start " + _id, e);
                 }
 
-                public void ice_exception(Ice.LocalException e)
+                public void exception(Ice.LocalException e)
                 {
                     amiFailure(prefix, "Failed to start " + _id, e.toString());
                 }
@@ -98,7 +98,7 @@ class Server extends ListArrayTreeNode
         try
         {
             getCoordinator().getMainFrame().setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
-            getCoordinator().getAdmin().startServer_async(cb, _id);
+            getCoordinator().getAdmin().begin_startServer(_id, cb);
         }
         catch(Ice.LocalException e)
         {
@@ -115,22 +115,22 @@ class Server extends ListArrayTreeNode
         final String prefix = "Stopping server '" + _id + "'...";
         getCoordinator().getStatusBar().setText(prefix);
 
-        AMI_Admin_stopServer cb = new AMI_Admin_stopServer()
+        Callback_Admin_stopServer cb = new Callback_Admin_stopServer()
             {
                 //
                 // Called by another thread!
                 //
-                public void ice_response()
+                public void response()
                 {
                     amiSuccess(prefix);
                 }
 
-                public void ice_exception(Ice.UserException e)
+                public void exception(Ice.UserException e)
                 {
                     amiFailure(prefix, "Failed to stop " + _id, e);
                 }
 
-                public void ice_exception(Ice.LocalException e)
+                public void exception(Ice.LocalException e)
                 {
                     amiFailure(prefix, "Failed to stop " + _id, e.toString());
                 }
@@ -139,7 +139,7 @@ class Server extends ListArrayTreeNode
         try
         {
             getCoordinator().getMainFrame().setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
-            getCoordinator().getAdmin().stopServer_async(cb, _id);
+            getCoordinator().getAdmin().begin_stopServer(_id, cb);
         }
         catch(Ice.LocalException e)
         {
@@ -262,22 +262,22 @@ class Server extends ListArrayTreeNode
         final String prefix = "Sending '" + s + "' to server '" + _id + "'...";
         getCoordinator().getStatusBar().setText(prefix);
 
-        AMI_Admin_sendSignal cb = new AMI_Admin_sendSignal()
+        Callback_Admin_sendSignal cb = new Callback_Admin_sendSignal()
             {
                 //
                 // Called by another thread!
                 //
-                public void ice_response()
+                public void response()
                 {
                     amiSuccess(prefix);
                 }
 
-                public void ice_exception(Ice.UserException e)
+                public void exception(Ice.UserException e)
                 {
                     amiFailure(prefix, "Failed to deliver signal " + s + " to " + _id, e);
                 }
 
-                public void ice_exception(Ice.LocalException e)
+                public void exception(Ice.LocalException e)
                 {
                     amiFailure(prefix, "Failed to deliver signal " + s + " to " + _id, e.toString());
                 }
@@ -285,7 +285,7 @@ class Server extends ListArrayTreeNode
 
         try
         {
-            getCoordinator().getAdmin().sendSignal_async(cb, _id, s);
+            getCoordinator().getAdmin().begin_sendSignal(_id, s, cb);
         }
         catch(Ice.LocalException e)
         {
@@ -316,22 +316,22 @@ class Server extends ListArrayTreeNode
         final String prefix = "Patching server '" + _id + "'...";
         getCoordinator().getStatusBar().setText(prefix);
 
-        AMI_Admin_patchServer cb = new AMI_Admin_patchServer()
+        Callback_Admin_patchServer cb = new Callback_Admin_patchServer()
             {
                 //
                 // Called by another thread!
                 //
-                public void ice_response()
+                public void response()
                 {
                     amiSuccess(prefix);
                 }
 
-                public void ice_exception(Ice.UserException e)
+                public void exception(Ice.UserException e)
                 {
                     amiFailure(prefix, "Failed to patch " + _id, e);
                 }
 
-                public void ice_exception(Ice.LocalException e)
+                public void exception(Ice.LocalException e)
                 {
                     amiFailure(prefix, "Failed to patch " + _id, e.toString());
                 }
@@ -340,7 +340,7 @@ class Server extends ListArrayTreeNode
         try
         {
             getCoordinator().getMainFrame().setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
-            getCoordinator().getAdmin().patchServer_async(cb, _id, shutdown == JOptionPane.YES_OPTION);
+            getCoordinator().getAdmin().begin_patchServer(_id, shutdown == JOptionPane.YES_OPTION, cb);
         }
         catch(Ice.LocalException e)
         {
@@ -360,22 +360,22 @@ class Server extends ListArrayTreeNode
 
         getCoordinator().getStatusBar().setText(prefix);
 
-        AMI_Admin_enableServer cb = new AMI_Admin_enableServer()
+        Callback_Admin_enableServer cb = new Callback_Admin_enableServer()
             {
                 //
                 // Called by another thread!
                 //
-                public void ice_response()
+                public void response()
                 {
                     amiSuccess(prefix);
                 }
 
-                public void ice_exception(Ice.UserException e)
+                public void exception(Ice.UserException e)
                 {
                     amiFailure(prefix, "Failed to " + action + " " + _id, e);
                 }
 
-                public void ice_exception(Ice.LocalException e)
+                public void exception(Ice.LocalException e)
                 {
                     amiFailure(prefix, "Failed to " + action + " " + _id, e.toString());
                 }
@@ -384,7 +384,7 @@ class Server extends ListArrayTreeNode
         try
         {
             getCoordinator().getMainFrame().setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
-            getCoordinator().getAdmin().enableServer_async(cb, _id, enable);
+            getCoordinator().getAdmin().begin_enableServer(_id, enable, cb);
         }
         catch(Ice.LocalException e)
         {
@@ -406,9 +406,9 @@ class Server extends ListArrayTreeNode
         }
         else
         {
-            Ice.AMI_PropertiesAdmin_getPropertiesForPrefix cb = new Ice.AMI_PropertiesAdmin_getPropertiesForPrefix()
+            Ice.Callback_PropertiesAdmin_getPropertiesForPrefix cb = new Ice.Callback_PropertiesAdmin_getPropertiesForPrefix()
                 {
-                    public void ice_response(final java.util.Map<String, String> properties)
+                    public void response(final java.util.Map<String, String> properties)
                     {
                         SwingUtilities.invokeLater(new Runnable()
                             {
@@ -420,7 +420,7 @@ class Server extends ListArrayTreeNode
                             });
                     }
 
-                    public void ice_exception(final Ice.LocalException e)
+                    public void exception(final Ice.LocalException e)
                     {
                         SwingUtilities.invokeLater(new Runnable()
                             {
@@ -451,7 +451,7 @@ class Server extends ListArrayTreeNode
             {
                 Ice.PropertiesAdminPrx propAdmin =
                     Ice.PropertiesAdminPrxHelper.uncheckedCast(serverAdmin.ice_facet("Properties"));
-                propAdmin.getPropertiesForPrefix_async(cb, "");
+                propAdmin.begin_getPropertiesForPrefix("", cb);
             }
             catch(Ice.LocalException e)
             {
@@ -891,14 +891,14 @@ class Server extends ListArrayTreeNode
                         // Note that duplicate registrations are ignored
                         //
 
-                        IceBox.AMI_ServiceManager_addObserver cb = new IceBox.AMI_ServiceManager_addObserver()
+                        IceBox.Callback_ServiceManager_addObserver cb = new IceBox.Callback_ServiceManager_addObserver()
                             {
-                                public void ice_response()
+                                public void response()
                                 {
                                     // all is good
                                 }
 
-                                public void ice_exception(Ice.LocalException e)
+                                public void exception(Ice.LocalException e)
                                 {
                                     JOptionPane.showMessageDialog(
                                         getCoordinator().getMainFrame(),
@@ -917,7 +917,7 @@ class Server extends ListArrayTreeNode
 
                             try
                             {
-                                serviceManager.addObserver_async(cb, _serviceObserver);
+                                serviceManager.begin_addObserver(_serviceObserver, cb);
                             }
                             catch(Ice.LocalException ex)
                             {
diff --git a/java/src/IceGridGUI/LiveDeployment/Service.java b/java/src/IceGridGUI/LiveDeployment/Service.java
index 40c3b57facd..a584d7798ba 100644
--- a/java/src/IceGridGUI/LiveDeployment/Service.java
+++ b/java/src/IceGridGUI/LiveDeployment/Service.java
@@ -64,17 +64,17 @@ public class Service extends ListArrayTreeNode
             final String prefix = "Starting service '" + _id + "'...";
             getCoordinator().getStatusBar().setText(prefix);
 
-            IceBox.AMI_ServiceManager_startService cb = new IceBox.AMI_ServiceManager_startService()
+            IceBox.Callback_ServiceManager_startService cb = new IceBox.Callback_ServiceManager_startService()
             {
                 //
                 // Called by another thread!
                 //
-                public void ice_response()
+                public void response()
                 {
                     amiSuccess(prefix);
                 }
 
-                public void ice_exception(Ice.UserException e)
+                public void exception(Ice.UserException e)
                 {
                     if(e instanceof IceBox.AlreadyStartedException)
                     {
@@ -86,7 +86,7 @@ public class Service extends ListArrayTreeNode
                     }
                 }
 
-                public void ice_exception(Ice.LocalException e)
+                public void exception(Ice.LocalException e)
                 {
                     amiFailure(prefix, "Failed to start service " + _id, e.toString());
                 }
@@ -97,7 +97,7 @@ public class Service extends ListArrayTreeNode
 
             try
             {
-                serviceManager.startService_async(cb, _id);
+                serviceManager.begin_startService(_id, cb);
             }
             catch(Ice.LocalException e)
             {
@@ -115,17 +115,17 @@ public class Service extends ListArrayTreeNode
             final String prefix = "Stopping service '" + _id + "'...";
             getCoordinator().getStatusBar().setText(prefix);
 
-            IceBox.AMI_ServiceManager_stopService cb = new IceBox.AMI_ServiceManager_stopService()
+            IceBox.Callback_ServiceManager_stopService cb = new IceBox.Callback_ServiceManager_stopService()
             {
                 //
                 // Called by another thread!
                 //
-                public void ice_response()
+                public void response()
                 {
                     amiSuccess(prefix);
                 }
 
-                public void ice_exception(Ice.UserException e)
+                public void exception(Ice.UserException e)
                 {
                     if(e instanceof IceBox.AlreadyStoppedException)
                     {
@@ -137,7 +137,7 @@ public class Service extends ListArrayTreeNode
                     }
                 }
 
-                public void ice_exception(Ice.LocalException e)
+                public void exception(Ice.LocalException e)
                 {
                     amiFailure(prefix, "Failed to stop service " + _id, e.toString());
                 }
@@ -148,7 +148,7 @@ public class Service extends ListArrayTreeNode
 
             try
             {
-                serviceManager.stopService_async(cb, _id);
+                serviceManager.begin_stopService(_id, cb);
             }
             catch(Ice.LocalException e)
             {
@@ -354,9 +354,9 @@ public class Service extends ListArrayTreeNode
         }
         else
         {
-            Ice.AMI_PropertiesAdmin_getPropertiesForPrefix cb = new Ice.AMI_PropertiesAdmin_getPropertiesForPrefix()
+            Ice.Callback_PropertiesAdmin_getPropertiesForPrefix cb = new Ice.Callback_PropertiesAdmin_getPropertiesForPrefix()
                 {
-                    public void ice_response(final java.util.Map<String, String> properties)
+                    public void response(final java.util.Map<String, String> properties)
                     {
                         SwingUtilities.invokeLater(new Runnable()
                             {
@@ -368,7 +368,7 @@ public class Service extends ListArrayTreeNode
                             });
                     }
 
-                    public void ice_exception(final Ice.LocalException e)
+                    public void exception(final Ice.LocalException e)
                     {
                         SwingUtilities.invokeLater(new Runnable()
                             {
@@ -397,7 +397,7 @@ public class Service extends ListArrayTreeNode
                 Ice.PropertiesAdminPrx propAdmin =
                     Ice.PropertiesAdminPrxHelper.uncheckedCast(serverAdmin.ice_facet("IceBox.Service." + _id +
                         ".Properties"));
-                propAdmin.getPropertiesForPrefix_async(cb, "");
+                propAdmin.begin_getPropertiesForPrefix("", cb);
             }
             catch(Ice.LocalException e)
             {
diff --git a/java/src/IceGridGUI/LiveDeployment/Slave.java b/java/src/IceGridGUI/LiveDeployment/Slave.java
index de967595c0f..be6dc806de9 100644
--- a/java/src/IceGridGUI/LiveDeployment/Slave.java
+++ b/java/src/IceGridGUI/LiveDeployment/Slave.java
@@ -41,22 +41,22 @@ class Slave extends TreeNode
         final String prefix = "Shutting down registry '" + _id + "'...";
         getCoordinator().getStatusBar().setText(prefix);
 
-        AMI_Admin_shutdownRegistry cb = new AMI_Admin_shutdownRegistry()
+        Callback_Admin_shutdownRegistry cb = new Callback_Admin_shutdownRegistry()
             {
                 //
                 // Called by another thread!
                 //
-                public void ice_response()
+                public void response()
                 {
                     amiSuccess(prefix);
                 }
 
-                public void ice_exception(Ice.UserException e)
+                public void exception(Ice.UserException e)
                 {
                     amiFailure(prefix, "Failed to shutdown " + _id, e);
                 }
 
-                public void ice_exception(Ice.LocalException e)
+                public void exception(Ice.LocalException e)
                 {
                     amiFailure(prefix, "Failed to shutdown " + _id,
                                e.toString());
@@ -67,7 +67,7 @@ class Slave extends TreeNode
         {
             getCoordinator().getMainFrame().setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
 
-            getCoordinator().getAdmin().shutdownRegistry_async(cb, _id);
+            getCoordinator().getAdmin().begin_shutdownRegistry(_id, cb);
         }
         catch(Ice.LocalException e)
         {
diff --git a/java/src/IceGridGUI/LiveDeployment/WriteMessageDialog.java b/java/src/IceGridGUI/LiveDeployment/WriteMessageDialog.java
index fd6b8a46711..d7b2dabfa63 100644
--- a/java/src/IceGridGUI/LiveDeployment/WriteMessageDialog.java
+++ b/java/src/IceGridGUI/LiveDeployment/WriteMessageDialog.java
@@ -85,9 +85,9 @@ class WriteMessageDialog extends JDialog
                         final String prefix = "Writing message to server '" + _target + "'...";
                         c.getStatusBar().setText(prefix);
 
-                        Ice.AMI_Process_writeMessage cb = new Ice.AMI_Process_writeMessage()
+                        Ice.Callback_Process_writeMessage cb = new Ice.Callback_Process_writeMessage()
                             {
-                                public void ice_response()
+                                public void response()
                                 {
                                     SwingUtilities.invokeLater(new Runnable()
                                         {
@@ -98,7 +98,7 @@ class WriteMessageDialog extends JDialog
                                         });
                                 }
 
-                                public void ice_exception(final Ice.LocalException e)
+                                public void exception(final Ice.LocalException e)
                                 {
                                     SwingUtilities.invokeLater(new Runnable()
                                         {
@@ -123,7 +123,7 @@ class WriteMessageDialog extends JDialog
 
                         try
                         {
-                            process.writeMessage_async(cb, _message.getText(), _stdOut.isSelected() ? 1 : 2);
+                            process.begin_writeMessage(_message.getText(), _stdOut.isSelected() ? 1 : 2, cb);
                         }
                         catch(Ice.LocalException ex)
                         {
diff --git a/java/src/IceInternal/LocatorInfo.java b/java/src/IceInternal/LocatorInfo.java
index c9750b11aca..9639351b661 100644
--- a/java/src/IceInternal/LocatorInfo.java
+++ b/java/src/IceInternal/LocatorInfo.java
@@ -239,28 +239,27 @@ public final class LocatorInfo
             {
                 if(async)
                 {
-                    _locatorInfo.getLocator().findObjectById_async(
-                        new Ice.AMI_Locator_findObjectById()
+                    _locatorInfo.getLocator().begin_findObjectById(_ref.getIdentity(),
+                        new Ice.Callback_Locator_findObjectById()
                         {
                             public void
-                            ice_response(Ice.ObjectPrx proxy)
+                            response(Ice.ObjectPrx proxy)
                             {
                                 ObjectRequest.this.response(proxy);
                             }
                             
                             public void
-                            ice_exception(Ice.UserException ex)
+                            exception(Ice.UserException ex)
                             {
                                 ObjectRequest.this.exception(ex);
                             }
                             
                             public void
-                            ice_exception(Ice.LocalException ex)
+                            exception(Ice.LocalException ex)
                             {
                                 ObjectRequest.this.exception(ex);
                             }
-                        },
-                        _ref.getIdentity());
+                        });
                 }
                 else
                 {
@@ -289,28 +288,27 @@ public final class LocatorInfo
             {
                 if(async)
                 {
-                    _locatorInfo.getLocator().findAdapterById_async(
-                        new Ice.AMI_Locator_findAdapterById()
+                    _locatorInfo.getLocator().begin_findAdapterById(_ref.getAdapterId(),
+                        new Ice.Callback_Locator_findAdapterById()
                         {
                             public void
-                            ice_response(Ice.ObjectPrx proxy)
+                            response(Ice.ObjectPrx proxy)
                             {
                                 AdapterRequest.this.response(proxy);
                             }
                             
                             public void
-                            ice_exception(Ice.UserException ex)
+                            exception(Ice.UserException ex)
                             {
                                 AdapterRequest.this.exception(ex);
                             }
                             
                             public void
-                            ice_exception(Ice.LocalException ex)
+                            exception(Ice.LocalException ex)
                             {
                                 AdapterRequest.this.exception(ex);
                             }
-                        },
-                        _ref.getAdapterId());
+                        });
                 }
                 else
                 {
diff --git a/java/src/IceInternal/RouterInfo.java b/java/src/IceInternal/RouterInfo.java
index f95ef32a9f8..cc482906167 100644
--- a/java/src/IceInternal/RouterInfo.java
+++ b/java/src/IceInternal/RouterInfo.java
@@ -99,16 +99,16 @@ public final class RouterInfo
             return;
         }
         
-        _router.getClientProxy_async(new Ice.AMI_Router_getClientProxy()
+        _router.begin_getClientProxy(new Ice.Callback_Router_getClientProxy()
             {
                 public void
-                ice_response(Ice.ObjectPrx clientProxy)
+                response(Ice.ObjectPrx clientProxy)
                 {
                     callback.setEndpoints(setClientEndpoints(clientProxy));
                 }
                 
                 public void
-                ice_exception(Ice.LocalException ex)
+                exception(Ice.LocalException ex)
                 {
                     if(ex instanceof Ice.CollocationOptimizationException)
                     {
@@ -176,17 +176,18 @@ public final class RouterInfo
             }
         }
 
-        _router.addProxies_async(new Ice.AMI_Router_addProxies()
+        _router.begin_addProxies(new Ice.ObjectPrx[] { proxy },
+            new Ice.Callback_Router_addProxies()
             {
                 public void
-                ice_response(Ice.ObjectPrx[] evictedProxies)
+                response(Ice.ObjectPrx[] evictedProxies)
                 {
                     addAndEvictProxies(proxy, evictedProxies);
                     callback.addedProxy();
                 }
                 
                 public void
-                ice_exception(Ice.LocalException ex)
+                exception(Ice.LocalException ex)
                 {
                     if(ex instanceof Ice.CollocationOptimizationException)
                     {
@@ -205,8 +206,7 @@ public final class RouterInfo
                         callback.setException(ex);
                     }
                 }
-            },
-            new Ice.ObjectPrx[] { proxy });
+            });
 
         return false;
     }