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

29 files changed, 178 insertions, 163 deletions

diff --git a/cpp/config/PropertyNames.xml b/cpp/config/PropertyNames.xml
index f2bc39df319..04763e2cda7 100755
--- a/cpp/config/PropertyNames.xml
+++ b/cpp/config/PropertyNames.xml
@@ -275,6 +275,26 @@ generated from the section label.
         <suffix name="ThreadPool" class="threadpool" />
     </class>
 
+    <class name="deprecatedthreadpool" prefix-only="true">
+        <suffix name="Size" deprecated="true" />
+        <suffix name="SizeMax" deprecated="true" />
+        <suffix name="SizeWarn" deprecated="true" />
+        <suffix name="StackSize" deprecated="true" />
+    </class>
+
+    <class name="deprecatedobjectadapter" prefix-only="true">
+        <suffix name="AdapterId" deprecated="true" />
+        <suffix name="Endpoints" deprecated="true" />
+        <suffix name="Locator" deprecated="true" />
+        <suffix name="PublishedEndpoints" deprecated="true" />
+        <suffix name="RegisterProcess" deprecated="true" />
+        <suffix name="ReplicaGroupId" deprecated="true" />
+        <suffix name="Router" deprecated="true" />
+        <suffix name="ThreadPerConnection" deprecated="true" />
+        <suffix name="ThreadPerConnection.StackSize" deprecated="true"/>
+        <suffix name="ThreadPool" class="deprecatedthreadpool"/>
+    </class>
+
     <section name="Ice">
         <property name="ACM.Client" />
         <property name="ACM.Server" />
@@ -417,7 +437,7 @@ generated from the section label.
     
     <section name="IcePatch2">
         <property class="objectadapter" />
-        <property name="Admin" class="objectadapter" />
+        <property name="Admin" class="deprecatedobjectadapter" />
         <property name="ChunkSize" />
         <property name="Directory" />
         <property name="InstanceName" />
@@ -482,7 +502,7 @@ generated from the section label.
         <property name="AddSSLContext" />
         <property name="AddUserToAllowCategories" deprecated="true"
             deprecatedBy="Glacier2.Filter.Category.AcceptUser" />
-        <property name="Admin" class="objectadapter"/>
+        <property name="Admin" class="deprecatedobjectadapter" />
         <property name="AllowCategories" deprecated="true" deprecatedBy="Glacier2.Filter.Category.Accept" />
         <property name="Client" class="objectadapter"/>
         <property name="Client.AlwaysBatch" />
diff --git a/cpp/config/templates.xml b/cpp/config/templates.xml
index 2fec560a307..494c67c396e 100644
--- a/cpp/config/templates.xml
+++ b/cpp/config/templates.xml
@@ -25,8 +25,6 @@
          </adapter>
 
          <properties>
-            <property name="IcePatch2.Admin.Endpoints" value="tcp -h 127.0.0.1"/>
-            <property name="IcePatch2.Admin.RegisterProcess" value="1"/>
             <property name="IcePatch2.InstanceName" value="${instance-name}"/>
             <property name="IcePatch2.Directory" value="${directory}"/>
          </properties>
@@ -46,8 +44,6 @@
          <properties>
             <property name="Glacier2.Client.Endpoints" value="${client-endpoints}"/>
             <property name="Glacier2.Server.Endpoints" value="${server-endpoints}"/>
-            <property name="Glacier2.Admin.Endpoints" value="tcp -h 127.0.0.1"/>
-            <property name="Glacier2.Admin.RegisterProcess" value="1"/>
             <property name="Glacier2.InstanceName" value="${instance-name}"/>
             <property name="Glacier2.SessionTimeout" value="${session-timeout}"/>
          </properties>
diff --git a/cpp/src/Ice/PropertyNames.cpp b/cpp/src/Ice/PropertyNames.cpp
index b45ad68b29b..f514fb6a11a 100644
--- a/cpp/src/Ice/PropertyNames.cpp
+++ b/cpp/src/Ice/PropertyNames.cpp
@@ -7,7 +7,7 @@
 //
 // **********************************************************************
 //
-// Generated by makeprops.py from file ../config/PropertyNames.xml, Tue Sep 25 18:32:10 2007
+// Generated by makeprops.py from file ../config/PropertyNames.xml, Wed Sep 26 17:22:42 2007
 
 // IMPORTANT: Do not edit this file -- any edits made here will be lost!
 
@@ -340,19 +340,19 @@ const IceInternal::Property IcePatch2PropsData[] =
     IceInternal::Property("IcePatch2.ThreadPool.SizeMax", false, 0),
     IceInternal::Property("IcePatch2.ThreadPool.SizeWarn", false, 0),
     IceInternal::Property("IcePatch2.ThreadPool.StackSize", false, 0),
-    IceInternal::Property("IcePatch2.Admin.AdapterId", false, 0),
-    IceInternal::Property("IcePatch2.Admin.Endpoints", false, 0),
-    IceInternal::Property("IcePatch2.Admin.Locator", false, 0),
-    IceInternal::Property("IcePatch2.Admin.PublishedEndpoints", false, 0),
+    IceInternal::Property("IcePatch2.Admin.AdapterId", true, 0),
+    IceInternal::Property("IcePatch2.Admin.Endpoints", true, 0),
+    IceInternal::Property("IcePatch2.Admin.Locator", true, 0),
+    IceInternal::Property("IcePatch2.Admin.PublishedEndpoints", true, 0),
     IceInternal::Property("IcePatch2.Admin.RegisterProcess", true, 0),
