From: Stefan Berger <stefanb@us.ibm.com>
Date: Tue, 6 Apr 2010 20:40:49 +0000 (-0400)
Subject: Fix for nwfilter: Add filter schema for nwfilter XML, extend domain XML schema
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=479dfbb0841c5cc46154853be7f192901a23fd33;p=people%2Fliuw%2Flibxenctrl-split%2Flibvirt.git

Fix for nwfilter: Add filter schema for nwfilter XML, extend domain XML schema

Fixing the regular expressions for variables where the first letter must be a $.
---

diff --git a/docs/schemas/nwfilter.rng b/docs/schemas/nwfilter.rng
index 54f3c2b99..e553bccc1 100644
--- a/docs/schemas/nwfilter.rng
+++ b/docs/schemas/nwfilter.rng
@@ -569,7 +569,7 @@
     <choice>
       <!-- variable -->
       <data type="string">
-        <param name="pattern">[\\$]{1}[a-zA-Z0-9_]+</param>
+        <param name="pattern">$[a-zA-Z0-9_]+</param>
       </data>
 
       <data type="string">
@@ -582,7 +582,7 @@
     <choice>
       <!-- variable -->
       <data type="string">
-        <param name="pattern">[\\$]{1}[a-zA-Z0-9_]+</param>
+        <param name="pattern">$[a-zA-Z0-9_]+</param>
       </data>
 
       <data type="string">
@@ -595,7 +595,7 @@
     <choice>
       <!-- variable -->
       <data type="string">
-        <param name="pattern">^[\\$]{1}[a-zA-Z0-9_]+$</param>
+        <param name="pattern">$[a-zA-Z0-9_]+</param>
       </data>
 
       <data type="string">
@@ -608,7 +608,7 @@
     <choice>
       <!-- variable -->
       <data type="string">
-        <param name="pattern">^[\\$]{1}[a-zA-Z0-9_]+$</param>
+        <param name="pattern">$[a-zA-Z0-9_]+</param>
       </data>
 
       <data type="int">
@@ -626,7 +626,7 @@
     <choice>
       <!-- variable -->
       <data type="string">
-        <param name="pattern">^[\\$]{1}[a-zA-Z0-9_]+$</param>
+        <param name="pattern">$[a-zA-Z0-9_]+</param>
       </data>
 
       <data type="int">
@@ -644,7 +644,7 @@
     <choice>
       <!-- variable -->
       <data type="string">
-        <param name="pattern">^[\\$]{1}[a-zA-Z0-9_]+$</param>
+        <param name="pattern">$[a-zA-Z0-9_]+</param>
       </data>
 
       <data type="int">
@@ -658,7 +658,7 @@
     <choice>
       <!-- variable -->
       <data type="string">
-        <param name="pattern">^[\\$]{1}[a-zA-Z0-9_]+$</param>
+        <param name="pattern">$[a-zA-Z0-9_]+</param>
       </data>
 
       <data type="int">
@@ -678,7 +678,7 @@
     <choice>
       <!-- variable -->
       <data type="string">
-        <param name="pattern">^[\\$]{1}[a-zA-Z0-9_]+$</param>
+        <param name="pattern">$[a-zA-Z0-9_]+</param>
       </data>
 
       <data type="int">
@@ -692,7 +692,7 @@
     <choice>
       <!-- variable -->
       <data type="string">
-        <param name="pattern">^[\\$]{1}[a-zA-Z0-9_]+$</param>
+        <param name="pattern">$[a-zA-Z0-9_]+</param>
       </data>
 
       <data type="int">
@@ -706,7 +706,7 @@
     <choice>
       <!-- variable -->
       <data type="string">
-        <param name="pattern">^[\\$]{1}[a-zA-Z0-9_]+$</param>
+        <param name="pattern">$[a-zA-Z0-9_]+</param>
       </data>
 
       <data type="int">
@@ -725,7 +725,7 @@
     <choice>
       <!-- variable -->
       <data type="string">
-        <param name="pattern">^[\\$]{1}[a-zA-Z0-9_]+$</param>
+        <param name="pattern">$[a-zA-Z0-9_]+</param>
       </data>
 
       <data type="int">