diff options
| author | Matthew Newhook <matthew@zeroc.com> | 2008-04-25 11:33:35 +0800 |
|---|---|---|
| committer | Matthew Newhook <matthew@zeroc.com> | 2008-04-25 11:33:35 +0800 |
| commit | 871557b39b11a76b981e2877aa2df7f3c6c7fd4c (patch) | |
| tree | d3048ed6b71f6b3865a833e08d40eb8c55277442 /cpp/test | |
| parent | Installation of .pc file with GAC install (diff) | |
| download | ice-871557b39b11a76b981e2877aa2df7f3c6c7fd4c.tar.bz2 ice-871557b39b11a76b981e2877aa2df7f3c6c7fd4c.tar.xz ice-871557b39b11a76b981e2877aa2df7f3c6c7fd4c.zip | |
http://bugzilla.zeroc.com/bugzilla/show_bug.cgi?id=3025 - Bogus IceStorm Makefile
Fixed bug with test/IceGrid/repgrid under Windows.
Squashed commit of the following:
commit ed7af002a5422540544f585c2f4ca7048bcdd226
Author: U-MARCH4\matthew <matthew@march4.(none)>
Date: Thu Apr 24 20:29:42 2008 -0700
undo the template parameters.
commit 35047bd138c362823cab641780edb144ec339355
Author: Matthew Newhook <matthew@zeroc.com>
Date: Fri Apr 25 08:51:52 2008 +0800
Added icebox.exe parameter to the IceStorm templates. added copyright notice to application.xml.
commit 1ed2c5863a7003f31c596ec2d6c644cc36e433c5
Author: U-MARCH4\matthew <matthew@march4.(none)>
Date: Thu Apr 24 17:45:04 2008 -0700
fix bug with repgrid test under windows with debug builds.
commit edbe9b16e84f0874cceb249ee8ce19937caba06b
Author: U-MARCH4\matthew <matthew@march4.(none)>
Date: Thu Apr 24 17:25:04 2008 -0700
Windows Makefile changes.
commit 9cea64d34ac6e2f3c4208fca39291da3c47d5c12
Author: Matthew Newhook <matthew@zeroc.com>
Date: Fri Apr 25 06:25:23 2008 +0800
Added IceStormLib.
Diffstat (limited to 'cpp/test')
| -rw-r--r-- | cpp/test/IceStorm/repgrid/application.xml | 47 |
1 files changed, 44 insertions, 3 deletions
diff --git a/cpp/test/IceStorm/repgrid/application.xml b/cpp/test/IceStorm/repgrid/application.xml index 5c881827aaf..2fc44d6cb7e 100644 --- a/cpp/test/IceStorm/repgrid/application.xml +++ b/cpp/test/IceStorm/repgrid/application.xml @@ -1,7 +1,47 @@ +<!-- + ********************************************************************** + + Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. + + This copy of Ice is licensed to you under the terms described in the + ICE_LICENSE file included in this distribution. + + ********************************************************************** +--> + <icegrid> <application name="Test" import-default-templates="true"> + <!-- + This is the IceStorm-HA template, except we use a variable + substitution for the icebox executable. + --> + <server-template id="IceStorm-HA-withsub"> + + <parameter name="instance-name" default="${application}.IceStorm"/> + <parameter name="node-id"/> + <parameter name="topic-manager-endpoints" default="default"/> + <parameter name="publish-endpoints" default="default"/> + <parameter name="node-endpoints" default="default"/> + <parameter name="flush-timeout" default="1000"/> + <parameter name="publish-replica-group"/> + <parameter name="topic-manager-replica-group"/> + + <icebox id="${instance-name}${node-id}" exe="${icebox.exe}" activation="on-demand"> + <service-instance template="IceStorm-HA" + instance-name="${instance-name}" + node-id="${node-id}" + topic-manager-endpoints="${topic-manager-endpoints}" + publish-endpoints="${publish-endpoints}" + node-endpoints="${node-endpoints}" + flush-timeout="${flush-timeout}" + publish-replica-group="${publish-replica-group}" + topic-manager-replica-group="${topic-manager-replica-group}"/> + </icebox> + + </server-template> + <replica-group id="PublishReplicaGroup"> </replica-group> @@ -10,10 +50,11 @@ </replica-group> <node name="localnode"> - <server-instance template="IceStorm-HA" node-id="1" - publish-replica-group="PublishReplicaGroup" topic-manager-replica-group="TopicManagerReplicaGroup"/> + <server-instance template="IceStorm-HA-withsub" + node-id="1" publish-replica-group="PublishReplicaGroup" + topic-manager-replica-group="TopicManagerReplicaGroup"/> - <icebox id="Test.IceStorm" exe="icebox" activation="on-demand"> + <icebox id="Test.IceStorm" exe="${icebox.exe}" activation="on-demand"> <service-instance template="IceStorm-HA" node-id="2" publish-replica-group="PublishReplicaGroup" |