summaryrefslogtreecommitdiff
path: root/cpp/demo/IceBox
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/demo/IceBox')
-rw-r--r--cpp/demo/IceBox/hello/README2
-rw-r--r--cpp/demo/IceBox/hello/config.admin14
-rw-r--r--cpp/demo/IceBox/hello/config.icebox37
3 files changed, 41 insertions, 12 deletions
diff --git a/cpp/demo/IceBox/hello/README b/cpp/demo/IceBox/hello/README
index 10561cdf56a..649e76814a8 100644
--- a/cpp/demo/IceBox/hello/README
+++ b/cpp/demo/IceBox/hello/README
@@ -15,7 +15,7 @@ $ client
To shut down IceBox, use iceboxadmin:
-$ iceboxadmin --Ice.Config=config.icebox shutdown
+$ iceboxadmin --Ice.Config=config.admin shutdown
Unix Note:
diff --git a/cpp/demo/IceBox/hello/config.admin b/cpp/demo/IceBox/hello/config.admin
new file mode 100644
index 00000000000..4e148e8a316
--- /dev/null
+++ b/cpp/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/cpp/demo/IceBox/hello/config.icebox b/cpp/demo/IceBox/hello/config.icebox
index 65c0c31d1a0..d28f367c194 100644
--- a/cpp/demo/IceBox/hello/config.icebox
+++ b/cpp/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:ssl -p 9999
+#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
@@ -37,12 +61,3 @@ Ice.Warn.Connections=1
#
#Ice.Trace.Protocol=1
-#
-# SSL Configuration
-#
-Ice.Plugin.IceSSL=IceSSL:createIceSSL
-IceSSL.DefaultDir=../../../certs
-IceSSL.CertAuthFile=cacert.pem
-IceSSL.CertFile=s_rsa1024_pub.pem
-IceSSL.KeyFile=s_rsa1024_priv.pem
-#IceSSL.Trace.Security=2