-    IceInternal::Property("IcePatch2.Admin.ReplicaGroupId", false, 0),
-    IceInternal::Property("IcePatch2.Admin.Router", false, 0),
-    IceInternal::Property("IcePatch2.Admin.ThreadPerConnection", false, 0),
-    IceInternal::Property("IcePatch2.Admin.ThreadPerConnection.StackSize", false, 0),
-    IceInternal::Property("IcePatch2.Admin.ThreadPool.Size", false, 0),
-    IceInternal::Property("IcePatch2.Admin.ThreadPool.SizeMax", false, 0),
-    IceInternal::Property("IcePatch2.Admin.ThreadPool.SizeWarn", false, 0),
-    IceInternal::Property("IcePatch2.Admin.ThreadPool.StackSize", false, 0),
+    IceInternal::Property("IcePatch2.Admin.ReplicaGroupId", true, 0),
+    IceInternal::Property("IcePatch2.Admin.Router", true, 0),
+    IceInternal::Property("IcePatch2.Admin.ThreadPerConnection", true, 0),
+    IceInternal::Property("IcePatch2.Admin.ThreadPerConnection.StackSize", true, 0),
+    IceInternal::Property("IcePatch2.Admin.ThreadPool.Size", true, 0),
+    IceInternal::Property("IcePatch2.Admin.ThreadPool.SizeMax", true, 0),
+    IceInternal::Property("IcePatch2.Admin.ThreadPool.SizeWarn", true, 0),
+    IceInternal::Property("IcePatch2.Admin.ThreadPool.StackSize", true, 0),
     IceInternal::Property("IcePatch2.ChunkSize", false, 0),
     IceInternal::Property("IcePatch2.Directory", false, 0),
     IceInternal::Property("IcePatch2.InstanceName", false, 0),
@@ -472,19 +472,19 @@ const IceInternal::Property Glacier2PropsData[] =
 {
     IceInternal::Property("Glacier2.AddSSLContext", false, 0),
     IceInternal::Property("Glacier2.AddUserToAllowCategories", true, "Glacier2.Filter.Category.AcceptUser"),
-    IceInternal::Property("Glacier2.Admin.AdapterId", false, 0),
-    IceInternal::Property("Glacier2.Admin.Endpoints", false, 0),
-    IceInternal::Property("Glacier2.Admin.Locator", false, 0),
-    IceInternal::Property("Glacier2.Admin.PublishedEndpoints", false, 0),
+    IceInternal::Property("Glacier2.Admin.AdapterId", true, 0),
+    IceInternal::Property("Glacier2.Admin.Endpoints", true, 0),
+    IceInternal::Property("Glacier2.Admin.Locator", true, 0),
+    IceInternal::Property("Glacier2.Admin.PublishedEndpoints", true, 0),
     IceInternal::Property("Glacier2.Admin.RegisterProcess", true, 0),
-    IceInternal::Property("Glacier2.Admin.ReplicaGroupId", false, 0),
-    IceInternal::Property("Glacier2.Admin.Router", false, 0),
-    IceInternal::Property("Glacier2.Admin.ThreadPerConnection", false, 0),
-    IceInternal::Property("Glacier2.Admin.ThreadPerConnection.StackSize", false, 0),
-    IceInternal::Property("Glacier2.Admin.ThreadPool.Size", false, 0),
-    IceInternal::Property("Glacier2.Admin.ThreadPool.SizeMax", false, 0),
-    IceInternal::Property("Glacier2.Admin.ThreadPool.SizeWarn", false, 0),
-    IceInternal::Property("Glacier2.Admin.ThreadPool.StackSize", false, 0),
+    IceInternal::Property("Glacier2.Admin.ReplicaGroupId", true, 0),
+    IceInternal::Property("Glacier2.Admin.Router", true, 0),
+    IceInternal::Property("Glacier2.Admin.ThreadPerConnection", true, 0),
+    IceInternal::Property("Glacier2.Admin.ThreadPerConnection.StackSize", true, 0),
+    IceInternal::Property("Glacier2.Admin.ThreadPool.Size", true, 0),
+    IceInternal::Property("Glacier2.Admin.ThreadPool.SizeMax", true, 0),
+    IceInternal::Property("Glacier2.Admin.ThreadPool.SizeWarn", true, 0),
+    IceInternal::Property("Glacier2.Admin.ThreadPool.StackSize", true, 0),
     IceInternal::Property("Glacier2.AllowCategories", true, "Glacier2.Filter.Category.Accept"),
     IceInternal::Property("Glacier2.Client.AdapterId", false, 0),
     IceInternal::Property("Glacier2.Client.Endpoints", false, 0),
diff --git a/cpp/src/Ice/PropertyNames.h b/cpp/src/Ice/PropertyNames.h
index be0dfc68048..c9b88bf3f2a 100644
--- a/cpp/src/Ice/PropertyNames.h
+++ b/cpp/src/Ice/PropertyNames.h
@@ -7,7 +7,7 @@
 //
 // **********************************************************************
 //
-// Generated by makeprops.py from file ../config/PropertyNames.xml, Tue Sep 25 18:32:10 2007
+// Generated by makeprops.py from file ../config/PropertyNames.xml, Wed Sep 26 17:22:42 2007
 
 // IMPORTANT: Do not edit this file -- any edits made here will be lost!
 
diff --git a/cpp/src/IceGrid/DescriptorBuilder.cpp b/cpp/src/IceGrid/DescriptorBuilder.cpp
index e030ada78f1..27ae39bb7ff 100644
--- a/cpp/src/IceGrid/DescriptorBuilder.cpp
+++ b/cpp/src/IceGrid/DescriptorBuilder.cpp
@@ -929,13 +929,8 @@ IceBoxDescriptorBuilder::finish()
         _hiddenProperties.push_back(createProperty("IceBox.InstanceName", "${server}"));
     }
     
