diff options
| author | Matthew Newhook <matthew@zeroc.com> | 2008-03-06 14:26:07 +0800 |
|---|---|---|
| committer | Matthew Newhook <matthew@zeroc.com> | 2008-03-06 14:26:07 +0800 |
| commit | bc6cdac7eda5e31c8fab6e891a7dc2078a7d22c6 (patch) | |
| tree | dc10cb41cd1280cf115c6bf5a1302481a969e15d /java/demo/Ice/callback | |
| parent | Fix to fix for 2395. Backed out Dwayne's previous change because we both work... (diff) | |
| download | ice-bc6cdac7eda5e31c8fab6e891a7dc2078a7d22c6.tar.bz2 ice-bc6cdac7eda5e31c8fab6e891a7dc2078a7d22c6.tar.xz ice-bc6cdac7eda5e31c8fab6e891a7dc2078a7d22c6.zip | |
Squashed commit of the following:
commit c2f83d9a3e0e1f97e76f33d7992ef8e3e2994d91
Author: Matthew Newhook <matthew@zeroc.com>
Date: Thu Mar 6 14:22:52 2008 +0800
Cleanup some IceGrid configuration files.
commit 4e33903c9ae238b9e317fc3f1f3e281c816374dd
Author: Matthew Newhook <matthew@zeroc.com>
Date: Thu Mar 6 14:17:10 2008 +0800
remove ttl setting.
commit c418b308ff7cc8e8a4296819938b88dfedc16a97
Author: Matthew Newhook <matthew@zeroc.com>
Date: Thu Mar 6 14:16:32 2008 +0800
remove useless PopulateEmptyIndices config.
commit da70d3936f921aa2c92bd2db7b1fcddb4467a9bd
Author: Matthew Newhook <matthew@zeroc.com>
Date: Thu Mar 6 13:59:51 2008 +0800
- Removed interrupt handlers for interactive C++ demos.
- Lots of cleanups to demos.
Diffstat (limited to 'java/demo/Ice/callback')
| -rw-r--r-- | java/demo/Ice/callback/Client.java | 2 | ||||
| -rw-r--r-- | java/demo/Ice/callback/config.client | 12 | ||||
| -rw-r--r-- | java/demo/Ice/callback/config.server | 7 |
3 files changed, 18 insertions, 3 deletions
diff --git a/java/demo/Ice/callback/Client.java b/java/demo/Ice/callback/Client.java index a2a81d4c5af..8785f1bb44c 100644 --- a/java/demo/Ice/callback/Client.java +++ b/java/demo/Ice/callback/Client.java @@ -61,7 +61,7 @@ public class Client extends Ice.Application setInterruptHook(new ShutdownHook()); CallbackSenderPrx twoway = CallbackSenderPrxHelper.checkedCast( - communicator().propertyToProxy("Callback.CallbackServer"). + communicator().propertyToProxy("CallbackSender.Proxy"). ice_twoway().ice_timeout(-1).ice_secure(false)); if(twoway == null) { diff --git a/java/demo/Ice/callback/config.client b/java/demo/Ice/callback/config.client index b53d5737c4b..242366bb84f 100644 --- a/java/demo/Ice/callback/config.client +++ b/java/demo/Ice/callback/config.client @@ -1,4 +1,14 @@ -Callback.CallbackServer=callback:tcp -p 12000:udp -p 10000:ssl -p 10001 +# +# The client reads this property to create the reference to the +# "CallbackSender" object in the server. +# +CallbackSender.Proxy=callback:tcp -p 10000:udp -p 10000:ssl -p 10001 + +# +# The client creates one single object adapter with the name +# "Callback.Client". The following line sets the endpoints for this +# adapter. +# Callback.Client.Endpoints=tcp:udp:ssl # diff --git a/java/demo/Ice/callback/config.server b/java/demo/Ice/callback/config.server index c1b58bd8e45..72ea2cf0425 100644 --- a/java/demo/Ice/callback/config.server +++ b/java/demo/Ice/callback/config.server @@ -1,4 +1,9 @@ -Callback.Server.Endpoints=tcp -p 12000:udp -p 10000:ssl -p 10001 +# +# The server creates one single object adapter with the name +# "Callback.Server". The following line sets the endpoints for this +# adapter. +# +Callback.Server.Endpoints=tcp -p 10000:udp -p 10000:ssl -p 10001 # # Warn about connection exceptions |