separating client/server configuration; removing client/server properties

    for IceSSL

69 files changed, 347 insertions, 185 deletions

diff --git a/java/demo/Freeze/bench/Client.java b/java/demo/Freeze/bench/Client.java
index 125fe81f75c..f3f5efe9625 100644
--- a/java/demo/Freeze/bench/Client.java
+++ b/java/demo/Freeze/bench/Client.java
@@ -601,6 +601,6 @@ public class Client
     main(String[] args)
     {
 	TestApp app = new TestApp("db");
-	app.main("test.Freeze.bench.Client", args, "config");
+	app.main("test.Freeze.bench.Client", args);
     }
 }
diff --git a/java/demo/Freeze/bench/config b/java/demo/Freeze/bench/config
deleted file mode 100644
index e69de29bb2d..00000000000
--- a/java/demo/Freeze/bench/config
+++ /dev/null
diff --git a/java/demo/Freeze/library/Client.java b/java/demo/Freeze/library/Client.java
index 7e4492c8da1..3105354d443 100644
--- a/java/demo/Freeze/library/Client.java
+++ b/java/demo/Freeze/library/Client.java
@@ -19,6 +19,6 @@ public class Client extends Ice.Application
     main(String[] args)
     {
 	Client app = new Client();
-	app.main("demo.Freeze.library.Client", args, "config");
+	app.main("demo.Freeze.library.Client", args, "config.client");
     }
 }
diff --git a/java/demo/Freeze/library/Server.java b/java/demo/Freeze/library/Server.java
index f0b61c1e256..b5c6c536f67 100644
--- a/java/demo/Freeze/library/Server.java
+++ b/java/demo/Freeze/library/Server.java
@@ -70,6 +70,6 @@ public class Server
     main(String[] args)
     {
 	LibraryServer app = new LibraryServer("db");
-	app.main("demo.Freeze.library.Server", args, "config");
+	app.main("demo.Freeze.library.Server", args, "config.server");
     }
 }
diff --git a/java/demo/Freeze/library/config.client b/java/demo/Freeze/library/config.client
new file mode 100644
index 00000000000..81bb193637c
--- /dev/null
+++ b/java/demo/Freeze/library/config.client
@@ -0,0 +1,5 @@
+Ice.Warn.Connections=1
+#Ice.Trace.Network=3
+#Ice.Trace.Protocol=1
+
+Library.Proxy=library:default -p 10000
diff --git a/java/demo/Freeze/library/config b/java/demo/Freeze/library/config.server
index ff5fddefbfc..7b35c27317c 100644
--- a/java/demo/Freeze/library/config
+++ b/java/demo/Freeze/library/config.server
@@ -1,9 +1,9 @@
-
 Library.Endpoints=default -p 10000
-Ice.Warn.Connections=1
-#Ice.Trace.Network=3
-#Ice.Trace.Protocol=1
-Library.Proxy=library:default -p 10000
 Library.EvictorSize=3
+
 Freeze.Trace.Map=1
 Freeze.Trace.Evictor=2
+
+Ice.Warn.Connections=1
+#Ice.Trace.Network=3
+#Ice.Trace.Protocol=1
diff --git a/java/demo/Freeze/phonebook/Client.java b/java/demo/Freeze/phonebook/Client.java
index cefcb8cf6ce..c4ec8377276 100644
--- a/java/demo/Freeze/phonebook/Client.java
+++ b/java/demo/Freeze/phonebook/Client.java
@@ -19,6 +19,6 @@ public class Client extends Ice.Application
     main(String[] args)
     {
 	Client app = new Client();
-	app.main("demo.Freeze.phonebook.Client", args, "config");
+	app.main("demo.Freeze.phonebook.Client", args, "config.client");
     }
 }
diff --git a/java/demo/Freeze/phonebook/Server.java b/java/demo/Freeze/phonebook/Server.java
index 0616eb18e94..91b3d558b55 100644
--- a/java/demo/Freeze/phonebook/Server.java
+++ b/java/demo/Freeze/phonebook/Server.java
@@ -90,6 +90,6 @@ public class Server
     main(String[] args)
     {
 	PhoneBookServer app = new PhoneBookServer("db");
-	app.main("demo.Freeze.phonebook.Server", args, "config");
+	app.main("demo.Freeze.phonebook.Server", args, "config.server");
     }
 }