-    if(!isSet(_descriptor->propertySet.properties, "IceBox.ServiceManager.Endpoints"))
-    {
-        _hiddenProperties.push_back(createProperty("IceBox.ServiceManager.Endpoints", "tcp -h 127.0.0.1"));
-    }
-
     //
-    // The NodeCache takes care of setting RegisterProcess for old IceBox servers
+    // The NodeCache takes care of setting Endpoints and RegisterProcess for old IceBox servers
     //
 
     ServerDescriptorBuilder::finish();
diff --git a/cpp/src/IceGrid/NodeCache.cpp b/cpp/src/IceGrid/NodeCache.cpp
index f88258488fc..3ac84d29d4e 100644
--- a/cpp/src/IceGrid/NodeCache.cpp
+++ b/cpp/src/IceGrid/NodeCache.cpp
@@ -918,6 +918,10 @@ NodeEntry::getInternalServerDescriptor(const ServerInfo& info) const
                 props.push_back(createProperty("IceBox.ServiceManager.RegisterProcess", "1"));
                 server->processRegistered = true;
             }
+            if(!isSet(iceBox->propertySet.properties, "IceBox.ServiceManager.Endpoints"))
+            {
+                props.push_back(createProperty("IceBox.ServiceManager.Endpoints", "tcp -h 127.0.0.1"));
+            }
         }
     }
 
diff --git a/cpp/test/Glacier2/attack/Client.cpp b/cpp/test/Glacier2/attack/Client.cpp
index 113df36526c..02f2041afcb 100644
--- a/cpp/test/Glacier2/attack/Client.cpp
+++ b/cpp/test/Glacier2/attack/Client.cpp
@@ -114,13 +114,13 @@ AttackClient::run(int argc, char* argv[])
     cout << "testing server and router shutdown... " << flush;
     backend->shutdown();
     communicator()->setDefaultRouter(0);
-    ObjectPrx adminBase = communicator()->stringToProxy("Glacier2/admin:tcp -h 127.0.0.1 -p 12348 -t 10000");
-    Glacier2::AdminPrx admin = Glacier2::AdminPrx::checkedCast(adminBase);
-    test(admin);
-    admin->shutdown();
+    ObjectPrx adminBase = communicator()->stringToProxy("Glacier2/admin -f Process:tcp -h 127.0.0.1 -p 12348 -t 10000");
+    Ice::ProcessPrx process = Ice::ProcessPrx::checkedCast(adminBase);
+    test(process);
+    process->shutdown();
     try
     {
-        admin->ice_ping();
+        process->ice_ping();
         test(false);
     }
     catch(const Ice::LocalException&)
diff --git a/cpp/test/Glacier2/attack/run.py b/cpp/test/Glacier2/attack/run.py
index 37031621fb2..651dbde6d91 100755
--- a/cpp/test/Glacier2/attack/run.py
+++ b/cpp/test/Glacier2/attack/run.py
@@ -25,7 +25,8 @@ router = os.path.join(toplevel, "bin", "glacier2router")
 command = router + TestUtil.clientServerOptions + \
           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/cpp/test/Glacier2/dynamicFiltering/Client.cpp b/cpp/test/Glacier2/dynamicFiltering/Client.cpp
index ee19c221a6e..e9c438a532e 100755
--- a/cpp/test/Glacier2/dynamicFiltering/Client.cpp
+++ b/cpp/test/Glacier2/dynamicFiltering/Client.cpp
@@ -164,13 +164,13 @@ SessionControlClient::run(int argc, char* argv[])
     // Shut down the router.
     //
     communicator()->setDefaultRouter(0);
-    ObjectPrx adminBase = communicator()->stringToProxy("Glacier2/admin:tcp -h 127.0.0.1 -p 12348 -t 10000");
-    Glacier2::AdminPrx admin = Glacier2::AdminPrx::checkedCast(adminBase);
-    test(admin);
-    admin->shutdown();
+    ObjectPrx processBase = communicator()->stringToProxy("Glacier2/admin -f Process:tcp -h 127.0.0.1 -p 12348 -t 10000");
+    Ice::ProcessPrx process = Ice::ProcessPrx::checkedCast(processBase);
+    test(process);
+    process->shutdown();
     try
     {
-        admin->ice_ping();
+        process->ice_ping();
         test(false);
     }
     catch(const Ice::LocalException&)
