diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2008-04-09 17:08:17 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2008-04-09 17:08:17 +0200 |
| commit | abefabeae65261c96f34877ff286b406bfb09d73 (patch) | |
| tree | 83df2a93bd544e0a9ec2d935654177736c6f1e2e /cpp/demo | |
| parent | amended README.txt to mention object by value (diff) | |
| download | ice-abefabeae65261c96f34877ff286b406bfb09d73.tar.bz2 ice-abefabeae65261c96f34877ff286b406bfb09d73.tar.xz ice-abefabeae65261c96f34877ff286b406bfb09d73.zip | |
Removed IceGrid AdminCallbackRouter object adapter (bug 2998)
Diffstat (limited to 'cpp/demo')
| -rw-r--r-- | cpp/demo/IceGrid/icebox/config.grid | 1 | ||||
| -rw-r--r-- | cpp/demo/IceStorm/replicated/config.grid | 1 | ||||
| -rwxr-xr-x | cpp/demo/IceStorm/replicated/expect.py | 2 |
3 files changed, 1 insertions, 3 deletions
diff --git a/cpp/demo/IceGrid/icebox/config.grid b/cpp/demo/IceGrid/icebox/config.grid index 7515bf57725..6cf76f76f78 100644 --- a/cpp/demo/IceGrid/icebox/config.grid +++ b/cpp/demo/IceGrid/icebox/config.grid @@ -14,7 +14,6 @@ Ice.Default.Locator=DemoIceGrid/Locator:default -p 4061 IceGrid.Registry.Client.Endpoints=default -p 4061 IceGrid.Registry.Server.Endpoints=default IceGrid.Registry.Internal.Endpoints=default -IceGrid.Registry.AdminCallbackRouter.Endpoints=default # # Enable the admin session manager for use with Glacier2. diff --git a/cpp/demo/IceStorm/replicated/config.grid b/cpp/demo/IceStorm/replicated/config.grid index 30b8c75c8e3..913b68efb68 100644 --- a/cpp/demo/IceStorm/replicated/config.grid +++ b/cpp/demo/IceStorm/replicated/config.grid @@ -14,7 +14,6 @@ Ice.Default.Locator=DemoIceGrid/Locator:default -p 4061 IceGrid.Registry.Client.Endpoints=default -p 4061 IceGrid.Registry.Server.Endpoints=default IceGrid.Registry.Internal.Endpoints=default -IceGrid.Registry.AdminCallbackRouter.Endpoints=default IceGrid.Registry.Data=db/registry IceGrid.Registry.PermissionsVerifier=DemoIceGrid/NullPermissionsVerifier IceGrid.Registry.AdminPermissionsVerifier=DemoIceGrid/NullPermissionsVerifier diff --git a/cpp/demo/IceStorm/replicated/expect.py b/cpp/demo/IceStorm/replicated/expect.py index 723c0095d8a..aa8c85bba0e 100755 --- a/cpp/demo/IceStorm/replicated/expect.py +++ b/cpp/demo/IceStorm/replicated/expect.py @@ -52,7 +52,7 @@ else: print "starting icegridnode...", sys.stdout.flush() node = demoscript.Util.spawn('icegridnode --Ice.Config=config.grid --Ice.PrintAdapterReady %s' % (args)) -node.expect('IceGrid.Registry.Server ready\r{1,2}\nIceGrid.Registry.AdminCallbackRouter ready\r{1,2}\nIceGrid.Registry.Client ready\r{1,2}\nIceGrid.Node ready') +node.expect('IceGrid.Registry.Server ready\r{1,2}\nIceGrid.Registry.Client ready\r{1,2}\nIceGrid.Node ready') print "ok" print "deploying application...", |