Update examples for RemoveAddrValve, RemoteHostValve in the docs

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1059390 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/webapps/docs/config/context.xml b/webapps/docs/config/context.xml
index ab3bf17..5f25a77 100644 (file)
--- a/webapps/docs/config/context.xml
+++ b/webapps/docs/config/context.xml
@@ -837,10 +837,9 @@
     incoming request directed to the surrounding
     <a href="engine.html">Engine</a>, <a href="host.html">Host</a>, or
     <a href="context.html">Context</a> element.  The remote address or name
-    will be checked against a configured list of "accept" and/or "deny"
-    filters, which are defined using the Regular Expression syntax supported
-    by the <a href="http://jakarta.apache.org/regexp/">Jakarta Regexp</a>
-    regular expression library.  Requests that come from locations that are
+    will be checked against configured "accept" and/or "deny"
+    filters, which are defined using <code>java.util.regex</code> Regular
+    Expression syntax.  Requests that come from locations that are
     not accepted will be rejected with an HTTP "Forbidden" error.
     Example filter declarations:</p>
 
@@ -848,9 +847,9 @@
 &lt;Context path="/examples" ...&gt;
   ...
   &lt;Valve className="org.apache.catalina.valves.RemoteHostValve"
-         allow="*.mycompany.com,www.yourcompany.com"/&gt;
+         allow=".*\.mycompany\.com|www\.yourcompany\.com"/&gt;
   &lt;Valve className="org.apache.catalina.valves.RemoteAddrValve"
-         deny="192.168.1.*"/&gt;
+         deny="192\.168\.1\.\d+"/&gt;
   ...
 &lt;/Context&gt;
 </source>

diff --git a/webapps/docs/config/engine.xml b/webapps/docs/config/engine.xml
index 687006c..07ddec4 100644 (file)
--- a/webapps/docs/config/engine.xml
+++ b/webapps/docs/config/engine.xml
@@ -224,10 +224,9 @@
     incoming request directed to the surrounding
     <a href="engine.html">Engine</a>, <a href="host.html">Host</a>, or
     <a href="context.html">Context</a> element.  The remote address or name
-    will be checked against a configured list of "accept" and/or "deny"
-    filters, which are defined using the Regular Expression syntax supported
-    by the <a href="http://jakarta.apache.org/regexp/">Jakarta Regexp</a>
-    regular expression library.  Requests that come from locations that are
+    will be checked against configured "accept" and/or "deny"
+    filters, which are defined using <code>java.util.regex</code> Regular
+    Expression syntax.  Requests that come from locations that are
     not accepted will be rejected with an HTTP "Forbidden" error.
     Example filter declarations:</p>
 
@@ -235,9 +234,9 @@
 &lt;Engine name="Standalone" ...&gt;
   ...
   &lt;Valve className="org.apache.catalina.valves.RemoteHostValve"
-         allow="*.mycompany.com,www.yourcompany.com"/&gt;
+         allow=".*\.mycompany\.com|www\.yourcompany\.com"/&gt;
   &lt;Valve className="org.apache.catalina.valves.RemoteAddrValve"
-         deny="192.168.1.*"/&gt;
+         deny="192\.168\.1\.\d+"/&gt;
   ...
 &lt;/Engine&gt;
 </source>

diff --git a/webapps/docs/config/filter.xml b/webapps/docs/config/filter.xml
index a0373bb..e54c005 100644 (file)
--- a/webapps/docs/config/filter.xml
+++ b/webapps/docs/config/filter.xml
@@ -549,7 +549,7 @@ FINE: Request "/docs/config/manager.html" with response status "200" content-typ
     <attributes>
 
       <attribute name="allow" required="false">
-        <p>A regular expression (using <code>java.util.Regex</code>) that the
+        <p>A regular expression (using <code>java.util.regex</code>) that the
         remote client&apos;s IP address is compared to.  If this attribute
         is specified, the remote address MUST match for this request to be
         accepted.  If this attribute is not specified, all requests will be
@@ -558,7 +558,7 @@ FINE: Request "/docs/config/manager.html" with response status "200" content-typ
       </attribute>
 
       <attribute name="deny" required="false">
-        <p>A regular expression (using <code>java.util.Regex</code>) that the
+        <p>A regular expression (using <code>java.util.regex</code>) that the
         remote client's IP address is compared to.  If this attribute
         is specified, the remote address MUST NOT match for this request to be
         accepted.  If this attribute is not specified, request acceptance is
