diff options
| -rw-r--r-- | cpp/test/IceStorm/repgrid/application.xml | 45 |
1 files changed, 1 insertions, 44 deletions
diff --git a/cpp/test/IceStorm/repgrid/application.xml b/cpp/test/IceStorm/repgrid/application.xml index f204a20d82c..0b2eca543ff 100644 --- a/cpp/test/IceStorm/repgrid/application.xml +++ b/cpp/test/IceStorm/repgrid/application.xml @@ -14,49 +14,6 @@ <application name="Test" import-default-templates="true"> <!-- - This is the IceStorm-HA template, except we include - configuration for running with SQLite. - --> - <service-template id="IceStorm-HA-withsql"> - - <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"/> - - <service name="${instance-name}${node-id}" entry="IceStormService,37:createIceStorm"> - - <dbenv name="${service}"/> - - <adapter name="${service}.TopicManager" - id="${instance-name}${node-id}.TopicManager" - endpoints="${topic-manager-endpoints}" - replica-group="${topic-manager-replica-group}"/> - - <adapter name="${service}.Publish" - id="${instance-name}${node-id}.Publish" - endpoints="${publish-endpoints}" - replica-group="${publish-replica-group}"/> - - <adapter name="${service}.Node" - id="${instance-name}${node-id}.Node" - endpoints="${node-endpoints}"/> - - <properties> - <property name="${service}.LMDB.Path" value="${service.data}"/> - <property name="${service}.InstanceName" value="${instance-name}"/> - <property name="${service}.NodeId" value="${node-id}"/> - <property name="${service}.Flush.Timeout" value="${flush-timeout}"/> - </properties> - </service> - - </service-template> - - <!-- This is the IceStorm-HA template, except we use a variable substitution for the icebox executable. --> @@ -72,7 +29,7 @@ <parameter name="topic-manager-replica-group"/> <icebox id="${instance-name}${node-id}" exe="${icebox.exe}" activation="on-demand"> - <service-instance template="IceStorm-HA-withsql" + <service-instance template="IceStorm-HA" instance-name="${instance-name}" node-id="${node-id}" topic-manager-endpoints="${topic-manager-endpoints}" |