Added Glacier2 administration option

3 files changed, 47 insertions, 0 deletions

diff --git a/cpp/demo/IceGrid/icebox/README b/cpp/demo/IceGrid/icebox/README
index 0b87801ff6f..8f17043c784 100644
--- a/cpp/demo/IceGrid/icebox/README
+++ b/cpp/demo/IceGrid/icebox/README
@@ -30,3 +30,27 @@ utility; for example to stop and restart the 'Lisa' service:
  $ icegridadmin --Ice.Config=config.grid
  >>> service stop IceBox Lisa
  >>> service start IceBox Lisa
+
+Administration through Glacier2
+-------------------------------
+
+This demo also includes the configuration for a Glacier2 router
+(DemoGlacier2), to show how you could administer IceGrid from
+ "the other side" of a firewall. (In these demo, however, everything
+is on the same system).
+
+Follow these steps:
+
+ - connect to the IceGrid registry with icegridadmin or the
+   IceGrid Admin graphical utility
+
+ - start the DemoGlacier2 server
+
+ - reconnect to the IceGrid registry with icegridadmin:
+   $ icegridadmin --Ice.Default.Router="DemoGlacier2/router:tcp -h localhost -p 4063"
+
+   or with the IceGrid Admin graphical utility using the Routed
+   tab of the Login dialog. DemoGlacier2 is configured to use its built-in
+   NullPermissionsVerifier, so you can login using any username/password
+   combination.
+
diff --git a/cpp/demo/IceGrid/icebox/application.xml b/cpp/demo/IceGrid/icebox/application.xml
index d512968e449..036f5b7a581 100644
--- a/cpp/demo/IceGrid/icebox/application.xml
+++ b/cpp/demo/IceGrid/icebox/application.xml
@@ -12,11 +12,32 @@
             <adapter name="Hello-${name}" endpoints="default" id="Hello-${name}" replica-group="HelloGroup" server-lifetime="false"/>
          </service>
       </service-template>
+      <server-template id="Glacier2">
+         <parameter name="instance-name" default="${application}.Glacier2"/>
+         <parameter name="client-endpoints"/>
+         <parameter name="server-endpoints"/>
+         <parameter name="session-timeout" default="0"/>
+         <server id="${instance-name}" activation="manual" exe="glacier2router">
+            <properties>
+               <property name="Ice.Admin.Endpoints" value="tcp -h 127.0.0.1"/>
+               <property name="Glacier2.Client.Endpoints" value="${client-endpoints}"/>
+               <property name="Glacier2.Server.Endpoints" value="${server-endpoints}"/>
+               <property name="Glacier2.InstanceName" value="${instance-name}"/>
+               <property name="Glacier2.SessionTimeout" value="${session-timeout}"/>
+            </properties>
+         </server>
+      </server-template>
       <replica-group id="HelloGroup">
          <load-balancing type="round-robin" n-replicas="1"/>
          <object identity="hello" type="::Demo::Hello"/>
       </replica-group>
       <node name="localhost">
+         <server-instance template="Glacier2" instance-name="DemoGlacier2" client-endpoints="tcp -h localhost -p 4063" server-endpoints="tcp">
+            <properties>
+               <property name="Glacier2.SessionManager" value="DemoIceGrid/AdminSessionManager"/>
+               <property name="Glacier2.PermissionsVerifier" value="DemoGlacier2/NullPermissionsVerifier"/>
+            </properties>
+         </server-instance>
          <icebox id="IceBox" activation="on-demand" exe="icebox">
             <description>A sample IceBox server</description>
             <properties>
diff --git a/cpp/demo/IceGrid/icebox/config.grid b/cpp/demo/IceGrid/icebox/config.grid
index 4766cfe7a6a..a65c2b9ee61 100644
--- a/cpp/demo/IceGrid/icebox/config.grid
+++ b/cpp/demo/IceGrid/icebox/config.grid
@@ -12,6 +12,8 @@ IceGrid.Registry.Client.Endpoints=default -p 4061
 IceGrid.Registry.Server.Endpoints=default
 IceGrid.Registry.Internal.Endpoints=default
 IceGrid.Registry.AdminCallbackRouter.Endpoints=default
+IceGrid.Registry.AdminSessionManager.Endpoints=default
+
 IceGrid.Registry.Data=db/registry
 IceGrid.Registry.PermissionsVerifier=DemoIceGrid/NullPermissionsVerifier
 IceGrid.Registry.AdminPermissionsVerifier=DemoIceGrid/NullPermissionsVerifier