diff --git a/cpp/test/Glacier2/dynamicFiltering/run.py b/cpp/test/Glacier2/dynamicFiltering/run.py
index daa7efd396a..4a08f0479a7 100755
--- a/cpp/test/Glacier2/dynamicFiltering/run.py
+++ b/cpp/test/Glacier2/dynamicFiltering/run.py
@@ -35,7 +35,8 @@ router = os.path.join(toplevel, "bin", "glacier2router")
 
 command = router + TestUtil.clientServerOptions + \
           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.Server.Endpoints="default -p 12349 -t 10000"' + \
           r' --Glacier2.SessionManager="SessionManager:tcp -h 127.0.0.1 -p 12010 -t 10000"' + \
           r' --Glacier2.PermissionsVerifier="Glacier2/NullPermissionsVerifier"' + \
diff --git a/cpp/test/Glacier2/sessionControl/Client.cpp b/cpp/test/Glacier2/sessionControl/Client.cpp
index e80822b6731..04b3fa4bb8c 100644
--- a/cpp/test/Glacier2/sessionControl/Client.cpp
+++ b/cpp/test/Glacier2/sessionControl/Client.cpp
@@ -99,13 +99,13 @@ SessionControlClient::run(int argc, char* argv[])
     session = Test::SessionPrx::uncheckedCast(router->createSession("userid", "abc123"));
     session->shutdown();
     communicator()->setDefaultRouter(0);
-    ObjectPrx adminBase = communicator()->stringToProxy("Glacier2/admin:tcp -h 127.0.0.1 -p 12348 -t 10000");
-    Glacier2::AdminPrx admin = Glacier2::AdminPrx::checkedCast(adminBase);
-    test(admin);
-    admin->shutdown();
+    ObjectPrx processBase = communicator()->stringToProxy("Glacier2/admin -f Process:tcp -h 127.0.0.1 -p 12348 -t 10000");
+    Ice::ProcessPrx process = Ice::ProcessPrx::checkedCast(processBase);
+    test(process);
+    process->shutdown();
     try
     {
-        admin->ice_ping();
+        process->ice_ping();
         test(false);
     }
     catch(const Ice::LocalException&)
diff --git a/cpp/test/Glacier2/sessionControl/run.py b/cpp/test/Glacier2/sessionControl/run.py
index bac9cd799c0..8c62f569b44 100755
--- a/cpp/test/Glacier2/sessionControl/run.py
+++ b/cpp/test/Glacier2/sessionControl/run.py
@@ -35,7 +35,8 @@ router = os.path.join(toplevel, "bin", "glacier2router")
 
 command = router + TestUtil.clientServerOptions + \
           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.Server.Endpoints="default -p 12349 -t 10000"' + \
           r' --Glacier2.SessionManager="SessionManager:tcp -h 127.0.0.1 -p 12010 -t 10000"' \
           r' --Glacier2.PermissionsVerifier="Glacier2/NullPermissionsVerifier"'
diff --git a/cpp/test/Glacier2/ssl/Client.cpp b/cpp/test/Glacier2/ssl/Client.cpp
index 3c3e2f24b24..39858be2ee2 100755
--- a/cpp/test/Glacier2/ssl/Client.cpp
+++ b/cpp/test/Glacier2/ssl/Client.cpp
@@ -120,9 +120,9 @@ CallbackClient::run(int argc, char* argv[])
     cout << "ok" << endl;
 
     communicator()->setDefaultRouter(0);
-    Glacier2::AdminPrx admin = Glacier2::AdminPrx::checkedCast(
-        communicator()->stringToProxy("Glacier2/admin:tcp -h 127.0.0.1 -p 12349 -t 10000"));
-    admin->shutdown();
+    Ice::ProcessPrx process = Ice::ProcessPrx::checkedCast(
+        communicator()->stringToProxy("Glacier2/admin -f Process:tcp -h 127.0.0.1 -p 12349 -t 10000"));
+    process->shutdown();
     
     return EXIT_SUCCESS;
 }
diff --git a/cpp/test/Glacier2/ssl/run.py b/cpp/test/Glacier2/ssl/run.py
index 93b9e4ea635..d25504b6741 100755
--- a/cpp/test/Glacier2/ssl/run.py
+++ b/cpp/test/Glacier2/ssl/run.py
@@ -38,7 +38,8 @@ command = router + TestUtil.clientServerOptions + \
           r' --Glacier2.AddSSLContext=1' + \
           r' --Glacier2.Client.Endpoints="tcp -h 127.0.0.1 -p 12347 -t 10000:ssl -h 127.0.0.1 -p 12348 -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 12349 -t 10000"' + \
