separating client/server configuration; removing client/server properties

    for IceSSL

40 files changed, 206 insertions, 113 deletions

diff --git a/java/demo/Ice/bidir/Client.java b/java/demo/Ice/bidir/Client.java
index b987a72069a..b6a8d26006a 100755
--- a/java/demo/Ice/bidir/Client.java
+++ b/java/demo/Ice/bidir/Client.java
@@ -47,7 +47,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/bidir/Server.java b/java/demo/Ice/bidir/Server.java
index 2aa8b047796..950433cd3df 100755
--- a/java/demo/Ice/bidir/Server.java
+++ b/java/demo/Ice/bidir/Server.java
@@ -45,7 +45,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/bidir/config b/java/demo/Ice/bidir/config.client
index 143b3a0fed3..dfb9cf68b8f 100755
--- a/java/demo/Ice/bidir/config
+++ b/java/demo/Ice/bidir/config.client
@@ -1,6 +1,5 @@
 Callback.Client.CallbackServer=sender:tcp -p 10000

 Callback.Client.Endpoints=

-Callback.Server.Endpoints=tcp -p 10000

 

 #Ice.Trace.Network=1

 #Ice.Trace.Protocol=1

diff --git a/java/demo/Ice/bidir/config.server b/java/demo/Ice/bidir/config.server
new file mode 100755
index 00000000000..7051998caa3
--- /dev/null
+++ b/java/demo/Ice/bidir/config.server
@@ -0,0 +1,9 @@
+Callback.Server.Endpoints=tcp -p 10000

+

+#Ice.Trace.Network=1

+#Ice.Trace.Protocol=1

+Ice.Warn.Connections=1

+

+# Active connection management must be disabled when using

+# bidirectional connections.

+Ice.ACM.Client=0

diff --git a/java/demo/Ice/callback/Client.java b/java/demo/Ice/callback/Client.java
index aa92b3f4be0..025c6f4a5db 100644
--- a/java/demo/Ice/callback/Client.java
+++ b/java/demo/Ice/callback/Client.java
@@ -179,7 +179,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/callback/Server.java b/java/demo/Ice/callback/Server.java
index ecbc30f4bc1..b743dbbad84 100644
--- a/java/demo/Ice/callback/Server.java
+++ b/java/demo/Ice/callback/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/callback/config b/java/demo/Ice/callback/config
deleted file mode 100644
index 574b5270316..00000000000
--- a/java/demo/Ice/callback/config
+++ /dev/null
@@ -1,21 +0,0 @@
-Callback.Client.CallbackServer=callback:tcp -p 12000:udp -p 10000:ssl -p 10001
-Callback.Client.Endpoints=tcp:udp:ssl
-Callback.Server.Endpoints=tcp -p 12000:udp -p 10000:ssl -p 10001
-
-#Ice.Trace.Network=3
-#Ice.Trace.Protocol=3
-Ice.Warn.Connections=1
-
-#
-# 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
diff --git a/java/demo/Ice/callback/config.client b/java/demo/Ice/callback/config.client
new file mode 100644
index 00000000000..b7b9bb73099
--- /dev/null
+++ b/java/demo/Ice/callback/config.client
@@ -0,0 +1,16 @@
+Callback.Client.CallbackServer=callback:tcp -p 12000:udp -p 10000:ssl -p 10001
+Callback.Client.Endpoints=tcp:udp:ssl
+
+#Ice.Trace.Network=3
+#Ice.Trace.Protocol=3
+Ice.Warn.Connections=1
+
+#
+# SSL Configuration
+#
+Ice.Plugin.IceSSL=IceSSL.PluginFactory
+Ice.ThreadPerConnection=1
+IceSSL.DefaultDir=../../../certs
+IceSSL.Keystore=client.jks
+IceSSL.Password=password
+IceSSL.Truststore=certs.jks
diff --git a/java/demo/Ice/callback/config.server b/java/demo/Ice/callback/config.server
new file mode 100644
index 00000000000..1bd2a0800c8
--- /dev/null
+++ b/java/demo/Ice/callback/config.server
@@ -0,0 +1,15 @@
+Callback.Server.Endpoints=tcp -p 12000:udp -p 10000:ssl -p 10001
+
+#Ice.Trace.Network=3
+#Ice.Trace.Protocol=3
+Ice.Warn.Connections=1
+
+#
+# SSL Configuration
+#
+Ice.Plugin.IceSSL=IceSSL.PluginFactory
+Ice.ThreadPerConnection=1
+IceSSL.DefaultDir=../../../certs
+IceSSL.Keystore=server.jks
+IceSSL.Password=password
+IceSSL.Truststore=certs.jks
diff --git a/java/demo/Ice/hello/Client.java b/java/demo/Ice/hello/Client.java
index 46711a8dc6f..f6783f2827d 100644
--- a/java/demo/Ice/hello/Client.java
+++ b/java/demo/Ice/hello/Client.java
@@ -189,7 +189,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/hello/Server.java b/java/demo/Ice/hello/Server.java
index 2e7f8638173..8d6b80a5536 100644
--- a/java/demo/Ice/hello/Server.java
+++ b/java/demo/Ice/hello/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/hello/config.client b/java/demo/Ice/hello/config.client
new file mode 100644
index 00000000000..086d43db986
--- /dev/null
+++ b/java/demo/Ice/hello/config.client
@@ -0,0 +1,44 @@
+#
+# The client reads this property to create the reference to the
+# "hello" object in the server.
+#
+Hello.Proxy=hello:tcp -p 10000:udp -p 10000:ssl -p 10001
+
+#
+# Warn about connection exceptions
+#
+Ice.Warn.Connections=2
+
+#
+# We want a faster ACM for this demo.
+#
+Ice.ACM.Client=10
+
+#
+# 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
+IceSSL.Trace.Security=0
diff --git a/java/demo/Ice/hello/config b/java/demo/Ice/hello/config.server
index 75ad5c37481..f7a05a38dad 100644
--- a/java/demo/Ice/hello/config
+++ b/java/demo/Ice/hello/config.server
@@ -1,10 +1,4 @@
 #
