[Openvas-commits] r11665 - in trunk/openvas-administrator: . doc src/schema_formats/XML

[scm-commit@wald.intevation.org]

Author: mattm
Date: 2011-09-22 17:19:11 +0200 (Thu, 22 Sep 2011)
New Revision: 11665

Modified:
   trunk/openvas-administrator/ChangeLog
   trunk/openvas-administrator/doc/CMakeLists.txt
   trunk/openvas-administrator/doc/oap.html
   trunk/openvas-administrator/doc/oap.rnc
   trunk/openvas-administrator/src/schema_formats/XML/OAP.xml
Log:
	* doc/CMakeLists.txt: Move xsltproc call into Makefile, to workaround dash.

	* src/schema_formats/XML/OAP.xml (create_user, get_users, modify_user): Add
	Observer to roles.

	* doc/oap.html, doc/oap.rnc: Update from source.

Modified: trunk/openvas-administrator/ChangeLog
===================================================================
--- trunk/openvas-administrator/ChangeLog	2011-09-22 15:03:35 UTC (rev 11664)
+++ trunk/openvas-administrator/ChangeLog	2011-09-22 15:19:11 UTC (rev 11665)
@@ -1,5 +1,14 @@
 2011-09-22  Matthew Mundell <matthew.mundell at greenbone.net>
 
+	* doc/CMakeLists.txt: Move xsltproc call into Makefile, to workaround dash.
+
+	* src/schema_formats/XML/OAP.xml (create_user, get_users, modify_user): Add
+	Observer to roles.
+
+	* doc/oap.html, doc/oap.rnc: Update from source.
+
+2011-09-22  Matthew Mundell <matthew.mundell at greenbone.net>
+
 	* src/oap.c (oap_xml_handle_end_element): Add observer role to GET_USERS.
 
 	* src/openvasad.c (main): Add observer to roles in help.

Modified: trunk/openvas-administrator/doc/CMakeLists.txt
===================================================================
--- trunk/openvas-administrator/doc/CMakeLists.txt	2011-09-22 15:03:35 UTC (rev 11664)
+++ trunk/openvas-administrator/doc/CMakeLists.txt	2011-09-22 15:19:11 UTC (rev 11665)
@@ -82,7 +82,7 @@
 
 add_custom_command (OUTPUT oap.rnc
                     COMMAND sh
-					ARGS -c \"cd ../src/schema_formats/RNC && . ./generate ../XML/OAP.xml > ../../../doc/oap.rnc\;\"
+					ARGS -c \"cd ../src/schema_formats/RNC && xsltproc ./RNC.xsl ../XML/OAP.xml > ../../../doc/oap.rnc\;\"
 					DEPENDS
 					../src/schema_formats/XML/OAP.xml
 					../src/schema_formats/RNC/generate
@@ -91,7 +91,7 @@
 
 add_custom_command (OUTPUT oap.html
                     COMMAND sh
-					ARGS -c \"cd ../src/schema_formats/HTML && . ./generate ../XML/OAP.xml > ../../../doc/oap.html\;\"
+					ARGS -c \"cd ../src/schema_formats/HTML && xsltproc ./HTML.xsl ../XML/OAP.xml > ../../../doc/oap.html\;\"
 					DEPENDS
 					../src/schema_formats/XML/OAP.xml
 					../src/schema_formats/HTML/generate

Modified: trunk/openvas-administrator/doc/oap.html
===================================================================
--- trunk/openvas-administrator/doc/oap.html	2011-09-22 15:03:35 UTC (rev 11664)
+++ trunk/openvas-administrator/doc/oap.html	2011-09-22 15:19:11 UTC (rev 11665)
@@ -1259,7 +1259,7 @@
 create_user_role
  = element role
      {
-       xsd:token { pattern = "Administrator|User" }
+       xsd:token { pattern = "Administrator|User|Observer" }
      }
 </pre></div>
 <i>Response</i><div style="margin-left: 5%"><pre>create_user_response
@@ -1732,7 +1732,7 @@
 get_users_response_user_role
  = element role
      {
-       xsd:token { pattern = "Admin|User" }
+       xsd:token { pattern = "Admin|User|Observer" }
      }
 
 get_users_response_user_hosts
@@ -2308,7 +2308,7 @@
 modify_user_role
  = element role
      {
-       xsd:token { pattern = "Administrator|User" }
+       xsd:token { pattern = "Administrator|User|Observer" }
      }
 </pre></div>
 <i>Response</i><div style="margin-left: 5%"><pre>modify_user_response

Modified: trunk/openvas-administrator/doc/oap.rnc
===================================================================
--- trunk/openvas-administrator/doc/oap.rnc	2011-09-22 15:03:35 UTC (rev 11664)
+++ trunk/openvas-administrator/doc/oap.rnc	2011-09-22 15:19:11 UTC (rev 11665)
@@ -423,7 +423,7 @@
 create_user_role
  = element role
      {
-       xsd:token { pattern = "Administrator|User" }
+       xsd:token { pattern = "Administrator|User|Observer" }
      }
 
 ## Command delete_user
@@ -567,7 +567,7 @@
 modify_user_role
  = element role
      {
-       xsd:token { pattern = "Administrator|User" }
+       xsd:token { pattern = "Administrator|User|Observer" }
      }
 
 ## Command sync_feed
@@ -749,7 +749,7 @@
 get_users_response_user_role
  = element role
      {
-       xsd:token { pattern = "Admin|User" }
+       xsd:token { pattern = "Admin|User|Observer" }
      }
 
 # Host access rule for the user.

Modified: trunk/openvas-administrator/src/schema_formats/XML/OAP.xml
===================================================================
--- trunk/openvas-administrator/src/schema_formats/XML/OAP.xml	2011-09-22 15:03:35 UTC (rev 11664)
+++ trunk/openvas-administrator/src/schema_formats/XML/OAP.xml	2011-09-22 15:19:11 UTC (rev 11665)
@@ -513,6 +513,7 @@
           <alts>
             <alt>Administrator</alt>
             <alt>User</alt>
+            <alt>Observer</alt>
           </alts>
         </t>
       </pattern>
@@ -850,6 +851,7 @@
               <alts>
                 <alt>Admin</alt>
                 <alt>User</alt>
+                <alt>Observer</alt>
               </alts>
             </t>
           </pattern>
@@ -1270,6 +1272,7 @@
           <alts>
             <alt>Administrator</alt>
             <alt>User</alt>
+            <alt>Observer</alt>
           </alts>
         </t>
       </pattern>