Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=376... Commit: 3763fad337da072c63a155ab74caa1753ef76bb9 Parent: 9b4e3699ef9eb69e721bfc7eee1468db08c7fbfc Author: Lon Hohberger lhh@redhat.com AuthorDate: Mon Jun 21 14:06:07 2010 -0400 Committer: Lon Hohberger lhh@redhat.com CommitterDate: Mon Jun 21 14:18:21 2010 -0400
Revert "config: Clean up recursion and documentation"
This reverts commit 9a10f46f2101e31232d13c178d4703c2fc6b69ed. --- config/tools/xml/cluster.rng.in | 13 +++++++++++-- rgmanager/src/resources/resources.rng.mid | 3 ++- rgmanager/src/resources/resources.rng.tail | 8 ++++++++ 3 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/config/tools/xml/cluster.rng.in b/config/tools/xml/cluster.rng.in index cc29617..8438d4c 100644 --- a/config/tools/xml/cluster.rng.in +++ b/config/tools/xml/cluster.rng.in @@ -892,7 +892,7 @@ To validate your cluster.conf against this schema, run: </element> </optional> <!-- End of events block --> <optional> - <element name="resources" rha:description="Defines global resources which may be referenced in services. You may redefine actions for resources here, but child resource definitions are ignored in this section."> + <element name="resources" rha:description="Defines global resources."> <zeroOrMore> <ref name="CHILDREN"/> </zeroOrMore> @@ -1968,7 +1968,8 @@ To validate your cluster.conf against this schema, run: </element> </define>
- <define name="CHILDREN"> + <define name="CHILD"> + <!-- for recursion to work properly, CHILD may be referenced at CHILDREN only --> <zeroOrMore> <choice>
@@ -1998,6 +1999,14 @@ To validate your cluster.conf against this schema, run: </zeroOrMore> </define>
+ <define name="CHILDREN"> + <zeroOrMore> + <choice> + <ref name="CHILD"/> + </choice> + </zeroOrMore> + </define> + <define name="RESOURCEACTION"> <zeroOrMore> <element name="action" rha:description="Overrides resource action timings for a resource instance."> diff --git a/rgmanager/src/resources/resources.rng.mid b/rgmanager/src/resources/resources.rng.mid index cc2dff3..fb35cbd 100644 --- a/rgmanager/src/resources/resources.rng.mid +++ b/rgmanager/src/resources/resources.rng.mid @@ -1,3 +1,4 @@ - <define name="CHILDREN"> + <define name="CHILD"> + <!-- for recursion to work properly, CHILD may be referenced at CHILDREN only --> <zeroOrMore> <choice> diff --git a/rgmanager/src/resources/resources.rng.tail b/rgmanager/src/resources/resources.rng.tail index 5cbcc9d..765c2d9 100644 --- a/rgmanager/src/resources/resources.rng.tail +++ b/rgmanager/src/resources/resources.rng.tail @@ -4,6 +4,14 @@ </zeroOrMore> </define>
+ <define name="CHILDREN"> + <zeroOrMore> + <choice> + <ref name="CHILD"/> + </choice> + </zeroOrMore> + </define> + <define name="RESOURCEACTION"> <zeroOrMore> <element name="action" rha:description="Overrides resource action timings for a resource instance.">
cluster-commits@lists.fedorahosted.org