Fixes

4 files changed, 18 insertions, 11 deletions

diff --git a/cpp/demo/IceGrid/simple/Makefile b/cpp/demo/IceGrid/simple/Makefile
index 5581010a29b..8f10a68cde0 100644
--- a/cpp/demo/IceGrid/simple/Makefile
+++ b/cpp/demo/IceGrid/simple/Makefile
@@ -34,7 +34,7 @@ LINKWITH	:= -lIce -lIceUtil
 
 $(CLIENT): $(OBJS) $(COBJS)
 	rm -f $@
-	$(CXX) $(LDFLAGS) -o $@ $(OBJS) $(COBJS) $(LIBS)
+	$(CXX) $(LDFLAGS) -o $@ $(OBJS) $(COBJS) -lIceGrid $(LIBS)
 
 $(SERVER): $(OBJS) $(SOBJS)
 	rm -f $@
diff --git a/cpp/demo/IceGrid/simple/README b/cpp/demo/IceGrid/simple/README
index 3ab5067c9fc..24f1363cb61 100644
--- a/cpp/demo/IceGrid/simple/README
+++ b/cpp/demo/IceGrid/simple/README
@@ -7,7 +7,7 @@ In a separate window:
 $ icegridadmin --Ice.Config=config -e "application add 'application.xml'"
 $ client
 
-This will deploy the servers described in the file "application.xml"
+This will deploy the application described in the file "application.xml"
 and start the client.
 
 Messages will be displayed in the IceGrid service window.
@@ -16,18 +16,25 @@ To remove the application:
 
 $ icegridadmin --Ice.Config=config -e "application remove Simple"
 
+To update the application with a new descriptor:
+
+$ icegridadmin --Ice.Config=config -e "application update 'application.xml'"
+
 You can also use the following descriptors to deploy the application:
 
-- application_with_templates.xml: This descriptor demonstrates the use
-  of templates for the server definition. Templates make it easy to
-  deploy multiple instances of the same server. To deploy a new server
-  based on the template, use the following command:
+- application_with_template.xml: 
+
+  This descriptor demonstrates the use of templates for the server
+  definition. Templates make it easy to deploy multiple instances of the
+  same server. To deploy a new server based on the template, use for
+  example the following command:
   
   $ icegridadmin --Ice.Config=config -e "server template instantiate \
     Simple localhost SimpleServer index=2"
 
   This will deploy a new server based on the `SimpleServer' template.
 
-- application_with_replication.xml: This descriptor demonstrates the
-  use of replication to balance the load of the application over
-  several servers.
+- application_with_replication.xml: 
+
+  This descriptor demonstrates the use of replication to balance the
+  load of the application over several servers.
diff --git a/cpp/demo/IceGrid/simple/application.xml b/cpp/demo/IceGrid/simple/application.xml
index 4abf161e6ba..e7afd339b2d 100644
--- a/cpp/demo/IceGrid/simple/application.xml
+++ b/cpp/demo/IceGrid/simple/application.xml
@@ -16,7 +16,7 @@
     <node name="localhost">
       <server id="SimpleServer" exe="./server" pwd="." activation="on-demand">
 	<adapter name="Hello" endpoints="tcp" register="true">
-	  <object identity="hello" type="::Hello"/>
+	  <object identity="hello" type="::Demo::Hello"/>
 	</adapter>
 	<property name="Identity" value="hello"/>
       </server>
diff --git a/cpp/demo/IceGrid/simple/application_with_template.xml b/cpp/demo/IceGrid/simple/application_with_template.xml
index 4a94a697b32..b0d300a7887 100644
--- a/cpp/demo/IceGrid/simple/application_with_template.xml
+++ b/cpp/demo/IceGrid/simple/application_with_template.xml
@@ -17,7 +17,7 @@
       <parameter name="index"/>
       <server id="SimpleServer-${index}" exe="./server" pwd="." activation="on-demand">
         <adapter name="Hello" endpoints="tcp" register="true">
-          <object identity="hello-${index}" type="::Hello"/>
+          <object identity="hello-${index}" type="::Demo::Hello"/>
         </adapter>
         <property name="Identity" value="hello-${index}"/>
       </server>