+          r' --Ice.Admin.Endpoints="tcp -h 127.0.0.1 -p 12349 -t 10000"' + \
+          r' --Ice.Admin.InstanceName=Glacier2' + \
           r' --Glacier2.SessionManager="sessionmanager:tcp -h 127.0.0.1 -p 12350 -t 10000"' + \
           r' --Glacier2.PermissionsVerifier="Glacier2/NullPermissionsVerifier"' + \
           r' --Glacier2.SSLSessionManager="sslsessionmanager:tcp -h 127.0.0.1 -p 12350 -t 10000"' + \
diff --git a/cpp/test/Glacier2/staticFiltering/Client.cpp b/cpp/test/Glacier2/staticFiltering/Client.cpp
index d6990d801e5..e733eddb7a0 100755
--- a/cpp/test/Glacier2/staticFiltering/Client.cpp
+++ b/cpp/test/Glacier2/staticFiltering/Client.cpp
@@ -152,25 +152,19 @@ AttackClient::run(int argc, char* argv[])
         test(false);
     }
 
+    ObjectPrx processBase = communicator()->stringToProxy("Glacier2/admin -f Process:tcp -h 127.0.0.1 -p 12348 -t 10000");
+    Ice::ProcessPrx process = Ice::ProcessPrx::checkedCast(processBase);
+    test(process);
+    process->shutdown();
     try
     {
-        ObjectPrx adminBase = communicator()->stringToProxy("Glacier2/admin:tcp -h 127.0.0.1 -p 12348 -t 10000");
-        Glacier2::AdminPrx admin = Glacier2::AdminPrx::checkedCast(adminBase);
-        test(admin);
-        admin->shutdown();
-        try
-        {
-            admin->ice_ping();
-            test(false);
-        }
-        catch(const Ice::LocalException&)
-        {
-        }
+        process->ice_ping();
+        test(false);
     }
     catch(const Ice::LocalException&)
     {
+        cout << "ok" << endl;
     }
-    cout << "ok" << endl;
 
     return EXIT_SUCCESS;
 }
diff --git a/cpp/test/Glacier2/staticFiltering/run.py b/cpp/test/Glacier2/staticFiltering/run.py
index fea6ee0badb..d4ef8407ed3 100755
--- a/cpp/test/Glacier2/staticFiltering/run.py
+++ b/cpp/test/Glacier2/staticFiltering/run.py
@@ -259,7 +259,8 @@ for testcase in testcases:
 
     routerCmd = router + serverOptions + " --Ice.Config=%s" % os.path.join(testdir, "router.cfg") + \
           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/staticFiltering/passwords"' 
 
     routerConfig = file(os.path.join(testdir, "router.cfg"), "w")
diff --git a/cpp/test/IceGrid/allocation/application.xml b/cpp/test/IceGrid/allocation/application.xml
index e48545892b6..26bac40a540 100644
--- a/cpp/test/IceGrid/allocation/application.xml
+++ b/cpp/test/IceGrid/allocation/application.xml
@@ -10,8 +10,7 @@
 
       <server id="${id}" exe="${ice.dir}/bin/glacier2router">
         <property name="Glacier2.Client.Endpoints" value="${endpoints}"/>
-        <property name="Glacier2.Server.Endpoints" value="tcp -h 127.0.0.1"/>
-        <property name="Glacier2.Admin.Endpoints" value="tcp -h 127.0.0.1"/>				   
+        <property name="Glacier2.Server.Endpoints" value="tcp -h 127.0.0.1"/>			   
         <property name="Glacier2.SessionManager" value="${manager}"/>
         <property name="Glacier2.SSLSessionManager" value="IceGrid/SSLSessionManager"/>
         <property name="Glacier2.PermissionsVerifier" value="${verifier}"/>
diff --git a/cpp/test/IceGrid/distribution/application.xml b/cpp/test/IceGrid/distribution/application.xml
index dcdd5da7028..1a1b629b390 100644
--- a/cpp/test/IceGrid/distribution/application.xml
+++ b/cpp/test/IceGrid/distribution/application.xml
@@ -15,7 +15,6 @@
          <adapter name="IcePatch2" endpoints="${endpoints}">
            <object identity="${instance-name}/server" type="::IcePatch2::FileServer"/>
          </adapter>
-         <adapter name="IcePatch2.Admin" endpoints="tcp -h 127.0.0.1"/>
          <properties>
             <property name="IcePatch2.InstanceName" value="${instance-name}"/>
             <property name="IcePatch2.Directory" value="${directory}"/>
diff --git a/cpp/test/IceGrid/session/application.xml b/cpp/test/IceGrid/session/application.xml
index 119151cc9ee..ce63ed705bc 100644
--- a/cpp/test/IceGrid/session/application.xml
+++ b/cpp/test/IceGrid/session/application.xml
@@ -12,8 +12,7 @@
       <server id="${id}" exe="${ice.dir}/bin/glacier2router">
         <property name="Glacier2.Client.Endpoints" value="${endpoints}"/>
         <property name="Glacier2.Server.Endpoints" value="tcp -h 127.0.0.1"/>
-        <property name="Glacier2.Admin.Endpoints" value="tcp -h 127.0.0.1"/>
-      
+       
         <property name="Glacier2.SessionManager" value="${manager}"/>
         <property name="Glacier2.SSLSessionManager" value="${ssl-manager}"/>
         <property name="Glacier2.PermissionsVerifier" value="${verifier}"/>
