Rename Secure->Config and rework demo (#279)

Author: bernardnormier

cpp/Ice/config/Client.cpp

@@ -23,12 +23,12 @@ main(int argc, char* argv[])
     }
 
     // Create an Ice communicator to initialize the Ice runtime. The communicator gets its configuration properties from
-    // file "config.server". The communicator initialization also parses the command-line options to find and set
-    // additional properties.
+    // file config.client in the client's current working directory. The communicator initialization also parses the
+    // command-line options to find and set additional properties.
     const Ice::CommunicatorHolder communicatorHolder{argc, argv, "config.client"};
     const Ice::CommunicatorPtr& communicator = communicatorHolder.communicator();
 
-    // We create a Greeter proxy using the value of the "Greeter.Proxy" property in config.client.
+    // We create a Greeter proxy using the value of the Greeter.Proxy property in config.client.
     // It's nullopt if the property is not set.
     std::optional<VisitorCenter::GreeterPrx> greeter =
         communicator->propertyToProxy<VisitorCenter::GreeterPrx>("Greeter.Proxy");

cpp/Ice/config/README.md

@@ -1,7 +1,6 @@
 # Config
 
-This demo shows how to configure your client and server applications using Ice configuration
-files.
+This demo shows how to configure your client and server applications using Ice configuration files.
 
 To build the demo run:
 

cpp/Ice/config/Server.cpp

@@ -16,8 +16,8 @@ main(int argc, char* argv[])
     Ice::CtrlCHandler ctrlCHandler;
 
     // Create an Ice communicator to initialize the Ice runtime. The communicator gets its configuration properties from
-    // file "config.server". The communicator initialization also parses the command-line options to find and set
-    // additional properties.
+    // file config.server, in the server's current working directory. The communicator initialization also parses the
+    // command-line options to find and set additional properties.
     const Ice::CommunicatorHolder communicatorHolder{argc, argv, "config.server"};
     const Ice::CommunicatorPtr& communicator = communicatorHolder.communicator();
 

csharp/Ice/Secure/Client/Client.csproj renamed to csharp/Ice/Config/Client/Client.csproj

@@ -0,0 +1,21 @@
+// Copyright (c) ZeroC, Inc.
+
+using System.Diagnostics;
+
+// Slice module VisitorCenter in Greeter.ice maps to C# namespace VisitorCenter.
+using VisitorCenter;
+
+// Create an Ice communicator to initialize the Ice runtime. The communicator gets its configuration properties from
+// file config.client in the client's current working directory. The communicator initialization also parses the
+// command-line options to find and set additional properties.
+using Ice.Communicator communicator = Ice.Util.initialize(ref args, "config.client");
+
+// We create a Greeter proxy using the value of the Greeter.Proxy property in config.client.
+// It's null if the property is not set.
+GreeterPrx? greeter = GreeterPrxHelper.uncheckedCast(communicator.propertyToProxy("Greeter.Proxy"));
+Debug.Assert(greeter is not null);
+
+// Send a request to the remote object and get the response.
+string greeting = await greeter.GreetAsync(Environment.UserName);
+
+Console.WriteLine(greeting);

csharp/Ice/Config/Client/Program.cs

@@ -0,0 +1,34 @@
+#
+# Application-specific configuration
+#
+
+# The address of the target object. `default` is replaced by the value of Ice.Default.Protocol.
+Greeter.Proxy=greeter:default -h localhost -p 4061
+
+#
+# Ice configuration
+#
+
+# The transport protocol to use for Ice communications when `default` is specified.
+# You can set it to tcp, ssl, ws, or wss. Leaving it unset is equivalent to setting it to tcp.
+# Make sure you use the same value in config.client and config.server.
+Ice.Default.Protocol=ssl
+
+#
+# IceSSL configuration
+#
+
+# The directory where the application finds certificates and other files.
+IceSSL.DefaultDir=../../../../certs
+
+# The certificate authority file.
+IceSSL.CAs=cacert.pem
+
+# The client's certificate file.
+IceSSL.CertFile=client.p12
+
+# TODO: switch to password-less certificates
+IceSSL.Password=password
+
+# Turn on security logging/tracing.
+# IceSSL.Trace.Security=1

csharp/Ice/Config/Client/config.client

@@ -0,0 +1,36 @@
+# Config
+
+This demo shows how to configure your client and server applications using Ice configuration files.
+
+To build the demo run:
+
+``` shell
+dotnet build
+```
+
+First start the Server program:
+
+```shell
+cd Server
+dotnet run
+```
+
+In a separate terminal, start the Client program:
+
+```shell
+cd Client
+dotnet run
+```
+
+You can pass `--Ice` command-line options to set additional properties or override the properties set in the
+configuration file. For example:
+
+```shell
+cd Server
+dotnet run --Ice.Default.Protocol=ws
+```
+
+```shell
+cd Client
+dotnet run --Ice.Default.Protocol=ws --Ice.Trace.Network=2
+```

csharp/Ice/Secure/Secure.sln renamed to csharp/Ice/Config/Config.sln

@@ -2,7 +2,7 @@
 
 using VisitorCenter;
 
-namespace SecureServer;
+namespace ConfigServer;
 
 /// <summary>A Chatbot is an Ice servant that implements Slice interface Greeter.</summary>
 internal class Chatbot : GreeterDisp_

csharp/Ice/Config/README.md

@@ -0,0 +1,24 @@
+// Copyright (c) ZeroC, Inc.
+
+using ConfigServer;
+
+// Create an Ice communicator to initialize the Ice runtime. The communicator gets its configuration properties from
+// file config.server, in the server's current working directory. The communicator initialization also parses the
+// command-line options to find and set additional properties.
+using Ice.Communicator communicator = Ice.Util.initialize(ref args, "config.server");
+
+// Create an object adapter that listens for incoming requests and dispatches them to servants.
+// This adapter is configured through the GreeterAdapter.* properties in config.server.
+Ice.ObjectAdapter adapter = communicator.createObjectAdapter("GreeterAdapter");
+
+// Register the Chatbot servant with the adapter.
+adapter.add(new Chatbot(), Ice.Util.stringToIdentity("greeter"));
+
+// Start dispatching requests.
+adapter.activate();
+
+// Ice.Trace.Network=1 or greater shows on which interface(s) and port(s) the server is listening.
+
+// Wait until the user presses Ctrl+C.
+await CancelKeyPressed;
+Console.WriteLine("Caught Ctrl+C, exiting...");