separating client/server configuration; removing client/server properties

    for IceSSL

4 files changed, 12 insertions, 8 deletions

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.