diff --git a/cs/src/Ice/PropertyNames.cs b/cs/src/Ice/PropertyNames.cs
index f86c8870101..76ed8886cae 100644
--- a/cs/src/Ice/PropertyNames.cs
+++ b/cs/src/Ice/PropertyNames.cs
@@ -7,7 +7,7 @@
 //
 // **********************************************************************
 //
-// Generated by makeprops.py from file ../config/PropertyNames.xml, Tue Sep 25 18:32:10 2007
+// Generated by makeprops.py from file ../config/PropertyNames.xml, Wed Sep 26 17:22:42 2007
 
 // IMPORTANT: Do not edit this file -- any edits made here will be lost!
 
@@ -330,19 +330,19 @@ namespace IceInternal
              new Property(@"^IcePatch2\.ThreadPool\.SizeMax$", false, null),
              new Property(@"^IcePatch2\.ThreadPool\.SizeWarn$", false, null),
              new Property(@"^IcePatch2\.ThreadPool\.StackSize$", false, null),
-             new Property(@"^IcePatch2\.Admin\.AdapterId$", false, null),
-             new Property(@"^IcePatch2\.Admin\.Endpoints$", false, null),
-             new Property(@"^IcePatch2\.Admin\.Locator$", false, null),
-             new Property(@"^IcePatch2\.Admin\.PublishedEndpoints$", false, null),
+             new Property(@"^IcePatch2\.Admin\.AdapterId$", true, null),
+             new Property(@"^IcePatch2\.Admin\.Endpoints$", true, null),
+             new Property(@"^IcePatch2\.Admin\.Locator$", true, null),
+             new Property(@"^IcePatch2\.Admin\.PublishedEndpoints$", true, null),
              new Property(@"^IcePatch2\.Admin\.RegisterProcess$", true, null),
-             new Property(@"^IcePatch2\.Admin\.ReplicaGroupId$", false, null),
-             new Property(@"^IcePatch2\.Admin\.Router$", false, null),
-             new Property(@"^IcePatch2\.Admin\.ThreadPerConnection$", false, null),
-             new Property(@"^IcePatch2\.Admin\.ThreadPerConnection\.StackSize$", false, null),
-             new Property(@"^IcePatch2\.Admin\.ThreadPool\.Size$", false, null),
-             new Property(@"^IcePatch2\.Admin\.ThreadPool\.SizeMax$", false, null),
-             new Property(@"^IcePatch2\.Admin\.ThreadPool\.SizeWarn$", false, null),
-             new Property(@"^IcePatch2\.Admin\.ThreadPool\.StackSize$", false, null),
+             new Property(@"^IcePatch2\.Admin\.ReplicaGroupId$", true, null),
+             new Property(@"^IcePatch2\.Admin\.Router$", true, null),
+             new Property(@"^IcePatch2\.Admin\.ThreadPerConnection$", true, null),
+             new Property(@"^IcePatch2\.Admin\.ThreadPerConnection\.StackSize$", true, null),
+             new Property(@"^IcePatch2\.Admin\.ThreadPool\.Size$", true, null),
+             new Property(@"^IcePatch2\.Admin\.ThreadPool\.SizeMax$", true, null),
+             new Property(@"^IcePatch2\.Admin\.ThreadPool\.SizeWarn$", true, null),
+             new Property(@"^IcePatch2\.Admin\.ThreadPool\.StackSize$", true, null),
              new Property(@"^IcePatch2\.ChunkSize$", false, null),
              new Property(@"^IcePatch2\.Directory$", false, null),
              new Property(@"^IcePatch2\.InstanceName$", false, null),