-# The client reads this property to create the reference to the
-# "hello" object in the server.
-#
-Hello.Proxy=hello:tcp -p 10000:udp -p 10000:ssl -p 10001
-
-#
 # The server creates one single object adapter with the name
 # "helloadapater". The following line sets the endpoints for this
 # adapter
@@ -19,7 +13,6 @@ Ice.Warn.Connections=2
 #
 # We want a faster ACM for this demo.
 #
-Ice.ACM.Client=10
 Ice.ACM.Server=10
 
 #
@@ -41,24 +34,12 @@ Ice.Trace.Network=0
 Ice.Trace.Protocol=0
 
 #
-# Security Tracing
-#
-# 0 = no security tracing
-# 1 = trace warning messages
-# 2 = config file parsing warnings
-#
-IceSSL.Trace.Security=0
-
-#
 # 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
+IceSSL.Trace.Security=0
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
diff --git a/java/demo/Ice/latency/Client.java b/java/demo/Ice/latency/Client.java
index 58b0e890c99..199ad3d7024 100644
--- a/java/demo/Ice/latency/Client.java
+++ b/java/demo/Ice/latency/Client.java
@@ -55,7 +55,7 @@ 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/latency/Server.java b/java/demo/Ice/latency/Server.java
index 577c1e49b1d..ebfa99d0797 100644
--- a/java/demo/Ice/latency/Server.java
+++ b/java/demo/Ice/latency/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/latency/config b/java/demo/Ice/latency/config.client
index 89b07653828..93aa4cde3d5 100644
--- a/java/demo/Ice/latency/config
+++ b/java/demo/Ice/latency/config.client
@@ -1,5 +1,3 @@
 Latency.Ping=ping:default -p 10000
-Latency.Endpoints=default -p 10000
 
 Ice.ACM.Client=0