diff --git a/java/demo/Freeze/phonebook/config b/java/demo/Freeze/phonebook/config.client
index dbb26ef2901..dbb26ef2901 100644
--- a/java/demo/Freeze/phonebook/config
+++ b/java/demo/Freeze/phonebook/config.client
diff --git a/java/demo/Freeze/phonebook/config.server b/java/demo/Freeze/phonebook/config.server
new file mode 100644
index 00000000000..dbb26ef2901
--- /dev/null
+++ b/java/demo/Freeze/phonebook/config.server
@@ -0,0 +1,12 @@
+Ice.Warn.Connections=1
+#Ice.Trace.Network=3
+#Ice.Trace.Protocol=1
+
+Freeze.Trace.Evictor=1
+Freeze.Trace.DbEnv=1
+Freeze.Evictor.db.contacts.SavePeriod=10000
+Freeze.Evictor.db.contacts.PopulateEmptyIndices=1
+
+PhoneBook.Endpoints=default -p 10000
+PhoneBook.Proxy=phonebook:default -p 10000
+PhoneBook.EvictorSize=3
diff --git a/java/demo/Glacier2/callback/Client.java b/java/demo/Glacier2/callback/Client.java
index 95c261874d9..f46a389f370 100644
--- a/java/demo/Glacier2/callback/Client.java
+++ b/java/demo/Glacier2/callback/Client.java
@@ -233,7 +233,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/Glacier2/callback/README b/java/demo/Glacier2/callback/README
index d723af8c5b6..8d828c2f62c 100644
--- a/java/demo/Glacier2/callback/README
+++ b/java/demo/Glacier2/callback/README
@@ -19,10 +19,10 @@ In a separate window, start the client:
 
 $ java Client
 
-If you plan to run this demo using clients running on different
-hosts than the glacier2router, it is necessary to first modify the
-configuration. You need to change the Glacier2.Client.Endpoints
-property in config.glacier2 and the Ice.Default.Router and
-Callback.Client.Router properties in config. In all cases you must
-replace the "-h 127.0.0.1" parameter with the actual external address
-of the machine on which glacier2router is running.
+If you plan to run this demo using clients on different hosts than
+the router, you must first modify the configuration. You need to
+change the Glacier2.Client.Endpoints property in config.glacier2 and
+the Ice.Default.Router and Callback.Client.Router properties in
+config.client. In all cases you must replace the "-h 127.0.0.1"
+parameter with the actual external address of the machine on which
+glacier2router is running.
diff --git a/java/demo/Glacier2/callback/config b/java/demo/Glacier2/callback/config.client
index 05cd897bf4d..28971cabe2c 100644
--- a/java/demo/Glacier2/callback/config
+++ b/java/demo/Glacier2/callback/config.client
@@ -29,7 +29,6 @@ Callback.Proxy=callback:tcp -h 127.0.0.1 -p 10000
 # Connections must remain established.
 #
 Ice.ACM.Client=0
-Ice.ACM.Server=0
 
 #
 # Ice.MonitorConnections defaults to the smaller of Ice.ACM.Client or
@@ -58,11 +57,7 @@ Ice.Warn.Connections=1
 #
 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=client.jks
+IceSSL.Password=password
+IceSSL.Truststore=certs.jks
diff --git a/java/demo/Glacier2/callback/config.glacier2 b/java/demo/Glacier2/callback/config.glacier2
index 971f8f6400b..ac43eebd877 100644
--- a/java/demo/Glacier2/callback/config.glacier2
+++ b/java/demo/Glacier2/callback/config.glacier2
@@ -109,10 +109,10 @@ Glacier2.Trace.RoutingTable=1
 #Ice.Trace.Network=1
 #Ice.Trace.Protocol=1
 Ice.Warn.Connections=1
-#IceSSL.Trace.Security=3
 
 Ice.Plugin.IceSSL=IceSSL:create
-IceSSL.Server.CertPath=../../../certs
-IceSSL.Server.Config=sslconfig.xml
-IceSSL.Client.CertPath=../../../certs
-IceSSL.Client.Config=sslconfig.xml
+IceSSL.DefaultDir=../../../certs
+IceSSL.CertAuthFile=cacert.pem
+IceSSL.CertFile=s_rsa1024_pub.pem
+IceSSL.KeyFile=s_rsa1024_priv.pem
+#IceSSL.Trace.Security=1
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
diff --git a/java/demo/IceBox/hello/Client.java b/java/demo/IceBox/hello/Client.java
index b98b8400190..c793b966758 100644
--- a/java/demo/IceBox/hello/Client.java
+++ b/java/demo/IceBox/hello/Client.java
@@ -149,7 +149,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/IceBox/hello/README b/java/demo/IceBox/hello/README
index 964656eaf07..7691dd3a52e 100644
--- a/java/demo/IceBox/hello/README
+++ b/java/demo/IceBox/hello/README
@@ -1,8 +1,12 @@
 To run this demo, open two terminal windows. In the first window,
 start the IceBox server:
 
-$ java IceBox.Server --Ice.Config=config
+$ java IceBox.Server --Ice.Config=config.icebox
 
 In the second window, run the client:
 
 $ java Client
