diff options
| author | Bernard Normier <bernard@zeroc.com> | 2012-10-23 15:03:49 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2012-10-23 15:03:49 -0400 |
| commit | ef571f80c545d30a5a2330b2d835f9c6441616a1 (patch) | |
| tree | fce9620a538899c44d8471a0e798c4ff134dead8 /cpp/demo/IceStorm | |
| parent | Java/C# factory fix (diff) | |
| download | ice-ef571f80c545d30a5a2330b2d835f9c6441616a1.tar.bz2 ice-ef571f80c545d30a5a2330b2d835f9c6441616a1.tar.xz ice-ef571f80c545d30a5a2330b2d835f9c6441616a1.zip | |
Fixed ICE-4884:
Updated version to 3.5b
Some fixes to distribution/bin/fixVersion.py
Diffstat (limited to 'cpp/demo/IceStorm')
| -rw-r--r-- | cpp/demo/IceStorm/clock/config.icebox | 2 | ||||
| -rw-r--r-- | cpp/demo/IceStorm/counter/config.icebox | 2 | ||||
| -rwxr-xr-x | cpp/demo/IceStorm/counter/expect.py | 2 | ||||
| -rw-r--r-- | cpp/demo/IceStorm/replicated/application.xml | 2 | ||||
| -rw-r--r-- | cpp/demo/IceStorm/replicated2/config.ib1 | 2 | ||||
| -rw-r--r-- | cpp/demo/IceStorm/replicated2/config.ib2 | 2 | ||||
| -rw-r--r-- | cpp/demo/IceStorm/replicated2/config.ib3 | 2 | ||||
| -rwxr-xr-x | cpp/demo/IceStorm/replicated2/expect.py | 6 |
8 files changed, 10 insertions, 10 deletions
diff --git a/cpp/demo/IceStorm/clock/config.icebox b/cpp/demo/IceStorm/clock/config.icebox index 7f866a8021f..1ef67c260be 100644 --- a/cpp/demo/IceStorm/clock/config.icebox +++ b/cpp/demo/IceStorm/clock/config.icebox @@ -11,7 +11,7 @@ IceBox.ServiceManager.Endpoints=tcp -h localhost -p 9998 # The IceStorm service. The service is configured using a separate # configuration file (see config.service). # -IceBox.Service.IceStorm=IceStormService,34:createIceStorm --Ice.Config=config.service +IceBox.Service.IceStorm=IceStormService,35b:createIceStorm --Ice.Config=config.service # # Warn about connection exceptions diff --git a/cpp/demo/IceStorm/counter/config.icebox b/cpp/demo/IceStorm/counter/config.icebox index 0019ad9f81b..845b3d42090 100644 --- a/cpp/demo/IceStorm/counter/config.icebox +++ b/cpp/demo/IceStorm/counter/config.icebox @@ -6,7 +6,7 @@ IceBox.ServiceManager.Endpoints=tcp -h localhost -p 9998 # # The IceStorm service # -IceBox.Service.IceStorm=IceStormService,34:createIceStorm --Ice.Config=config.service +IceBox.Service.IceStorm=IceStormService,35b:createIceStorm --Ice.Config=config.service # # Warn about connection exceptions diff --git a/cpp/demo/IceStorm/counter/expect.py b/cpp/demo/IceStorm/counter/expect.py index 40d1dc55d64..cc7b52a984f 100755 --- a/cpp/demo/IceStorm/counter/expect.py +++ b/cpp/demo/IceStorm/counter/expect.py @@ -27,7 +27,7 @@ Util.cleanDbDir("db") print("ok") if Util.defaultHost: - args = ' --IceBox.Service.IceStorm="IceStormService,34:createIceStorm --Ice.Config=config.service %s"' \ + args = ' --IceBox.Service.IceStorm="IceStormService,35b:createIceStorm --Ice.Config=config.service %s"' \ % Util.defaultHost else: args = '' diff --git a/cpp/demo/IceStorm/replicated/application.xml b/cpp/demo/IceStorm/replicated/application.xml index 1bfb5950ced..0be46486840 100644 --- a/cpp/demo/IceStorm/replicated/application.xml +++ b/cpp/demo/IceStorm/replicated/application.xml @@ -21,7 +21,7 @@ <icebox id="${instance-name}-${index}" exe="icebox" activation="on-demand"> - <service name="IceStorm" entry="IceStormService,34:createIceStorm"> + <service name="IceStorm" entry="IceStormService,35b:createIceStorm"> <dbenv name="${service}"/> diff --git a/cpp/demo/IceStorm/replicated2/config.ib1 b/cpp/demo/IceStorm/replicated2/config.ib1 index 67044a09270..66251b6516d 100644 --- a/cpp/demo/IceStorm/replicated2/config.ib1 +++ b/cpp/demo/IceStorm/replicated2/config.ib1 @@ -6,7 +6,7 @@ IceBox.ServiceManager.Endpoints=tcp -p 9990 # # The IceStorm service # -IceBox.Service.IceStorm=IceStormService,34:createIceStorm --Ice.Config=config.s1 +IceBox.Service.IceStorm=IceStormService,35b:createIceStorm --Ice.Config=config.s1 # # Warn about connection exceptions diff --git a/cpp/demo/IceStorm/replicated2/config.ib2 b/cpp/demo/IceStorm/replicated2/config.ib2 index 49b7c67b3c5..8bb5752441a 100644 --- a/cpp/demo/IceStorm/replicated2/config.ib2 +++ b/cpp/demo/IceStorm/replicated2/config.ib2 @@ -6,7 +6,7 @@ IceBox.ServiceManager.Endpoints=tcp -p 9991 # # The IceStorm service # -IceBox.Service.IceStorm=IceStormService,34:createIceStorm --Ice.Config=config.s2 +IceBox.Service.IceStorm=IceStormService,35b:createIceStorm --Ice.Config=config.s2 # # Warn about connection exceptions diff --git a/cpp/demo/IceStorm/replicated2/config.ib3 b/cpp/demo/IceStorm/replicated2/config.ib3 index 2059f75d38c..b693b48b09d 100644 --- a/cpp/demo/IceStorm/replicated2/config.ib3 +++ b/cpp/demo/IceStorm/replicated2/config.ib3 @@ -6,7 +6,7 @@ IceBox.ServiceManager.Endpoints=tcp -p 9993 # # The IceStorm service # -IceBox.Service.IceStorm=IceStormService,34:createIceStorm --Ice.Config=config.s3 +IceBox.Service.IceStorm=IceStormService,35b:createIceStorm --Ice.Config=config.s3 # # Warn about connection exceptions diff --git a/cpp/demo/IceStorm/replicated2/expect.py b/cpp/demo/IceStorm/replicated2/expect.py index 748440d2ea6..5d6259393b6 100755 --- a/cpp/demo/IceStorm/replicated2/expect.py +++ b/cpp/demo/IceStorm/replicated2/expect.py @@ -30,11 +30,11 @@ Util.cleanDbDir("db3") print("ok") if Util.defaultHost: - a1 = ' --IceBox.Service.IceStorm="IceStormService,34:createIceStorm --Ice.Config=config.s1 %s"' \ + a1 = ' --IceBox.Service.IceStorm="IceStormService,35b:createIceStorm --Ice.Config=config.s1 %s"' \ % Util.defaultHost - a2 = ' --IceBox.Service.IceStorm="IceStormService,34:createIceStorm --Ice.Config=config.s2 %s"' \ + a2 = ' --IceBox.Service.IceStorm="IceStormService,35b:createIceStorm --Ice.Config=config.s2 %s"' \ % Util.defaultHost - a3 = ' --IceBox.Service.IceStorm="IceStormService,34:createIceStorm --Ice.Config=config.s3 %s"' \ + a3 = ' --IceBox.Service.IceStorm="IceStormService,35b:createIceStorm --Ice.Config=config.s3 %s"' \ % Util.defaultHost else: a1 = '' |