5 files changed, 6 insertions, 10 deletions
diff --git a/java/demo/IceBox/hello/Client.java b/java/demo/IceBox/hello/Client.java
index c89be59d095..7a21ca205d5 100644
--- a/java/demo/IceBox/hello/Client.java
+++ b/java/demo/IceBox/hello/Client.java
@@ -31,7 +31,7 @@ public class Client extends Ice.Application
     run(String[] args)
     {
         Ice.Properties properties = communicator().getProperties();
-        final String refProperty = "Hello.Hello";
+        final String refProperty = "Hello.Proxy";
         String ref = properties.getProperty(refProperty);
         if(ref.length() == 0)
         {
diff --git a/java/demo/IceBox/hello/Hello.ice b/java/demo/IceBox/hello/Hello.ice
index b3e16ef95a5..c80a9d9df23 100644
--- a/java/demo/IceBox/hello/Hello.ice
+++ b/java/demo/IceBox/hello/Hello.ice
@@ -16,7 +16,6 @@ module Demo
 interface Hello
 {
     void sayHello();
-    void shutdown();
 };
 
 };
diff --git a/java/demo/IceBox/hello/HelloI.java b/java/demo/IceBox/hello/HelloI.java
index e4dea49e024..14737d3c46a 100644
--- a/java/demo/IceBox/hello/HelloI.java
+++ b/java/demo/IceBox/hello/HelloI.java
@@ -16,11 +16,4 @@ public class HelloI extends _HelloDisp
     {
         System.out.println("Hello World!");
     }
-
-    public void
-    shutdown(Ice.Current current)
-    {
-        System.out.println("Shutting down...");
-        current.adapter.getCommunicator().shutdown();
-    }
 }
diff --git a/java/demo/IceBox/hello/config b/java/demo/IceBox/hello/config
index 4ef27f0fb88..8695ae7f761 100644
--- a/java/demo/IceBox/hello/config
+++ b/java/demo/IceBox/hello/config
@@ -14,7 +14,7 @@ IceBox.Service.Hello=HelloServiceI
 # The client reads this property to create the reference to the
 # "hello" object in the server.
 #
-Hello.Hello=hello:tcp -p 10000:udp -p 10000
+Hello.Proxy=hello:tcp -p 10000:udp -p 10000
 
 #
 # The server creates one single object adapter with the name of
diff --git a/java/src/IceBox/ServiceManagerI.java b/java/src/IceBox/ServiceManagerI.java
index 15903140908..ae650f8e5fa 100644
--- a/java/src/IceBox/ServiceManagerI.java
+++ b/java/src/IceBox/ServiceManagerI.java
@@ -50,6 +50,10 @@ public class ServiceManagerI extends _ServiceManagerDisp
 	    Ice.Properties properties = _server.communicator().getProperties();
 
 	    String identity = properties.getPropertyWithDefault("IceBox.ServiceManager.Identity", "ServiceManager");
+	    if(identity.length() == 0)
+	    {
+		identity = properties.getPropertyWithDefault("IceBox.InstanceName", "IceBox") + "/ServiceManager";
+	    }
 	    adapter.add(this, Ice.Util.stringToIdentity(identity));
 
 	    //