Gitweb:
http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=...
Commit: 3ffd2b8fb224149e9b3cd4d33545fef98d6cd380
Parent: b4a125a969b145e5b08dc478ac4ff3c0e4b11dee
Author: Lon Hohberger <lhh(a)redhat.com>
AuthorDate: Tue Jun 15 15:44:23 2010 -0400
Committer: Lon Hohberger <lhh(a)redhat.com>
CommitterDate: Mon Jun 21 13:49:16 2010 -0400
config: Clean up recursion and documentation
Resolves: rhbz#604298
Signed-off-by: Lon Hohberger <lhh(a)redhat.com>
---
config/tools/xml/cluster.rng.in | 13 ++-----------
rgmanager/src/resources/resources.rng.mid | 3 +--
rgmanager/src/resources/resources.rng.tail | 8 --------
3 files changed, 3 insertions(+), 21 deletions(-)
diff --git a/config/tools/xml/cluster.rng.in b/config/tools/xml/cluster.rng.in
index 647b2c8..2b6c976 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.">
+ <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.">
<zeroOrMore>
<ref name="CHILDREN"/>
</zeroOrMore>
@@ -1968,8 +1968,7 @@ To validate your cluster.conf against this schema, run:
</element>
</define>
- <define name="CHILD">
- <!-- for recursion to work properly, CHILD may be referenced at CHILDREN only
-->
+ <define name="CHILDREN">
<zeroOrMore>
<choice>
@@ -1999,14 +1998,6 @@ 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 fb35cbd..cc2dff3 100644
--- a/rgmanager/src/resources/resources.rng.mid
+++ b/rgmanager/src/resources/resources.rng.mid
@@ -1,4 +1,3 @@
- <define name="CHILD">
- <!-- for recursion to work properly, CHILD may be referenced at CHILDREN only
-->
+ <define name="CHILDREN">
<zeroOrMore>
<choice>
diff --git a/rgmanager/src/resources/resources.rng.tail
b/rgmanager/src/resources/resources.rng.tail
index 765c2d9..5cbcc9d 100644
--- a/rgmanager/src/resources/resources.rng.tail
+++ b/rgmanager/src/resources/resources.rng.tail
@@ -4,14 +4,6 @@
</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.">