separating client/server configuration; removing client/server properties

    for IceSSL

7 files changed, 33 insertions, 18 deletions

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