+
+To shut down IceBox, use IceBox.Admin:
+
+$ java IceBox.Admin --Ice.Config=config.icebox shutdown
diff --git a/java/demo/IceBox/hello/config.client b/java/demo/IceBox/hello/config.client
new file mode 100644
index 00000000000..161f0cecb7b
--- /dev/null
+++ b/java/demo/IceBox/hello/config.client
@@ -0,0 +1,28 @@
+#
+# 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
+
+#
+# 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=1
+
+#
+# Protocol Tracing
+#
+# 0 = no protocol tracing
+# 1 = trace protocol messages
+#
+#Ice.Trace.Protocol=1
diff --git a/java/demo/IceBox/hello/config b/java/demo/IceBox/hello/config.icebox
index 8695ae7f761..07adfa38ce4 100644
--- a/java/demo/IceBox/hello/config
+++ b/java/demo/IceBox/hello/config.icebox
@@ -11,12 +11,6 @@ IceBox.ServiceManager.Endpoints=tcp -p 9998
 IceBox.Service.Hello=HelloServiceI
 
 #
-# 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
-
-#
 # The server creates one single object adapter with the name of
 # the service. The following line sets the endpoints for this
 # adapter.
diff --git a/java/demo/IceGrid/simple/Client.java b/java/demo/IceGrid/simple/Client.java
index 6c955550d46..094a41027c6 100644
--- a/java/demo/IceGrid/simple/Client.java
+++ b/java/demo/IceGrid/simple/Client.java
@@ -103,7 +103,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/IceGrid/simple/README b/java/demo/IceGrid/simple/README
index 2bfa58b0428..6e3bd046e93 100644
--- a/java/demo/IceGrid/simple/README
+++ b/java/demo/IceGrid/simple/README
@@ -1,10 +1,10 @@
 To run the demo, first start the IceGrid service:
 
-$ icegridnode --Ice.Config=config --warn
+$ icegridnode --Ice.Config=config.grid --warn
 
 In a separate window:
 
-$ icegridadmin --Ice.Config=config -e "application add 'application.xml'"
+$ icegridadmin --Ice.Config=config.grid -e "application add 'application.xml'"
 $ java Client
 
 This will deploy the application described in the file "application.xml"
@@ -26,7 +26,7 @@ application:
 If you have already deployed the application, you can update it to try
 a new set of descriptors, for example:
 
-$ icegridadmin --Ice.Config=config -e "application update \ 
+$ icegridadmin --Ice.Config=config.grid -e "application update \ 
 	'application_with_template.xml'"
 
 When using the descriptors from 'application_with_template.xml' or
