Squashed commit of the following:

commit 8b2757175b076f620b2f5c5c788f811f38a4fa5b
Author: Bernard Normier <bernard@zeroc.com>
Date:   Wed Sep 26 18:56:30 2007 -0400

    Deprecated Glacier2.Admin and IcePatch2.Admin

4 files changed, 19 insertions, 17 deletions

diff --git a/java/test/Glacier2/attack/AttackClient.java b/java/test/Glacier2/attack/AttackClient.java
index 48208139d13..b8a3696c95a 100644
--- a/java/test/Glacier2/attack/AttackClient.java
+++ b/java/test/Glacier2/attack/AttackClient.java
@@ -109,13 +109,13 @@ class AttackClient extends Ice.Application
         System.out.flush();
         backend.shutdown();
         communicator().setDefaultRouter(null);
-        Ice.ObjectPrx adminBase = communicator().stringToProxy("Glacier2/admin:tcp -h 127.0.0.1 -p 12348 -t 10000");
-        Glacier2.AdminPrx admin = Glacier2.AdminPrxHelper.checkedCast(adminBase);
-        test(admin != null);
-        admin.shutdown();
+        Ice.ObjectPrx processBase = communicator().stringToProxy("Glacier2/admin -f Process:tcp -h 127.0.0.1 -p 12348 -t 10000");
+        Ice.ProcessPrx process = Ice.ProcessPrxHelper.checkedCast(processBase);
+        test(process != null);
+        process.shutdown();
         try
         {
-           admin.ice_ping();
+           process.ice_ping();
            test(false);
         }
         catch(Ice.LocalException ex)
diff --git a/java/test/Glacier2/attack/run.py b/java/test/Glacier2/attack/run.py
index ff955c2cfd4..c5bb9ee37d8 100755
--- a/java/test/Glacier2/attack/run.py
+++ b/java/test/Glacier2/attack/run.py
@@ -32,7 +32,8 @@ command = router + TestUtil.cppClientServerOptions + \
           r' --Ice.PrintProcessId' \
           r' --Glacier2.RoutingTable.MaxSize=10' + \
           r' --Glacier2.Client.Endpoints="default -p 12347 -t 10000"' + \
-          r' --Glacier2.Admin.Endpoints="tcp -h 127.0.0.1 -p 12348 -t 10000"' + \
+          r' --Ice.Admin.Endpoints="tcp -h 127.0.0.1 -p 12348 -t 10000"' + \
+          r' --Ice.Admin.InstanceName=Glacier2' + \
           r' --Glacier2.CryptPasswords="' + toplevel + r'/test/Glacier2/attack/passwords"'
 
 print "starting router...",
diff --git a/java/test/Glacier2/router/CallbackClient.java b/java/test/Glacier2/router/CallbackClient.java
index c6ab1ca364f..96713a2740a 100644
--- a/java/test/Glacier2/router/CallbackClient.java
+++ b/java/test/Glacier2/router/CallbackClient.java
@@ -398,36 +398,36 @@ class CallbackClient extends Ice.Application
                 System.out.println("ok");
             }
             
-            Ice.ObjectPrx adminBase;
+            Ice.ObjectPrx processBase;
             
             {
-                System.out.print("testing stringToProxy for admin object... ");
-                adminBase = communicator().stringToProxy("Glacier2/admin:tcp -h 127.0.0.1 -p 12348 -t 10000");
+                System.out.print("testing stringToProxy for process object... ");
+                processBase = communicator().stringToProxy("Glacier2/admin -f Process:tcp -h 127.0.0.1 -p 12348 -t 10000");
                 System.out.println("ok");
             }
             
 /*
             {
-                System.out.print("uninstalling router with admin object... ");
-                adminBase.ice_router(null);
+                System.out.print("uninstalling router with process object... ");
+                processBase.ice_router(null);
                 System.out.println("ok");
             }
 */
             
-            Glacier2.AdminPrx admin;
+            Ice.ProcessPrx process;
             
             {
                 System.out.print("testing checked cast for admin object... ");
-                admin = Glacier2.AdminPrxHelper.checkedCast(adminBase);
-                test(admin != null);
+                process = Ice.ProcessPrxHelper.checkedCast(processBase);
+                test(process != null);
                 System.out.println("ok");
             }
             
             System.out.print("testing Glacier2 shutdown... ");
-            admin.shutdown();
+            process.shutdown();
             try
             {
-                admin.ice_ping();
+                process.ice_ping();
                 test(false);
             }
             catch(Ice.LocalException ex)
diff --git a/java/test/Glacier2/router/run.py b/java/test/Glacier2/router/run.py
index 14eea5b1cce..49c67e2f46f 100755
--- a/java/test/Glacier2/router/run.py
+++ b/java/test/Glacier2/router/run.py
@@ -36,7 +36,8 @@ command = router + TestUtil.cppClientServerOptions + \
           r' --Glacier2.SessionTimeout="30"' + \
           r' --Glacier2.Client.Endpoints="default -p 12347 -t 10000"' + \
           r' --Glacier2.Server.Endpoints="tcp -h 127.0.0.1 -t 10000"' \
-          r' --Glacier2.Admin.Endpoints="tcp -h 127.0.0.1 -p 12348 -t 10000"' + \
+          r' --Ice.Admin.Endpoints="tcp -h 127.0.0.1 -p 12348 -t 10000"' + \
+          r' --Ice.Admin.InstanceName=Glacier2' + \
           r' --Glacier2.CryptPasswords="' + toplevel + r'/test/Glacier2/router/passwords"'
 
 print "starting router...",