summaryrefslogtreecommitdiff
path: root/java/demo/IceBox
diff options
context:
space:
mode:
authorBernard Normier <bernard@zeroc.com>2007-09-27 11:37:26 -0400
committerBernard Normier <bernard@zeroc.com>2007-09-27 11:37:26 -0400
commit29aad94424e506d30ba89c18e3ce3d5fecc03dcc (patch)
tree9acda23df0d372428fe500ff55a02d07db382792 /java/demo/IceBox
parentSquashed commit of the following: (diff)
downloadice-29aad94424e506d30ba89c18e3ce3d5fecc03dcc.tar.bz2
ice-29aad94424e506d30ba89c18e3ce3d5fecc03dcc.tar.xz
ice-29aad94424e506d30ba89c18e3ce3d5fecc03dcc.zip
iceboxadmin is now using IceBoxAdmin.ServiceManager.Proxy
Diffstat (limited to 'java/demo/IceBox')
-rw-r--r--java/demo/IceBox/hello/README2
-rw-r--r--java/demo/IceBox/hello/config.admin14
-rw-r--r--java/demo/IceBox/hello/config.icebox28
3 files changed, 41 insertions, 3 deletions
diff --git a/java/demo/IceBox/hello/README b/java/demo/IceBox/hello/README
index 7691dd3a52e..f78a94616ce 100644
--- a/java/demo/IceBox/hello/README
+++ b/java/demo/IceBox/hello/README
@@ -9,4 +9,4 @@ $ java Client
To shut down IceBox, use IceBox.Admin:
-$ java IceBox.Admin --Ice.Config=config.icebox shutdown
+$ java IceBox.Admin --Ice.Config=config.admin shutdown
diff --git a/java/demo/IceBox/hello/config.admin b/java/demo/IceBox/hello/config.admin
new file mode 100644
index 00000000000..4e148e8a316
--- /dev/null
+++ b/java/demo/IceBox/hello/config.admin
@@ -0,0 +1,14 @@
+#
+# Proxy to the IceBox ServiceManager:
+#
+
+#
+# When the IceBox.ServiceManager object adapter is configured:
+#
+#IceBoxAdmin.ServiceManager.Proxy=DemoIceBox/ServiceManager:tcp -p 9998 -h 127.0.0.1
+
+#
+# When Ice.Admin is configured:
+#
+IceBoxAdmin.ServiceManager.Proxy=DemoIceBox/admin -f IceBox.ServiceManager:tcp -p 9996 -h 127.0.0.1
+
diff --git a/java/demo/IceBox/hello/config.icebox b/java/demo/IceBox/hello/config.icebox
index 0d2f8cfade0..7eea4e10bfd 100644
--- a/java/demo/IceBox/hello/config.icebox
+++ b/java/demo/IceBox/hello/config.icebox
@@ -1,13 +1,37 @@
#
+# The IceBox ServiceManager object can be provided by configuring
+# IceBox.ServiceManager.Endpoints (and optionally
+# IceBox.InstanceName), or as a facet of the Ice.Admin object
+# (or both if you like). Make sure to keep config.admin
+# synchronized with these settings.
+#
+
+#
+# IceBox.ServiceManager configuration
+#
+
+#
# The IceBox instance name is used to set the category field of the
# IceBox ServiceManager identity.
#
-IceBox.InstanceName=DemoIceBox
+#IceBox.InstanceName=DemoIceBox
#
# The IceBox server endpoint configuration
#
-IceBox.ServiceManager.Endpoints=tcp -p 9998
+#IceBox.ServiceManager.Endpoints=tcp -p 9998 -h 127.0.0.1
+
+
+#
+# Ice.Admin configuration
+#
+
+#
+# Enable Ice.Admin object:
+#
+Ice.Admin.InstanceName=DemoIceBox
+Ice.Admin.Endpoints=tcp -p 9996 -h 127.0.0.1
+
#
# The hello service