diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 5cab51ec4..813f79026 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -150,6 +150,7 @@ Patrick Chanezon
Patrick G. Heck (Gus Heck)
Paul Austin
Paul Christmann
+Paul Galbraith
Paulo Gaspar
Peter B. West
Peter Donald
diff --git a/docs/manual/CoreTypes/mapper.html b/docs/manual/CoreTypes/mapper.html
index 55b0fb7a4..c73bbb25c 100644
--- a/docs/manual/CoreTypes/mapper.html
+++ b/docs/manual/CoreTypes/mapper.html
@@ -362,6 +362,32 @@ jakarta-ORO and finally try jakarta-regexp.
properties.Classes/dir/dir2/A |
+
+<mapper type="regexp" from="^(.*?)(\$$[^/\\\.]*)?\.class$$" to="\1.java"/>
+<regexpmapper from="^(.*?)(\$$[^/\\\.]*)?\.class$$" to="\1.java"/>
+
+
+
+ | Source file name |
+ Target file name |
+
+
+ ClassLoader.class |
+ ClassLoader.java |
+
+
+ java/lang/ClassLoader.class |
+ java/lang/ClassLoader.java |
+
+
+ java\lang\ClassLoader$1.class |
+ java\lang\ClassLoader.java |
+
+
+ java/lang/ClassLoader$foo$1.class |
+ java/lang/ClassLoader.java |
+
+
Sharing the same syntax as the glob mapper,