[Openvas-commits] r9555 - in trunk/openvas-manager: . doc src/schema_formats/XML
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Mon Nov 29 17:45:44 CET 2010
Author: mattm
Date: 2010-11-29 17:45:43 +0100 (Mon, 29 Nov 2010)
New Revision: 9555
Modified:
trunk/openvas-manager/ChangeLog
trunk/openvas-manager/doc/omp.html
trunk/openvas-manager/doc/omp.rnc
trunk/openvas-manager/src/schema_formats/XML/OMP.xml
Log:
* src/schema_formats/XML/OMP.xml: Add COMMAND/EXAMPLE to the schema case
of HELP.
* doc/omp.rnc, doc/omp.html: Update from source.
Modified: trunk/openvas-manager/ChangeLog
===================================================================
--- trunk/openvas-manager/ChangeLog 2010-11-29 16:12:33 UTC (rev 9554)
+++ trunk/openvas-manager/ChangeLog 2010-11-29 16:45:43 UTC (rev 9555)
@@ -1,5 +1,12 @@
2010-11-29 Matthew Mundell <matthew.mundell at greenbone.net>
+ * src/schema_formats/XML/OMP.xml: Add COMMAND/EXAMPLE to the schema case
+ of HELP.
+
+ * doc/omp.rnc, doc/omp.html: Update from source.
+
+2010-11-29 Matthew Mundell <matthew.mundell at greenbone.net>
+
* src/schema_formats/XML/OMP.xml: Add COMMAND/RESPONSE to the schema case
of HELP.
Modified: trunk/openvas-manager/doc/omp.html
===================================================================
--- trunk/openvas-manager/doc/omp.html 2010-11-29 16:12:33 UTC (rev 9554)
+++ trunk/openvas-manager/doc/omp.html 2010-11-29 16:45:43 UTC (rev 9555)
@@ -836,6 +836,29 @@
</li>
</ul>
</li>
+<li>
+ <<b>example</b>>
+ *<ul style="list-style: none">
+<li>
+ <<b>summary</b>>
+ ?<ul style="list-style: none"></ul>
+</li>
+<li>
+ <<b>description</b>>
+ ?<ul style="list-style: none"></ul>
+</li>
+<li>
+ <<b>request</b>>
+ <div style="margin-left: 15px; display: inline;">Example request.</div>
+<ul style="list-style: none"></ul>
+</li>
+<li>
+ <<b>response</b>>
+ <div style="margin-left: 15px; display: inline;">Response to example request.</div>
+<ul style="list-style: none"></ul>
+</li>
+</ul>
+</li>
</ul></li></ul>
<h4>5.8.2 RNC</h4>
<div style="border: 1px solid; padding:10px; width: 85%; align: center; margin-left: auto; margin-right: auto; background: #d5d5d5;"><div style="margin-left: 5%"><pre>command_definition
@@ -848,6 +871,7 @@
& command_definition_response )
| ( command_definition_type
& command_definition_ele* ) )
+ & command_definition_example*
}
command_definition_name
@@ -879,6 +903,39 @@
command_definition_response = pattern
+command_definition_example
+ = element example
+ {
+ command_definition_example_summary?
+ & command_definition_example_description?
+ & command_definition_example_request
+ & command_definition_example_response
+ }
+
+command_definition_example_summary
+ = element summary
+ {
+ text
+ }
+
+command_definition_example_description
+ = element description
+ {
+ text
+ }
+
+command_definition_example_request
+ = element request
+ {
+ text
+ }
+
+command_definition_example_response
+ = element response
+ {
+ text
+ }
+
command_definition_type
= element type
{
Modified: trunk/openvas-manager/doc/omp.rnc
===================================================================
--- trunk/openvas-manager/doc/omp.rnc 2010-11-29 16:12:33 UTC (rev 9554)
+++ trunk/openvas-manager/doc/omp.rnc 2010-11-29 16:45:43 UTC (rev 9555)
@@ -293,6 +293,7 @@
& command_definition_response )
| ( command_definition_type
& command_definition_ele* ) )
+ & command_definition_example*
}
# The name of the command.
@@ -328,6 +329,41 @@
command_definition_response = pattern
+command_definition_example
+ = element example
+ {
+ command_definition_example_summary?
+ & command_definition_example_description?
+ & command_definition_example_request
+ & command_definition_example_response
+ }
+
+command_definition_example_summary
+ = element summary
+ {
+ text
+ }
+
+command_definition_example_description
+ = element description
+ {
+ text
+ }
+
+# Example request.
+command_definition_example_request
+ = element request
+ {
+ text
+ }
+
+# Response to example request.
+command_definition_example_response
+ = element response
+ {
+ text
+ }
+
# The type of the element.
command_definition_type
= element type
Modified: trunk/openvas-manager/src/schema_formats/XML/OMP.xml
===================================================================
--- trunk/openvas-manager/src/schema_formats/XML/OMP.xml 2010-11-29 16:12:33 UTC (rev 9554)
+++ trunk/openvas-manager/src/schema_formats/XML/OMP.xml 2010-11-29 16:45:43 UTC (rev 9555)
@@ -249,6 +249,7 @@
<any><e>ele</e></any>
</g>
</or>
+ <any><e>example</e></any>
</pattern>
<ele>
<name>name</name>
@@ -283,6 +284,35 @@
<type>pattern</type>
</ele>
<ele>
+ <name>example</name>
+ <pattern>
+ <o><e>summary</e></o>
+ <o><e>description</e></o>
+ <e>request</e>
+ <e>response</e>
+ </pattern>
+ <ele>
+ <name>summary</name>
+ <pattern>text</pattern>
+ </ele>
+ <ele>
+ <name>description</name>
+ <pattern>text</pattern>
+ </ele>
+ <ele>
+ <name>request</name>
+ <summary>Example request</summary>
+ <description>This can actually contain any XML</description>
+ <pattern>text</pattern>
+ </ele>
+ <ele>
+ <name>response</name>
+ <summary>Response to example request</summary>
+ <description>This can actually contain any XML</description>
+ <pattern>text</pattern>
+ </ele>
+ </ele>
+ <ele>
<name>type</name>
<summary>The type of the element</summary>
<pattern>text</pattern>
More information about the Openvas-commits
mailing list