-Ice.ACM.Server=0
diff --git a/java/demo/Ice/latency/config.server b/java/demo/Ice/latency/config.server
new file mode 100644
index 00000000000..bed0b10202b
--- /dev/null
+++ b/java/demo/Ice/latency/config.server
@@ -0,0 +1 @@
+Latency.Endpoints=default -p 10000
diff --git a/java/demo/Ice/nested/Client.java b/java/demo/Ice/nested/Client.java
index 936043ed621..c3215782ffd 100644
--- a/java/demo/Ice/nested/Client.java
+++ b/java/demo/Ice/nested/Client.java
@@ -82,7 +82,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/nested/Server.java b/java/demo/Ice/nested/Server.java
index 4bd78b33426..91cae195227 100644
--- a/java/demo/Ice/nested/Server.java
+++ b/java/demo/Ice/nested/Server.java
@@ -26,7 +26,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/nested/config b/java/demo/Ice/nested/config.client
index 7f73744dc7b..2afc90a0d0e 100644
--- a/java/demo/Ice/nested/config
+++ b/java/demo/Ice/nested/config.client
@@ -1,5 +1,3 @@
-Nested.Server.Endpoints=default -p 10000 -t 10000
-
 Nested.Client.NestedServer=nestedServer:default -p 10000 -t 10000
 Nested.Client.Endpoints=default -t 10000
 
diff --git a/java/demo/Ice/nested/config.server b/java/demo/Ice/nested/config.server
new file mode 100644
index 00000000000..fd59ae88a78
--- /dev/null
+++ b/java/demo/Ice/nested/config.server
@@ -0,0 +1,8 @@
+Nested.Server.Endpoints=default -p 10000 -t 10000
+
+Ice.ThreadPool.Server.Size=5
+Ice.ThreadPool.Server.SizeWarn=5
+Ice.ThreadPool.Server.SizeMax=10
+#Ice.Trace.Network=1
+#Ice.Trace.Protocol=1
+#Ice.Warn.Connections=1
diff --git a/java/demo/Ice/session/Client.java b/java/demo/Ice/session/Client.java
index 379a7d941cb..db9c3071fae 100644
--- a/java/demo/Ice/session/Client.java
+++ b/java/demo/Ice/session/Client.java
@@ -241,7 +241,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/session/Server.java b/java/demo/Ice/session/Server.java
index b6fd4ba1485..58877b9fe9e 100644
--- a/java/demo/Ice/session/Server.java
+++ b/java/demo/Ice/session/Server.java
@@ -38,7 +38,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/session/config.client b/java/demo/Ice/session/config.client
new file mode 100644
index 00000000000..3a0133d0a30
--- /dev/null
+++ b/java/demo/Ice/session/config.client
@@ -0,0 +1,10 @@
+#
+# The client reads this property to create the reference to the
+# "SessionFactory" object in the server.
+#
+SessionFactory.Proxy=SessionFactory:default -p 10000
+
+#
+# Warn about connection exceptions
+#
+Ice.Warn.Connections=1
diff --git a/java/demo/Ice/session/config b/java/demo/Ice/session/config.server
index ec0a2e522ce..8aa8dfac36f 100644
--- a/java/demo/Ice/session/config
+++ b/java/demo/Ice/session/config.server
@@ -1,10 +1,4 @@
 #
-# The client reads this property to create the reference to the
-# "SessionFactory" object in the server.
-#
-SessionFactory.Proxy=SessionFactory:default -p 10000
-
-#
 # The server creates one single object adapter with the name
 # "SessionFactory". The following line sets the endpoints for this
 # adapter.