@@ -450,19 +450,19 @@ namespace IceInternal
         {
              new Property(@"^Glacier2\.AddSSLContext$", false, null),
              new Property(@"^Glacier2\.AddUserToAllowCategories$", true, @"Glacier2.Filter.Category.AcceptUser"),
-             new Property(@"^Glacier2\.Admin\.AdapterId$", false, null),
-             new Property(@"^Glacier2\.Admin\.Endpoints$", false, null),
-             new Property(@"^Glacier2\.Admin\.Locator$", false, null),
-             new Property(@"^Glacier2\.Admin\.PublishedEndpoints$", false, null),
+             new Property(@"^Glacier2\.Admin\.AdapterId$", true, null),
+             new Property(@"^Glacier2\.Admin\.Endpoints$", true, null),
+             new Property(@"^Glacier2\.Admin\.Locator$", true, null),
+             new Property(@"^Glacier2\.Admin\.PublishedEndpoints$", true, null),
              new Property(@"^Glacier2\.Admin\.RegisterProcess$", true, null),
-             new Property(@"^Glacier2\.Admin\.ReplicaGroupId$", false, null),
-             new Property(@"^Glacier2\.Admin\.Router$", false, null),
-             new Property(@"^Glacier2\.Admin\.ThreadPerConnection$", false, null),
-             new Property(@"^Glacier2\.Admin\.ThreadPerConnection\.StackSize$", false, null),
-             new Property(@"^Glacier2\.Admin\.ThreadPool\.Size$", false, null),
-             new Property(@"^Glacier2\.Admin\.ThreadPool\.SizeMax$", false, null),
-             new Property(@"^Glacier2\.Admin\.ThreadPool\.SizeWarn$", false, null),
-             new Property(@"^Glacier2\.Admin\.ThreadPool\.StackSize$", false, null),
+             new Property(@"^Glacier2\.Admin\.ReplicaGroupId$", true, null),
+             new Property(@"^Glacier2\.Admin\.Router$", true, null),
+             new Property(@"^Glacier2\.Admin\.ThreadPerConnection$", true, null),
+             new Property(@"^Glacier2\.Admin\.ThreadPerConnection\.StackSize$", true, null),
+             new Property(@"^Glacier2\.Admin\.ThreadPool\.Size$", true, null),
+             new Property(@"^Glacier2\.Admin\.ThreadPool\.SizeMax$", true, null),
+             new Property(@"^Glacier2\.Admin\.ThreadPool\.SizeWarn$", true, null),
+             new Property(@"^Glacier2\.Admin\.ThreadPool\.StackSize$", true, null),
              new Property(@"^Glacier2\.AllowCategories$", true, @"Glacier2.Filter.Category.Accept"),
              new Property(@"^Glacier2\.Client\.AdapterId$", false, null),
              new Property(@"^Glacier2\.Client\.Endpoints$", false, null),
diff --git a/cs/test/Glacier2/attack/Client.cs b/cs/test/Glacier2/attack/Client.cs
index f5b0a041687..87014e16d4b 100644
--- a/cs/test/Glacier2/attack/Client.cs
+++ b/cs/test/Glacier2/attack/Client.cs
@@ -95,13 +95,13 @@ public class Client : Ice.Application
         Console.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)
diff --git a/cs/test/Glacier2/attack/run.py b/cs/test/Glacier2/attack/run.py
index 9641775c95a..084368698ae 100755
--- a/cs/test/Glacier2/attack/run.py
+++ b/cs/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/cs/test/Glacier2/router/Client.cs b/cs/test/Glacier2/router/Client.cs
index 96fd3650379..5f8749e46c6 100644
--- a/cs/test/Glacier2/router/Client.cs
+++ b/cs/test/Glacier2/router/Client.cs
@@ -373,36 +373,36 @@ public class Client : Ice.Application
                 Console.Out.WriteLine("ok");
             }
             
-            Ice.ObjectPrx adminBase;
+            Ice.ObjectPrx processBase;
             
             {
                 Console.Out.Write("testing stringToProxy for admin object... ");
-                adminBase = communicator().stringToProxy("Glacier2/admin:tcp -h 127.0.0.1 -p 12348 -t 10000");
+                processBase = communicator().stringToProxy("Glacier2/admin -f Process:tcp -h 127.0.0.1 -p 12348 -t 10000");
                 Console.Out.WriteLine("ok");
             }
             
 /*
             {
-                Console.Out.Write("uninstalling router with admin object... ");
-                adminBase.ice_router(null);
+                Console.Out.Write("uninstalling router with process object... ");
+                processBase.ice_router(null);
                 Console.Out.WriteLine("ok");
             }
 */
             
-            Glacier2.AdminPrx admin;
+            Ice.ProcessPrx process;
             
             {
-                Console.Out.Write("testing checked cast for admin object... ");
-                admin = Glacier2.AdminPrxHelper.checkedCast(adminBase);
-                test(admin != null);
+                Console.Out.Write("testing checked cast for process object... ");
+                process = Ice.ProcessPrxHelper.checkedCast(processBase);
+                test(process != null);
                 Console.Out.WriteLine("ok");
             }
             
             Console.Out.Write("testing Glacier2 shutdown... ");
-            admin.shutdown();
+            process.shutdown();
             try
             {
-                admin.ice_ping();
+                process.ice_ping();
                 test(false);
             }
             catch(Ice.LocalException)
diff --git a/cs/test/Glacier2/router/run.py b/cs/test/Glacier2/router/run.py
index 6455eb9f18b..da717837f5c 100755
--- a/cs/test/Glacier2/router/run.py
+++ b/cs/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...",
diff --git a/java/src/IceInternal/PropertyNames.java b/java/src/IceInternal/PropertyNames.java
index 5ffc548fa1a..0786a86d5a0 100644
--- a/java/src/IceInternal/PropertyNames.java
+++ b/java/src/IceInternal/PropertyNames.java
@@ -7,7 +7,7 @@
 //
 // **********************************************************************
 //
-// Generated by makeprops.py from file ../config/PropertyNames.xml, Tue Sep 25 18:32:10 2007
+// Generated by makeprops.py from file ../config/PropertyNames.xml, Wed Sep 26 17:22:42 2007
 
 // IMPORTANT: Do not edit this file -- any edits made here will be lost!
 
@@ -330,19 +330,19 @@ public final class PropertyNames
         new Property("IcePatch2\\.ThreadPool\\.SizeMax", false, null),
         new Property("IcePatch2\\.ThreadPool\\.SizeWarn", false, null),
         new Property("IcePatch2\\.ThreadPool\\.StackSize", false, null),
