regexp and ORO have been mothballed

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

manual/Tasks/perforce.html

@@ -44,7 +44,7 @@ However, the addition of new p4 commands is a pretty simple task (see the source
 Although it is possible to use these commands on the desktop, 
 they were primarily intended to be used by automated build systems.</p>
 
-<p><b>Note:</b> These tasks require the <a href="http://jakarta.apache.org/oro" target="_top">oro</a> regular
+<p><b>Note:</b> These tasks require the <a href="http://attic.apache.org/projects/jakarta-oro.html" target="_top">oro</a> regular
 expression package. See <a href="../install.html#librarydependencies">library dependencies</a> for the precise
 version required.
 You will also need the Perforce client executable (p4 or p4.exe but not p4win.exe) in your path.

manual/Types/mapper.html

@@ -374,7 +374,7 @@ of <code>org.apache.tools.ant.util.regexp.RegexpMatcher</code> that
   hides the specifics of the library.  <em>Since Ant 1.8.0</em> Ant
   requires Java 1.4 to run, so the implementation based on
   the <code>java.util.regex</code> package will always be available.
-  You can still use Jakarta ORO or Jakarta Regex instead if your
+  You can still use the now retired Jakarta ORO or Jakarta Regex instead if your
   provide the corresponding jar in your CLASSPATH.</p>
 
 <p>For information about using <a

manual/Types/regexp.html

@@ -59,8 +59,8 @@ Use the regular expression with id myregexp.
 Apache Ant comes with
 wrappers for
 <a href="http://download.oracle.com/javase/6/docs/api/java/util/regex/package-summary.html" target="_top">the java.util.regex package</a>,
-<a href="http://jakarta.apache.org/regexp/" target="_top">jakarta-regexp</a>
-and <a href="http://jakarta.apache.org/oro/" target="_top">jakarta-ORO</a>,
+<a href="http://attic.apache.org/projects/jakarta-regexp.html" target="_top">jakarta-regexp</a>
+and <a href="http://attic.apache.org/projects/jakarta-oro.html" target="_top">jakarta-ORO</a>,
 See <a href="../install.html#librarydependencies">installation dependencies</a>
  concerning the supporting libraries.</p>
 <p>
@@ -91,7 +91,9 @@ both Unix and Windows platforms before you rely on it.
     <li>JDK 1.4 uses '\n', '\r\n', '\u0085', '\u2028', '\u2029' as a default
     but is configured in the wrapper to use only '\n' (UNIX_LINE)</li>
 </ul>
-<em>We <b>strongly</b> recommend that you use Jakarta Oro.</em>
+<em>We used to recommend that you use Jakarta ORO but since its
+  development has been retired Java's built-in regex package is likely
+  the best choice going forward.</em>
 </p>
 <h3>Usage</h3>
 The following tasks and types use the Regexp type :

manual/install.html

@@ -842,14 +842,14 @@ Installing Ant / Optional Tasks</a> section above.</p>
   <tr>
     <td>jakarta-regexp-1.3.jar</td>
     <td>regexp type with mappers (if you do not wish to use java.util.regex)</td>
-    <td><a href="http://jakarta.apache.org/regexp/" target="_top">http://jakarta.apache.org/regexp/</a></td>
+    <td><a href="http://attic.apache.org/projects/jakarta-regexp.html" target="_top">http://attic.apache.org/projects/jakarta-regexp.html</a></td>
   </tr>
   <tr>
     <td>jakarta-oro-2.0.8.jar</td>
     <td>regexp type with mappers (if you do not wish to use java.util.regex) and the Perforce tasks<br>
     To use the FTP task,
 you need jakarta-oro 2.0.8 or later, and <a href="#commons-net">commons-net</a></td>
-    <td><a href="http://jakarta.apache.org/oro/" target="_top">http://jakarta.apache.org/oro/</a></td>
+    <td><a href="http://attic.apache.org/projects/jakarta-oro.html" target="_top">http://attic.apache.org/projects/jakarta-oro.html</a></td>
   </tr>
   <tr>
     <td>junit.jar</td>