@@ -604,7 +604,7 @@ FINE: Request "/docs/config/manager.html" with response status "200" content-typ
     <attributes>
 
       <attribute name="allow" required="false">
-        <p>A regular expression (using <code>java.util.Regex</code>) that the
+        <p>A regular expression (using <code>java.util.regex</code>) that the
         remote client&apos;s hostname is compared to.  If this attribute
         is specified, the remote hostname MUST match for this request to be
         accepted.  If this attribute is not specified, all requests will be
@@ -613,7 +613,7 @@ FINE: Request "/docs/config/manager.html" with response status "200" content-typ
       </attribute>
 
       <attribute name="deny" required="false">
-        <p>A regular expression (using <code>java.util.Regex</code>) that the
+        <p>A regular expression (using <code>java.util.regex</code>) that the
         remote client's hostname is compared to.  If this attribute
         is specified, the remote hostname MUST NOT match for this request to be
         accepted.  If this attribute is not specified, request acceptance is

diff --git a/webapps/docs/config/host.xml b/webapps/docs/config/host.xml
index 36069fb..fc54c73 100644 (file)
--- a/webapps/docs/config/host.xml
+++ b/webapps/docs/config/host.xml
@@ -519,10 +519,9 @@
     incoming request directed to the surrounding
     <a href="engine.html">Engine</a>, <a href="host.html">Host</a>, or
     <a href="context.html">Context</a> element.  The remote address or name
-    will be checked against a configured list of "accept" and/or "deny"
-    filters, which are defined using the Regular Expression syntax supported
-    by the <a href="http://jakarta.apache.org/regexp/">Jakarta Regexp</a>
-    regular expression library.  Requests that come from locations that are
+    will be checked against configured "accept" and/or "deny"
+    filters, which are defined using <code>java.util.regex</code> Regular
+    Expression syntax.  Requests that come from locations that are
     not accepted will be rejected with an HTTP "Forbidden" error.
     Example filter declarations:</p>
 
@@ -530,9 +529,9 @@
 &lt;Host name="localhost" ...&gt;
   ...
   &lt;Valve className="org.apache.catalina.valves.RemoteHostValve"
-         allow="*.mycompany.com,www.yourcompany.com"/&gt;
+         allow=".*\.mycompany\.com|www\.yourcompany\.com"/&gt;
   &lt;Valve className="org.apache.catalina.valves.RemoteAddrValve"
-         deny="192.168.1.*"/&gt;
+         deny="192\.168\.1\.\d+"/&gt;
   ...
 &lt;/Host&gt;
 </source>

diff --git a/webapps/docs/config/valve.xml b/webapps/docs/config/valve.xml
index a1e43c7..52319a7 100644 (file)
--- a/webapps/docs/config/valve.xml
+++ b/webapps/docs/config/valve.xml
@@ -258,7 +258,7 @@
       </attribute>
 
       <attribute name="allow" required="false">
-        <p>A regular expression (using <code>java.util.Regex</code>) that the
+        <p>A regular expression (using <code>java.util.regex</code>) that the
         remote client&apos;s IP address is compared to.  If this attribute
         is specified, the remote address MUST match for this request to be
         accepted.  If this attribute is not specified, all requests will be
@@ -267,7 +267,7 @@
       </attribute>
 
       <attribute name="deny" required="false">
-        <p>A regular expression (using <code>java.util.Regex</code>) that the
+        <p>A regular expression (using <code>java.util.regex</code>) that the
         remote client's IP address is compared to.  If this attribute
         is specified, the remote address MUST NOT match for this request to be
         accepted.  If this attribute is not specified, request acceptance is
@@ -314,7 +314,7 @@
       </attribute>
 
       <attribute name="allow" required="false">
-        <p>A regular expression (using <code>java.util.Regex</code>) that the
+        <p>A regular expression (using <code>java.util.regex</code>) that the
         remote client&apos;s hostname is compared to.  If this attribute
         is specified, the remote hostname MUST match for this request to be
         accepted.  If this attribute is not specified, all requests will be
@@ -323,7 +323,7 @@
       </attribute>
 
       <attribute name="deny" required="false">
-        <p>A regular expression (using <code>java.util.Regex</code>) that the
+        <p>A regular expression (using <code>java.util.regex</code>) that the
         remote client's hostname is compared to.  If this attribute
         is specified, the remote hostname MUST NOT match for this request to be
         accepted.  If this attribute is not specified, request acceptance is