You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juneau.apache.org by ja...@apache.org on 2020/12/27 23:01:12 UTC

[juneau] branch master updated: Improved REST static files support.

This is an automated email from the ASF dual-hosted git repository.

jamesbognar pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/juneau.git


The following commit(s) were added to refs/heads/master by this push:
     new f24ab0d  Improved REST static files support.
f24ab0d is described below

commit f24ab0d5c5c235b1347eb84ee95a37697d862da4
Author: JamesBognar <ja...@salesforce.com>
AuthorDate: Sun Dec 27 18:00:32 2020 -0500

    Improved REST static files support.
---
 .../files/{test2.txt => test1/.c}                  |   2 +-
 .../files/{test2.txt => test1/.c_ja}               |   2 +-
 .../files/{test2.txt => test1/.c_ja_JP}            |   2 +-
 .../files/{test2.txt => test1/.d.txt}              |   2 +-
 .../files/{test2.txt => test1/.d_ja.txt}           |   2 +-
 .../files/{test2.txt => test1/.d_ja_JP.txt}        |   2 +-
 .../files/{test2.txt => test1/_a.txt}              |   2 +-
 .../files/{test2.txt => test1/_a_ja.txt}           |   2 +-
 .../files/{test2.txt => test1/_a_ja_JP.txt}        |   2 +-
 .../files/{test2.txt => test1/_b}                  |   2 +-
 .../files/{test2.txt => test1/_b_ja}               |   2 +-
 .../files/{test2.txt => test1/_b_ja_JP}            |   2 +-
 .../files/{test2.txt => test1/dir/.c}              |   2 +-
 .../files/{test2.txt => test1/dir/.c_ja}           |   2 +-
 .../files/{test2.txt => test1/dir/.c_ja_JP}        |   2 +-
 .../files/{test2.txt => test1/dir/.d.txt}          |   2 +-
 .../files/{test2.txt => test1/dir/.d_ja.txt}       |   2 +-
 .../files/{test2.txt => test1/dir/.d_ja_JP.txt}    |   2 +-
 .../files/{test2.txt => test1/dir/_a.txt}          |   2 +-
 .../files/{test2.txt => test1/dir/_a_ja.txt}       |   2 +-
 .../files/{test2.txt => test1/dir/_a_ja_JP.txt}    |   2 +-
 .../files/{test2.txt => test1/dir/_b}              |   2 +-
 .../files/{test2.txt => test1/dir/_b_ja}           |   2 +-
 .../files/{test2.txt => test1/dir/_b_ja_JP}        |   2 +-
 .../files/{test2.txt => test1/dir/dir/.c}          |   2 +-
 .../files/{test2.txt => test1/dir/dir/.c_ja}       |   2 +-
 .../files/{test2.txt => test1/dir/dir/.c_ja_JP}    |   2 +-
 .../files/{test2.txt => test1/dir/dir/.d.txt}      |   2 +-
 .../files/{test2.txt => test1/dir/dir/.d_ja.txt}   |   2 +-
 .../{test2.txt => test1/dir/dir/.d_ja_JP.txt}      |   2 +-
 .../files/{test2.txt => test1/dir/dir/_a.txt}      |   2 +-
 .../files/{test2.txt => test1/dir/dir/_a_ja.txt}   |   2 +-
 .../{test2.txt => test1/dir/dir/_a_ja_JP.txt}      |   2 +-
 .../files/{test2.txt => test1/dir/dir/_b}          |   2 +-
 .../files/{test2.txt => test1/dir/dir/_b_ja}       |   2 +-
 .../files/{test2.txt => test1/dir/dir/_b_ja_JP}    |   2 +-
 .../files/{test2.txt => test1/dir/dir/e.txt}       |   2 +-
 .../files/{test2.txt => test1/dir/dir/e_ja.txt}    |   2 +-
 .../files/{test2.txt => test1/dir/dir/e_ja_JP.txt} |   2 +-
 .../files/{test2.txt => test1/dir/dir/f}           |   2 +-
 .../files/{test2.txt => test1/dir/dir/f_ja}        |   2 +-
 .../files/{test2.txt => test1/dir/dir/f_ja_JP}     |   2 +-
 .../files/{test2.txt => test1/dir/dir/g_foo.txt}   |   2 +-
 .../{test2.txt => test1/dir/dir/g_foo_ja.txt}      |   2 +-
 .../{test2.txt => test1/dir/dir/g_foo_ja_JP.txt}   |   2 +-
 .../files/{test2.txt => test1/dir/dir/h.foo.txt}   |   2 +-
 .../{test2.txt => test1/dir/dir/h.foo_ja.txt}      |   2 +-
 .../{test2.txt => test1/dir/dir/h.foo_ja_JP.txt}   |   2 +-
 .../files/{test2.txt => test1/dir/dir/i_foo}       |   2 +-
 .../files/{test2.txt => test1/dir/dir/i_foo_ja}    |   2 +-
 .../files/{test2.txt => test1/dir/dir/i_foo_ja_JP} |   2 +-
 .../files/{test2.txt => test1/dir/e.txt}           |   2 +-
 .../files/{test2.txt => test1/dir/e_ja.txt}        |   2 +-
 .../files/{test2.txt => test1/dir/e_ja_JP.txt}     |   2 +-
 .../files/{test2.txt => test1/dir/f}               |   2 +-
 .../files/{test2.txt => test1/dir/f_ja}            |   2 +-
 .../files/{test2.txt => test1/dir/f_ja_JP}         |   2 +-
 .../files/{test2.txt => test1/dir/g_foo.txt}       |   2 +-
 .../files/{test2.txt => test1/dir/g_foo_ja.txt}    |   2 +-
 .../files/{test2.txt => test1/dir/g_foo_ja_JP.txt} |   2 +-
 .../files/{test2.txt => test1/dir/h.foo.txt}       |   2 +-
 .../files/{test2.txt => test1/dir/h.foo_ja.txt}    |   2 +-
 .../files/{test2.txt => test1/dir/h.foo_ja_JP.txt} |   2 +-
 .../files/{test2.txt => test1/dir/i_foo}           |   2 +-
 .../files/{test2.txt => test1/dir/i_foo_ja}        |   2 +-
 .../files/{test2.txt => test1/dir/i_foo_ja_JP}     |   2 +-
 .../files/{test2.txt => test1/e.txt}               |   2 +-
 .../files/{test2.txt => test1/e_ja.txt}            |   2 +-
 .../files/{test2.txt => test1/e_ja_JP.txt}         |   2 +-
 .../juneau-core-utest/files/{test2.txt => test1/f} |   2 +-
 .../files/{test2.txt => test1/f_ja}                |   2 +-
 .../files/{test2.txt => test1/f_ja_JP}             |   2 +-
 .../files/{test2.txt => test1/g_foo.txt}           |   2 +-
 .../files/{test2.txt => test1/g_foo_ja.txt}        |   2 +-
 .../files/{test2.txt => test1/g_foo_ja_JP.txt}     |   2 +-
 .../files/{test2.txt => test1/h.foo.txt}           |   2 +-
 .../files/{test2.txt => test1/h.foo_ja.txt}        |   2 +-
 .../files/{test2.txt => test1/h.foo_ja_JP.txt}     |   2 +-
 .../files/{test2.txt => test1/i_foo}               |   2 +-
 .../files/{test2.txt => test1/i_foo_ja}            |   2 +-
 .../files/{test2.txt => test1/i_foo_ja_JP}         |   2 +-
 .../files/{test2.txt => test2/a.txt}               |   2 +-
 .../files/{test2.txt => test2/dir/a.txt}           |   2 +-
 .../files/{test2.txt => test2/dir/dir/a.txt}       |   2 +-
 .../files/{test2.txt => test2/ja/JP/a.txt}         |   2 +-
 .../files/{test2.txt => test2/ja/JP/dir/a.txt}     |   2 +-
 .../files/{test2.txt => test2/ja/JP/dir/dir/a.txt} |   2 +-
 .../files/{test2.txt => test2/ja/a.txt}            |   2 +-
 .../files/{test2.txt => test2/ja/dir/a.txt}        |   2 +-
 .../files/{test2.txt => test2/ja/dir/dir/a.txt}    |   2 +-
 .../apache/juneau/cp/BasicResourceFinder_Test.java |   4 +-
 .../java/org/apache/juneau/cp/FileFinder_Test.java | 675 +++++++++++++++++++++
 .../java/org/apache/juneau/cp/Messages_Test.java   |   4 +-
 .../juneau/cp/RecursiveResourceFinder_Test.java    |   4 +-
 .../java/org/apache/juneau/cp/Resources_Test.java  |   2 +-
 .../juneau/cp/SimpleResourceFinder_Test.java       |   4 +-
 .../FileFinder_Test2.java}                         |   6 +-
 .../cp/{test1 => test3}/MessageBundleTest1.java    |   2 +-
 .../apache/juneau/cp/{test1 => test3}/Test1.java   |   2 +-
 .../apache/juneau/cp/{test2 => test4}/Test2.java   |   4 +-
 .../java/org/apache/juneau/utils/IOUtilsTest.java  |   1 -
 .../Test2_ja.properties => files/Test3.properties} |   2 +-
 .../Test3_ja.properties}                           |   2 +-
 .../Test3_ja_JP.properties}                        |   2 +-
 .../test/resources/files/test1/.c}                 |   2 +-
 .../test/resources/files/test1/.c_ja}              |   2 +-
 .../test/resources/files/test1/.c_ja_JP}           |   2 +-
 .../test/resources/files/test1/.d.txt}             |   2 +-
 .../test/resources/files/test1/.d_ja.txt}          |   2 +-
 .../test/resources/files/test1/.d_ja_JP.txt}       |   2 +-
 .../test/resources/files/test1/_a.txt}             |   2 +-
 .../test/resources/files/test1/_a_ja.txt}          |   2 +-
 .../test/resources/files/test1/_a_ja_JP.txt}       |   2 +-
 .../test/resources/files/test1/_b}                 |   2 +-
 .../test/resources/files/test1/_b_ja}              |   2 +-
 .../test/resources/files/test1/_b_ja_JP}           |   2 +-
 .../test/resources/files/test1/dir/.c}             |   2 +-
 .../test/resources/files/test1/dir/.c_ja}          |   2 +-
 .../test/resources/files/test1/dir/.c_ja_JP}       |   2 +-
 .../test/resources/files/test1/dir/.d.txt}         |   2 +-
 .../test/resources/files/test1/dir/.d_ja.txt}      |   2 +-
 .../test/resources/files/test1/dir/.d_ja_JP.txt}   |   2 +-
 .../test/resources/files/test1/dir/_a.txt}         |   2 +-
 .../test/resources/files/test1/dir/_a_ja.txt}      |   2 +-
 .../test/resources/files/test1/dir/_a_ja_JP.txt}   |   2 +-
 .../test/resources/files/test1/dir/_b}             |   2 +-
 .../test/resources/files/test1/dir/_b_ja}          |   2 +-
 .../test/resources/files/test1/dir/_b_ja_JP}       |   2 +-
 .../test/resources/files/test1/dir/dir/.c}         |   2 +-
 .../test/resources/files/test1/dir/dir/.c_ja}      |   2 +-
 .../test/resources/files/test1/dir/dir/.c_ja_JP}   |   2 +-
 .../test/resources/files/test1/dir/dir/.d.txt}     |   2 +-
 .../test/resources/files/test1/dir/dir/.d_ja.txt}  |   2 +-
 .../resources/files/test1/dir/dir/.d_ja_JP.txt}    |   2 +-
 .../test/resources/files/test1/dir/dir/_a.txt}     |   2 +-
 .../test/resources/files/test1/dir/dir/_a_ja.txt}  |   2 +-
 .../resources/files/test1/dir/dir/_a_ja_JP.txt}    |   2 +-
 .../test/resources/files/test1/dir/dir/_b}         |   2 +-
 .../test/resources/files/test1/dir/dir/_b_ja}      |   2 +-
 .../test/resources/files/test1/dir/dir/_b_ja_JP}   |   2 +-
 .../test/resources/files/test1/dir/dir/e.txt}      |   2 +-
 .../test/resources/files/test1/dir/dir/e_ja.txt}   |   2 +-
 .../resources/files/test1/dir/dir/e_ja_JP.txt}     |   2 +-
 .../test/resources/files/test1/dir/dir/f}          |   2 +-
 .../test/resources/files/test1/dir/dir/f_ja}       |   2 +-
 .../test/resources/files/test1/dir/dir/f_ja_JP}    |   2 +-
 .../test/resources/files/test1/dir/dir/g_foo.txt}  |   2 +-
 .../resources/files/test1/dir/dir/g_foo_ja.txt}    |   2 +-
 .../resources/files/test1/dir/dir/g_foo_ja_JP.txt} |   2 +-
 .../test/resources/files/test1/dir/dir/h.foo.txt}  |   2 +-
 .../resources/files/test1/dir/dir/h.foo_ja.txt}    |   2 +-
 .../resources/files/test1/dir/dir/h.foo_ja_JP.txt} |   2 +-
 .../test/resources/files/test1/dir/dir/i_foo}      |   2 +-
 .../test/resources/files/test1/dir/dir/i_foo_ja}   |   2 +-
 .../resources/files/test1/dir/dir/i_foo_ja_JP}     |   2 +-
 .../test/resources/files/test1/dir/e.txt}          |   2 +-
 .../test/resources/files/test1/dir/e_ja.txt}       |   2 +-
 .../test/resources/files/test1/dir/e_ja_JP.txt}    |   2 +-
 .../test/resources/files/test1/dir/f}              |   2 +-
 .../test/resources/files/test1/dir/f_ja}           |   2 +-
 .../test/resources/files/test1/dir/f_ja_JP}        |   2 +-
 .../test/resources/files/test1/dir/g_foo.txt}      |   2 +-
 .../test/resources/files/test1/dir/g_foo_ja.txt}   |   2 +-
 .../resources/files/test1/dir/g_foo_ja_JP.txt}     |   2 +-
 .../test/resources/files/test1/dir/h.foo.txt}      |   2 +-
 .../test/resources/files/test1/dir/h.foo_ja.txt}   |   2 +-
 .../resources/files/test1/dir/h.foo_ja_JP.txt}     |   2 +-
 .../test/resources/files/test1/dir/i_foo}          |   2 +-
 .../test/resources/files/test1/dir/i_foo_ja}       |   2 +-
 .../test/resources/files/test1/dir/i_foo_ja_JP}    |   2 +-
 .../test/resources/files/test1/e.txt}              |   2 +-
 .../test/resources/files/test1/e_ja.txt}           |   2 +-
 .../test/resources/files/test1/e_ja_JP.txt}        |   2 +-
 .../test2.txt => src/test/resources/files/test1/f} |   2 +-
 .../test/resources/files/test1/f_ja}               |   2 +-
 .../test/resources/files/test1/f_ja_JP}            |   2 +-
 .../test/resources/files/test1/g_foo.txt}          |   2 +-
 .../test/resources/files/test1/g_foo_ja.txt}       |   2 +-
 .../test/resources/files/test1/g_foo_ja_JP.txt}    |   2 +-
 .../test/resources/files/test1/h.foo.txt}          |   2 +-
 .../test/resources/files/test1/h.foo_ja.txt}       |   2 +-
 .../test/resources/files/test1/h.foo_ja_JP.txt}    |   2 +-
 .../test/resources/files/test1/i_foo}              |   2 +-
 .../test/resources/files/test1/i_foo_ja}           |   2 +-
 .../test/resources/files/test1/i_foo_ja_JP}        |   2 +-
 .../test/resources/files/test1/j.class}            |   2 +-
 .../test/resources/files/test1/j_ja.class}         |   2 +-
 .../test/resources/files/test1/j_ja_JP.class}      |   2 +-
 .../test/resources/files/test1/k.properties}       |   2 +-
 .../test/resources/files/test1/k_ja.properties}    |   2 +-
 .../test/resources/files/test1/k_ja_JP.properties} |   2 +-
 .../test/resources/files/test2/a.txt}              |   2 +-
 .../test/resources/files/test2/dir/a.txt}          |   2 +-
 .../test/resources/files/test2/dir/dir/a.txt}      |   2 +-
 .../test/resources/files/test2/ja/JP/a.txt}        |   2 +-
 .../test/resources/files/test2/ja/JP/dir/a.txt}    |   2 +-
 .../resources/files/test2/ja/JP/dir/dir/a.txt}     |   2 +-
 .../test/resources/files/test2/ja/a.txt}           |   2 +-
 .../test/resources/files/test2/ja/dir/a.txt}       |   2 +-
 .../test/resources/files/test2/ja/dir/dir/a.txt}   |   2 +-
 .../test/resources/org/apache/juneau/cp/_a.txt}    |   2 +-
 .../test/resources/org/apache/juneau/cp/_a_ja.txt} |   2 +-
 .../resources/org/apache/juneau/cp/_a_ja_JP.txt}   |   2 +-
 .../resources/org/apache/juneau/cp/files/test1/.c} |   2 +-
 .../org/apache/juneau/cp/files/test1/.c_ja}        |   2 +-
 .../org/apache/juneau/cp/files/test1/.c_ja_JP}     |   2 +-
 .../org/apache/juneau/cp/files/test1/.d.txt}       |   2 +-
 .../org/apache/juneau/cp/files/test1/.d_ja.txt}    |   2 +-
 .../org/apache/juneau/cp/files/test1/.d_ja_JP.txt} |   2 +-
 .../org/apache/juneau/cp/files/test1/_a.txt}       |   2 +-
 .../org/apache/juneau/cp/files/test1/_a_ja.txt}    |   2 +-
 .../org/apache/juneau/cp/files/test1/_a_ja_JP.txt} |   2 +-
 .../resources/org/apache/juneau/cp/files/test1/_b} |   2 +-
 .../org/apache/juneau/cp/files/test1/_b_ja}        |   2 +-
 .../org/apache/juneau/cp/files/test1/_b_ja_JP}     |   2 +-
 .../org/apache/juneau/cp/files/test1/dir/.c}       |   2 +-
 .../org/apache/juneau/cp/files/test1/dir/.c_ja}    |   2 +-
 .../org/apache/juneau/cp/files/test1/dir/.c_ja_JP} |   2 +-
 .../org/apache/juneau/cp/files/test1/dir/.d.txt}   |   2 +-
 .../apache/juneau/cp/files/test1/dir/.d_ja.txt}    |   2 +-
 .../apache/juneau/cp/files/test1/dir/.d_ja_JP.txt} |   2 +-
 .../org/apache/juneau/cp/files/test1/dir/_a.txt}   |   2 +-
 .../apache/juneau/cp/files/test1/dir/_a_ja.txt}    |   2 +-
 .../apache/juneau/cp/files/test1/dir/_a_ja_JP.txt} |   2 +-
 .../org/apache/juneau/cp/files/test1/dir/_b}       |   2 +-
 .../org/apache/juneau/cp/files/test1/dir/_b_ja}    |   2 +-
 .../org/apache/juneau/cp/files/test1/dir/_b_ja_JP} |   2 +-
 .../org/apache/juneau/cp/files/test1/dir/dir/.c}   |   2 +-
 .../apache/juneau/cp/files/test1/dir/dir/.c_ja}    |   2 +-
 .../apache/juneau/cp/files/test1/dir/dir/.c_ja_JP} |   2 +-
 .../apache/juneau/cp/files/test1/dir/dir/.d.txt}   |   2 +-
 .../juneau/cp/files/test1/dir/dir/.d_ja.txt}       |   2 +-
 .../juneau/cp/files/test1/dir/dir/.d_ja_JP.txt}    |   2 +-
 .../apache/juneau/cp/files/test1/dir/dir/_a.txt}   |   2 +-
 .../juneau/cp/files/test1/dir/dir/_a_ja.txt}       |   2 +-
 .../juneau/cp/files/test1/dir/dir/_a_ja_JP.txt}    |   2 +-
 .../org/apache/juneau/cp/files/test1/dir/dir/_b}   |   2 +-
 .../apache/juneau/cp/files/test1/dir/dir/_b_ja}    |   2 +-
 .../apache/juneau/cp/files/test1/dir/dir/_b_ja_JP} |   2 +-
 .../apache/juneau/cp/files/test1/dir/dir/e.txt}    |   2 +-
 .../apache/juneau/cp/files/test1/dir/dir/e_ja.txt} |   2 +-
 .../juneau/cp/files/test1/dir/dir/e_ja_JP.txt}     |   2 +-
 .../org/apache/juneau/cp/files/test1/dir/dir/f}    |   2 +-
 .../org/apache/juneau/cp/files/test1/dir/dir/f_ja} |   2 +-
 .../apache/juneau/cp/files/test1/dir/dir/f_ja_JP}  |   2 +-
 .../juneau/cp/files/test1/dir/dir/g_foo.txt}       |   2 +-
 .../juneau/cp/files/test1/dir/dir/g_foo_ja.txt}    |   2 +-
 .../juneau/cp/files/test1/dir/dir/g_foo_ja_JP.txt} |   2 +-
 .../juneau/cp/files/test1/dir/dir/h.foo.txt}       |   2 +-
 .../juneau/cp/files/test1/dir/dir/h.foo_ja.txt}    |   2 +-
 .../juneau/cp/files/test1/dir/dir/h.foo_ja_JP.txt} |   2 +-
 .../apache/juneau/cp/files/test1/dir/dir/i_foo}    |   2 +-
 .../apache/juneau/cp/files/test1/dir/dir/i_foo_ja} |   2 +-
 .../juneau/cp/files/test1/dir/dir/i_foo_ja_JP}     |   2 +-
 .../org/apache/juneau/cp/files/test1/dir/e.txt}    |   2 +-
 .../org/apache/juneau/cp/files/test1/dir/e_ja.txt} |   2 +-
 .../apache/juneau/cp/files/test1/dir/e_ja_JP.txt}  |   2 +-
 .../org/apache/juneau/cp/files/test1/dir/f}        |   2 +-
 .../org/apache/juneau/cp/files/test1/dir/f_ja}     |   2 +-
 .../org/apache/juneau/cp/files/test1/dir/f_ja_JP}  |   2 +-
 .../apache/juneau/cp/files/test1/dir/g_foo.txt}    |   2 +-
 .../apache/juneau/cp/files/test1/dir/g_foo_ja.txt} |   2 +-
 .../juneau/cp/files/test1/dir/g_foo_ja_JP.txt}     |   2 +-
 .../apache/juneau/cp/files/test1/dir/h.foo.txt}    |   2 +-
 .../apache/juneau/cp/files/test1/dir/h.foo_ja.txt} |   2 +-
 .../juneau/cp/files/test1/dir/h.foo_ja_JP.txt}     |   2 +-
 .../org/apache/juneau/cp/files/test1/dir/i_foo}    |   2 +-
 .../org/apache/juneau/cp/files/test1/dir/i_foo_ja} |   2 +-
 .../apache/juneau/cp/files/test1/dir/i_foo_ja_JP}  |   2 +-
 .../org/apache/juneau/cp/files/test1/e.txt}        |   2 +-
 .../org/apache/juneau/cp/files/test1/e_ja.txt}     |   2 +-
 .../org/apache/juneau/cp/files/test1/e_ja_JP.txt}  |   2 +-
 .../resources/org/apache/juneau/cp/files/test1/f}  |   2 +-
 .../org/apache/juneau/cp/files/test1/f_ja}         |   2 +-
 .../org/apache/juneau/cp/files/test1/f_ja_JP}      |   2 +-
 .../org/apache/juneau/cp/files/test1/g_foo.txt}    |   2 +-
 .../org/apache/juneau/cp/files/test1/g_foo_ja.txt} |   2 +-
 .../apache/juneau/cp/files/test1/g_foo_ja_JP.txt}  |   2 +-
 .../org/apache/juneau/cp/files/test1/h.foo.txt}    |   2 +-
 .../org/apache/juneau/cp/files/test1/h.foo_ja.txt} |   2 +-
 .../apache/juneau/cp/files/test1/h.foo_ja_JP.txt}  |   2 +-
 .../org/apache/juneau/cp/files/test1/i_foo}        |   2 +-
 .../org/apache/juneau/cp/files/test1/i_foo_ja}     |   2 +-
 .../org/apache/juneau/cp/files/test1/i_foo_ja_JP}  |   2 +-
 .../org/apache/juneau/cp/files/test2/a.txt}        |   2 +-
 .../org/apache/juneau/cp/files/test2/dir/a.txt}    |   2 +-
 .../apache/juneau/cp/files/test2/dir/dir/a.txt}    |   2 +-
 .../org/apache/juneau/cp/files/test2/ja/JP/a.txt}  |   2 +-
 .../apache/juneau/cp/files/test2/ja/JP/dir/a.txt}  |   2 +-
 .../juneau/cp/files/test2/ja/JP/dir/dir/a.txt}     |   2 +-
 .../org/apache/juneau/cp/files/test2/ja/a.txt}     |   2 +-
 .../org/apache/juneau/cp/files/test2/ja/dir/a.txt} |   2 +-
 .../apache/juneau/cp/files/test2/ja/dir/dir/a.txt} |   2 +-
 .../{test1 => test3}/MessageBundleTest1.properties |   0
 .../MessageBundleTest1_ja.properties               |   0
 .../MessageBundleTest1_ja_JP.properties            |   0
 .../cp/{test1 => test3}/files/Test1.properties     |   0
 .../cp/{test1 => test3}/files/Test1_ja.properties  |   0
 .../{test1 => test3}/files/Test1_ja_JP.properties  |   0
 .../juneau/cp/{test2 => test4}/Test2.properties    |   0
 .../juneau/cp/{test2 => test4}/Test2_ja.properties |   0
 .../cp/{test2 => test4}/Test2_ja_JP.properties     |   0
 .../org/apache/juneau/cp/{test2 => test4}/Test4    |   0
 .../org/apache/juneau/cp/{test2 => test4}/Test4_ja |   0
 .../apache/juneau/cp/{test2 => test4}/Test4_ja_JP  |   0
 .../main/java/org/apache/juneau/cp/FileFinder.java | 241 ++++++++
 .../org/apache/juneau/cp/FileFinderBuilder.java    | 146 +++++
 .../main/java/org/apache/juneau/cp/LocalDir.java   | 120 ++++
 .../main/java/org/apache/juneau/cp/LocalFile.java  | 108 ++++
 .../org/apache/juneau/internal/StringUtils.java    |  16 +
 310 files changed, 1604 insertions(+), 299 deletions(-)

diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/files/test1/.c
similarity index 98%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/files/test1/.c
index d12cd3c..7af678d 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/files/test1/.c
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[home:/files/test1/.c]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/files/test1/.c_ja
similarity index 98%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/files/test1/.c_ja
index d12cd3c..3ff0dba 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/files/test1/.c_ja
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[home:/files/test1/.c_ja]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/files/test1/.c_ja_JP
similarity index 98%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/files/test1/.c_ja_JP
index d12cd3c..7cd4312 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/files/test1/.c_ja_JP
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[home:/files/test1/.c_ja_JP]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/files/test1/.d.txt
similarity index 98%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/files/test1/.d.txt
index d12cd3c..98c36b1 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/files/test1/.d.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[home:/files/test1/.d.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/files/test1/.d_ja.txt
similarity index 98%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/files/test1/.d_ja.txt
index d12cd3c..9674075 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/files/test1/.d_ja.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[home:/files/test1/.d_ja.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/files/test1/.d_ja_JP.txt
similarity index 97%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/files/test1/.d_ja_JP.txt
index d12cd3c..e1a2276 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/files/test1/.d_ja_JP.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[home:/files/test1/.d_ja_JP.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/files/test1/_a.txt
similarity index 98%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/files/test1/_a.txt
index d12cd3c..4f51883 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/files/test1/_a.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[home:/files/test1/_a.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/files/test1/_a_ja.txt
similarity index 98%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/files/test1/_a_ja.txt
index d12cd3c..a2b6a92 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/files/test1/_a_ja.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[home:/files/test1/_a_ja.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/files/test1/_a_ja_JP.txt
similarity index 97%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/files/test1/_a_ja_JP.txt
index d12cd3c..32f4ff2 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/files/test1/_a_ja_JP.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[home:/files/test1/_a_ja_JP.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/files/test1/_b
similarity index 98%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/files/test1/_b
index d12cd3c..3ccf506 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/files/test1/_b
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[home:/files/test1/_b]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/files/test1/_b_ja
similarity index 98%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/files/test1/_b_ja
index d12cd3c..b3a32ee 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/files/test1/_b_ja
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[home:/files/test1/_b_ja]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/files/test1/_b_ja_JP
similarity index 98%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/files/test1/_b_ja_JP
index d12cd3c..4b9c30f 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/files/test1/_b_ja_JP
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[home:/files/test1/_b_ja_JP]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/files/test1/dir/.c
similarity index 98%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/files/test1/dir/.c
index d12cd3c..2dd1da6 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/files/test1/dir/.c
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[home:/files/test1/dir/.c]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/files/test1/dir/.c_ja
similarity index 98%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/files/test1/dir/.c_ja
index d12cd3c..900f0e3 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/files/test1/dir/.c_ja
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[home:/files/test1/dir/.c_ja]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/files/test1/dir/.c_ja_JP
similarity index 97%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/files/test1/dir/.c_ja_JP
index d12cd3c..b1b584b 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/files/test1/dir/.c_ja_JP
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[home:/files/test1/dir/.c_ja_JP]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/files/test1/dir/.d.txt
similarity index 98%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/files/test1/dir/.d.txt
index d12cd3c..70072ab 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/files/test1/dir/.d.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[home:/files/test1/dir/.d.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/files/test1/dir/.d_ja.txt
similarity index 97%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/files/test1/dir/.d_ja.txt
index d12cd3c..a87cd50 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/files/test1/dir/.d_ja.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[home:/files/test1/dir/.d_ja.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/files/test1/dir/.d_ja_JP.txt
similarity index 97%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/files/test1/dir/.d_ja_JP.txt
index d12cd3c..739a7dd 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/files/test1/dir/.d_ja_JP.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[home:/files/test1/dir/.d_ja_JP.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/files/test1/dir/_a.txt
similarity index 98%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/files/test1/dir/_a.txt
index d12cd3c..2a65cf1 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/files/test1/dir/_a.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[home:/files/test1/dir/_a.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/files/test1/dir/_a_ja.txt
similarity index 97%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/files/test1/dir/_a_ja.txt
index d12cd3c..2c341cd 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/files/test1/dir/_a_ja.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[home:/files/test1/dir/_a_ja.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/files/test1/dir/_a_ja_JP.txt
similarity index 97%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/files/test1/dir/_a_ja_JP.txt
index d12cd3c..0585027 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/files/test1/dir/_a_ja_JP.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[home:/files/test1/dir/_a_ja_JP.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/files/test1/dir/_b
similarity index 98%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/files/test1/dir/_b
index d12cd3c..d6e804e 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/files/test1/dir/_b
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[home:/files/test1/dir/_b]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/files/test1/dir/_b_ja
similarity index 98%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/files/test1/dir/_b_ja
index d12cd3c..fbe71f4 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/files/test1/dir/_b_ja
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[home:/files/test1/dir/_b_ja]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/files/test1/dir/_b_ja_JP
similarity index 97%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/files/test1/dir/_b_ja_JP
index d12cd3c..a6a36e7 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/files/test1/dir/_b_ja_JP
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[home:/files/test1/dir/_b_ja_JP]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/files/test1/dir/dir/.c
similarity index 98%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/files/test1/dir/dir/.c
index d12cd3c..9ebd1b5 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/files/test1/dir/dir/.c
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[home:/files/test1/dir/dir/.c]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/files/test1/dir/dir/.c_ja
similarity index 97%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/files/test1/dir/dir/.c_ja
index d12cd3c..38f87f3 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/files/test1/dir/dir/.c_ja
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[home:/files/test1/dir/dir/.c_ja]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/files/test1/dir/dir/.c_ja_JP
similarity index 97%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/files/test1/dir/dir/.c_ja_JP
index d12cd3c..fe98ced 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/files/test1/dir/dir/.c_ja_JP
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[home:/files/test1/dir/dir/.c_ja_JP]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/files/test1/dir/dir/.d.txt
similarity index 97%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/files/test1/dir/dir/.d.txt
index d12cd3c..574e7b8 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/files/test1/dir/dir/.d.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[home:/files/test1/dir/dir/.d.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/files/test1/dir/dir/.d_ja.txt
similarity index 97%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/files/test1/dir/dir/.d_ja.txt
index d12cd3c..e2e4c92 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/files/test1/dir/dir/.d_ja.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[home:/files/test1/dir/dir/.d_ja.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/files/test1/dir/dir/.d_ja_JP.txt
similarity index 97%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/files/test1/dir/dir/.d_ja_JP.txt
index d12cd3c..b631019 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/files/test1/dir/dir/.d_ja_JP.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[home:/files/test1/dir/dir/.d_ja_JP.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/files/test1/dir/dir/_a.txt
similarity index 97%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/files/test1/dir/dir/_a.txt
index d12cd3c..e264e90 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/files/test1/dir/dir/_a.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[home:/files/test1/dir/dir/_a.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/files/test1/dir/dir/_a_ja.txt
similarity index 97%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/files/test1/dir/dir/_a_ja.txt
index d12cd3c..23d2a91 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/files/test1/dir/dir/_a_ja.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[home:/files/test1/dir/dir/_a_ja.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/files/test1/dir/dir/_a_ja_JP.txt
similarity index 97%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/files/test1/dir/dir/_a_ja_JP.txt
index d12cd3c..d506fc9 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/files/test1/dir/dir/_a_ja_JP.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[home:/files/test1/dir/dir/_a_ja_JP.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/files/test1/dir/dir/_b
similarity index 98%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/files/test1/dir/dir/_b
index d12cd3c..19f7d2b 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/files/test1/dir/dir/_b
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[home:/files/test1/dir/dir/_b]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/files/test1/dir/dir/_b_ja
similarity index 97%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/files/test1/dir/dir/_b_ja
index d12cd3c..8b80ee1 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/files/test1/dir/dir/_b_ja
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[home:/files/test1/dir/dir/_b_ja]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/files/test1/dir/dir/_b_ja_JP
similarity index 97%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/files/test1/dir/dir/_b_ja_JP
index d12cd3c..1631549 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/files/test1/dir/dir/_b_ja_JP
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[home:/files/test1/dir/dir/_b_ja_JP]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/files/test1/dir/dir/e.txt
similarity index 97%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/files/test1/dir/dir/e.txt
index d12cd3c..f684e88 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/files/test1/dir/dir/e.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[home:/files/test1/dir/dir/e.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/files/test1/dir/dir/e_ja.txt
similarity index 97%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/files/test1/dir/dir/e_ja.txt
index d12cd3c..fff01e3 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/files/test1/dir/dir/e_ja.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[home:/files/test1/dir/dir/e_ja.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/files/test1/dir/dir/e_ja_JP.txt
similarity index 97%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/files/test1/dir/dir/e_ja_JP.txt
index d12cd3c..fa779ff 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/files/test1/dir/dir/e_ja_JP.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[home:/files/test1/dir/dir/e_ja_JP.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/files/test1/dir/dir/f
similarity index 98%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/files/test1/dir/dir/f
index d12cd3c..3df3ae3 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/files/test1/dir/dir/f
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[home:/files/test1/dir/dir/f]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/files/test1/dir/dir/f_ja
similarity index 97%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/files/test1/dir/dir/f_ja
index d12cd3c..23c7f9e 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/files/test1/dir/dir/f_ja
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[home:/files/test1/dir/dir/f_ja]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/files/test1/dir/dir/f_ja_JP
similarity index 97%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/files/test1/dir/dir/f_ja_JP
index d12cd3c..fdf0182 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/files/test1/dir/dir/f_ja_JP
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[home:/files/test1/dir/dir/f_ja_JP]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/files/test1/dir/dir/g_foo.txt
similarity index 97%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/files/test1/dir/dir/g_foo.txt
index d12cd3c..990e961 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/files/test1/dir/dir/g_foo.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[home:/files/test1/dir/dir/g_foo.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/files/test1/dir/dir/g_foo_ja.txt
similarity index 97%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/files/test1/dir/dir/g_foo_ja.txt
index d12cd3c..0d807c2 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/files/test1/dir/dir/g_foo_ja.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[home:/files/test1/dir/dir/g_foo_ja.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/files/test1/dir/dir/g_foo_ja_JP.txt
similarity index 97%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/files/test1/dir/dir/g_foo_ja_JP.txt
index d12cd3c..cfba2b8 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/files/test1/dir/dir/g_foo_ja_JP.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[home:/files/test1/dir/dir/g_foo_ja_JP.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/files/test1/dir/dir/h.foo.txt
similarity index 97%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/files/test1/dir/dir/h.foo.txt
index d12cd3c..3acdf38 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/files/test1/dir/dir/h.foo.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[home:/files/test1/dir/dir/h.foo.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/files/test1/dir/dir/h.foo_ja.txt
similarity index 97%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/files/test1/dir/dir/h.foo_ja.txt
index d12cd3c..2b2732e 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/files/test1/dir/dir/h.foo_ja.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[home:/files/test1/dir/dir/h.foo_ja.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/files/test1/dir/dir/h.foo_ja_JP.txt
similarity index 97%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/files/test1/dir/dir/h.foo_ja_JP.txt
index d12cd3c..7b94f58 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/files/test1/dir/dir/h.foo_ja_JP.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[home:/files/test1/dir/dir/h.foo_ja_JP.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/files/test1/dir/dir/i_foo
similarity index 97%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/files/test1/dir/dir/i_foo
index d12cd3c..02ec78b 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/files/test1/dir/dir/i_foo
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[home:/files/test1/dir/dir/i_foo]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/files/test1/dir/dir/i_foo_ja
similarity index 97%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/files/test1/dir/dir/i_foo_ja
index d12cd3c..7cf9a1f 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/files/test1/dir/dir/i_foo_ja
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[home:/files/test1/dir/dir/i_foo_ja]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/files/test1/dir/dir/i_foo_ja_JP
similarity index 97%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/files/test1/dir/dir/i_foo_ja_JP
index d12cd3c..e5d3c99 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/files/test1/dir/dir/i_foo_ja_JP
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[home:/files/test1/dir/dir/i_foo_ja_JP]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/files/test1/dir/e.txt
similarity index 98%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/files/test1/dir/e.txt
index d12cd3c..dc2b73b 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/files/test1/dir/e.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[home:/files/test1/dir/e.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/files/test1/dir/e_ja.txt
similarity index 97%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/files/test1/dir/e_ja.txt
index d12cd3c..ad5d91f 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/files/test1/dir/e_ja.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[home:/files/test1/dir/e_ja.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/files/test1/dir/e_ja_JP.txt
similarity index 97%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/files/test1/dir/e_ja_JP.txt
index d12cd3c..5f45ac0 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/files/test1/dir/e_ja_JP.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[home:/files/test1/dir/e_ja_JP.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/files/test1/dir/f
similarity index 98%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/files/test1/dir/f
index d12cd3c..bfe33e4 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/files/test1/dir/f
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[home:/files/test1/dir/f]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/files/test1/dir/f_ja
similarity index 98%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/files/test1/dir/f_ja
index d12cd3c..60cf498 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/files/test1/dir/f_ja
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[home:/files/test1/dir/f_ja]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/files/test1/dir/f_ja_JP
similarity index 97%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/files/test1/dir/f_ja_JP
index d12cd3c..1f518e4 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/files/test1/dir/f_ja_JP
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[home:/files/test1/dir/f_ja_JP]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/files/test1/dir/g_foo.txt
similarity index 97%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/files/test1/dir/g_foo.txt
index d12cd3c..4be8969 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/files/test1/dir/g_foo.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[home:/files/test1/dir/g_foo.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/files/test1/dir/g_foo_ja.txt
similarity index 97%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/files/test1/dir/g_foo_ja.txt
index d12cd3c..081277d 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/files/test1/dir/g_foo_ja.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[home:/files/test1/dir/g_foo_ja.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/files/test1/dir/g_foo_ja_JP.txt
similarity index 97%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/files/test1/dir/g_foo_ja_JP.txt
index d12cd3c..f586ad8 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/files/test1/dir/g_foo_ja_JP.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[home:/files/test1/dir/g_foo_ja_JP.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/files/test1/dir/h.foo.txt
similarity index 97%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/files/test1/dir/h.foo.txt
index d12cd3c..292af7e 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/files/test1/dir/h.foo.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[home:/files/test1/dir/h.foo.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/files/test1/dir/h.foo_ja.txt
similarity index 97%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/files/test1/dir/h.foo_ja.txt
index d12cd3c..8e0edc9 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/files/test1/dir/h.foo_ja.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[home:/files/test1/dir/h.foo_ja.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/files/test1/dir/h.foo_ja_JP.txt
similarity index 97%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/files/test1/dir/h.foo_ja_JP.txt
index d12cd3c..824c8f9 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/files/test1/dir/h.foo_ja_JP.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[home:/files/test1/dir/h.foo_ja_JP.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/files/test1/dir/i_foo
similarity index 98%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/files/test1/dir/i_foo
index d12cd3c..9fcbf00 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/files/test1/dir/i_foo
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[home:/files/test1/dir/i_foo]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/files/test1/dir/i_foo_ja
similarity index 97%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/files/test1/dir/i_foo_ja
index d12cd3c..db681f6 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/files/test1/dir/i_foo_ja
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[home:/files/test1/dir/i_foo_ja]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/files/test1/dir/i_foo_ja_JP
similarity index 97%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/files/test1/dir/i_foo_ja_JP
index d12cd3c..366557a 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/files/test1/dir/i_foo_ja_JP
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[home:/files/test1/dir/i_foo_ja_JP]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/files/test1/e.txt
similarity index 98%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/files/test1/e.txt
index d12cd3c..654467f 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/files/test1/e.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[home:/files/test1/e.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/files/test1/e_ja.txt
similarity index 98%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/files/test1/e_ja.txt
index d12cd3c..05a9c4d 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/files/test1/e_ja.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[home:/files/test1/e_ja.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/files/test1/e_ja_JP.txt
similarity index 97%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/files/test1/e_ja_JP.txt
index d12cd3c..a805e63 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/files/test1/e_ja_JP.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[home:/files/test1/e_ja_JP.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/files/test1/f
similarity index 98%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/files/test1/f
index d12cd3c..44c65b8 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/files/test1/f
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[home:/files/test1/f]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/files/test1/f_ja
similarity index 98%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/files/test1/f_ja
index d12cd3c..4e24153 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/files/test1/f_ja
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[home:/files/test1/f_ja]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/files/test1/f_ja_JP
similarity index 98%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/files/test1/f_ja_JP
index d12cd3c..a08f087 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/files/test1/f_ja_JP
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[home:/files/test1/f_ja_JP]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/files/test1/g_foo.txt
similarity index 98%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/files/test1/g_foo.txt
index d12cd3c..d7ec74a 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/files/test1/g_foo.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[home:/files/test1/g_foo.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/files/test1/g_foo_ja.txt
similarity index 97%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/files/test1/g_foo_ja.txt
index d12cd3c..b33b131 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/files/test1/g_foo_ja.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[home:/files/test1/g_foo_ja.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/files/test1/g_foo_ja_JP.txt
similarity index 97%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/files/test1/g_foo_ja_JP.txt
index d12cd3c..02eee78 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/files/test1/g_foo_ja_JP.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[home:/files/test1/g_foo_ja_JP.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/files/test1/h.foo.txt
similarity index 98%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/files/test1/h.foo.txt
index d12cd3c..786bcd8 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/files/test1/h.foo.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[home:/files/test1/h.foo.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/files/test1/h.foo_ja.txt
similarity index 97%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/files/test1/h.foo_ja.txt
index d12cd3c..b25ce63 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/files/test1/h.foo_ja.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[home:/files/test1/h.foo_ja.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/files/test1/h.foo_ja_JP.txt
similarity index 97%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/files/test1/h.foo_ja_JP.txt
index d12cd3c..4157911 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/files/test1/h.foo_ja_JP.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[home:/files/test1/h.foo_ja_JP.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/files/test1/i_foo
similarity index 98%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/files/test1/i_foo
index d12cd3c..b8d5f76 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/files/test1/i_foo
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[home:/files/test1/i_foo]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/files/test1/i_foo_ja
similarity index 98%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/files/test1/i_foo_ja
index d12cd3c..23b02d7 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/files/test1/i_foo_ja
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[home:/files/test1/i_foo_ja]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/files/test1/i_foo_ja_JP
similarity index 97%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/files/test1/i_foo_ja_JP
index d12cd3c..aafbdd0 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/files/test1/i_foo_ja_JP
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[home:/files/test1/i_foo_ja_JP]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/files/test2/a.txt
similarity index 98%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/files/test2/a.txt
index d12cd3c..86421a6 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/files/test2/a.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[home:/files/test2/a.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/files/test2/dir/a.txt
similarity index 98%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/files/test2/dir/a.txt
index d12cd3c..627f230 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/files/test2/dir/a.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[home:/files/test2/dir/a.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/files/test2/dir/dir/a.txt
similarity index 97%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/files/test2/dir/dir/a.txt
index d12cd3c..f3d7b9f 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/files/test2/dir/dir/a.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[home:/files/test2/dir/dir/a.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/files/test2/ja/JP/a.txt
similarity index 97%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/files/test2/ja/JP/a.txt
index d12cd3c..805e644 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/files/test2/ja/JP/a.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[home:/files/test2/ja/JP/a.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/files/test2/ja/JP/dir/a.txt
similarity index 97%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/files/test2/ja/JP/dir/a.txt
index d12cd3c..8b1b388 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/files/test2/ja/JP/dir/a.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[home:/files/test2/ja/JP/dir/a.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/files/test2/ja/JP/dir/dir/a.txt
similarity index 97%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/files/test2/ja/JP/dir/dir/a.txt
index d12cd3c..54fd904 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/files/test2/ja/JP/dir/dir/a.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[home:/files/test2/ja/JP/dir/dir/a.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/files/test2/ja/a.txt
similarity index 98%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/files/test2/ja/a.txt
index d12cd3c..c65082f 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/files/test2/ja/a.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[home:/files/test2/ja/a.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/files/test2/ja/dir/a.txt
similarity index 97%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/files/test2/ja/dir/a.txt
index d12cd3c..b3fa679 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/files/test2/ja/dir/a.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[home:/files/test2/ja/dir/a.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/files/test2/ja/dir/dir/a.txt
similarity index 97%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/files/test2/ja/dir/dir/a.txt
index d12cd3c..d32a44b 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/files/test2/ja/dir/dir/a.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[home:/files/test2/ja/dir/dir/a.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/cp/BasicResourceFinder_Test.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/cp/BasicResourceFinder_Test.java
index 6edc881..d0aa6df 100644
--- a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/cp/BasicResourceFinder_Test.java
+++ b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/cp/BasicResourceFinder_Test.java
@@ -16,8 +16,8 @@ import static org.apache.juneau.assertions.Assertions.*;
 import static org.junit.runners.MethodSorters.*;
 import static java.util.Locale.*;
 
-import org.apache.juneau.cp.test1.*;
-import org.apache.juneau.cp.test2.*;
+import org.apache.juneau.cp.test3.*;
+import org.apache.juneau.cp.test4.*;
 import org.junit.*;
 
 @FixMethodOrder(NAME_ASCENDING)
diff --git a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/cp/FileFinder_Test.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/cp/FileFinder_Test.java
new file mode 100644
index 0000000..3bc8852
--- /dev/null
+++ b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/cp/FileFinder_Test.java
@@ -0,0 +1,675 @@
+// ***************************************************************************************************************************
+// * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file *
+// * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file        *
+// * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance            *
+// * with the License.  You may obtain a copy of the License at                                                              *
+// *                                                                                                                         *
+// *  http://www.apache.org/licenses/LICENSE-2.0                                                                             *
+// *                                                                                                                         *
+// * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an  *
+// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
+// * specific language governing permissions and limitations under the License.                                              *
+// ***************************************************************************************************************************
+package org.apache.juneau.cp;
+
+import static org.apache.juneau.assertions.Assertions.*;
+import static org.junit.runners.MethodSorters.*;
+
+import java.nio.file.*;
+import java.util.*;
+import java.util.regex.*;
+
+import org.apache.juneau.collections.*;
+import org.apache.juneau.cp.sub.*;
+
+import static java.util.Locale.*;
+
+import org.junit.*;
+
+@FixMethodOrder(NAME_ASCENDING)
+public class FileFinder_Test {
+
+	//-----------------------------------------------------------------------------------------------------------------
+	// Basic tests.
+	//-----------------------------------------------------------------------------------------------------------------
+
+	@Test
+	public void a01_empty() throws Exception {
+		FileFinder x = FileFinder
+			.create()
+			.build();
+
+		assertStream(x.getFile("files/test1a")).string().doesNotExist();
+	}
+
+	//-----------------------------------------------------------------------------------------------------------------
+	// File system tests.
+	//-----------------------------------------------------------------------------------------------------------------
+
+	@Test
+	public void b01_fileSystem_rootDir() throws Exception {
+		FileFinder x = FileFinder
+			.create()
+			.dir(".")
+			.build();
+
+		String[] patterns = {"_a.txt","_b",".c",".d.txt","e.txt","f","g_foo.txt","h.foo.txt","i_foo"};
+
+		for (String p : patterns) {
+			assertStream(x.getFile("files/test1/"+p)).string().contains("[home:/files/test1/"+p+"]");
+			assertStream(x.getFile("files/test1/dir/"+p)).string().contains("[home:/files/test1/dir/"+p+"]");
+			assertStream(x.getFile("files/test1/dir/dir/"+p)).string().contains("[home:/files/test1/dir/dir/"+p+"]");
+			assertStream(x.getFile(" / files/test1/"+p+" / ")).string().contains("[home:/files/test1/"+p+"]");
+			assertStream(x.getFile(" / files/test1/dir/"+p+" / ")).string().contains("[home:/files/test1/dir/"+p+"]");
+			assertStream(x.getFile(" / files/test1/dir/dir/"+p+" / ")).string().contains("[home:/files/test1/dir/dir/"+p+"]");
+		}
+
+		String[] badPatterns = {"files/test1/bad.txt","files/test1/../test1/_a.txt","files/test1/%2E%2E/test1/_a.txt","files/bad.txt",null,"",".","..","%2E","%2E%2E","j.class","k.properties"};
+
+		for (String p : badPatterns) {
+			assertStream(x.getFile(p)).doesNotExist();
+		}
+	}
+
+	@Test
+	public void b02_fileSystem_subDir() throws Exception {
+		FileFinder x = FileFinder
+			.create()
+			.dir("files")
+			.build();
+
+		String[] patterns = {"_a.txt","_b",".c",".d.txt","e.txt","f","g_foo.txt","h.foo.txt","i_foo"};
+
+		for (String p : patterns) {
+			assertStream(x.getFile("test1/"+p)).string().contains("[home:/files/test1/"+p+"]");
+			assertStream(x.getFile("test1/dir/"+p)).string().contains("[home:/files/test1/dir/"+p+"]");
+			assertStream(x.getFile("test1/dir/dir/"+p)).string().contains("[home:/files/test1/dir/dir/"+p+"]");
+			assertStream(x.getFile("/test1/"+p+"/")).string().contains("[home:/files/test1/"+p+"]");
+			assertStream(x.getFile("/test1/dir/"+p+"/")).string().contains("[home:/files/test1/dir/"+p+"]");
+			assertStream(x.getFile("/test1/dir/dir/"+p+"/")).string().contains("[home:/files/test1/dir/dir/"+p+"]");
+		}
+
+		String[] badPatterns = {"test1/bad.txt","test1/../test1/_a.txt","bad.txt",null,"",".",".."};
+
+		for (String p : badPatterns) {
+			assertStream(x.getFile(p)).doesNotExist();
+		}
+	}
+
+	@Test
+	public void b03_fileSystem_localized_flat() throws Exception {
+		FileFinder x = FileFinder
+			.create()
+			.dir("files")
+			.build();
+
+		String[] patterns = {"_a.txt","_b",".c",".d.txt","e.txt","f","g_foo.txt","h.foo.txt","i_foo"};
+		String[] patterns_ja = {"_a_ja.txt","_b_ja",".c",".d_ja.txt","e_ja.txt","f_ja","g_foo_ja.txt","h.foo_ja.txt","i_foo_ja"};
+		String[] patterns_ja_JP = {"_a_ja_JP.txt","_b_ja_JP",".c",".d_ja_JP.txt","e_ja_JP.txt","f_ja_JP","g_foo_ja_JP.txt","h.foo_ja_JP.txt","i_foo_ja_JP"};
+
+		for (int i = 0; i < patterns.length; i++) {
+			String p = patterns[i], p_ja = patterns_ja[i], p_ja_JP = patterns_ja_JP[i];
+
+			assertStream(x.getFile("test1/"+p,null)).string().contains("[home:/files/test1/"+p+"]");
+			assertStream(x.getFile("test1/dir/"+p,null)).string().contains("[home:/files/test1/dir/"+p+"]");
+			assertStream(x.getFile("test1/dir/dir/"+p,null)).string().contains("[home:/files/test1/dir/dir/"+p+"]");
+			assertStream(x.getFile("/test1/"+p+"/",null)).string().contains("[home:/files/test1/"+p+"]");
+			assertStream(x.getFile("/test1/dir/"+p+"/",null)).string().contains("[home:/files/test1/dir/"+p+"]");
+			assertStream(x.getFile("/test1/dir/dir/"+p+"/",null)).string().contains("[home:/files/test1/dir/dir/"+p+"]");
+
+			assertStream(x.getFile("test1/"+p,JAPANESE)).string().contains("[home:/files/test1/"+p_ja+"]");
+			assertStream(x.getFile("test1/dir/"+p,JAPANESE)).string().contains("[home:/files/test1/dir/"+p_ja+"]");
+			assertStream(x.getFile("test1/dir/dir/"+p,JAPANESE)).string().contains("[home:/files/test1/dir/dir/"+p_ja+"]");
+			assertStream(x.getFile("/test1/"+p+"/",JAPANESE)).string().contains("[home:/files/test1/"+p_ja+"]");
+			assertStream(x.getFile("/test1/dir/"+p+"/",JAPANESE)).string().contains("[home:/files/test1/dir/"+p_ja+"]");
+			assertStream(x.getFile("/test1/dir/dir/"+p+"/",JAPANESE)).string().contains("[home:/files/test1/dir/dir/"+p_ja+"]");
+
+			assertStream(x.getFile("test1/"+p,JAPAN)).string().contains("[home:/files/test1/"+p_ja_JP+"]");
+			assertStream(x.getFile("test1/dir/"+p,JAPAN)).string().contains("[home:/files/test1/dir/"+p_ja_JP+"]");
+			assertStream(x.getFile("test1/dir/dir/"+p,JAPAN)).string().contains("[home:/files/test1/dir/dir/"+p_ja_JP+"]");
+			assertStream(x.getFile("/test1/"+p+"/",JAPAN)).string().contains("[home:/files/test1/"+p_ja_JP+"]");
+			assertStream(x.getFile("/test1/dir/"+p+"/",JAPAN)).string().contains("[home:/files/test1/dir/"+p_ja_JP+"]");
+			assertStream(x.getFile("/test1/dir/dir/"+p+"/",JAPAN)).string().contains("[home:/files/test1/dir/dir/"+p_ja_JP+"]");
+		}
+
+		String[] badPatterns = {"test1/bad.txt","test1/../test1/_a.txt","bad.txt",null,"",".","..","j.class","k.properties"};
+
+		for (String p : badPatterns) {
+			assertStream(x.getFile(p,null)).doesNotExist();
+			assertStream(x.getFile(p,JAPANESE)).doesNotExist();
+			assertStream(x.getFile(p,JAPAN)).doesNotExist();
+		}
+	}
+
+	@Test
+	public void b04_fileSystem_localized_hierarchical() throws Exception {
+		FileFinder x = FileFinder
+			.create()
+			.dir("files/test2")
+			.build();
+
+		assertStream(x.getFile("a.txt", null)).string().contains("[home:/files/test2/a.txt]");
+		assertStream(x.getFile("a.txt", JAPANESE)).string().contains("[home:/files/test2/ja/a.txt]");
+		assertStream(x.getFile("a.txt", JAPAN)).string().contains("[home:/files/test2/ja/JP/a.txt]");
+		assertStream(x.getFile("/a.txt/", null)).string().contains("[home:/files/test2/a.txt]");
+		assertStream(x.getFile("/a.txt/", JAPANESE)).string().contains("[home:/files/test2/ja/a.txt]");
+		assertStream(x.getFile("/a.txt/", JAPAN)).string().contains("[home:/files/test2/ja/JP/a.txt]");
+
+		assertStream(x.getFile("dir/a.txt", null)).string().contains("[home:/files/test2/dir/a.txt]");
+		assertStream(x.getFile("dir/a.txt", JAPANESE)).string().contains("[home:/files/test2/ja/dir/a.txt]");
+		assertStream(x.getFile("dir/a.txt", JAPAN)).string().contains("[home:/files/test2/ja/JP/dir/a.txt]");
+		assertStream(x.getFile("/dir/a.txt/", null)).string().contains("[home:/files/test2/dir/a.txt]");
+		assertStream(x.getFile("/dir/a.txt/", JAPANESE)).string().contains("[home:/files/test2/ja/dir/a.txt]");
+		assertStream(x.getFile("/dir/a.txt/", JAPAN)).string().contains("[home:/files/test2/ja/JP/dir/a.txt]");
+
+		assertStream(x.getFile("dir/dir/a.txt", null)).string().contains("[home:/files/test2/dir/dir/a.txt]");
+		assertStream(x.getFile("dir/dir/a.txt", JAPANESE)).string().contains("[home:/files/test2/ja/dir/dir/a.txt]");
+		assertStream(x.getFile("dir/dir/a.txt", JAPAN)).string().contains("[home:/files/test2/ja/JP/dir/dir/a.txt]");
+		assertStream(x.getFile("/dir/dir/a.txt/", null)).string().contains("[home:/files/test2/dir/dir/a.txt]");
+		assertStream(x.getFile("/dir/dir/a.txt/", JAPANESE)).string().contains("[home:/files/test2/ja/dir/dir/a.txt]");
+		assertStream(x.getFile("/dir/dir/a.txt/", JAPAN)).string().contains("[home:/files/test2/ja/JP/dir/dir/a.txt]");
+	}
+
+	//-----------------------------------------------------------------------------------------------------------------
+	// Classpath tests - Classpath root
+	//-----------------------------------------------------------------------------------------------------------------
+
+	@Test
+	public void c01_classpathRoot_rootDir() throws Exception {
+		FileFinder x = FileFinder
+			.create()
+			.cp(FileFinder_Test.class, "/", false)
+			.build();
+
+		String[] patterns = {"_a.txt","_b",".c",".d.txt","e.txt","f","g_foo.txt","h.foo.txt","i_foo"};
+
+		for (String p : patterns) {
+			assertStream(x.getFile("files/test1/"+p)).string().contains("[cp:/files/test1/"+p+"]");
+			assertStream(x.getFile("files/test1/dir/"+p)).string().contains("[cp:/files/test1/dir/"+p+"]");
+			assertStream(x.getFile("files/test1/dir/dir/"+p)).string().contains("[cp:/files/test1/dir/dir/"+p+"]");
+			assertStream(x.getFile(" / files/test1/"+p+" / ")).string().contains("[cp:/files/test1/"+p+"]");
+			assertStream(x.getFile(" / files/test1/dir/"+p+" / ")).string().contains("[cp:/files/test1/dir/"+p+"]");
+			assertStream(x.getFile(" / files/test1/dir/dir/"+p+" / ")).string().contains("[cp:/files/test1/dir/dir/"+p+"]");
+		}
+
+		String[] badPatterns = {"files/test1/bad.txt","files/test1/../test1/_a.txt","files/bad.txt",null,"",".","..","LocalizedFileStore_Test.class"};
+
+		for (String p : badPatterns) {
+			assertStream(x.getFile(p)).msg("pattern=[{0}]", p).doesNotExist();
+		}
+	}
+
+	@Test
+	public void c02_classpathRoot_subdir() throws Exception {
+		FileFinder x = FileFinder
+			.create()
+			.cp(FileFinder_Test.class, "/files", false)
+			.build();
+
+		String[] patterns = {"_a.txt","_b",".c",".d.txt","e.txt","f","g_foo.txt","h.foo.txt","i_foo"};
+
+		for (String p : patterns) {
+			assertStream(x.getFile("test1/"+p)).string().contains("[cp:/files/test1/"+p+"]");
+			assertStream(x.getFile("test1/dir/"+p)).string().contains("[cp:/files/test1/dir/"+p+"]");
+			assertStream(x.getFile("test1/dir/dir/"+p)).string().contains("[cp:/files/test1/dir/dir/"+p+"]");
+			assertStream(x.getFile(" / test1/"+p+" / ")).string().contains("[cp:/files/test1/"+p+"]");
+			assertStream(x.getFile(" / test1/dir/"+p+" / ")).string().contains("[cp:/files/test1/dir/"+p+"]");
+			assertStream(x.getFile(" / test1/dir/dir/"+p+" / ")).string().contains("[cp:/files/test1/dir/dir/"+p+"]");
+		}
+
+		String[] badPatterns = {"files/test1/bad.txt","files/test1/../test1/_a.txt","files/bad.txt",null,"",".",".."};
+
+		for (String p : badPatterns) {
+			assertStream(x.getFile(p)).doesNotExist();
+		}
+	}
+
+	@Test
+	public void c03_classpathRoot_localized_flat() throws Exception {
+		FileFinder x = FileFinder
+			.create()
+			.cp(FileFinder_Test.class, "/files", false)
+			.build();
+
+
+		String[] patterns = {"_a.txt","_b",".c",".d.txt","e.txt","f","g_foo.txt","h.foo.txt","i_foo"};
+		String[] patterns_ja = {"_a_ja.txt","_b_ja",".c",".d_ja.txt","e_ja.txt","f_ja","g_foo_ja.txt","h.foo_ja.txt","i_foo_ja"};
+		String[] patterns_ja_JP = {"_a_ja_JP.txt","_b_ja_JP",".c",".d_ja_JP.txt","e_ja_JP.txt","f_ja_JP","g_foo_ja_JP.txt","h.foo_ja_JP.txt","i_foo_ja_JP"};
+
+		for (int i = 0; i < patterns.length; i++) {
+			String p = patterns[i], p_ja = patterns_ja[i], p_ja_JP = patterns_ja_JP[i];
+
+			assertStream(x.getFile("test1/"+p,null)).string().contains("[cp:/files/test1/"+p+"]");
+			assertStream(x.getFile("test1/dir/"+p,null)).string().contains("[cp:/files/test1/dir/"+p+"]");
+			assertStream(x.getFile("test1/dir/dir/"+p,null)).string().contains("[cp:/files/test1/dir/dir/"+p+"]");
+			assertStream(x.getFile("/test1/"+p+"/",null)).string().contains("[cp:/files/test1/"+p+"]");
+			assertStream(x.getFile("/test1/dir/"+p+"/",null)).string().contains("[cp:/files/test1/dir/"+p+"]");
+			assertStream(x.getFile("/test1/dir/dir/"+p+"/",null)).string().contains("[cp:/files/test1/dir/dir/"+p+"]");
+
+			assertStream(x.getFile("test1/"+p,JAPANESE)).string().contains("[cp:/files/test1/"+p_ja+"]");
+			assertStream(x.getFile("test1/dir/"+p,JAPANESE)).string().contains("[cp:/files/test1/dir/"+p_ja+"]");
+			assertStream(x.getFile("test1/dir/dir/"+p,JAPANESE)).string().contains("[cp:/files/test1/dir/dir/"+p_ja+"]");
+			assertStream(x.getFile("/test1/"+p+"/",JAPANESE)).string().contains("[cp:/files/test1/"+p_ja+"]");
+			assertStream(x.getFile("/test1/dir/"+p+"/",JAPANESE)).string().contains("[cp:/files/test1/dir/"+p_ja+"]");
+			assertStream(x.getFile("/test1/dir/dir/"+p+"/",JAPANESE)).string().contains("[cp:/files/test1/dir/dir/"+p_ja+"]");
+
+			assertStream(x.getFile("test1/"+p,JAPAN)).string().contains("[cp:/files/test1/"+p_ja_JP+"]");
+			assertStream(x.getFile("test1/dir/"+p,JAPAN)).string().contains("[cp:/files/test1/dir/"+p_ja_JP+"]");
+			assertStream(x.getFile("test1/dir/dir/"+p,JAPAN)).string().contains("[cp:/files/test1/dir/dir/"+p_ja_JP+"]");
+			assertStream(x.getFile("/test1/"+p+"/",JAPAN)).string().contains("[cp:/files/test1/"+p_ja_JP+"]");
+			assertStream(x.getFile("/test1/dir/"+p+"/",JAPAN)).string().contains("[cp:/files/test1/dir/"+p_ja_JP+"]");
+			assertStream(x.getFile("/test1/dir/dir/"+p+"/",JAPAN)).string().contains("[cp:/files/test1/dir/dir/"+p_ja_JP+"]");
+		}
+
+		String[] badPatterns = {"test1/bad.txt","test1/../test1/_a.txt","bad.txt",null,"",".",".."};
+
+		for (String p : badPatterns) {
+			assertStream(x.getFile(p,null)).doesNotExist();
+			assertStream(x.getFile(p,JAPANESE)).doesNotExist();
+			assertStream(x.getFile(p,JAPAN)).doesNotExist();
+		}
+	}
+
+
+	@Test
+	public void c04_classpathRoot_localized_hierarchical() throws Exception {
+		FileFinder x = FileFinder
+			.create()
+			.cp(FileFinder_Test.class, "/files/test2", false)
+			.build();
+
+		assertStream(x.getFile("a.txt", null)).string().contains("[cp:/files/test2/a.txt]");
+		assertStream(x.getFile("a.txt", JAPANESE)).string().contains("[cp:/files/test2/ja/a.txt]");
+		assertStream(x.getFile("a.txt", JAPAN)).string().contains("[cp:/files/test2/ja/JP/a.txt]");
+		assertStream(x.getFile("/a.txt/", null)).string().contains("[cp:/files/test2/a.txt]");
+		assertStream(x.getFile("/a.txt/", JAPANESE)).string().contains("[cp:/files/test2/ja/a.txt]");
+		assertStream(x.getFile("/a.txt/", JAPAN)).string().contains("[cp:/files/test2/ja/JP/a.txt]");
+
+		assertStream(x.getFile("dir/a.txt", null)).string().contains("[cp:/files/test2/dir/a.txt]");
+		assertStream(x.getFile("dir/a.txt", JAPANESE)).string().contains("[cp:/files/test2/ja/dir/a.txt]");
+		assertStream(x.getFile("dir/a.txt", JAPAN)).string().contains("[cp:/files/test2/ja/JP/dir/a.txt]");
+		assertStream(x.getFile("/dir/a.txt/", null)).string().contains("[cp:/files/test2/dir/a.txt]");
+		assertStream(x.getFile("/dir/a.txt/", JAPANESE)).string().contains("[cp:/files/test2/ja/dir/a.txt]");
+		assertStream(x.getFile("/dir/a.txt/", JAPAN)).string().contains("[cp:/files/test2/ja/JP/dir/a.txt]");
+
+		assertStream(x.getFile("dir/dir/a.txt", null)).string().contains("[cp:/files/test2/dir/dir/a.txt]");
+		assertStream(x.getFile("dir/dir/a.txt", JAPANESE)).string().contains("[cp:/files/test2/ja/dir/dir/a.txt]");
+		assertStream(x.getFile("dir/dir/a.txt", JAPAN)).string().contains("[cp:/files/test2/ja/JP/dir/dir/a.txt]");
+		assertStream(x.getFile("/dir/dir/a.txt/", null)).string().contains("[cp:/files/test2/dir/dir/a.txt]");
+		assertStream(x.getFile("/dir/dir/a.txt/", JAPANESE)).string().contains("[cp:/files/test2/ja/dir/dir/a.txt]");
+		assertStream(x.getFile("/dir/dir/a.txt/", JAPAN)).string().contains("[cp:/files/test2/ja/JP/dir/dir/a.txt]");
+	}
+
+	//-----------------------------------------------------------------------------------------------------------------
+	// Classpath tests - Classpath relative
+	//-----------------------------------------------------------------------------------------------------------------
+
+	@Test
+	public void d01a_classpathRelative_rootDir() throws Exception {
+		FileFinder x = FileFinder
+			.create()
+			.cp(FileFinder_Test.class, "", false)
+			.build();
+
+		String[] patterns = {"_a.txt","_b",".c",".d.txt","e.txt","f","g_foo.txt","h.foo.txt","i_foo"};
+
+		for (String p : patterns) {
+			assertStream(x.getFile("files/test1/"+p)).string().contains("[cp:/org/apache/juneau/cp/files/test1/"+p+"]");
+			assertStream(x.getFile("files/test1/dir/"+p)).string().contains("[cp:/org/apache/juneau/cp/files/test1/dir/"+p+"]");
+			assertStream(x.getFile("files/test1/dir/dir/"+p)).string().contains("[cp:/org/apache/juneau/cp/files/test1/dir/dir/"+p+"]");
+			assertStream(x.getFile(" / files/test1/"+p+" / ")).string().contains("[cp:/org/apache/juneau/cp/files/test1/"+p+"]");
+			assertStream(x.getFile(" / files/test1/dir/"+p+" / ")).string().contains("[cp:/org/apache/juneau/cp/files/test1/dir/"+p+"]");
+			assertStream(x.getFile(" / files/test1/dir/dir/"+p+" / ")).string().contains("[cp:/org/apache/juneau/cp/files/test1/dir/dir/"+p+"]");
+		}
+
+		assertStream(x.getFile("_a.txt")).string().contains("[cp:/org/apache/juneau/cp/_a.txt]");
+
+		String[] badPatterns = {"files/test1/bad.txt","files/test1/../test1/_a.txt","files/bad.txt",null,"",".",".."};
+
+		for (String p : badPatterns) {
+			assertStream(x.getFile(p)).doesNotExist();
+		}
+	}
+
+	@Test
+	public void d01b_classpathRelative_rootDir_recursive() throws Exception {
+		FileFinder x = FileFinder
+			.create()
+			.cp(FileFinder_Test2.class, "", true)
+			.build();
+
+		String[] patterns = {"_a.txt","_b",".c",".d.txt","e.txt","f","g_foo.txt","h.foo.txt","i_foo"};
+
+		for (String p : patterns) {
+			assertStream(x.getFile("files/test1/"+p)).string().contains("[cp:/org/apache/juneau/cp/files/test1/"+p+"]");
+			assertStream(x.getFile("files/test1/dir/"+p)).string().contains("[cp:/org/apache/juneau/cp/files/test1/dir/"+p+"]");
+			assertStream(x.getFile("files/test1/dir/dir/"+p)).string().contains("[cp:/org/apache/juneau/cp/files/test1/dir/dir/"+p+"]");
+			assertStream(x.getFile(" / files/test1/"+p+" / ")).string().contains("[cp:/org/apache/juneau/cp/files/test1/"+p+"]");
+			assertStream(x.getFile(" / files/test1/dir/"+p+" / ")).string().contains("[cp:/org/apache/juneau/cp/files/test1/dir/"+p+"]");
+			assertStream(x.getFile(" / files/test1/dir/dir/"+p+" / ")).string().contains("[cp:/org/apache/juneau/cp/files/test1/dir/dir/"+p+"]");
+		}
+	}
+
+	@Test
+	public void d02a_classpathRelative_subdir() throws Exception {
+		FileFinder x = FileFinder
+			.create()
+			.cp(FileFinder_Test.class, "files", false)
+			.build();
+
+		String[] patterns = {"_a.txt","_b",".c",".d.txt","e.txt","f","g_foo.txt","h.foo.txt","i_foo"};
+
+		for (String p : patterns) {
+			assertStream(x.getFile("test1/"+p)).string().contains("[cp:/org/apache/juneau/cp/files/test1/"+p+"]");
+			assertStream(x.getFile("test1/dir/"+p)).string().contains("[cp:/org/apache/juneau/cp/files/test1/dir/"+p+"]");
+			assertStream(x.getFile("test1/dir/dir/"+p)).string().contains("[cp:/org/apache/juneau/cp/files/test1/dir/dir/"+p+"]");
+			assertStream(x.getFile(" / test1/"+p+" / ")).string().contains("[cp:/org/apache/juneau/cp/files/test1/"+p+"]");
+			assertStream(x.getFile(" / test1/dir/"+p+" / ")).string().contains("[cp:/org/apache/juneau/cp/files/test1/dir/"+p+"]");
+			assertStream(x.getFile(" / test1/dir/dir/"+p+" / ")).string().contains("[cp:/org/apache/juneau/cp/files/test1/dir/dir/"+p+"]");
+		}
+
+		String[] badPatterns = {"files/test1/bad.txt","files/test1/../test1/_a.txt","files/bad.txt",null,"",".",".."};
+
+		for (String p : badPatterns) {
+			assertStream(x.getFile(p)).doesNotExist();
+		}
+	}
+
+	@Test
+	public void d02b_classpathRelative_subdir_recursive() throws Exception {
+		FileFinder x = FileFinder
+			.create()
+			.cp(FileFinder_Test2.class, "files", true)
+			.build();
+
+		String[] patterns = {"_a.txt","_b",".c",".d.txt","e.txt","f","g_foo.txt","h.foo.txt","i_foo"};
+
+		for (String p : patterns) {
+			assertStream(x.getFile("test1/"+p)).string().contains("[cp:/org/apache/juneau/cp/files/test1/"+p+"]");
+			assertStream(x.getFile("test1/dir/"+p)).string().contains("[cp:/org/apache/juneau/cp/files/test1/dir/"+p+"]");
+			assertStream(x.getFile("test1/dir/dir/"+p)).string().contains("[cp:/org/apache/juneau/cp/files/test1/dir/dir/"+p+"]");
+			assertStream(x.getFile(" / test1/"+p+" / ")).string().contains("[cp:/org/apache/juneau/cp/files/test1/"+p+"]");
+			assertStream(x.getFile(" / test1/dir/"+p+" / ")).string().contains("[cp:/org/apache/juneau/cp/files/test1/dir/"+p+"]");
+			assertStream(x.getFile(" / test1/dir/dir/"+p+" / ")).string().contains("[cp:/org/apache/juneau/cp/files/test1/dir/dir/"+p+"]");
+		}
+	}
+
+	@Test
+	public void d03a_classpathRelative_localized_flat() throws Exception {
+		FileFinder x = FileFinder
+			.create()
+			.cp(FileFinder_Test.class, "files", false)
+			.build();
+
+
+		String[] patterns = {"_a.txt","_b",".c",".d.txt","e.txt","f","g_foo.txt","h.foo.txt","i_foo"};
+		String[] patterns_ja = {"_a_ja.txt","_b_ja",".c",".d_ja.txt","e_ja.txt","f_ja","g_foo_ja.txt","h.foo_ja.txt","i_foo_ja"};
+		String[] patterns_ja_JP = {"_a_ja_JP.txt","_b_ja_JP",".c",".d_ja_JP.txt","e_ja_JP.txt","f_ja_JP","g_foo_ja_JP.txt","h.foo_ja_JP.txt","i_foo_ja_JP"};
+
+		for (int i = 0; i < patterns.length; i++) {
+			String p = patterns[i], p_ja = patterns_ja[i], p_ja_JP = patterns_ja_JP[i];
+
+			assertStream(x.getFile("test1/"+p,null)).string().contains("[cp:/org/apache/juneau/cp/files/test1/"+p+"]");
+			assertStream(x.getFile("test1/dir/"+p,null)).string().contains("[cp:/org/apache/juneau/cp/files/test1/dir/"+p+"]");
+			assertStream(x.getFile("test1/dir/dir/"+p,null)).string().contains("[cp:/org/apache/juneau/cp/files/test1/dir/dir/"+p+"]");
+			assertStream(x.getFile("/test1/"+p+"/",null)).string().contains("[cp:/org/apache/juneau/cp/files/test1/"+p+"]");
+			assertStream(x.getFile("/test1/dir/"+p+"/",null)).string().contains("[cp:/org/apache/juneau/cp/files/test1/dir/"+p+"]");
+			assertStream(x.getFile("/test1/dir/dir/"+p+"/",null)).string().contains("[cp:/org/apache/juneau/cp/files/test1/dir/dir/"+p+"]");
+
+			assertStream(x.getFile("test1/"+p,JAPANESE)).string().contains("[cp:/org/apache/juneau/cp/files/test1/"+p_ja+"]");
+			assertStream(x.getFile("test1/dir/"+p,JAPANESE)).string().contains("[cp:/org/apache/juneau/cp/files/test1/dir/"+p_ja+"]");
+			assertStream(x.getFile("test1/dir/dir/"+p,JAPANESE)).string().contains("[cp:/org/apache/juneau/cp/files/test1/dir/dir/"+p_ja+"]");
+			assertStream(x.getFile("/test1/"+p+"/",JAPANESE)).string().contains("[cp:/org/apache/juneau/cp/files/test1/"+p_ja+"]");
+			assertStream(x.getFile("/test1/dir/"+p+"/",JAPANESE)).string().contains("[cp:/org/apache/juneau/cp/files/test1/dir/"+p_ja+"]");
+			assertStream(x.getFile("/test1/dir/dir/"+p+"/",JAPANESE)).string().contains("[cp:/org/apache/juneau/cp/files/test1/dir/dir/"+p_ja+"]");
+
+			assertStream(x.getFile("test1/"+p,JAPAN)).string().contains("[cp:/org/apache/juneau/cp/files/test1/"+p_ja_JP+"]");
+			assertStream(x.getFile("test1/dir/"+p,JAPAN)).string().contains("[cp:/org/apache/juneau/cp/files/test1/dir/"+p_ja_JP+"]");
+			assertStream(x.getFile("test1/dir/dir/"+p,JAPAN)).string().contains("[cp:/org/apache/juneau/cp/files/test1/dir/dir/"+p_ja_JP+"]");
+			assertStream(x.getFile("/test1/"+p+"/",JAPAN)).string().contains("[cp:/org/apache/juneau/cp/files/test1/"+p_ja_JP+"]");
+			assertStream(x.getFile("/test1/dir/"+p+"/",JAPAN)).string().contains("[cp:/org/apache/juneau/cp/files/test1/dir/"+p_ja_JP+"]");
+			assertStream(x.getFile("/test1/dir/dir/"+p+"/",JAPAN)).string().contains("[cp:/org/apache/juneau/cp/files/test1/dir/dir/"+p_ja_JP+"]");
+		}
+
+		String[] badPatterns = {"test1/bad.txt","test1/../test1/_a.txt","bad.txt",null,"",".",".."};
+
+		for (String p : badPatterns) {
+			assertStream(x.getFile(p,null)).doesNotExist();
+			assertStream(x.getFile(p,JAPANESE)).doesNotExist();
+			assertStream(x.getFile(p,JAPAN)).doesNotExist();
+		}
+	}
+
+	@Test
+	public void d03b_classpathRelative_localized_flat_recursive() throws Exception {
+		FileFinder x = FileFinder
+			.create()
+			.cp(FileFinder_Test2.class, "files", true)
+			.build();
+
+
+		String[] patterns = {"_a.txt","_b",".c",".d.txt","e.txt","f","g_foo.txt","h.foo.txt","i_foo"};
+		String[] patterns_ja = {"_a_ja.txt","_b_ja",".c",".d_ja.txt","e_ja.txt","f_ja","g_foo_ja.txt","h.foo_ja.txt","i_foo_ja"};
+		String[] patterns_ja_JP = {"_a_ja_JP.txt","_b_ja_JP",".c",".d_ja_JP.txt","e_ja_JP.txt","f_ja_JP","g_foo_ja_JP.txt","h.foo_ja_JP.txt","i_foo_ja_JP"};
+
+		for (int i = 0; i < patterns.length; i++) {
+			String p = patterns[i], p_ja = patterns_ja[i], p_ja_JP = patterns_ja_JP[i];
+
+			assertStream(x.getFile("test1/"+p,null)).string().contains("[cp:/org/apache/juneau/cp/files/test1/"+p+"]");
+			assertStream(x.getFile("test1/dir/"+p,null)).string().contains("[cp:/org/apache/juneau/cp/files/test1/dir/"+p+"]");
+			assertStream(x.getFile("test1/dir/dir/"+p,null)).string().contains("[cp:/org/apache/juneau/cp/files/test1/dir/dir/"+p+"]");
+			assertStream(x.getFile("/test1/"+p+"/",null)).string().contains("[cp:/org/apache/juneau/cp/files/test1/"+p+"]");
+			assertStream(x.getFile("/test1/dir/"+p+"/",null)).string().contains("[cp:/org/apache/juneau/cp/files/test1/dir/"+p+"]");
+			assertStream(x.getFile("/test1/dir/dir/"+p+"/",null)).string().contains("[cp:/org/apache/juneau/cp/files/test1/dir/dir/"+p+"]");
+
+			assertStream(x.getFile("test1/"+p,JAPANESE)).string().contains("[cp:/org/apache/juneau/cp/files/test1/"+p_ja+"]");
+			assertStream(x.getFile("test1/dir/"+p,JAPANESE)).string().contains("[cp:/org/apache/juneau/cp/files/test1/dir/"+p_ja+"]");
+			assertStream(x.getFile("test1/dir/dir/"+p,JAPANESE)).string().contains("[cp:/org/apache/juneau/cp/files/test1/dir/dir/"+p_ja+"]");
+			assertStream(x.getFile("/test1/"+p+"/",JAPANESE)).string().contains("[cp:/org/apache/juneau/cp/files/test1/"+p_ja+"]");
+			assertStream(x.getFile("/test1/dir/"+p+"/",JAPANESE)).string().contains("[cp:/org/apache/juneau/cp/files/test1/dir/"+p_ja+"]");
+			assertStream(x.getFile("/test1/dir/dir/"+p+"/",JAPANESE)).string().contains("[cp:/org/apache/juneau/cp/files/test1/dir/dir/"+p_ja+"]");
+
+			assertStream(x.getFile("test1/"+p,JAPAN)).string().contains("[cp:/org/apache/juneau/cp/files/test1/"+p_ja_JP+"]");
+			assertStream(x.getFile("test1/dir/"+p,JAPAN)).string().contains("[cp:/org/apache/juneau/cp/files/test1/dir/"+p_ja_JP+"]");
+			assertStream(x.getFile("test1/dir/dir/"+p,JAPAN)).string().contains("[cp:/org/apache/juneau/cp/files/test1/dir/dir/"+p_ja_JP+"]");
+			assertStream(x.getFile("/test1/"+p+"/",JAPAN)).string().contains("[cp:/org/apache/juneau/cp/files/test1/"+p_ja_JP+"]");
+			assertStream(x.getFile("/test1/dir/"+p+"/",JAPAN)).string().contains("[cp:/org/apache/juneau/cp/files/test1/dir/"+p_ja_JP+"]");
+			assertStream(x.getFile("/test1/dir/dir/"+p+"/",JAPAN)).string().contains("[cp:/org/apache/juneau/cp/files/test1/dir/dir/"+p_ja_JP+"]");
+		}
+	}
+
+	@Test
+	public void d04a_classpathRelative_localized_hierarchical() throws Exception {
+		FileFinder x = FileFinder
+			.create()
+			.cp(FileFinder_Test.class, "files/test2", false)
+			.build();
+
+		assertStream(x.getFile("a.txt", null)).string().contains("[cp:/org/apache/juneau/cp/files/test2/a.txt]");
+		assertStream(x.getFile("a.txt", JAPANESE)).string().contains("[cp:/org/apache/juneau/cp/files/test2/ja/a.txt]");
+		assertStream(x.getFile("a.txt", JAPAN)).string().contains("[cp:/org/apache/juneau/cp/files/test2/ja/JP/a.txt]");
+		assertStream(x.getFile("/a.txt/", null)).string().contains("[cp:/org/apache/juneau/cp/files/test2/a.txt]");
+		assertStream(x.getFile("/a.txt/", JAPANESE)).string().contains("[cp:/org/apache/juneau/cp/files/test2/ja/a.txt]");
+		assertStream(x.getFile("/a.txt/", JAPAN)).string().contains("[cp:/org/apache/juneau/cp/files/test2/ja/JP/a.txt]");
+
+		assertStream(x.getFile("dir/a.txt", null)).string().contains("[cp:/org/apache/juneau/cp/files/test2/dir/a.txt]");
+		assertStream(x.getFile("dir/a.txt", JAPANESE)).string().contains("[cp:/org/apache/juneau/cp/files/test2/ja/dir/a.txt]");
+		assertStream(x.getFile("dir/a.txt", JAPAN)).string().contains("[cp:/org/apache/juneau/cp/files/test2/ja/JP/dir/a.txt]");
+		assertStream(x.getFile("/dir/a.txt/", null)).string().contains("[cp:/org/apache/juneau/cp/files/test2/dir/a.txt]");
+		assertStream(x.getFile("/dir/a.txt/", JAPANESE)).string().contains("[cp:/org/apache/juneau/cp/files/test2/ja/dir/a.txt]");
+		assertStream(x.getFile("/dir/a.txt/", JAPAN)).string().contains("[cp:/org/apache/juneau/cp/files/test2/ja/JP/dir/a.txt]");
+
+		assertStream(x.getFile("dir/dir/a.txt", null)).string().contains("[cp:/org/apache/juneau/cp/files/test2/dir/dir/a.txt]");
+		assertStream(x.getFile("dir/dir/a.txt", JAPANESE)).string().contains("[cp:/org/apache/juneau/cp/files/test2/ja/dir/dir/a.txt]");
+		assertStream(x.getFile("dir/dir/a.txt", JAPAN)).string().contains("[cp:/org/apache/juneau/cp/files/test2/ja/JP/dir/dir/a.txt]");
+		assertStream(x.getFile("/dir/dir/a.txt/", null)).string().contains("[cp:/org/apache/juneau/cp/files/test2/dir/dir/a.txt]");
+		assertStream(x.getFile("/dir/dir/a.txt/", JAPANESE)).string().contains("[cp:/org/apache/juneau/cp/files/test2/ja/dir/dir/a.txt]");
+		assertStream(x.getFile("/dir/dir/a.txt/", JAPAN)).string().contains("[cp:/org/apache/juneau/cp/files/test2/ja/JP/dir/dir/a.txt]");
+	}
+
+	@Test
+	public void d04b_classpathRelative_localized_hierarchical_recursive() throws Exception {
+		FileFinder x = FileFinder
+			.create()
+			.cp(FileFinder_Test2.class, "files/test2", true)
+			.build();
+
+		assertStream(x.getFile("a.txt", null)).string().contains("[cp:/org/apache/juneau/cp/files/test2/a.txt]");
+		assertStream(x.getFile("a.txt", JAPANESE)).string().contains("[cp:/org/apache/juneau/cp/files/test2/ja/a.txt]");
+		assertStream(x.getFile("a.txt", JAPAN)).string().contains("[cp:/org/apache/juneau/cp/files/test2/ja/JP/a.txt]");
+		assertStream(x.getFile("/a.txt/", null)).string().contains("[cp:/org/apache/juneau/cp/files/test2/a.txt]");
+		assertStream(x.getFile("/a.txt/", JAPANESE)).string().contains("[cp:/org/apache/juneau/cp/files/test2/ja/a.txt]");
+		assertStream(x.getFile("/a.txt/", JAPAN)).string().contains("[cp:/org/apache/juneau/cp/files/test2/ja/JP/a.txt]");
+
+		assertStream(x.getFile("dir/a.txt", null)).string().contains("[cp:/org/apache/juneau/cp/files/test2/dir/a.txt]");
+		assertStream(x.getFile("dir/a.txt", JAPANESE)).string().contains("[cp:/org/apache/juneau/cp/files/test2/ja/dir/a.txt]");
+		assertStream(x.getFile("dir/a.txt", JAPAN)).string().contains("[cp:/org/apache/juneau/cp/files/test2/ja/JP/dir/a.txt]");
+		assertStream(x.getFile("/dir/a.txt/", null)).string().contains("[cp:/org/apache/juneau/cp/files/test2/dir/a.txt]");
+		assertStream(x.getFile("/dir/a.txt/", JAPANESE)).string().contains("[cp:/org/apache/juneau/cp/files/test2/ja/dir/a.txt]");
+		assertStream(x.getFile("/dir/a.txt/", JAPAN)).string().contains("[cp:/org/apache/juneau/cp/files/test2/ja/JP/dir/a.txt]");
+
+		assertStream(x.getFile("dir/dir/a.txt", null)).string().contains("[cp:/org/apache/juneau/cp/files/test2/dir/dir/a.txt]");
+		assertStream(x.getFile("dir/dir/a.txt", JAPANESE)).string().contains("[cp:/org/apache/juneau/cp/files/test2/ja/dir/dir/a.txt]");
+		assertStream(x.getFile("dir/dir/a.txt", JAPAN)).string().contains("[cp:/org/apache/juneau/cp/files/test2/ja/JP/dir/dir/a.txt]");
+		assertStream(x.getFile("/dir/dir/a.txt/", null)).string().contains("[cp:/org/apache/juneau/cp/files/test2/dir/dir/a.txt]");
+		assertStream(x.getFile("/dir/dir/a.txt/", JAPANESE)).string().contains("[cp:/org/apache/juneau/cp/files/test2/ja/dir/dir/a.txt]");
+		assertStream(x.getFile("/dir/dir/a.txt/", JAPAN)).string().contains("[cp:/org/apache/juneau/cp/files/test2/ja/JP/dir/dir/a.txt]");
+
+		x = FileFinder
+			.create()
+			.cp(FileFinder_Test2.class, "files/test2", true)
+			.ignorePattern(Pattern.compile("(?i).*\\.(class|properties)"))
+			.build();
+	}
+
+	@Test
+	public void d05_classpathRelative_ignorePattern() throws Exception {
+		FileFinder x = FileFinder
+			.create()
+			.cp(FileFinder_Test2.class, "files/test2", true)
+			.ignorePattern(Pattern.compile("(?i).*\\.(txt)"))
+			.build();
+
+		assertStream(x.getFile("a.txt", null)).doesNotExist();
+		assertStream(x.getFile("a.txt", JAPANESE)).doesNotExist();
+		assertStream(x.getFile("a.txt", JAPAN)).doesNotExist();
+
+		assertStream(x.getFile("dir/a.txt", null)).doesNotExist();
+		assertStream(x.getFile("dir/a.txt", JAPANESE)).doesNotExist();
+		assertStream(x.getFile("dir/a.txt", JAPAN)).doesNotExist();
+
+		assertStream(x.getFile("dir/dir/a.txt", null)).doesNotExist();
+		assertStream(x.getFile("dir/dir/a.txt", JAPANESE)).doesNotExist();
+		assertStream(x.getFile("dir/dir/a.txt", JAPAN)).doesNotExist();
+
+		x = FileFinder
+			.create()
+			.cp(FileFinder_Test2.class, "files/test2", true)
+			.ignorePattern(Pattern.compile("(?i).*\\.(TXT)"))
+			.build();
+
+		assertStream(x.getFile("a.txt", null)).doesNotExist();
+		assertStream(x.getFile("a.txt", JAPANESE)).doesNotExist();
+		assertStream(x.getFile("a.txt", JAPAN)).doesNotExist();
+
+		assertStream(x.getFile("dir/a.txt", null)).doesNotExist();
+		assertStream(x.getFile("dir/a.txt", JAPANESE)).doesNotExist();
+		assertStream(x.getFile("dir/a.txt", JAPAN)).doesNotExist();
+
+		assertStream(x.getFile("dir/dir/a.txt", null)).doesNotExist();
+		assertStream(x.getFile("dir/dir/a.txt", JAPANESE)).doesNotExist();
+		assertStream(x.getFile("dir/dir/a.txt", JAPAN)).doesNotExist();
+
+		x = FileFinder
+			.create()
+			.cp(FileFinder_Test2.class, "files/test2", true)
+			.ignorePattern(null)
+			.build();
+
+		assertStream(x.getFile("a.txt", null)).string().contains("[cp:/org/apache/juneau/cp/files/test2/a.txt]");
+		assertStream(x.getFile("a.txt", JAPANESE)).string().contains("[cp:/org/apache/juneau/cp/files/test2/ja/a.txt]");
+		assertStream(x.getFile("a.txt", JAPAN)).string().contains("[cp:/org/apache/juneau/cp/files/test2/ja/JP/a.txt]");
+
+		assertStream(x.getFile("dir/a.txt", null)).string().contains("[cp:/org/apache/juneau/cp/files/test2/dir/a.txt]");
+		assertStream(x.getFile("dir/a.txt", JAPANESE)).string().contains("[cp:/org/apache/juneau/cp/files/test2/ja/dir/a.txt]");
+		assertStream(x.getFile("dir/a.txt", JAPAN)).string().contains("[cp:/org/apache/juneau/cp/files/test2/ja/JP/dir/a.txt]");
+
+		assertStream(x.getFile("dir/dir/a.txt", null)).string().contains("[cp:/org/apache/juneau/cp/files/test2/dir/dir/a.txt]");
+		assertStream(x.getFile("dir/dir/a.txt", JAPANESE)).string().contains("[cp:/org/apache/juneau/cp/files/test2/ja/dir/dir/a.txt]");
+		assertStream(x.getFile("dir/dir/a.txt", JAPAN)).string().contains("[cp:/org/apache/juneau/cp/files/test2/ja/JP/dir/dir/a.txt]");
+	}
+
+	//-----------------------------------------------------------------------------------------------------------------
+	// Other tests
+	//-----------------------------------------------------------------------------------------------------------------
+
+	@Test
+	public void e01_localDir_hashCode() throws Exception {
+		Set<LocalDir> s = null;
+
+		s = ASet.of(new LocalDir(Paths.get("test")), new LocalDir(Paths.get("test")));
+		assertCollection(s).isSize(1);
+
+		s = ASet.of(new LocalDir(Paths.get("test")), new LocalDir(Paths.get("test","test")));
+		assertCollection(s).isSize(2);
+
+		s = ASet.of(new LocalDir(List.class,null), new LocalDir(List.class,null));
+		assertCollection(s).isSize(1);
+
+		s = ASet.of(new LocalDir(List.class,null), new LocalDir(List.class,"foo"));
+		assertCollection(s).isSize(2);
+
+		s = ASet.of(new LocalDir(List.class,null), new LocalDir(String.class,null));
+		assertCollection(s).isSize(2);
+	}
+
+	@Test
+	public void e02_caching() throws Exception {
+		FileFinder x = FileFinder
+			.create()
+			.dir(".")
+			.caching(100_000_000)
+			.build();
+
+		assertStream(x.getFile("files/test1/_a.txt")).string().contains("[home:/files/test1/_a.txt]");
+		assertStream(x.getFile("files/test1/_a.txt")).string().contains("[home:/files/test1/_a.txt]");
+
+		x = FileFinder
+			.create()
+			.dir(".")
+			.caching(1)
+			.build();
+
+		assertStream(x.getFile("files/test1/_a.txt")).string().contains("[home:/files/test1/_a.txt]");
+		assertStream(x.getFile("files/test1/_a.txt")).string().contains("[home:/files/test1/_a.txt]");
+
+		x = FileFinder
+			.create()
+			.cp(FileFinder_Test.class, "/", false)
+			.caching(100_000_000)
+			.build();
+
+		assertStream(x.getFile("files/test1/_a.txt")).string().contains("[cp:/files/test1/_a.txt]");
+		assertStream(x.getFile("files/test1/_a.txt")).string().contains("[cp:/files/test1/_a.txt]");
+	}
+
+	@Test
+	public void e03_subclassing() throws Exception {
+		E03b x = E03b
+			.create()
+			.dir(".")
+			.caching(100_000_000)
+			.build(E03b.class);
+		assertObject(x).isType(E03b.class);
+	}
+
+	public static class E03a extends FileFinderBuilder {}
+	public static class E03b extends FileFinder {
+		public static E03a create() {
+			return new E03a();
+		}
+		public E03b(E03a x) {
+			super(x);
+		}
+	}
+}
diff --git a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/cp/Messages_Test.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/cp/Messages_Test.java
index 13197fb..4e4d49e 100644
--- a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/cp/Messages_Test.java
+++ b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/cp/Messages_Test.java
@@ -19,8 +19,8 @@ import java.util.*;
 
 import static java.util.Locale.*;
 
-import org.apache.juneau.cp.test1.*;
-import org.apache.juneau.cp.test2.*;
+import org.apache.juneau.cp.test3.*;
+import org.apache.juneau.cp.test4.*;
 import org.junit.*;
 
 @FixMethodOrder(NAME_ASCENDING)
diff --git a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/cp/RecursiveResourceFinder_Test.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/cp/RecursiveResourceFinder_Test.java
index 6907e66..d5b88ca 100644
--- a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/cp/RecursiveResourceFinder_Test.java
+++ b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/cp/RecursiveResourceFinder_Test.java
@@ -16,8 +16,8 @@ import static org.apache.juneau.assertions.Assertions.*;
 import static org.junit.runners.MethodSorters.*;
 import static java.util.Locale.*;
 
-import org.apache.juneau.cp.test1.*;
-import org.apache.juneau.cp.test2.*;
+import org.apache.juneau.cp.test3.*;
+import org.apache.juneau.cp.test4.*;
 import org.junit.*;
 
 @FixMethodOrder(NAME_ASCENDING)
diff --git a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/cp/Resources_Test.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/cp/Resources_Test.java
index 5a9133e..6cebc85 100644
--- a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/cp/Resources_Test.java
+++ b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/cp/Resources_Test.java
@@ -16,7 +16,7 @@ import static org.apache.juneau.assertions.Assertions.*;
 import static org.junit.runners.MethodSorters.*;
 import static java.util.Locale.*;
 
-import org.apache.juneau.cp.test2.*;
+import org.apache.juneau.cp.test4.*;
 import org.apache.juneau.parser.*;
 import org.apache.juneau.plaintext.*;
 import org.junit.*;
diff --git a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/cp/SimpleResourceFinder_Test.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/cp/SimpleResourceFinder_Test.java
index fb1cb48..72b569b 100644
--- a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/cp/SimpleResourceFinder_Test.java
+++ b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/cp/SimpleResourceFinder_Test.java
@@ -16,8 +16,8 @@ import static org.apache.juneau.assertions.Assertions.*;
 import static org.junit.runners.MethodSorters.*;
 import static java.util.Locale.*;
 
-import org.apache.juneau.cp.test1.*;
-import org.apache.juneau.cp.test2.*;
+import org.apache.juneau.cp.test3.*;
+import org.apache.juneau.cp.test4.*;
 import org.junit.*;
 
 @FixMethodOrder(NAME_ASCENDING)
diff --git a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/cp/test1/MessageBundleTest1.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/cp/sub/FileFinder_Test2.java
similarity index 92%
copy from juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/cp/test1/MessageBundleTest1.java
copy to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/cp/sub/FileFinder_Test2.java
index cd3b40c..41f797b 100644
--- a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/cp/test1/MessageBundleTest1.java
+++ b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/cp/sub/FileFinder_Test2.java
@@ -10,8 +10,8 @@
 // * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 // * specific language governing permissions and limitations under the License.                                              *
 // ***************************************************************************************************************************
-package org.apache.juneau.cp.test1;
+package org.apache.juneau.cp.sub;
 
-public class MessageBundleTest1 {
+import org.apache.juneau.cp.*;
 
-}
+public class FileFinder_Test2 extends FileFinder_Test {}
diff --git a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/cp/test1/MessageBundleTest1.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/cp/test3/MessageBundleTest1.java
similarity index 97%
rename from juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/cp/test1/MessageBundleTest1.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/cp/test3/MessageBundleTest1.java
index cd3b40c..97fad18 100644
--- a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/cp/test1/MessageBundleTest1.java
+++ b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/cp/test3/MessageBundleTest1.java
@@ -10,7 +10,7 @@
 // * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 // * specific language governing permissions and limitations under the License.                                              *
 // ***************************************************************************************************************************
-package org.apache.juneau.cp.test1;
+package org.apache.juneau.cp.test3;
 
 public class MessageBundleTest1 {
 
diff --git a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/cp/test1/Test1.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/cp/test3/Test1.java
similarity index 97%
rename from juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/cp/test1/Test1.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/cp/test3/Test1.java
index 36757f6..b54c065 100644
--- a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/cp/test1/Test1.java
+++ b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/cp/test3/Test1.java
@@ -10,7 +10,7 @@
 // * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 // * specific language governing permissions and limitations under the License.                                              *
 // ***************************************************************************************************************************
-package org.apache.juneau.cp.test1;
+package org.apache.juneau.cp.test3;
 
 public class Test1 {
 
diff --git a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/cp/test2/Test2.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/cp/test4/Test2.java
similarity index 95%
rename from juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/cp/test2/Test2.java
rename to juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/cp/test4/Test2.java
index e433353..d55c119 100644
--- a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/cp/test2/Test2.java
+++ b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/cp/test4/Test2.java
@@ -10,9 +10,9 @@
 // * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 // * specific language governing permissions and limitations under the License.                                              *
 // ***************************************************************************************************************************
-package org.apache.juneau.cp.test2;
+package org.apache.juneau.cp.test4;
 
-import org.apache.juneau.cp.test1.*;
+import org.apache.juneau.cp.test3.*;
 
 public class Test2 extends Test1 {
 
diff --git a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/utils/IOUtilsTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/utils/IOUtilsTest.java
index e743b0d..ded7580 100755
--- a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/utils/IOUtilsTest.java
+++ b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/utils/IOUtilsTest.java
@@ -47,7 +47,6 @@ public class IOUtilsTest {
 	public void testLoadSystemResourceAsString() throws Exception {
 		assertNotNull(loadSystemResourceAsString("test1.txt", "."));
 		assertNull(loadSystemResourceAsString("test2.txt", "."));
-		assertNotNull(loadSystemResourceAsString("test2.txt", ".", "files"));
 		assertNull(loadSystemResourceAsString("test3.txt", "sub"));
 		assertNull(loadSystemResourceAsString("test3.txt", "sub2"));
 		assertNotNull(loadSystemResourceAsString("test3.txt", "."));
diff --git a/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/test2/Test2_ja.properties b/juneau-core/juneau-core-utest/src/test/resources/files/Test3.properties
similarity index 98%
copy from juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/test2/Test2_ja.properties
copy to juneau-core/juneau-core-utest/src/test/resources/files/Test3.properties
index 0431d1c..90a3dcd 100644
--- a/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/test2/Test2_ja.properties
+++ b/juneau-core/juneau-core-utest/src/test/resources/files/Test3.properties
@@ -12,4 +12,4 @@
 # *                                                                                                                         *
 # ***************************************************************************************************************************
 
-file=Test2_ja.properties
+file=files/Test3.properties
diff --git a/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/test2/Test2_ja.properties b/juneau-core/juneau-core-utest/src/test/resources/files/Test3_ja.properties
similarity index 98%
copy from juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/test2/Test2_ja.properties
copy to juneau-core/juneau-core-utest/src/test/resources/files/Test3_ja.properties
index 0431d1c..4ffd31e 100644
--- a/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/test2/Test2_ja.properties
+++ b/juneau-core/juneau-core-utest/src/test/resources/files/Test3_ja.properties
@@ -12,4 +12,4 @@
 # *                                                                                                                         *
 # ***************************************************************************************************************************
 
-file=Test2_ja.properties
+file=files/Test3_ja.properties
diff --git a/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/test1/files/Test1_ja_JP.properties b/juneau-core/juneau-core-utest/src/test/resources/files/Test3_ja_JP.properties
similarity index 97%
copy from juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/test1/files/Test1_ja_JP.properties
copy to juneau-core/juneau-core-utest/src/test/resources/files/Test3_ja_JP.properties
index 6ee8fdb..ed1139f 100644
--- a/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/test1/files/Test1_ja_JP.properties
+++ b/juneau-core/juneau-core-utest/src/test/resources/files/Test3_ja_JP.properties
@@ -12,4 +12,4 @@
 # *                                                                                                                         *
 # ***************************************************************************************************************************
 
-file=files/Test1_ja_JP.properties
+file=files/Test3_ja_JP.properties
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/files/test1/.c
similarity index 98%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/files/test1/.c
index d12cd3c..2402c40 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/files/test1/.c
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/files/test1/.c]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/files/test1/.c_ja
similarity index 98%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/files/test1/.c_ja
index d12cd3c..2a3c4d4 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/files/test1/.c_ja
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/files/test1/.c_ja]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/files/test1/.c_ja_JP
similarity index 98%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/files/test1/.c_ja_JP
index d12cd3c..56f6209 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/files/test1/.c_ja_JP
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/files/test1/.c_ja_JP]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/files/test1/.d.txt
similarity index 98%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/files/test1/.d.txt
index d12cd3c..8d40ccd 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/files/test1/.d.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/files/test1/.d.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/files/test1/.d_ja.txt
similarity index 98%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/files/test1/.d_ja.txt
index d12cd3c..ee31540 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/files/test1/.d_ja.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/files/test1/.d_ja.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/files/test1/.d_ja_JP.txt
similarity index 98%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/files/test1/.d_ja_JP.txt
index d12cd3c..d036b22 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/files/test1/.d_ja_JP.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/files/test1/.d_ja_JP.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/files/test1/_a.txt
similarity index 98%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/files/test1/_a.txt
index d12cd3c..3b747e4 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/files/test1/_a.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/files/test1/_a.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/files/test1/_a_ja.txt
similarity index 98%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/files/test1/_a_ja.txt
index d12cd3c..fb18caa 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/files/test1/_a_ja.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/files/test1/_a_ja.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/files/test1/_a_ja_JP.txt
similarity index 98%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/files/test1/_a_ja_JP.txt
index d12cd3c..1930494 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/files/test1/_a_ja_JP.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/files/test1/_a_ja_JP.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/files/test1/_b
similarity index 98%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/files/test1/_b
index d12cd3c..cd9d0a0 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/files/test1/_b
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/files/test1/_b]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/files/test1/_b_ja
similarity index 98%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/files/test1/_b_ja
index d12cd3c..ad57c12 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/files/test1/_b_ja
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/files/test1/_b_ja]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/files/test1/_b_ja_JP
similarity index 98%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/files/test1/_b_ja_JP
index d12cd3c..e2bd201 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/files/test1/_b_ja_JP
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/files/test1/_b_ja_JP]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/.c
similarity index 98%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/.c
index d12cd3c..3545919 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/.c
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/files/test1/dir/.c]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/.c_ja
similarity index 98%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/.c_ja
index d12cd3c..78886dc 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/.c_ja
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/files/test1/dir/.c_ja]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/.c_ja_JP
similarity index 98%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/.c_ja_JP
index d12cd3c..036977a 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/.c_ja_JP
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/files/test1/dir/.c_ja_JP]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/.d.txt
similarity index 98%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/.d.txt
index d12cd3c..b483fa8 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/.d.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/files/test1/dir/.d.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/.d_ja.txt
similarity index 97%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/.d_ja.txt
index d12cd3c..84d0f93 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/.d_ja.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/files/test1/dir/.d_ja.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/.d_ja_JP.txt
similarity index 97%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/.d_ja_JP.txt
index d12cd3c..11417ad 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/.d_ja_JP.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/files/test1/dir/.d_ja_JP.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/_a.txt
similarity index 98%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/_a.txt
index d12cd3c..f664427 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/_a.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/files/test1/dir/_a.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/_a_ja.txt
similarity index 97%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/_a_ja.txt
index d12cd3c..7f73395 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/_a_ja.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/files/test1/dir/_a_ja.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/_a_ja_JP.txt
similarity index 97%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/_a_ja_JP.txt
index d12cd3c..12492d8 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/_a_ja_JP.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/files/test1/dir/_a_ja_JP.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/_b
similarity index 98%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/_b
index d12cd3c..d5d477e 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/_b
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/files/test1/dir/_b]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/_b_ja
similarity index 98%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/_b_ja
index d12cd3c..b5b4397 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/_b_ja
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/files/test1/dir/_b_ja]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/_b_ja_JP
similarity index 98%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/_b_ja_JP
index d12cd3c..e3e75ea 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/_b_ja_JP
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/files/test1/dir/_b_ja_JP]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/dir/.c
similarity index 98%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/dir/.c
index d12cd3c..0b9a763 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/dir/.c
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/files/test1/dir/dir/.c]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/dir/.c_ja
similarity index 97%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/dir/.c_ja
index d12cd3c..b95e569 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/dir/.c_ja
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/files/test1/dir/dir/.c_ja]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/dir/.c_ja_JP
similarity index 97%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/dir/.c_ja_JP
index d12cd3c..b5921f3 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/dir/.c_ja_JP
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/files/test1/dir/dir/.c_ja_JP]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/dir/.d.txt
similarity index 97%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/dir/.d.txt
index d12cd3c..ab9b108 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/dir/.d.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/files/test1/dir/dir/.d.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/dir/.d_ja.txt
similarity index 97%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/dir/.d_ja.txt
index d12cd3c..ec01e68 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/dir/.d_ja.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/files/test1/dir/dir/.d_ja.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/dir/.d_ja_JP.txt
similarity index 97%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/dir/.d_ja_JP.txt
index d12cd3c..c03188d 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/dir/.d_ja_JP.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/files/test1/dir/dir/.d_ja_JP.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/dir/_a.txt
similarity index 97%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/dir/_a.txt
index d12cd3c..6a502ed 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/dir/_a.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/files/test1/dir/dir/_a.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/dir/_a_ja.txt
similarity index 97%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/dir/_a_ja.txt
index d12cd3c..bc80da6 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/dir/_a_ja.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/files/test1/dir/dir/_a_ja.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/dir/_a_ja_JP.txt
similarity index 97%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/dir/_a_ja_JP.txt
index d12cd3c..15f6ae8 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/dir/_a_ja_JP.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/files/test1/dir/dir/_a_ja_JP.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/dir/_b
similarity index 98%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/dir/_b
index d12cd3c..ba31d5d 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/dir/_b
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/files/test1/dir/dir/_b]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/dir/_b_ja
similarity index 97%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/dir/_b_ja
index d12cd3c..ef2acd4 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/dir/_b_ja
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/files/test1/dir/dir/_b_ja]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/dir/_b_ja_JP
similarity index 97%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/dir/_b_ja_JP
index d12cd3c..08aaf84 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/dir/_b_ja_JP
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/files/test1/dir/dir/_b_ja_JP]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/dir/e.txt
similarity index 97%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/dir/e.txt
index d12cd3c..1d10c64 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/dir/e.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/files/test1/dir/dir/e.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/dir/e_ja.txt
similarity index 97%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/dir/e_ja.txt
index d12cd3c..72c48f9 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/dir/e_ja.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/files/test1/dir/dir/e_ja.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/dir/e_ja_JP.txt
similarity index 97%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/dir/e_ja_JP.txt
index d12cd3c..27831a8 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/dir/e_ja_JP.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/files/test1/dir/dir/e_ja_JP.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/dir/f
similarity index 98%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/dir/f
index d12cd3c..7dfd6ff 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/dir/f
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/files/test1/dir/dir/f]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/dir/f_ja
similarity index 98%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/dir/f_ja
index d12cd3c..cb17343 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/dir/f_ja
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/files/test1/dir/dir/f_ja]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/dir/f_ja_JP
similarity index 97%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/dir/f_ja_JP
index d12cd3c..257f853 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/dir/f_ja_JP
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/files/test1/dir/dir/f_ja_JP]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/dir/g_foo.txt
similarity index 97%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/dir/g_foo.txt
index d12cd3c..22f0d50 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/dir/g_foo.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/files/test1/dir/dir/g_foo.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/dir/g_foo_ja.txt
similarity index 97%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/dir/g_foo_ja.txt
index d12cd3c..fbe7274 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/dir/g_foo_ja.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/files/test1/dir/dir/g_foo_ja.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/dir/g_foo_ja_JP.txt
similarity index 97%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/dir/g_foo_ja_JP.txt
index d12cd3c..2eccbe5 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/dir/g_foo_ja_JP.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/files/test1/dir/dir/g_foo_ja_JP.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/dir/h.foo.txt
similarity index 97%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/dir/h.foo.txt
index d12cd3c..51746e2 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/dir/h.foo.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/files/test1/dir/dir/h.foo.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/dir/h.foo_ja.txt
similarity index 97%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/dir/h.foo_ja.txt
index d12cd3c..d5f159e 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/dir/h.foo_ja.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/files/test1/dir/dir/h.foo_ja.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/dir/h.foo_ja_JP.txt
similarity index 97%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/dir/h.foo_ja_JP.txt
index d12cd3c..48f075b 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/dir/h.foo_ja_JP.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/files/test1/dir/dir/h.foo_ja_JP.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/dir/i_foo
similarity index 97%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/dir/i_foo
index d12cd3c..918f01a 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/dir/i_foo
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/files/test1/dir/dir/i_foo]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/dir/i_foo_ja
similarity index 97%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/dir/i_foo_ja
index d12cd3c..aee76ef 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/dir/i_foo_ja
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/files/test1/dir/dir/i_foo_ja]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/dir/i_foo_ja_JP
similarity index 97%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/dir/i_foo_ja_JP
index d12cd3c..21ff642 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/dir/i_foo_ja_JP
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/files/test1/dir/dir/i_foo_ja_JP]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/e.txt
similarity index 98%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/e.txt
index d12cd3c..1d2080c 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/e.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/files/test1/dir/e.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/e_ja.txt
similarity index 98%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/e_ja.txt
index d12cd3c..f4a088d 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/e_ja.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/files/test1/dir/e_ja.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/e_ja_JP.txt
similarity index 97%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/e_ja_JP.txt
index d12cd3c..82fce12 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/e_ja_JP.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/files/test1/dir/e_ja_JP.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/f
similarity index 98%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/f
index d12cd3c..4a76254 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/f
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/files/test1/dir/f]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/f_ja
similarity index 98%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/f_ja
index d12cd3c..a89c8f4 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/f_ja
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/files/test1/dir/f_ja]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/f_ja_JP
similarity index 98%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/f_ja_JP
index d12cd3c..97763a8 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/f_ja_JP
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/files/test1/dir/f_ja_JP]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/g_foo.txt
similarity index 97%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/g_foo.txt
index d12cd3c..32cc367 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/g_foo.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/files/test1/dir/g_foo.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/g_foo_ja.txt
similarity index 97%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/g_foo_ja.txt
index d12cd3c..9e54f10 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/g_foo_ja.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/files/test1/dir/g_foo_ja.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/g_foo_ja_JP.txt
similarity index 97%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/g_foo_ja_JP.txt
index d12cd3c..2b076a0 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/g_foo_ja_JP.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/files/test1/dir/g_foo_ja_JP.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/h.foo.txt
similarity index 97%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/h.foo.txt
index d12cd3c..1d64a91 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/h.foo.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/files/test1/dir/h.foo.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/h.foo_ja.txt
similarity index 97%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/h.foo_ja.txt
index d12cd3c..1546373 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/h.foo_ja.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/files/test1/dir/h.foo_ja.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/h.foo_ja_JP.txt
similarity index 97%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/h.foo_ja_JP.txt
index d12cd3c..2ce27fb 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/h.foo_ja_JP.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/files/test1/dir/h.foo_ja_JP.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/i_foo
similarity index 98%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/i_foo
index d12cd3c..c90bcba 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/i_foo
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/files/test1/dir/i_foo]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/i_foo_ja
similarity index 98%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/i_foo_ja
index d12cd3c..8f6281a 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/i_foo_ja
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/files/test1/dir/i_foo_ja]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/i_foo_ja_JP
similarity index 97%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/i_foo_ja_JP
index d12cd3c..534f314 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/files/test1/dir/i_foo_ja_JP
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/files/test1/dir/i_foo_ja_JP]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/files/test1/e.txt
similarity index 98%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/files/test1/e.txt
index d12cd3c..abbb044 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/files/test1/e.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/files/test1/e.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/files/test1/e_ja.txt
similarity index 98%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/files/test1/e_ja.txt
index d12cd3c..ad6d81b 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/files/test1/e_ja.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/files/test1/e_ja.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/files/test1/e_ja_JP.txt
similarity index 98%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/files/test1/e_ja_JP.txt
index d12cd3c..fb3cd3d 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/files/test1/e_ja_JP.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/files/test1/e_ja_JP.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/files/test1/f
similarity index 98%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/files/test1/f
index d12cd3c..855e9cd 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/files/test1/f
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/files/test1/f]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/files/test1/f_ja
similarity index 98%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/files/test1/f_ja
index d12cd3c..83e285d 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/files/test1/f_ja
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/files/test1/f_ja]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/files/test1/f_ja_JP
similarity index 98%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/files/test1/f_ja_JP
index d12cd3c..45aec73 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/files/test1/f_ja_JP
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/files/test1/f_ja_JP]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/files/test1/g_foo.txt
similarity index 98%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/files/test1/g_foo.txt
index d12cd3c..9acbe36 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/files/test1/g_foo.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/files/test1/g_foo.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/files/test1/g_foo_ja.txt
similarity index 98%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/files/test1/g_foo_ja.txt
index d12cd3c..7856ac8 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/files/test1/g_foo_ja.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/files/test1/g_foo_ja.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/files/test1/g_foo_ja_JP.txt
similarity index 97%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/files/test1/g_foo_ja_JP.txt
index d12cd3c..d08ec08 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/files/test1/g_foo_ja_JP.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/files/test1/g_foo_ja_JP.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/files/test1/h.foo.txt
similarity index 98%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/files/test1/h.foo.txt
index d12cd3c..c2e24bd 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/files/test1/h.foo.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/files/test1/h.foo.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/files/test1/h.foo_ja.txt
similarity index 98%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/files/test1/h.foo_ja.txt
index d12cd3c..3dd35ad 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/files/test1/h.foo_ja.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/files/test1/h.foo_ja.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/files/test1/h.foo_ja_JP.txt
similarity index 97%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/files/test1/h.foo_ja_JP.txt
index d12cd3c..92ed68a 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/files/test1/h.foo_ja_JP.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/files/test1/h.foo_ja_JP.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/files/test1/i_foo
similarity index 98%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/files/test1/i_foo
index d12cd3c..af50bec 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/files/test1/i_foo
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/files/test1/i_foo]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/files/test1/i_foo_ja
similarity index 98%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/files/test1/i_foo_ja
index d12cd3c..c36ddb6 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/files/test1/i_foo_ja
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/files/test1/i_foo_ja]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/files/test1/i_foo_ja_JP
similarity index 98%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/files/test1/i_foo_ja_JP
index d12cd3c..8b8d92e 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/files/test1/i_foo_ja_JP
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/files/test1/i_foo_ja_JP]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/files/test1/j.class
similarity index 98%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/files/test1/j.class
index d12cd3c..8e3f25c 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/files/test1/j.class
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/files/test1/j.class]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/files/test1/j_ja.class
similarity index 98%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/files/test1/j_ja.class
index d12cd3c..a5bce33 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/files/test1/j_ja.class
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/files/test1/j_ja.class]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/files/test1/j_ja_JP.class
similarity index 97%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/files/test1/j_ja_JP.class
index d12cd3c..a711b2d 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/files/test1/j_ja_JP.class
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/files/test1/j_ja_JP.class]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/files/test1/k.properties
similarity index 98%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/files/test1/k.properties
index d12cd3c..7f60314 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/files/test1/k.properties
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/files/test1/k.properties]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/files/test1/k_ja.properties
similarity index 97%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/files/test1/k_ja.properties
index d12cd3c..d3e20e9 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/files/test1/k_ja.properties
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/files/test1/k_ja.properties]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/files/test1/k_ja_JP.properties
similarity index 97%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/files/test1/k_ja_JP.properties
index d12cd3c..ef84dac 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/files/test1/k_ja_JP.properties
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/files/test1/k_ja_JP.properties]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/files/test2/a.txt
similarity index 98%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/files/test2/a.txt
index d12cd3c..b912207 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/files/test2/a.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/files/test2/a.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/files/test2/dir/a.txt
similarity index 98%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/files/test2/dir/a.txt
index d12cd3c..b106481 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/files/test2/dir/a.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/files/test2/dir/a.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/files/test2/dir/dir/a.txt
similarity index 97%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/files/test2/dir/dir/a.txt
index d12cd3c..41a31f9 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/files/test2/dir/dir/a.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/files/test2/dir/dir/a.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/files/test2/ja/JP/a.txt
similarity index 98%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/files/test2/ja/JP/a.txt
index d12cd3c..b5d3856 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/files/test2/ja/JP/a.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/files/test2/ja/JP/a.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/files/test2/ja/JP/dir/a.txt
similarity index 97%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/files/test2/ja/JP/dir/a.txt
index d12cd3c..b0779be 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/files/test2/ja/JP/dir/a.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/files/test2/ja/JP/dir/a.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/files/test2/ja/JP/dir/dir/a.txt
similarity index 97%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/files/test2/ja/JP/dir/dir/a.txt
index d12cd3c..50ee3fc 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/files/test2/ja/JP/dir/dir/a.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/files/test2/ja/JP/dir/dir/a.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/files/test2/ja/a.txt
similarity index 98%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/files/test2/ja/a.txt
index d12cd3c..997a401 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/files/test2/ja/a.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/files/test2/ja/a.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/files/test2/ja/dir/a.txt
similarity index 98%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/files/test2/ja/dir/a.txt
index d12cd3c..afd3ec1 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/files/test2/ja/dir/a.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/files/test2/ja/dir/a.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/files/test2/ja/dir/dir/a.txt
similarity index 97%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/files/test2/ja/dir/dir/a.txt
index d12cd3c..1df33f7 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/files/test2/ja/dir/dir/a.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/files/test2/ja/dir/dir/a.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/_a.txt
similarity index 97%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/_a.txt
index d12cd3c..93af828 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/_a.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/org/apache/juneau/cp/_a.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/_a_ja.txt
similarity index 97%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/_a_ja.txt
index d12cd3c..7902422 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/_a_ja.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/org/apache/juneau/cp/_a_ja.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/_a_ja_JP.txt
similarity index 97%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/_a_ja_JP.txt
index d12cd3c..448ca4e 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/_a_ja_JP.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/org/apache/juneau/cp/_a_ja_JP.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/.c
similarity index 97%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/.c
index d12cd3c..a1797d3 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/.c
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/org/apache/juneau/cp/files/test1/.c]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/.c_ja
similarity index 97%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/.c_ja
index d12cd3c..15f006d 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/.c_ja
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/org/apache/juneau/cp/files/test1/.c_ja]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/.c_ja_JP
similarity index 96%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/.c_ja_JP
index d12cd3c..5a9a5e6 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/.c_ja_JP
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/org/apache/juneau/cp/files/test1/.c_ja_JP]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/.d.txt
similarity index 97%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/.d.txt
index d12cd3c..400d338 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/.d.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/org/apache/juneau/cp/files/test1/.d.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/.d_ja.txt
similarity index 96%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/.d_ja.txt
index d12cd3c..e254b91 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/.d_ja.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/org/apache/juneau/cp/files/test1/.d_ja.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/.d_ja_JP.txt
similarity index 96%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/.d_ja_JP.txt
index d12cd3c..ce1d5a7 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/.d_ja_JP.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/org/apache/juneau/cp/files/test1/.d_ja_JP.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/_a.txt
similarity index 97%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/_a.txt
index d12cd3c..b56564d 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/_a.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/org/apache/juneau/cp/files/test1/_a.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/_a_ja.txt
similarity index 96%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/_a_ja.txt
index d12cd3c..d1f253f 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/_a_ja.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/org/apache/juneau/cp/files/test1/_a_ja.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/_a_ja_JP.txt
similarity index 96%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/_a_ja_JP.txt
index d12cd3c..bf1644e 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/_a_ja_JP.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/org/apache/juneau/cp/files/test1/_a_ja_JP.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/_b
similarity index 97%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/_b
index d12cd3c..22a460d 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/_b
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/org/apache/juneau/cp/files/test1/_b]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/_b_ja
similarity index 97%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/_b_ja
index d12cd3c..81282ba 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/_b_ja
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/org/apache/juneau/cp/files/test1/_b_ja]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/_b_ja_JP
similarity index 96%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/_b_ja_JP
index d12cd3c..7666561 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/_b_ja_JP
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/org/apache/juneau/cp/files/test1/_b_ja_JP]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/.c
similarity index 97%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/.c
index d12cd3c..b0bdf4d 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/.c
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/org/apache/juneau/cp/files/test1/dir/.c]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/.c_ja
similarity index 96%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/.c_ja
index d12cd3c..25a2dd3 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/.c_ja
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/org/apache/juneau/cp/files/test1/dir/.c_ja]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/.c_ja_JP
similarity index 96%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/.c_ja_JP
index d12cd3c..f0bfb36 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/.c_ja_JP
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/org/apache/juneau/cp/files/test1/dir/.c_ja_JP]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/.d.txt
similarity index 96%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/.d.txt
index d12cd3c..4a675fa 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/.d.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/org/apache/juneau/cp/files/test1/dir/.d.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/.d_ja.txt
similarity index 96%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/.d_ja.txt
index d12cd3c..22ee6e8 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/.d_ja.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/org/apache/juneau/cp/files/test1/dir/.d_ja.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/.d_ja_JP.txt
similarity index 96%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/.d_ja_JP.txt
index d12cd3c..cd53498 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/.d_ja_JP.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/org/apache/juneau/cp/files/test1/dir/.d_ja_JP.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/_a.txt
similarity index 96%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/_a.txt
index d12cd3c..3a820b3 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/_a.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/org/apache/juneau/cp/files/test1/dir/_a.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/_a_ja.txt
similarity index 96%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/_a_ja.txt
index d12cd3c..5e2028e 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/_a_ja.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/org/apache/juneau/cp/files/test1/dir/_a_ja.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/_a_ja_JP.txt
similarity index 96%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/_a_ja_JP.txt
index d12cd3c..5e2b47d 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/_a_ja_JP.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/org/apache/juneau/cp/files/test1/dir/_a_ja_JP.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/_b
similarity index 97%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/_b
index d12cd3c..6570ea7 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/_b
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/org/apache/juneau/cp/files/test1/dir/_b]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/_b_ja
similarity index 96%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/_b_ja
index d12cd3c..4fbe6c9 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/_b_ja
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/org/apache/juneau/cp/files/test1/dir/_b_ja]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/_b_ja_JP
similarity index 96%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/_b_ja_JP
index d12cd3c..30dc1fb 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/_b_ja_JP
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/org/apache/juneau/cp/files/test1/dir/_b_ja_JP]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/dir/.c
similarity index 96%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/dir/.c
index d12cd3c..d26680b 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/dir/.c
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/org/apache/juneau/cp/files/test1/dir/dir/.c]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/dir/.c_ja
similarity index 96%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/dir/.c_ja
index d12cd3c..62159f5 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/dir/.c_ja
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/org/apache/juneau/cp/files/test1/dir/dir/.c_ja]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/dir/.c_ja_JP
similarity index 96%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/dir/.c_ja_JP
index d12cd3c..93d0488 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/dir/.c_ja_JP
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/org/apache/juneau/cp/files/test1/dir/dir/.c_ja_JP]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/dir/.d.txt
similarity index 96%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/dir/.d.txt
index d12cd3c..ffb08dd 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/dir/.d.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/org/apache/juneau/cp/files/test1/dir/dir/.d.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/dir/.d_ja.txt
similarity index 96%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/dir/.d_ja.txt
index d12cd3c..51cca0c 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/dir/.d_ja.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/org/apache/juneau/cp/files/test1/dir/dir/.d_ja.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/dir/.d_ja_JP.txt
similarity index 96%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/dir/.d_ja_JP.txt
index d12cd3c..5a517ca 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/dir/.d_ja_JP.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/org/apache/juneau/cp/files/test1/dir/dir/.d_ja_JP.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/dir/_a.txt
similarity index 96%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/dir/_a.txt
index d12cd3c..6ee1b7f 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/dir/_a.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/org/apache/juneau/cp/files/test1/dir/dir/_a.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/dir/_a_ja.txt
similarity index 96%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/dir/_a_ja.txt
index d12cd3c..465bbd9 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/dir/_a_ja.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/org/apache/juneau/cp/files/test1/dir/dir/_a_ja.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/dir/_a_ja_JP.txt
similarity index 96%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/dir/_a_ja_JP.txt
index d12cd3c..c5b5de4 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/dir/_a_ja_JP.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/org/apache/juneau/cp/files/test1/dir/dir/_a_ja_JP.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/dir/_b
similarity index 96%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/dir/_b
index d12cd3c..fa36620 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/dir/_b
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/org/apache/juneau/cp/files/test1/dir/dir/_b]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/dir/_b_ja
similarity index 96%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/dir/_b_ja
index d12cd3c..3fb022c 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/dir/_b_ja
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/org/apache/juneau/cp/files/test1/dir/dir/_b_ja]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/dir/_b_ja_JP
similarity index 96%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/dir/_b_ja_JP
index d12cd3c..18132eb 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/dir/_b_ja_JP
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/org/apache/juneau/cp/files/test1/dir/dir/_b_ja_JP]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/dir/e.txt
similarity index 96%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/dir/e.txt
index d12cd3c..043d43d 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/dir/e.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/org/apache/juneau/cp/files/test1/dir/dir/e.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/dir/e_ja.txt
similarity index 96%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/dir/e_ja.txt
index d12cd3c..02d37ce 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/dir/e_ja.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/org/apache/juneau/cp/files/test1/dir/dir/e_ja.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/dir/e_ja_JP.txt
similarity index 96%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/dir/e_ja_JP.txt
index d12cd3c..88c94a4 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/dir/e_ja_JP.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/org/apache/juneau/cp/files/test1/dir/dir/e_ja_JP.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/dir/f
similarity index 96%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/dir/f
index d12cd3c..8ad9582 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/dir/f
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/org/apache/juneau/cp/files/test1/dir/dir/f]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/dir/f_ja
similarity index 96%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/dir/f_ja
index d12cd3c..08d856f 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/dir/f_ja
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/org/apache/juneau/cp/files/test1/dir/dir/f_ja]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/dir/f_ja_JP
similarity index 96%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/dir/f_ja_JP
index d12cd3c..c56ad77 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/dir/f_ja_JP
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/org/apache/juneau/cp/files/test1/dir/dir/f_ja_JP]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/dir/g_foo.txt
similarity index 96%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/dir/g_foo.txt
index d12cd3c..619dcdc 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/dir/g_foo.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/org/apache/juneau/cp/files/test1/dir/dir/g_foo.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/dir/g_foo_ja.txt
similarity index 96%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/dir/g_foo_ja.txt
index d12cd3c..7239b42 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/dir/g_foo_ja.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/org/apache/juneau/cp/files/test1/dir/dir/g_foo_ja.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/dir/g_foo_ja_JP.txt
similarity index 96%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/dir/g_foo_ja_JP.txt
index d12cd3c..53432e4 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/dir/g_foo_ja_JP.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/org/apache/juneau/cp/files/test1/dir/dir/g_foo_ja_JP.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/dir/h.foo.txt
similarity index 96%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/dir/h.foo.txt
index d12cd3c..9f34bfa 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/dir/h.foo.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/org/apache/juneau/cp/files/test1/dir/dir/h.foo.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/dir/h.foo_ja.txt
similarity index 96%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/dir/h.foo_ja.txt
index d12cd3c..14c02de 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/dir/h.foo_ja.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/org/apache/juneau/cp/files/test1/dir/dir/h.foo_ja.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/dir/h.foo_ja_JP.txt
similarity index 96%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/dir/h.foo_ja_JP.txt
index d12cd3c..b2633fd 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/dir/h.foo_ja_JP.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/org/apache/juneau/cp/files/test1/dir/dir/h.foo_ja_JP.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/dir/i_foo
similarity index 96%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/dir/i_foo
index d12cd3c..0a761be 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/dir/i_foo
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/org/apache/juneau/cp/files/test1/dir/dir/i_foo]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/dir/i_foo_ja
similarity index 96%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/dir/i_foo_ja
index d12cd3c..7ac7dc2 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/dir/i_foo_ja
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/org/apache/juneau/cp/files/test1/dir/dir/i_foo_ja]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/dir/i_foo_ja_JP
similarity index 96%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/dir/i_foo_ja_JP
index d12cd3c..7e34c48 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/dir/i_foo_ja_JP
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/org/apache/juneau/cp/files/test1/dir/dir/i_foo_ja_JP]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/e.txt
similarity index 96%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/e.txt
index d12cd3c..42e3866 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/e.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/org/apache/juneau/cp/files/test1/dir/e.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/e_ja.txt
similarity index 96%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/e_ja.txt
index d12cd3c..59d76f9 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/e_ja.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/org/apache/juneau/cp/files/test1/dir/e_ja.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/e_ja_JP.txt
similarity index 96%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/e_ja_JP.txt
index d12cd3c..2071bca 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/e_ja_JP.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/org/apache/juneau/cp/files/test1/dir/e_ja_JP.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/f
similarity index 97%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/f
index d12cd3c..bbb322a 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/f
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/org/apache/juneau/cp/files/test1/dir/f]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/f_ja
similarity index 96%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/f_ja
index d12cd3c..866301d 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/f_ja
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/org/apache/juneau/cp/files/test1/dir/f_ja]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/f_ja_JP
similarity index 96%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/f_ja_JP
index d12cd3c..09f833d 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/f_ja_JP
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/org/apache/juneau/cp/files/test1/dir/f_ja_JP]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/g_foo.txt
similarity index 96%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/g_foo.txt
index d12cd3c..1567e7a 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/g_foo.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/org/apache/juneau/cp/files/test1/dir/g_foo.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/g_foo_ja.txt
similarity index 96%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/g_foo_ja.txt
index d12cd3c..5745873 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/g_foo_ja.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/org/apache/juneau/cp/files/test1/dir/g_foo_ja.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/g_foo_ja_JP.txt
similarity index 96%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/g_foo_ja_JP.txt
index d12cd3c..2c16e5d 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/g_foo_ja_JP.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/org/apache/juneau/cp/files/test1/dir/g_foo_ja_JP.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/h.foo.txt
similarity index 96%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/h.foo.txt
index d12cd3c..c05780c 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/h.foo.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/org/apache/juneau/cp/files/test1/dir/h.foo.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/h.foo_ja.txt
similarity index 96%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/h.foo_ja.txt
index d12cd3c..05f1a08 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/h.foo_ja.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/org/apache/juneau/cp/files/test1/dir/h.foo_ja.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/h.foo_ja_JP.txt
similarity index 96%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/h.foo_ja_JP.txt
index d12cd3c..2e1a4a8 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/h.foo_ja_JP.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/org/apache/juneau/cp/files/test1/dir/h.foo_ja_JP.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/i_foo
similarity index 96%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/i_foo
index d12cd3c..af2c244 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/i_foo
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/org/apache/juneau/cp/files/test1/dir/i_foo]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/i_foo_ja
similarity index 96%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/i_foo_ja
index d12cd3c..5e0bcc2 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/i_foo_ja
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/org/apache/juneau/cp/files/test1/dir/i_foo_ja]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/i_foo_ja_JP
similarity index 96%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/i_foo_ja_JP
index d12cd3c..3f9ecb7 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/dir/i_foo_ja_JP
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/org/apache/juneau/cp/files/test1/dir/i_foo_ja_JP]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/e.txt
similarity index 97%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/e.txt
index d12cd3c..2d39452 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/e.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/org/apache/juneau/cp/files/test1/e.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/e_ja.txt
similarity index 96%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/e_ja.txt
index d12cd3c..a5a7072 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/e_ja.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/org/apache/juneau/cp/files/test1/e_ja.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/e_ja_JP.txt
similarity index 96%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/e_ja_JP.txt
index d12cd3c..5add3ef 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/e_ja_JP.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/org/apache/juneau/cp/files/test1/e_ja_JP.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/f
similarity index 97%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/f
index d12cd3c..dd439f7 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/f
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/org/apache/juneau/cp/files/test1/f]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/f_ja
similarity index 97%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/f_ja
index d12cd3c..2488a38 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/f_ja
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/org/apache/juneau/cp/files/test1/f_ja]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/f_ja_JP
similarity index 97%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/f_ja_JP
index d12cd3c..d37587d 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/f_ja_JP
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/org/apache/juneau/cp/files/test1/f_ja_JP]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/g_foo.txt
similarity index 96%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/g_foo.txt
index d12cd3c..375ed3e 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/g_foo.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/org/apache/juneau/cp/files/test1/g_foo.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/g_foo_ja.txt
similarity index 96%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/g_foo_ja.txt
index d12cd3c..312fada 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/g_foo_ja.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/org/apache/juneau/cp/files/test1/g_foo_ja.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/g_foo_ja_JP.txt
similarity index 96%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/g_foo_ja_JP.txt
index d12cd3c..8195567 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/g_foo_ja_JP.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/org/apache/juneau/cp/files/test1/g_foo_ja_JP.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/h.foo.txt
similarity index 96%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/h.foo.txt
index d12cd3c..77390f9 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/h.foo.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/org/apache/juneau/cp/files/test1/h.foo.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/h.foo_ja.txt
similarity index 96%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/h.foo_ja.txt
index d12cd3c..1306d20 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/h.foo_ja.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/org/apache/juneau/cp/files/test1/h.foo_ja.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/h.foo_ja_JP.txt
similarity index 96%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/h.foo_ja_JP.txt
index d12cd3c..d210bbc 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/h.foo_ja_JP.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/org/apache/juneau/cp/files/test1/h.foo_ja_JP.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/i_foo
similarity index 97%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/i_foo
index d12cd3c..09fa049 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/i_foo
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/org/apache/juneau/cp/files/test1/i_foo]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/i_foo_ja
similarity index 96%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/i_foo_ja
index d12cd3c..feb17b5 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/i_foo_ja
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/org/apache/juneau/cp/files/test1/i_foo_ja]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/i_foo_ja_JP
similarity index 96%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/i_foo_ja_JP
index d12cd3c..5c0281b 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test1/i_foo_ja_JP
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/org/apache/juneau/cp/files/test1/i_foo_ja_JP]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test2/a.txt
similarity index 97%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test2/a.txt
index d12cd3c..feb1297 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test2/a.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/org/apache/juneau/cp/files/test2/a.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test2/dir/a.txt
similarity index 96%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test2/dir/a.txt
index d12cd3c..013dcc9 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test2/dir/a.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/org/apache/juneau/cp/files/test2/dir/a.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test2/dir/dir/a.txt
similarity index 96%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test2/dir/dir/a.txt
index d12cd3c..6f10aea 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test2/dir/dir/a.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/org/apache/juneau/cp/files/test2/dir/dir/a.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test2/ja/JP/a.txt
similarity index 96%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test2/ja/JP/a.txt
index d12cd3c..1d57e44 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test2/ja/JP/a.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/org/apache/juneau/cp/files/test2/ja/JP/a.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test2/ja/JP/dir/a.txt
similarity index 96%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test2/ja/JP/dir/a.txt
index d12cd3c..7fa163f 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test2/ja/JP/dir/a.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/org/apache/juneau/cp/files/test2/ja/JP/dir/a.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test2/ja/JP/dir/dir/a.txt
similarity index 96%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test2/ja/JP/dir/dir/a.txt
index d12cd3c..506417b 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test2/ja/JP/dir/dir/a.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/org/apache/juneau/cp/files/test2/ja/JP/dir/dir/a.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test2/ja/a.txt
similarity index 96%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test2/ja/a.txt
index d12cd3c..11a4167 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test2/ja/a.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/org/apache/juneau/cp/files/test2/ja/a.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test2/ja/dir/a.txt
similarity index 96%
copy from juneau-core/juneau-core-utest/files/test2.txt
copy to juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test2/ja/dir/a.txt
index d12cd3c..def31e9 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test2/ja/dir/a.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/org/apache/juneau/cp/files/test2/ja/dir/a.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/files/test2.txt b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test2/ja/dir/dir/a.txt
similarity index 96%
rename from juneau-core/juneau-core-utest/files/test2.txt
rename to juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test2/ja/dir/dir/a.txt
index d12cd3c..f86aff2 100644
--- a/juneau-core/juneau-core-utest/files/test2.txt
+++ b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/files/test2/ja/dir/dir/a.txt
@@ -10,4 +10,4 @@
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
 * specific language governing permissions and limitations under the License.                                              *
 ***************************************************************************************************************************
