separating client/server configuration; removing client/server properties

    for IceSSL

4 files changed, 10 insertions, 4 deletions

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