-        new Property("IcePatch2\\.Admin\\.AdapterId", false, null),
-        new Property("IcePatch2\\.Admin\\.Endpoints", false, null),
-        new Property("IcePatch2\\.Admin\\.Locator", false, null),
-        new Property("IcePatch2\\.Admin\\.PublishedEndpoints", false, null),
+        new Property("IcePatch2\\.Admin\\.AdapterId", true, null),
+        new Property("IcePatch2\\.Admin\\.Endpoints", true, null),
+        new Property("IcePatch2\\.Admin\\.Locator", true, null),
+        new Property("IcePatch2\\.Admin\\.PublishedEndpoints", true, null),
         new Property("IcePatch2\\.Admin\\.RegisterProcess", true, null),
-        new Property("IcePatch2\\.Admin\\.ReplicaGroupId", false, null),
-        new Property("IcePatch2\\.Admin\\.Router", false, null),
-        new Property("IcePatch2\\.Admin\\.ThreadPerConnection", false, null),
-        new Property("IcePatch2\\.Admin\\.ThreadPerConnection\\.StackSize", false, null),
-        new Property("IcePatch2\\.Admin\\.ThreadPool\\.Size", false, null),
-        new Property("IcePatch2\\.Admin\\.ThreadPool\\.SizeMax", false, null),
-        new Property("IcePatch2\\.Admin\\.ThreadPool\\.SizeWarn", false, null),
-        new Property("IcePatch2\\.Admin\\.ThreadPool\\.StackSize", false, null),
+        new Property("IcePatch2\\.Admin\\.ReplicaGroupId", true, null),
+        new Property("IcePatch2\\.Admin\\.Router", true, null),
+        new Property("IcePatch2\\.Admin\\.ThreadPerConnection", true, null),
+        new Property("IcePatch2\\.Admin\\.ThreadPerConnection\\.StackSize", true, null),
+        new Property("IcePatch2\\.Admin\\.ThreadPool\\.Size", true, null),
+        new Property("IcePatch2\\.Admin\\.ThreadPool\\.SizeMax", true, null),
+        new Property("IcePatch2\\.Admin\\.ThreadPool\\.SizeWarn", true, null),
+        new Property("IcePatch2\\.Admin\\.ThreadPool\\.StackSize", true, null),
         new Property("IcePatch2\\.ChunkSize", false, null),
         new Property("IcePatch2\\.Directory", false, null),
         new Property("IcePatch2\\.InstanceName", false, null),
@@ -450,19 +450,19 @@ public final class PropertyNames
     {
         new Property("Glacier2\\.AddSSLContext", false, null),
         new Property("Glacier2\\.AddUserToAllowCategories", true, "Glacier2.Filter.Category.AcceptUser"),
-        new Property("Glacier2\\.Admin\\.AdapterId", false, null),
-        new Property("Glacier2\\.Admin\\.Endpoints", false, null),
-        new Property("Glacier2\\.Admin\\.Locator", false, null),
-        new Property("Glacier2\\.Admin\\.PublishedEndpoints", false, null),
+        new Property("Glacier2\\.Admin\\.AdapterId", true, null),
+        new Property("Glacier2\\.Admin\\.Endpoints", true, null),
+        new Property("Glacier2\\.Admin\\.Locator", true, null),
+        new Property("Glacier2\\.Admin\\.PublishedEndpoints", true, null),
         new Property("Glacier2\\.Admin\\.RegisterProcess", true, null),
-        new Property("Glacier2\\.Admin\\.ReplicaGroupId", false, null),
-        new Property("Glacier2\\.Admin\\.Router", false, null),
-        new Property("Glacier2\\.Admin\\.ThreadPerConnection", false, null),
-        new Property("Glacier2\\.Admin\\.ThreadPerConnection\\.StackSize", false, null),
-        new Property("Glacier2\\.Admin\\.ThreadPool\\.Size", false, null),
-        new Property("Glacier2\\.Admin\\.ThreadPool\\.SizeMax", false, null),
-        new Property("Glacier2\\.Admin\\.ThreadPool\\.SizeWarn", false, null),
-        new Property("Glacier2\\.Admin\\.ThreadPool\\.StackSize", false, null),
+        new Property("Glacier2\\.Admin\\.ReplicaGroupId", true, null),
+        new Property("Glacier2\\.Admin\\.Router", true, null),
+        new Property("Glacier2\\.Admin\\.ThreadPerConnection", true, null),
+        new Property("Glacier2\\.Admin\\.ThreadPerConnection\\.StackSize", true, null),
+        new Property("Glacier2\\.Admin\\.ThreadPool\\.Size", true, null),
+        new Property("Glacier2\\.Admin\\.ThreadPool\\.SizeMax", true, null),
+        new Property("Glacier2\\.Admin\\.ThreadPool\\.SizeWarn", true, null),
+        new Property("Glacier2\\.Admin\\.ThreadPool\\.StackSize", true, null),
         new Property("Glacier2\\.AllowCategories", true, "Glacier2.Filter.Category.Accept"),
         new Property("Glacier2\\.Client\\.AdapterId", false, null),
         new Property("Glacier2\\.Client\\.Endpoints", false, null),
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...",