3 files changed, 54 insertions, 12 deletions
diff --git a/cpp/all.dsw b/cpp/all.dsw
index c1261ea5433..6947e7ed2c6 100644
--- a/cpp/all.dsw
+++ b/cpp/all.dsw
@@ -416,6 +416,48 @@ Package=<4>
     Begin Project Dependency
     Project_Dep_Name GlacierRouter
     End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name callbackC
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name callbackS
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "callbackC"=.\demo\Ice\callback\callbackC.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name Ice
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name IceUtil
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "callbackS"=.\demo\Ice\callback\callbackS.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name Ice
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name IceUtil
+    End Project Dependency
 }}}
 
 ###############################################################################
diff --git a/cpp/demo/Ice/callback/config b/cpp/demo/Ice/callback/config
index ed43963194e..97b15732724 100644
--- a/cpp/demo/Ice/callback/config
+++ b/cpp/demo/Ice/callback/config
@@ -1,4 +1,4 @@
-Callback.Callback=callback:tcp -h 192.168.2.2 -p 10000:udp -h 192.168.2.2 -p 10000:ssl -h 192.168.2.2 -p 10001#:sudp -h 192.168.2.2 -p 10001
+Callback.Callback=callback:tcp -p 10000:udp -p 10000:ssl -p 10001#:sudp -p 10001
 Ice.Adapter.CallbackReceiverAdapter.Endpoints=tcp:udp:ssl#:sudp
 
 Ice.Trace.Network=3
@@ -10,7 +10,7 @@ Ice.Security.Ssl.Config=sslconfig.xml
 
 #Glacier.Router.Endpoints=default -p 10005
 #Glacier.Client.Endpoints=tcp:udp -c:ssl#:sudp -c
-#Glacier.Server.Endpoints=tcp -h 192.168.2.2:udp -h 192.168.2.2:ssl -h 192.168.2.2#:sudp -h 192.168.2.2
+#Glacier.Server.Endpoints=tcp:udp:ssl#:sudp
 #Glacier.Trace.Client=2
 #Glacier.Trace.Server=2
 #Glacier.Trace.RoutingTable=1
diff --git a/cpp/demo/Ice/nested/config b/cpp/demo/Ice/nested/config
index c978201e132..242139a7974 100644
--- a/cpp/demo/Ice/nested/config
+++ b/cpp/demo/Ice/nested/config
@@ -1,4 +1,4 @@
-Nested.NestedServer=nestedServer:default -h 192.168.2.2 -p 10000 -t 10000
+Nested.NestedServer=nestedServer:default -p 10000 -t 10000
 Ice.Adapter.NestedClientAdapter.Endpoints=default -t 10000
 
 Ice.ThreadPool.Size=50
@@ -9,12 +9,12 @@ Ice.ThreadPool.Size=50
 Ice.Security.Ssl.CertPath=../../../Certs
 Ice.Security.Ssl.Config=sslconfig.xml
 
-Glacier.Router.Endpoints=default -p 10005
-Glacier.Client.Endpoints=default
-Glacier.Server.Endpoints=default -h 192.168.2.2
-Glacier.Trace.Client=2
-Glacier.Trace.Server=2
-Glacier.Trace.RoutingTable=1
-Ice.DefaultRouter=router:default -p 10005
-Ice.Adapter.NestedClientAdapter.Router=router:default -p 10005
-Ice.Adapter.NestedClientAdapter.Endpoints=
+#Glacier.Router.Endpoints=default -p 10005
+#Glacier.Client.Endpoints=default
+#Glacier.Server.Endpoints=default
+#Glacier.Trace.Client=2
+#Glacier.Trace.Server=2
+#Glacier.Trace.RoutingTable=1
+#Ice.DefaultRouter=router:default -p 10005
+#Ice.Adapter.NestedClientAdapter.Router=router:default -p 10005
+#Ice.Adapter.NestedClientAdapter.Endpoints=