@@ -34,5 +34,5 @@ When using the descriptors from 'application_with_template.xml' or
 based on the `SimpleServer' template. For example, you can use the
 following command to deploy a new server:
 
-$ icegridadmin --Ice.Config=config -e "server template instantiate \
+$ icegridadmin --Ice.Config=config.grid -e "server template instantiate \
 	Simple localhost SimpleServer index=4"
diff --git a/java/demo/IceGrid/simple/config.client b/java/demo/IceGrid/simple/config.client
new file mode 100644
index 00000000000..78100695847
--- /dev/null
+++ b/java/demo/IceGrid/simple/config.client
@@ -0,0 +1,4 @@
+#
+# The IceGrid locator proxy.
+#
+Ice.Default.Locator=DemoIceGrid/Locator:default -p 12000
diff --git a/java/demo/IceGrid/simple/config b/java/demo/IceGrid/simple/config.grid
index 5f12392aa12..5f12392aa12 100644
--- a/java/demo/IceGrid/simple/config
+++ b/java/demo/IceGrid/simple/config.grid
diff --git a/java/demo/IceStorm/clock/Publisher.java b/java/demo/IceStorm/clock/Publisher.java
index 4ae1d0a7024..f1917cc93b2 100644
--- a/java/demo/IceStorm/clock/Publisher.java
+++ b/java/demo/IceStorm/clock/Publisher.java
@@ -71,7 +71,7 @@ public class Publisher extends Ice.Application
     main(String[] args)
     {
         Publisher app = new Publisher();
-        int status = app.main("Publisher", args, "config");
+        int status = app.main("Publisher", args, "config.pub");
         System.exit(status);
     }
 }
diff --git a/java/demo/IceStorm/clock/README b/java/demo/IceStorm/clock/README
index 1c7a0ac932c..0f9aeb93cf7 100644
--- a/java/demo/IceStorm/clock/README
+++ b/java/demo/IceStorm/clock/README
@@ -2,14 +2,14 @@ To run the demo:
 
 Start the IceStorm service:
 
-$ icebox --Ice.Config=config_service
+$ icebox --Ice.Config=config.icebox
 
 This configuration assumes there is a subdirectory named db in the
 current working directory.
 
 In a separate window:
 
-$ icestormadmin --Ice.Config=config -e "create time"
+$ icestormadmin --Ice.Config=config.service -e "create time"
 $ java Subscriber
 
 In another window:
diff --git a/java/demo/IceStorm/clock/Subscriber.java b/java/demo/IceStorm/clock/Subscriber.java
index fca4a0edcd2..4c451ee2ed6 100644
--- a/java/demo/IceStorm/clock/Subscriber.java
+++ b/java/demo/IceStorm/clock/Subscriber.java
@@ -138,7 +138,7 @@ public class Subscriber extends Ice.Application
     main(String[] args)
     {
         Subscriber app = new Subscriber();
-        int status = app.main("Subscriber", args, "config");
+        int status = app.main("Subscriber", args, "config.sub");
         System.exit(status);
     }
 }
diff --git a/java/demo/IceStorm/clock/config_service b/java/demo/IceStorm/clock/config.icebox
index 18102a0f209..84ef44ac236 100644
--- a/java/demo/IceStorm/clock/config_service
+++ b/java/demo/IceStorm/clock/config.icebox
@@ -6,18 +6,7 @@ IceBox.ServiceManager.Endpoints=tcp -p 9998
 #
 # The IceStorm service
 #
-IceBox.Service.IceStorm=IceStormService,30:create --Ice.Config=config
-
-#
-# This property defines the home directory of the Freeze 
-# database environment for the IceStorm service.
-#
-Freeze.DbEnv.IceStorm.DbHome=db
-
-#
-# The IceStorm service instance name.
-#
-IceStorm.InstanceName=DemoIceStorm
+IceBox.Service.IceStorm=IceStormService,31:create --Ice.Config=config.service
 
 #
 # Warn about connection exceptions
@@ -41,4 +30,3 @@ IceStorm.InstanceName=DemoIceStorm
 # 1 = trace protocol messages
 #
 #Ice.Trace.Protocol=1
-
diff --git a/java/demo/IceStorm/clock/config.pub b/java/demo/IceStorm/clock/config.pub
new file mode 100644
index 00000000000..e736a5faa1a
--- /dev/null
+++ b/java/demo/IceStorm/clock/config.pub
@@ -0,0 +1,14 @@
+#
+# This property is used by the clients to connect to IceStorm.
+#
+IceStorm.TopicManager.Proxy=DemoIceStorm/TopicManager:default -p 10000
+
+#
+# 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
diff --git a/java/demo/IceStorm/clock/config b/java/demo/IceStorm/clock/config.service
index 032a8cbc106..7cf906d19f1 100644
--- a/java/demo/IceStorm/clock/config
+++ b/java/demo/IceStorm/clock/config.service
@@ -1,11 +1,5 @@
 #
-# This property is used to configure the endpoints of the clock
-# subscriber adapter.
-#
-Clock.Subscriber.Endpoints=tcp
-
-#
-# This property is used by the clients to connect to IceStorm.
+# This property is used by the administrative client to connect to IceStorm.
 #
 IceStorm.TopicManager.Proxy=DemoIceStorm/TopicManager:default -p 10000
 
@@ -16,6 +10,11 @@ IceStorm.TopicManager.Proxy=DemoIceStorm/TopicManager:default -p 10000
 IceStorm.TopicManager.Endpoints=default -p 10000
 
 #
+# The IceStorm service instance name.
+#
+IceStorm.InstanceName=DemoIceStorm
+
+#
 # This property defines the endpoints on which the topic
 # publisher objects listen.
 #
@@ -56,6 +55,12 @@ IceStorm.Trace.Subscriber=1
 IceStorm.Trace.Flush=1
 
 #
+# Amount of time in milliseconds between flushes for batch mode
+# transfer. The minimum allowable value is 100ms.
+#
+IceStorm.Flush.Timeout=2000
+
+#
 # Network Tracing
 #
 # 0 = no network tracing
@@ -66,7 +71,7 @@ IceStorm.Trace.Flush=1
 Ice.Trace.Network=0
 
 #
-# Amount of time in milliseconds between flushes for batch mode
-# transfer. The minimum allowable value is 100ms.
+# This property defines the home directory of the Freeze 
+# database environment for the IceStorm service.
 #
-IceStorm.Flush.Timeout = 2000
+Freeze.DbEnv.IceStorm.DbHome=db
diff --git a/java/demo/IceStorm/clock/config.sub b/java/demo/IceStorm/clock/config.sub
new file mode 100644
index 00000000000..194f4f544e3
--- /dev/null
+++ b/java/demo/IceStorm/clock/config.sub
@@ -0,0 +1,20 @@
+#
+# This property is used to configure the endpoints of the clock
+# subscriber adapter.
+#
+Clock.Subscriber.Endpoints=tcp
+
+#
+# This property is used by the clients to connect to IceStorm.
+#
+IceStorm.TopicManager.Proxy=DemoIceStorm/TopicManager:default -p 10000
+
+#
+# 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