diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2006-06-19 18:14:11 +0000 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2006-06-19 18:14:11 +0000 |
| commit | 26fb8d0e7f6b5ce81f87c4015a24cc258138aa98 (patch) | |
| tree | 2e3add084b7697bc3238361fe557866e3dc64b6c /cpp | |
| parent | http://bugzilla.zeroc.com/bugzilla/show_bug.cgi?id=1075 (diff) | |
| download | ice-26fb8d0e7f6b5ce81f87c4015a24cc258138aa98.tar.bz2 ice-26fb8d0e7f6b5ce81f87c4015a24cc258138aa98.tar.xz ice-26fb8d0e7f6b5ce81f87c4015a24cc258138aa98.zip | |
Fixed bug 1099
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/test/IceGrid/activation/application.xml | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/cpp/test/IceGrid/activation/application.xml b/cpp/test/IceGrid/activation/application.xml index e5e79e19a07..60abb264a8e 100644 --- a/cpp/test/IceGrid/activation/application.xml +++ b/cpp/test/IceGrid/activation/application.xml @@ -4,11 +4,15 @@ <server-template id="Server"> <parameter name="id"/> <parameter name="activation" default="on-demand"/> + <parameter name="activation-timeout" default="60"/> + <parameter name="deactivation-timeout" default="60"/> <parameter name="activation-delay" default="0"/> <parameter name="deactivation-delay" default="0"/> <parameter name="fail-on-startup" default="0"/> <server id="${id}" exe="${test.dir}/server" - activation="${activation}" activation-timeout="4" deactivation-timeout="3"> + activation="${activation}" + activation-timeout="${activation-timeout}" + deactivation-timeout="${deactivation-timeout}"> <adapter name="TestAdapter" endpoints="default" register-process="true"> <object identity="${server}" type="Test"/> <allocatable identity="${server}" type="Test"/> @@ -41,8 +45,9 @@ <server-instance template="Server" id="server-manual" activation="manual"/> <server-instance template="Server" id="server-always" activation="always"/> <server-instance template="Server" id="server-session" activation="session"/> - <server-instance template="Server" id="server-activation-timeout" activation-delay="5"/> - <server-instance template="Server" id="server-deactivation-timeout" deactivation-delay="60"/> + <server-instance template="Server" id="server-activation-timeout" activation-delay="5" activation-timeout="4"/> + <server-instance template="Server" id="server-deactivation-timeout" deactivation-delay="60" + deactivation-timeout="3"/> <server-instance template="Server" id="fail-on-startup" fail-on-startup="1"/> <server id="invalid-exe" exe="server2" activation="on-demand"> |