separating client/server configuration; removing client/server properties

    for IceSSL

4 files changed, 46 insertions, 25 deletions

diff --git a/java/demo/Ice/invoke/Client.java b/java/demo/Ice/invoke/Client.java
index efe1d069bef..e9546117961 100644
--- a/java/demo/Ice/invoke/Client.java
+++ b/java/demo/Ice/invoke/Client.java
@@ -295,7 +295,7 @@ public class Client extends Ice.Application
     main(String[] args)
     {
         Client app = new Client();
-        int status = app.main("Client", args, "config");
+        int status = app.main("Client", args, "config.client");
         System.exit(status);
     }
 }
diff --git a/java/demo/Ice/invoke/Server.java b/java/demo/Ice/invoke/Server.java
index 3881488d374..966f6aad221 100644
--- a/java/demo/Ice/invoke/Server.java
+++ b/java/demo/Ice/invoke/Server.java
@@ -25,7 +25,7 @@ public class Server extends Ice.Application
     main(String[] args)
     {
         Server app = new Server();
-        int status = app.main("Server", args, "config");
+        int status = app.main("Server", args, "config.server");
         System.exit(status);
     }
 }
diff --git a/java/demo/Ice/invoke/config.client b/java/demo/Ice/invoke/config.client
new file mode 100644
index 00000000000..6c5e40ed1c9
--- /dev/null
+++ b/java/demo/Ice/invoke/config.client
@@ -0,0 +1,39 @@
+#
+# The client reads this property to create the reference to the
+# "hello" object in the server.
+#
+Printer.Proxy=printer:default -p 10000
+
+#
+# Warn about connection exceptions
+#
+Ice.Warn.Connections=1
+
+#
+# Network Tracing
+#
+# 0 = no network tracing
+# 1 = trace connection establishment and closure
+# 2 = like 1, but more detailed
+# 3 = like 2, but also trace data transfer
+#
+Ice.Trace.Network=0
+
+#
+# Protocol Tracing
+#
+# 0 = no protocol tracing
+# 1 = trace protocol messages
+#
+Ice.Trace.Protocol=0
+
+#
+# SSL Configuration
+#
+Ice.Plugin.IceSSL=IceSSL.PluginFactory
+Ice.ThreadPerConnection=1
+IceSSL.DefaultDir=../../../certs
+IceSSL.Keystore=client.jks
+IceSSL.Password=password
+IceSSL.Truststore=certs.jks
+#Ice.Trace.Security=1
diff --git a/java/demo/Ice/invoke/config b/java/demo/Ice/invoke/config.server
index 8c2420ca9ce..81f46512178 100644
--- a/java/demo/Ice/invoke/config
+++ b/java/demo/Ice/invoke/config.server
@@ -1,10 +1,4 @@
 #
-# The client reads this property to create the reference to the
-# "hello" object in the server.
-#
-Printer.Proxy=printer:default -p 10000
-
-#
 # The server creates one single object adapter with the name
 # "helloadapater". The following line sets the endpoints for this
 # adapter
@@ -35,24 +29,12 @@ Ice.Trace.Network=0
 Ice.Trace.Protocol=0
 
 #
-# Security Tracing
-#
-# 0 = no security tracing
-# 1 = trace warning messages
-# 2 = config file parsing warnings
-#
-#Ice.Trace.Security=2
-
-#
 # SSL Configuration
 #
 Ice.Plugin.IceSSL=IceSSL.PluginFactory
 Ice.ThreadPerConnection=1
-IceSSL.Client.DefaultDir=../../../certs
-IceSSL.Client.Keystore=client.jks
-IceSSL.Client.Password=password
-IceSSL.Client.Truststore=certs.jks
-IceSSL.Server.DefaultDir=../../../certs
-IceSSL.Server.Keystore=server.jks
-IceSSL.Server.Password=password
-IceSSL.Server.Truststore=certs.jks
+IceSSL.DefaultDir=../../../certs
+IceSSL.Keystore=server.jks
+IceSSL.Password=password
+IceSSL.Truststore=certs.jks
+#Ice.Trace.Security=1