-test2.txt
\ No newline at end of file
+[cp:/org/apache/juneau/cp/files/test2/ja/dir/dir/a.txt]
\ No newline at end of file
diff --git a/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/test1/MessageBundleTest1.properties b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/test3/MessageBundleTest1.properties
similarity index 100%
rename from juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/test1/MessageBundleTest1.properties
rename to juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/test3/MessageBundleTest1.properties
diff --git a/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/test1/MessageBundleTest1_ja.properties b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/test3/MessageBundleTest1_ja.properties
similarity index 100%
rename from juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/test1/MessageBundleTest1_ja.properties
rename to juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/test3/MessageBundleTest1_ja.properties
diff --git a/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/test1/MessageBundleTest1_ja_JP.properties b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/test3/MessageBundleTest1_ja_JP.properties
similarity index 100%
rename from juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/test1/MessageBundleTest1_ja_JP.properties
rename to juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/test3/MessageBundleTest1_ja_JP.properties
diff --git a/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/test1/files/Test1.properties b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/test3/files/Test1.properties
similarity index 100%
rename from juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/test1/files/Test1.properties
rename to juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/test3/files/Test1.properties
diff --git a/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/test1/files/Test1_ja.properties b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/test3/files/Test1_ja.properties
similarity index 100%
rename from juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/test1/files/Test1_ja.properties
rename to juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/test3/files/Test1_ja.properties
diff --git a/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/test1/files/Test1_ja_JP.properties b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/test3/files/Test1_ja_JP.properties
similarity index 100%
rename from juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/test1/files/Test1_ja_JP.properties
rename to juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/test3/files/Test1_ja_JP.properties
diff --git a/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/test2/Test2.properties b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/test4/Test2.properties
similarity index 100%
rename from juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/test2/Test2.properties
rename to juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/test4/Test2.properties
diff --git a/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/test2/Test2_ja.properties b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/test4/Test2_ja.properties
similarity index 100%
rename from juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/test2/Test2_ja.properties
rename to juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/test4/Test2_ja.properties
diff --git a/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/test2/Test2_ja_JP.properties b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/test4/Test2_ja_JP.properties
similarity index 100%
rename from juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/test2/Test2_ja_JP.properties
rename to juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/test4/Test2_ja_JP.properties
diff --git a/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/test2/Test4 b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/test4/Test4
similarity index 100%
rename from juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/test2/Test4
rename to juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/test4/Test4
diff --git a/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/test2/Test4_ja b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/test4/Test4_ja
similarity index 100%
rename from juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/test2/Test4_ja
rename to juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/test4/Test4_ja
diff --git a/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/test2/Test4_ja_JP b/juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/test4/Test4_ja_JP
similarity index 100%
rename from juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/test2/Test4_ja_JP
rename to juneau-core/juneau-core-utest/src/test/resources/org/apache/juneau/cp/test4/Test4_ja_JP
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/FileFinder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/FileFinder.java
new file mode 100644
index 0000000..f3e7cc2
--- /dev/null
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/FileFinder.java
@@ -0,0 +1,241 @@
+// ***************************************************************************************************************************
+// * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file *
+// * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file        *
+// * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance            *
+// * with the License.  You may obtain a copy of the License at                                                              *
+// *                                                                                                                         *
+// *  http://www.apache.org/licenses/LICENSE-2.0                                                                             *
+// *                                                                                                                         *
+// * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an  *
+// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
+// * specific language governing permissions and limitations under the License.                                              *
+// ***************************************************************************************************************************
+package org.apache.juneau.cp;
+
+import static org.apache.juneau.internal.FileUtils.*;
+import static org.apache.juneau.internal.StringUtils.*;
+
+import java.io.*;
+import java.util.*;
+import java.util.ResourceBundle.*;
+import java.util.concurrent.*;
+import java.util.regex.*;
+
+import org.apache.juneau.internal.*;
+
+/**
+ * Utility class for finding localized files on the classpath and file system.
+ *
+ * <p>
+ * Typical example:
+ *
+ * <p class='bcode w800'>
+ * 	<jc>// Constructor a file source that looks for files in the "files" working directory, then in the
+ * 	// package "foo.bar", then in the package "foo.bar.files", then in the package "files".</jc>
+ * 	FileFinder <jv>finder</jv> = FileFinder
+ * 		.<jsm>create</jsm>()
+ * 		.dir("files")
+ * 		.cp(foo.bar.MyClass.<jk>class</jk>,<jk>null</jk>,<jk>true</jk>)
+ * 		.cp(foo.bar.MyClass.<jk>class</jk>,<js>"files"</js>,<jk>true</jk>)
+ * 		.cp(foo.bar.MyClass.<jk>class</jk>,<js>"/files"</js>,<jk>true</jk>)
+ * 		.cache(1_000_000l)  <jc>// Cache files less than 1MB in size.</jc>
+ * 		.ignore(Pattern.<jsm>compile</jsm>(<js>"(?i)(.*\\.(class|properties))|(package.html)"</js>)) <jc>// Ignore certain files.</jc>
+ * 		.build();
+ *
+ * 	<jc>// Find a normal file.</jc>
+ * 	InputStream <jv>is1</jv> = <jv>finder</jv>.getFile(<js>"text.txt"</js>);
+ *
+ * 	<jc>// Find a localized file called "text_ja_JP.txt".</jc>
+ * 	InputStream <jv>is2</jv> = <jv>finder</jv>.getFile(<js>"text.txt"</js>, Locale.<jsf>JAPAN</jsf>);
+ * </p>
+ *
+ * <p>
+ * If the <c>locale</c> is specified, then we look for resources whose name matches that locale.
+ * For example, if looking for the resource <js>"MyResource.txt"</js> for the Japanese locale, we will look for
+ * files in the following order:
+ * <ol>
+ * 	<li><js>"MyResource_ja_JP.txt"</js>
+ * 	<li><js>"MyResource_ja.txt"</js>
+ * 	<li><js>"MyResource.txt"</js>
+ * </ol>
+ *
+ * <p>
+ * This class (and the builder class) can be subclassed by extension and using the {@link FileFinderBuilder#build(Class)} method.
+ */
+public class FileFinder {
+
+	private static final ResourceBundle.Control RB_CONTROL = ResourceBundle.Control.getControl(Control.FORMAT_DEFAULT);
+
+	private final Map<String,LocalFile> files = new ConcurrentHashMap<>();
+	private final Map<Locale,Map<String,LocalFile>> localizedFiles = new ConcurrentHashMap<>();
+
+	private final LocalDir[] roots;
+	private final long cachingLimit;
+	private final Pattern ignorePattern;
+
+
+	/**
+	 * Instantiate a new builder.
+	 *
+	 * @return A new builder.
+	 */
+	public static FileFinderBuilder create() {
+		return new FileFinderBuilder();
+	}
+
+	/**
+	 * Constructor.
+	 *
+	 * @param builder The builder object.
+	 */
+	public FileFinder(FileFinderBuilder builder) {
+		this.roots = builder.getRoots();
+		this.cachingLimit = builder.getCachingLimit();
+		this.ignorePattern = builder.getIgnorePattern();
+	}
+
+	/**
+	 * Returns the contents of the resource with the specified name.
+	 *
+	 * @param name The resource name.
+	 * 	See {@link Class#getResource(String)} for format.
+	 * @param locale
+	 * 	The locale of the resource to retrieve.
+	 * 	<br>If <jk>null</jk>, won't look for localized file names.
+	 * @return The resolved resource contents, or <jk>null</jk> if the resource was not found.
+	 * @throws IOException Thrown by underlying stream.
+	 */
+	public InputStream getFile(String name, Locale locale) throws IOException {
+
+		name = StringUtils.trimSlashesAndSpaces(name);
+
+		if (isInvalidPath(name))
+			return null;
+
+		if (locale != null)
+			localizedFiles.putIfAbsent(locale, new ConcurrentHashMap<>());
+
+		Map<String,LocalFile> fileCache = locale == null ? files : localizedFiles.get(locale);
+
+		LocalFile lf = fileCache.get(name);
+
+		if (lf == null) {
+			List<String> candidateFileNames = getCandidateFileNames(name, locale);
+			paths: for (LocalDir root : roots) {
+				for (String cfn : candidateFileNames) {
+					lf = root.resolve(cfn);
+					if (lf != null)
+						break paths;
+				}
+			}
+
+			if (lf != null  && ignorePattern != null && ignorePattern.matcher(lf.getName()).matches())
+				lf = null;
+
+			if (lf != null && (ignorePattern == null || ! ignorePattern.matcher(lf.getName()).matches())) {
+				fileCache.put(name, lf);
+
+				if (cachingLimit >= 0) {
+					long size = lf.size();
+					if (size > 0 && size <= cachingLimit)
+						lf.cache();
+				}
+			}
+		}
+
+		if (lf == null)
+			return null;
+
+		return lf.read();
+	}
+
+	/**
+	 * Returns the file with the specified name.
+	 *
+	 * @param name The file name.
+	 * @return An input stream to the file if it exists, or <jk>null</jk> if it does not.
+	 * @throws IOException If file could not be read.
+	 */
+	public InputStream getFile(String name) throws IOException {
+		return getFile(name, null);
+	}
+
+	/**
+	 * Returns the candidate file names for the specified file name in the specified locale.
+	 *
+	 * <p>
+	 * For example, if looking for the <js>"MyResource.txt"</js> file in the Japanese locale, the iterator will return
+	 * names in the following order:
+	 * <ol>
+	 * 	<li><js>"MyResource_ja_JP.txt"</js>
+	 * 	<li><js>"MyResource_ja.txt"</js>
+	 * 	<li><js>"MyResource.txt"</js>
+	 * </ol>
+	 *
+	 * <p>
+	 * If the locale is <jk>null</jk>, then it will only return <js>"MyResource.txt"</js>.
+	 *
+	 * @param fileName The name of the file to get candidate file names on.
+	 * @param locale
+	 * 	The locale.
+	 * 	<br>If <jk>null</jk>, won't look for localized file names.
+	 * @return An iterator of file names to look at.
+	 */
+	protected List<String> getCandidateFileNames(final String fileName, final Locale locale) {
+
+		if (locale == null)
+			return Collections.singletonList(fileName);
+
+		List<String> list = new ArrayList<>();
+		String baseName = getBaseName(fileName);
+		String ext = getExtension(fileName);
+
+		for (Locale l : getCandidateLocales(locale)) {
+			String ls = l.toString();
+			if (ls.isEmpty())
+				list.add(fileName);
+			else {
+				list.add(baseName + "_" + ls + (ext.isEmpty() ? "" : ('.' + ext)));
+				list.add(ls.replace('_', '/') + '/' + fileName);
+			}
+		}
+
+		return list;
+	}
+
+	/**
+	 * Returns the candidate locales for the specified locale.
+	 *
+	 * <p>
+	 * For example, if <c>locale</c> is <js>"ja_JP"</js>, then this method will return:
+	 * <ol>
+	 * 	<li><js>"ja_JP"</js>
+	 * 	<li><js>"ja"</js>
+	 * 	<li><js>""</js>
+	 * </ol>
+	 *
+	 * @param locale The locale to get the list of candidate locales for.
+	 * @return The list of candidate locales.
+	 */
+	protected List<Locale> getCandidateLocales(Locale locale) {
+		return RB_CONTROL.getCandidateLocales("", locale);
+	}
+
+	/**
+	 * Checks for path malformations such as use of <js>".."</js> which can be used to open up security holes.
+	 *
+	 * <p>
+	 * Default implementation returns <jk>true</jk> if the path is any of the following:
+	 * <ul>
+	 * 	<li>Is blank or <jk>null</jk>.
+	 * 	<li>Contains <js>".."</js> (to prevent traversing out of working directory).
+	 * 	<li>Contains <js>"%"</js> (to prevent URI trickery).
+	 * </ul>
+	 *
+	 * @param path The path to check.
+	 * @return <jk>true</jk> if the path is invalid.
+	 */
+	protected boolean isInvalidPath(String path) {
+		return isEmpty(path) || path.contains("..") || path.contains("%");
+	}
+}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/FileFinderBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/FileFinderBuilder.java
new file mode 100644
index 0000000..4080f99
--- /dev/null
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/FileFinderBuilder.java
@@ -0,0 +1,146 @@
+// ***************************************************************************************************************************
+// * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file *
+// * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file        *
+// * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance            *
+// * with the License.  You may obtain a copy of the License at                                                              *
+// *                                                                                                                         *
+// *  http://www.apache.org/licenses/LICENSE-2.0                                                                             *
+// *                                                                                                                         *
+// * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an  *
+// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
+// * specific language governing permissions and limitations under the License.                                              *
+// ***************************************************************************************************************************
+package org.apache.juneau.cp;
+
+import static org.apache.juneau.assertions.Assertions.*;
+
+import java.nio.file.*;
+import java.util.*;
+import java.util.regex.*;
+
+import org.apache.juneau.*;
+import org.apache.juneau.reflect.*;
+
+/**
+ * Builder for {@link FileFinder} objects.
+ */
+public class FileFinderBuilder {
+
+	private final Set<LocalDir> roots = new LinkedHashSet<>();
+	private long cachingLimit = -1;
+	private Pattern ignorePattern = Pattern.compile("(?i).*\\.(class|properties)");
+
+	/**
+	 * Create a new {@link FileFinder} using this builder.
+	 *
+	 * @return A new {@link FileFinder}
+	 */
+	public FileFinder build() {
+		return new FileFinder(this);
+	}
+
+	/**
+	 * Create a new {@link FileFinder} subclass using this builder.
+	 *
+	 * <p>
+	 * Subclass must have a public constructor that takes in a single {@link FileFinderBuilder} object.
+	 *
+	 * @param c The subclass of {@link FileFinder} to instantiate.
+	 * @param <T> The subclass of {@link FileFinder} to instantiate.
+	 *
+	 * @return A new {@link FileFinder}
+	 * @throws ExecutableException Thrown from constructor.
+	 */
+	public <T extends FileFinder> T build(Class<T> c) throws ExecutableException {
+		return ClassInfo.of(c).getPublicConstructor(this).invoke(this);
+	}
+
+	/**
+	 * Adds a class subpackage to the lookup paths.
+	 *
+	 * @param c The class whose package will be added to the lookup paths.  Must not be <jk>null</jk>.
+	 * @param path The absolute or relative subpath.
+	 * @param recursive If <jk>true</jk>, also recursively adds all the paths of the parent classes as well.
+	 * @return This object (for method chaining).
+	 */
+	public FileFinderBuilder cp(Class<?> c, String path, boolean recursive) {
+		assertArgNotNull("c", c);
+		while (c != null) {
+			roots.add(new LocalDir(c, path));
+			c = recursive ? c.getSuperclass() : null;
+		}
+		return this;
+	}
+
+	/**
+	 * Adds a file system directory to the lookup paths.
+	 *
+	 * @param path The path relative to the working directory.  Must not be <jk>null</jk>
+	 * @return This object (for method chaining).
+	 */
+	public FileFinderBuilder dir(String path) {
+		assertArgNotNull("path", path);
+		return path(Paths.get(".").resolve(path));
+	}
+
+	/**
+	 * Adds a file system directory to the lookup paths.
+	 *
+	 * @param path The directory path.
+	 * @return This object (for method chaining).
+	 */
+	public FileFinderBuilder path(Path path) {
+		roots.add(new LocalDir(path));
+		return this;
+	}
+
+	/**
+	 * Enables in-memory caching of files for quicker retrieval.
+	 *
+	 * @param cachingLimit The maximum file size in bytes.
+	 * @return This object (for method chaining).
+	 */
+	public FileFinderBuilder caching(long cachingLimit) {
+		this.cachingLimit = cachingLimit;
+		return this;
+	}
+
+	/**
+	 * Specifies the regular expression file name pattern to use to exclude files from being retrieved from the file source.
+	 *
+	 * @param ignorePattern The ignore pattern.  The default is <js>"(?i).*\\.(class|properties)"</js>. Can be <jk>null</jk>
+	 * 	to disable pattern ignores.
+	 * @return This object (for method chaining).
+	 */
+	public FileFinderBuilder ignorePattern(Pattern ignorePattern) {
+		this.ignorePattern = ignorePattern;
+		return this;
+	}
+
+	/**
+	 * Returns the list of root directories in this builder.
+	 *
+	 * @return The list of root directories in this builder.
+	 */
+	protected LocalDir[] getRoots() {
+		return roots.toArray(new LocalDir[roots.size()]);
+	}
+
+	/**
+	 * Returns the file size caching limit in this builder.
+	 *
+	 * @return The file size caching limit in this builder.
+	 */
+	protected long getCachingLimit() {
+		return cachingLimit;
+	}
+
+	/**
+	 * Returns the ignore pattern in this builder.
+	 *
+	 * @return The ignore pattern in this builder.
+	 */
+	protected Pattern getIgnorePattern() {
+		return ignorePattern;
+	}
+}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/LocalDir.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/LocalDir.java
new file mode 100644
index 0000000..f239909
--- /dev/null
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/LocalDir.java
@@ -0,0 +1,120 @@
+// ***************************************************************************************************************************
+// * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file *
+// * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file        *
+// * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance            *
+// * with the License.  You may obtain a copy of the License at                                                              *
+// *                                                                                                                         *
+// *  http://www.apache.org/licenses/LICENSE-2.0                                                                             *
+// *                                                                                                                         *
+// * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an  *
+// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
+// * specific language governing permissions and limitations under the License.                                              *
+// ***************************************************************************************************************************
+package org.apache.juneau.cp;
+
+import static org.apache.juneau.internal.ObjectUtils.*;
+import static org.apache.juneau.internal.StringUtils.*;
+import static org.apache.juneau.assertions.Assertions.*;
+
+import java.net.*;
+import java.nio.file.*;
+
+import org.apache.juneau.internal.*;
+
+/**
+ * Identifies a directory located either on the classpath or file system.
+ *
+ * Used to encapsulate basic resolution and retrieval of files regardless of where they are located.
+ */
+public class LocalDir {
+
+	private final Class<?> clazz;
+	private final String clazzPath;
+	private final Path path;
+	private final int hashCode;
+
+	/**
+	 * Constructor for classpath directory.
+	 *
+	 * @param clazz The class used to retrieve resources.
+	 * @param clazzPath
+	 * 	The subpath.  Can be any of the following:
+	 * 	<ul>
+	 * 		<li><jk>null</jk> or an empty string - Package of the class.
+	 * 		<li>Absolute path (starts with <js>'/'</js>) - Relative to root package.
+	 * 		<li>Relative path (does not start with <js>'/'</js>) - Relative to class package.
+	 * 	</ul>
+	 */
+	public LocalDir(Class<?> clazz, String clazzPath) {
+		this.clazz = assertArgNotNull("clazz", clazz);
+		this.clazzPath = "/".equals(clazzPath) ? "/" : nullIfEmpty(trimTrailingSlashes(clazzPath));
+		this.path = null;
+		this.hashCode = HashCode.of(clazz, clazzPath);
+	}
+
+	/**
+	 * Constructor for file system directory.
+	 *
+	 * @param path Filesystem directory location.  Must not be <jk>null</jk>.
+	 */
+	public LocalDir(Path path) {
+		this.clazz = null;
+		this.clazzPath = null;
+		this.path = assertArgNotNull("path", path);
+		this.hashCode = path.hashCode();
+	}
+
+	/**
+	 * Resolves the specified path.
+	 *
+	 * @param path
+	 * 	The path to the file to resolve.
+	 * 	<br>Must be a non-null relative path.
+	 * 	<br>Does no cleanup of the path (e.g. checking for security holes or malformed values).
+	 * @return The file if it exists, or <jk>null</jk> if it does not.
+	 */
+	public LocalFile resolve(String path) {
+		if (clazz != null) {
+			String p = clazzPath == null ? path : ("/".equals(clazzPath) ? "" : clazzPath) + '/' + path;
+			if (isClasspathFile(clazz.getResource(p)))
+				return new LocalFile(clazz, p);
+		} else {
+			Path p = this.path.resolve(path);
+			if (Files.isReadable(p) && ! Files.isDirectory(p))
+				return new LocalFile(p);
+		}
+		return null;
+	}
+
+	/**
+	 * Validates that the specified classpath resource exists and is a file.
+	 * Note that the behavior of Class.getResource(path) is different when pointing to directories on the classpath.
+	 * When packaged as a jar, calling Class.getResource(path) on a directory returns null.
+	 * When unpackaged, calling Class.getResource(path) on a directory returns a URL starting with "file:".
+	 * We perform a test to make the behavior the same regardless of whether we're packaged or not.
+	 */
+	private boolean isClasspathFile(URL url) {
+		try {
+			if (url == null)
+				return false;
+			URI uri = url.toURI();
+			if (uri.toString().startsWith("file:"))
+				if (Files.isDirectory(Paths.get(uri)))
+					return false;
+		} catch (URISyntaxException e) {
+			e.printStackTrace();  // Untestable.
+			return false;
+		}
+		return true;
+	}
+
+	@Override /* Object */
+	public boolean equals(Object o) {
+		return eq(this, (LocalDir)o, (x,y)->eq(x.clazz, y.clazz) && eq(x.clazzPath, y.clazzPath) && eq(x.path, y.path));
+	}
+
+	@Override /* Object */
+	public int hashCode() {
+		return hashCode;
+	}
+}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/LocalFile.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/LocalFile.java
new file mode 100644
index 0000000..23c71e2
--- /dev/null
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/LocalFile.java
@@ -0,0 +1,108 @@
+// ***************************************************************************************************************************
+// * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file *
+// * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file        *
+// * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance            *
+// * with the License.  You may obtain a copy of the License at                                                              *
+// *                                                                                                                         *
+// *  http://www.apache.org/licenses/LICENSE-2.0                                                                             *
+// *                                                                                                                         *
+// * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an  *
+// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
+// * specific language governing permissions and limitations under the License.                                              *
+// ***************************************************************************************************************************
+package org.apache.juneau.cp;
+
+import static org.apache.juneau.assertions.Assertions.*;
+
+import java.io.*;
+import java.nio.file.*;
+
+import org.apache.juneau.internal.*;
+
+/**
+ * Identifies a file located either on the classpath or file system.
+ *
+ * Used to encapsulate basic resolution and retrieval of files regardless of where they are located.
+ */
+public class LocalFile {
+
+	private final Class<?> clazz;
+	private final String clazzPath;
+	private final Path path;
+	private final String name;
+	private byte[] cache;
+
+	/**
+	 * Constructor for classpath file.
+	 *
+	 * @param clazz The class used to retrieve resources.  Must not be <jk>null</jk>.
+	 * @param clazzPath The path relative to the class.  Must be a non-null normalized relative path.
+	 */
+	public LocalFile(Class<?> clazz, String clazzPath) {
+		this.clazz = assertArgNotNull("clazz", clazz);
+		this.clazzPath = assertArgNotNull("clazzPath", clazzPath);
+		this.path = null;
+		int i = clazzPath.lastIndexOf('/');
+		this.name = i == -1 ? clazzPath : clazzPath.substring(i+1);
+	}
+
+	/**
+	 * Constructor for file system file.
+	 *
+	 * @param path Filesystem file location.  Must not be <jk>null</jk>.
+	 */
+	public LocalFile(Path path) {
+		this.clazz = null;
+		this.clazzPath = null;
+		this.path = assertArgNotNull("path", path);
+		this.name = path.getFileName().toString();
+	}
+
+	/**
+	 * Returns the contents of this file.
+	 *
+	 * @return An input stream of the contents of this file.
+	 * @throws IOException If file could not be read.
+	 */
+	public InputStream read() throws IOException {
+		synchronized(this) {
+			if (cache != null)
+				return new ByteArrayInputStream(cache);
+		}
+		if (clazz != null)
+			return clazz.getResourceAsStream(clazzPath);
+		return Files.newInputStream(path);
+	}
+
+	/**
+	 * Returns the size of this file.
+	 *
+	 * @return The size of this file in bytes, or <c>-1</c> if not known.
+	 * @throws IOException If file size could not be determined.
+	 */
+	public long size() throws IOException {
+		return (path == null ? -1 : Files.size(path));
+	}
+
+	/**
+	 * Caches the contents of this file into an internal byte array for quick future retrieval.
+	 *
+	 * @return This object (for method chaining).
+	 * @throws IOException If file could not be read.
+	 */
+	public LocalFile cache() throws IOException {
+		synchronized(this) {
+			this.cache = IOUtils.readBytes(read());
+		}
+		return this;
+	}
+
+	/**
+	 * Returns the name of this file.
+	 *
+	 * @return The name of this file.
+	 */
+	public String getName() {
+		return name;
+	}
+}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/StringUtils.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/StringUtils.java
index 81245ca..8b42b3e 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/StringUtils.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/StringUtils.java
@@ -1914,6 +1914,22 @@ public final class StringUtils {
 	}
 
 	/**
+	 * Trims <js>'/'</js> and space characters from both the start and end of the specified string.
+	 *
+	 * @param s The string to trim.
+	 * @return A new trimmed string, or the same string if no trimming was necessary.
+	 */
+	public static String trimSlashesAndSpaces(String s) {
+		if (s == null)
+			return null;
+		while (s.length() > 0 && (s.charAt(s.length()-1) == '/' || Character.isWhitespace(s.charAt(s.length()-1))))
+			s = s.substring(0, s.length()-1);
+		while (s.length() > 0 && (s.charAt(0) == '/' || Character.isWhitespace(s.charAt(0))))
+			s = s.substring(1);
+		return s;
+	}
+
+	/**
 	 * Trims <js>'/'</js> characters from the end of the specified string.
 	 *
 	 * @param s The string to trim.