diff --git a/java/demo/Ice/throughput/Client.java b/java/demo/Ice/throughput/Client.java
index 488a704753f..433fe380876 100644
--- a/java/demo/Ice/throughput/Client.java
+++ b/java/demo/Ice/throughput/Client.java
@@ -409,7 +409,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/throughput/Server.java b/java/demo/Ice/throughput/Server.java
index f09c69b0b6e..8caf6b71d53 100644
--- a/java/demo/Ice/throughput/Server.java
+++ b/java/demo/Ice/throughput/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/throughput/config b/java/demo/Ice/throughput/config.client
index 1de2062b6d2..1de2062b6d2 100644
--- a/java/demo/Ice/throughput/config
+++ b/java/demo/Ice/throughput/config.client
diff --git a/java/demo/Ice/throughput/config.server b/java/demo/Ice/throughput/config.server
new file mode 100644
index 00000000000..1de2062b6d2
--- /dev/null
+++ b/java/demo/Ice/throughput/config.server
@@ -0,0 +1,5 @@
+Throughput.Throughput=throughput:default -p 10000
+Throughput.Endpoints=default -p 10000
+
+Ice.ACM.Client=0
+Ice.ACM.Server=0
diff --git a/java/demo/Ice/value/Client.java b/java/demo/Ice/value/Client.java
index 76ad095fc9f..b2809d6ed3d 100644
--- a/java/demo/Ice/value/Client.java
+++ b/java/demo/Ice/value/Client.java
@@ -169,6 +169,8 @@ public class Client extends Ice.Application
         System.out.println();
         System.out.println("That's it for this demo. Have fun with Ice!");
 
+	initial.shutdown();
+
         return 0;
     }
 
@@ -176,7 +178,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/value/InitialI.java b/java/demo/Ice/value/InitialI.java
index 9b46bf94c0e..536c406c68b 100644
--- a/java/demo/Ice/value/InitialI.java
+++ b/java/demo/Ice/value/InitialI.java
@@ -51,6 +51,12 @@ class InitialI extends Initial
         throw ex;
     }
 
+    public void
+    shutdown(Ice.Current current)
+    {
+	current.adapter.getCommunicator().shutdown();
+    }
+
     private Simple _simple = new Simple();
     private Printer _printer = new PrinterI();
     private PrinterPrx _printerProxy;
diff --git a/java/demo/Ice/value/Server.java b/java/demo/Ice/value/Server.java
index 496a358b936..2e725928e9d 100644
--- a/java/demo/Ice/value/Server.java
+++ b/java/demo/Ice/value/Server.java
@@ -24,7 +24,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/value/Value.ice b/java/demo/Ice/value/Value.ice
index 63cf4649448..b5f340dbe05 100644
--- a/java/demo/Ice/value/Value.ice
+++ b/java/demo/Ice/value/Value.ice
@@ -41,6 +41,7 @@ class Initial
     void getPrinter(out Printer impl, out Printer* proxy);
     Printer getDerivedPrinter();
     void throwDerivedPrinter() throws DerivedPrinterException;
+    void shutdown();
 };
 
 };
diff --git a/java/demo/Ice/value/config b/java/demo/Ice/value/config
deleted file mode 100644
index 24ba3ee9a23..00000000000
--- a/java/demo/Ice/value/config
+++ /dev/null
@@ -1,16 +0,0 @@
-Value.Initial=initial:default -p 10000
-Value.Endpoints=default -p 10000
-
-#
-# 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
diff --git a/java/demo/Ice/value/config.client b/java/demo/Ice/value/config.client
new file mode 100644
index 00000000000..8d758f537c1
--- /dev/null
+++ b/java/demo/Ice/value/config.client
@@ -0,0 +1,11 @@
+Value.Initial=initial:default -p 10000
+
+#
+# SSL Configuration
+#
+Ice.Plugin.IceSSL=IceSSL.PluginFactory
+Ice.ThreadPerConnection=1
+IceSSL.DefaultDir=../../../certs
+IceSSL.Keystore=client.jks
+IceSSL.Password=password
+IceSSL.Truststore=certs.jks
diff --git a/java/demo/Ice/value/config.server b/java/demo/Ice/value/config.server
new file mode 100644
index 00000000000..4d7f600e5d7
--- /dev/null
+++ b/java/demo/Ice/value/config.server
@@ -0,0 +1,11 @@
+Value.Endpoints=default -p 10000
+
+#
+# SSL Configuration
+#
+Ice.Plugin.IceSSL=IceSSL.PluginFactory
+Ice.ThreadPerConnection=1
+IceSSL.DefaultDir=../../../certs
+IceSSL.Keystore=server.jks
+IceSSL.Password=password
+IceSSL.Truststore=certs.jks