http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/b5c66cf1/content/site/apidocs/org/apache/juneau/rest/widget/doc-files/PetStore_Query_r8.png
----------------------------------------------------------------------
diff --git 
a/content/site/apidocs/org/apache/juneau/rest/widget/doc-files/PetStore_Query_r8.png
 
b/content/site/apidocs/org/apache/juneau/rest/widget/doc-files/PetStore_Query_r8.png
deleted file mode 100644
index c3450d8..0000000
Binary files 
a/content/site/apidocs/org/apache/juneau/rest/widget/doc-files/PetStore_Query_r8.png
 and /dev/null differ

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/b5c66cf1/content/site/apidocs/org/apache/juneau/rest/widget/doc-files/PetStore_Query_r9.png
----------------------------------------------------------------------
diff --git 
a/content/site/apidocs/org/apache/juneau/rest/widget/doc-files/PetStore_Query_r9.png
 
b/content/site/apidocs/org/apache/juneau/rest/widget/doc-files/PetStore_Query_r9.png
deleted file mode 100644
index 8cf450b..0000000
Binary files 
a/content/site/apidocs/org/apache/juneau/rest/widget/doc-files/PetStore_Query_r9.png
 and /dev/null differ

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/b5c66cf1/content/site/apidocs/org/apache/juneau/rest/widget/doc-files/PetStore_Query_tooltip.png
----------------------------------------------------------------------
diff --git 
a/content/site/apidocs/org/apache/juneau/rest/widget/doc-files/PetStore_Query_tooltip.png
 
b/content/site/apidocs/org/apache/juneau/rest/widget/doc-files/PetStore_Query_tooltip.png
deleted file mode 100644
index 4373661..0000000
Binary files 
a/content/site/apidocs/org/apache/juneau/rest/widget/doc-files/PetStore_Query_tooltip.png
 and /dev/null differ

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/b5c66cf1/content/site/apidocs/org/apache/juneau/rest/widget/doc-files/PoweredByApacheWidget.png
----------------------------------------------------------------------
diff --git 
a/content/site/apidocs/org/apache/juneau/rest/widget/doc-files/PoweredByApacheWidget.png
 
b/content/site/apidocs/org/apache/juneau/rest/widget/doc-files/PoweredByApacheWidget.png
new file mode 100644
index 0000000..dd3d63f
Binary files /dev/null and 
b/content/site/apidocs/org/apache/juneau/rest/widget/doc-files/PoweredByApacheWidget.png
 differ

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/b5c66cf1/content/site/apidocs/org/apache/juneau/rest/widget/doc-files/PoweredByJuneauWidget.png
----------------------------------------------------------------------
diff --git 
a/content/site/apidocs/org/apache/juneau/rest/widget/doc-files/PoweredByJuneauWidget.png
 
b/content/site/apidocs/org/apache/juneau/rest/widget/doc-files/PoweredByJuneauWidget.png
new file mode 100644
index 0000000..7273413
Binary files /dev/null and 
b/content/site/apidocs/org/apache/juneau/rest/widget/doc-files/PoweredByJuneauWidget.png
 differ

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/b5c66cf1/content/site/apidocs/org/apache/juneau/rest/widget/doc-files/QueryMenuItem_1.png
----------------------------------------------------------------------
diff --git 
a/content/site/apidocs/org/apache/juneau/rest/widget/doc-files/QueryMenuItem_1.png
 
b/content/site/apidocs/org/apache/juneau/rest/widget/doc-files/QueryMenuItem_1.png
new file mode 100644
index 0000000..a577695
Binary files /dev/null and 
b/content/site/apidocs/org/apache/juneau/rest/widget/doc-files/QueryMenuItem_1.png
 differ

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/b5c66cf1/content/site/apidocs/org/apache/juneau/rest/widget/doc-files/QueryMenuItem_2.png
----------------------------------------------------------------------
diff --git 
a/content/site/apidocs/org/apache/juneau/rest/widget/doc-files/QueryMenuItem_2.png
 
b/content/site/apidocs/org/apache/juneau/rest/widget/doc-files/QueryMenuItem_2.png
new file mode 100644
index 0000000..71679f9
Binary files /dev/null and 
b/content/site/apidocs/org/apache/juneau/rest/widget/doc-files/QueryMenuItem_2.png
 differ

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/b5c66cf1/content/site/apidocs/org/apache/juneau/rest/widget/package-frame.html
----------------------------------------------------------------------
diff --git 
a/content/site/apidocs/org/apache/juneau/rest/widget/package-frame.html 
b/content/site/apidocs/org/apache/juneau/rest/widget/package-frame.html
index 81cb0d3..3691111 100644
--- a/content/site/apidocs/org/apache/juneau/rest/widget/package-frame.html
+++ b/content/site/apidocs/org/apache/juneau/rest/widget/package-frame.html
@@ -13,11 +13,11 @@
 <div class="indexContainer">
 <h2 title="Classes">Classes</h2>
 <ul title="Classes">
-<li><a href="ContentTypeLinksColumnWidget.html" title="class in 
org.apache.juneau.rest.widget" 
target="classFrame">ContentTypeLinksColumnWidget</a></li>
-<li><a href="ContentTypeLinksRowWidget.html" title="class in 
org.apache.juneau.rest.widget" 
target="classFrame">ContentTypeLinksRowWidget</a></li>
+<li><a href="ContentTypeMenuItem.html" title="class in 
org.apache.juneau.rest.widget" target="classFrame">ContentTypeMenuItem</a></li>
+<li><a href="MenuItemWidget.html" title="class in 
org.apache.juneau.rest.widget" target="classFrame">MenuItemWidget</a></li>
 <li><a href="PoweredByApacheWidget.html" title="class in 
org.apache.juneau.rest.widget" 
target="classFrame">PoweredByApacheWidget</a></li>
 <li><a href="PoweredByJuneauWidget.html" title="class in 
org.apache.juneau.rest.widget" 
target="classFrame">PoweredByJuneauWidget</a></li>
-<li><a href="QueryWidget.html" title="class in org.apache.juneau.rest.widget" 
target="classFrame">QueryWidget</a></li>
+<li><a href="QueryMenuItem.html" title="class in 
org.apache.juneau.rest.widget" target="classFrame">QueryMenuItem</a></li>
 <li><a href="Widget.html" title="class in org.apache.juneau.rest.widget" 
target="classFrame">Widget</a></li>
 </ul>
 </div>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/b5c66cf1/content/site/apidocs/org/apache/juneau/rest/widget/package-summary.html
----------------------------------------------------------------------
diff --git 
a/content/site/apidocs/org/apache/juneau/rest/widget/package-summary.html 
b/content/site/apidocs/org/apache/juneau/rest/widget/package-summary.html
index d843c9b..c9d9d08 100644
--- a/content/site/apidocs/org/apache/juneau/rest/widget/package-summary.html
+++ b/content/site/apidocs/org/apache/juneau/rest/widget/package-summary.html
@@ -82,15 +82,15 @@
 </tr>
 <tbody>
 <tr class="altColor">
-<td class="colFirst"><a 
href="../../../../../org/apache/juneau/rest/widget/ContentTypeLinksColumnWidget.html"
 title="class in 
org.apache.juneau.rest.widget">ContentTypeLinksColumnWidget</a></td>
+<td class="colFirst"><a 
href="../../../../../org/apache/juneau/rest/widget/ContentTypeMenuItem.html" 
title="class in org.apache.juneau.rest.widget">ContentTypeMenuItem</a></td>
 <td class="colLast">
 <div class="block">Widget that returns back a list of hyperlinks for rendering 
the contents of a page in a variety of content types.</div>
 </td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><a 
href="../../../../../org/apache/juneau/rest/widget/ContentTypeLinksRowWidget.html"
 title="class in 
org.apache.juneau.rest.widget">ContentTypeLinksRowWidget</a></td>
+<td class="colFirst"><a 
href="../../../../../org/apache/juneau/rest/widget/MenuItemWidget.html" 
title="class in org.apache.juneau.rest.widget">MenuItemWidget</a></td>
 <td class="colLast">
-<div class="block">Widget that returns back a list of hyperlinks for rendering 
the contents of a page in a variety of content types.</div>
+<div class="block">A subclass of widgets for rendering menu items with 
drop-down windows.</div>
 </td>
 </tr>
 <tr class="altColor">
@@ -106,15 +106,15 @@
 </td>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><a 
href="../../../../../org/apache/juneau/rest/widget/QueryWidget.html" 
title="class in org.apache.juneau.rest.widget">QueryWidget</a></td>
+<td class="colFirst"><a 
href="../../../../../org/apache/juneau/rest/widget/QueryMenuItem.html" 
title="class in org.apache.juneau.rest.widget">QueryMenuItem</a></td>
 <td class="colLast">
-<div class="block">Adds a <code>QUERY</code> link to the page that allows you 
to perform search/view/sort/paging on the page data.</div>
+<div class="block">Widget that returns a menu-item drop-down form for entering 
search/view/sort arguments.</div>
 </td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><a 
href="../../../../../org/apache/juneau/rest/widget/Widget.html" title="class in 
org.apache.juneau.rest.widget">Widget</a></td>
 <td class="colLast">
-<div class="block">Defines an interface for defining resolvers for 
<js>"$W{...}"</js> string variables.</div>
+<div class="block">Defines an interface for resolvers of <js>"$W{...}"</js> 
string variables.</div>
 </td>
 </tr>
 </tbody>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/b5c66cf1/content/site/apidocs/org/apache/juneau/rest/widget/package-tree.html
----------------------------------------------------------------------
diff --git 
a/content/site/apidocs/org/apache/juneau/rest/widget/package-tree.html 
b/content/site/apidocs/org/apache/juneau/rest/widget/package-tree.html
index a966f60..65a4e75 100644
--- a/content/site/apidocs/org/apache/juneau/rest/widget/package-tree.html
+++ b/content/site/apidocs/org/apache/juneau/rest/widget/package-tree.html
@@ -82,11 +82,14 @@
 <ul>
 <li type="circle">org.apache.juneau.rest.widget.<a 
href="../../../../../org/apache/juneau/rest/widget/Widget.html" title="class in 
org.apache.juneau.rest.widget"><span class="typeNameLink">Widget</span></a>
 <ul>
-<li type="circle">org.apache.juneau.rest.widget.<a 
href="../../../../../org/apache/juneau/rest/widget/ContentTypeLinksColumnWidget.html"
 title="class in org.apache.juneau.rest.widget"><span 
class="typeNameLink">ContentTypeLinksColumnWidget</span></a></li>
-<li type="circle">org.apache.juneau.rest.widget.<a 
href="../../../../../org/apache/juneau/rest/widget/ContentTypeLinksRowWidget.html"
 title="class in org.apache.juneau.rest.widget"><span 
class="typeNameLink">ContentTypeLinksRowWidget</span></a></li>
+<li type="circle">org.apache.juneau.rest.widget.<a 
href="../../../../../org/apache/juneau/rest/widget/MenuItemWidget.html" 
title="class in org.apache.juneau.rest.widget"><span 
class="typeNameLink">MenuItemWidget</span></a>
+<ul>
+<li type="circle">org.apache.juneau.rest.widget.<a 
href="../../../../../org/apache/juneau/rest/widget/ContentTypeMenuItem.html" 
title="class in org.apache.juneau.rest.widget"><span 
class="typeNameLink">ContentTypeMenuItem</span></a></li>
+<li type="circle">org.apache.juneau.rest.widget.<a 
href="../../../../../org/apache/juneau/rest/widget/QueryMenuItem.html" 
title="class in org.apache.juneau.rest.widget"><span 
class="typeNameLink">QueryMenuItem</span></a></li>
+</ul>
+</li>
 <li type="circle">org.apache.juneau.rest.widget.<a 
href="../../../../../org/apache/juneau/rest/widget/PoweredByApacheWidget.html" 
title="class in org.apache.juneau.rest.widget"><span 
class="typeNameLink">PoweredByApacheWidget</span></a></li>
 <li type="circle">org.apache.juneau.rest.widget.<a 
href="../../../../../org/apache/juneau/rest/widget/PoweredByJuneauWidget.html" 
title="class in org.apache.juneau.rest.widget"><span 
class="typeNameLink">PoweredByJuneauWidget</span></a></li>
-<li type="circle">org.apache.juneau.rest.widget.<a 
href="../../../../../org/apache/juneau/rest/widget/QueryWidget.html" 
title="class in org.apache.juneau.rest.widget"><span 
class="typeNameLink">QueryWidget</span></a></li>
 </ul>
 </li>
 </ul>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/b5c66cf1/content/site/apidocs/org/apache/juneau/utils/MetadataMap.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/utils/MetadataMap.html 
b/content/site/apidocs/org/apache/juneau/utils/MetadataMap.html
index 419588e..4595e17 100644
--- a/content/site/apidocs/org/apache/juneau/utils/MetadataMap.html
+++ b/content/site/apidocs/org/apache/juneau/utils/MetadataMap.html
@@ -49,7 +49,7 @@ var activeTableTab = "activeTableTab";
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../../org/apache/juneau/utils/MessageBundle.html" 
title="class in org.apache.juneau.utils"><span 
class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/apache/juneau/utils/ObjectUtils.html" 
title="class in org.apache.juneau.utils"><span 
class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/utils/PojoIntrospector.html" 
title="class in org.apache.juneau.utils"><span 
class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../../../index.html?org/apache/juneau/utils/MetadataMap.html" 
target="_top">Frames</a></li>
@@ -244,7 +244,7 @@ extends <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../../org/apache/juneau/utils/MessageBundle.html" 
title="class in org.apache.juneau.utils"><span 
class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/apache/juneau/utils/ObjectUtils.html" 
title="class in org.apache.juneau.utils"><span 
class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/utils/PojoIntrospector.html" 
title="class in org.apache.juneau.utils"><span 
class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../../../index.html?org/apache/juneau/utils/MetadataMap.html" 
target="_top">Frames</a></li>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/b5c66cf1/content/site/apidocs/org/apache/juneau/utils/ObjectUtils.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/utils/ObjectUtils.html 
b/content/site/apidocs/org/apache/juneau/utils/ObjectUtils.html
deleted file mode 100644
index 2cd19eb..0000000
--- a/content/site/apidocs/org/apache/juneau/utils/ObjectUtils.html
+++ /dev/null
@@ -1,446 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" 
"http://www.w3.org/TR/html4/loose.dtd";>
-<!-- NewPage -->
-<html lang="en">
-<head>
-<!-- Generated by javadoc -->
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>ObjectUtils (Apache Juneau (incubating) 
6.3.1-incubating-SNAPSHOT)</title>
-<link rel="stylesheet" type="text/css" href="../../../../javadoc.css" 
title="Style">
-<script type="text/javascript" src="../../../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="ObjectUtils (Apache Juneau (incubating) 
6.3.1-incubating-SNAPSHOT)";
-        }
-    }
-    catch(err) {
-    }
-//-->
-var methods = {"i0":9,"i1":9};
-var tabs = {65535:["t0","All Methods"],1:["t1","Static 
Methods"],8:["t4","Concrete Methods"]};
-var altColor = "altColor";
-var rowColor = "rowColor";
-var tableTab = "tableTab";
-var activeTableTab = "activeTableTab";
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation 
links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../../../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../../../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../../../index-all.html">Index</a></li>
-<li><a href="../../../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../../../../org/apache/juneau/utils/MetadataMap.html" 
title="class in org.apache.juneau.utils"><span 
class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/apache/juneau/utils/PojoIntrospector.html" 
title="class in org.apache.juneau.utils"><span 
class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../../../../index.html?org/apache/juneau/utils/ObjectUtils.html" 
target="_top">Frames</a></li>
-<li><a href="ObjectUtils.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<!-- ======== START OF CLASS DATA ======== -->
-<div class="header">
-<div class="subTitle">org.apache.juneau.utils</div>
-<h2 title="Class ObjectUtils" class="title">Class ObjectUtils</h2>
-</div>
-<div class="contentContainer">
-<ul class="inheritance">
-<li><a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true";
 title="class or interface in java.lang">java.lang.Object</a></li>
-<li>
-<ul class="inheritance">
-<li>org.apache.juneau.utils.ObjectUtils</li>
-</ul>
-</li>
-</ul>
-<div class="description">
-<ul class="blockList">
-<li class="blockList">
-<hr>
-<br>
-<pre>public class <a 
href="../../../../src-html/org/apache/juneau/utils/ObjectUtils.html#line.147">ObjectUtils</a>
-extends <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true";
 title="class or interface in java.lang">Object</a></pre>
-<div class="block">Utility class for efficiently converting objects between 
types.
-
- <p>
- If the value isn't an instance of the specified type, then converts the value 
if possible.
-
- <p>
- The following conversions are valid:
- <table class='styled'>
-   <tr><th>Convert to type</th><th>Valid input value 
types</th><th>Notes</th></tr>
-   <tr>
-      <td>
-         A class that is the normal type of a registered <a 
href="../../../../org/apache/juneau/transform/PojoSwap.html" title="class in 
org.apache.juneau.transform"><code>PojoSwap</code></a>.
-      </td>
-      <td>
-         A value whose class matches the transformed type of that registered 
<a href="../../../../org/apache/juneau/transform/PojoSwap.html" title="class in 
org.apache.juneau.transform"><code>PojoSwap</code></a>.
-      </td>
-      <td>&nbsp;</td>
-   </tr>
-   <tr>
-      <td>
-         A class that is the transformed type of a registered <a 
href="../../../../org/apache/juneau/transform/PojoSwap.html" title="class in 
org.apache.juneau.transform"><code>PojoSwap</code></a>.
-      </td>
-      <td>
-         A value whose class matches the normal type of that registered <a 
href="../../../../org/apache/juneau/transform/PojoSwap.html" title="class in 
org.apache.juneau.transform"><code>PojoSwap</code></a>.
-      </td>
-      <td>&nbsp;</td>
-   </tr>
-   <tr>
-      <td>
-         <code>Number</code> (e.g. <code>Integer</code>, <code>Short</code>, 
<code>Float</code>,...)
-         <br><code>Number.<jsf>TYPE</jsf></code> (e.g. 
<code>Integer.<jsf>TYPE</jsf></code>,
-         <code>Short.<jsf>TYPE</jsf></code>, 
<code>Float.<jsf>TYPE</jsf></code>,...)
-      </td>
-      <td>
-         <code>Number</code>, <code>String</code>, <jk>null</jk>
-      </td>
-      <td>
-         For primitive <code>TYPES</code>, <jk>null</jk> returns the JVM 
default value for that type.
-      </td>
-   </tr>
-   <tr>
-      <td>
-         <code>Map</code> (e.g. <code>Map</code>, <code>HashMap</code>, 
<code>TreeMap</code>, <code>ObjectMap</code>)
-      </td>
-      <td>
-         <code>Map</code>
-      </td>
-      <td>
-         If <code>Map</code> is not constructible, a <code>ObjectMap</code> is 
created.
-      </td>
-   </tr>
-   <tr>
-      <td>
-         <code>Collection</code> (e.g. <code>List</code>, 
<code>LinkedList</code>, <code>HashSet</code>, <code>ObjectList</code>)
-      </td>
-      <td>
-         <code>Collection&lt;Object&gt;</code>
-         <br><code>Object[]</code>
-      </td>
-      <td>
-         If <code>Collection</code> is not constructible, a 
<code>ObjectList</code> is created.
-      </td>
-   </tr>
-   <tr>
-      <td>
-         <code>X[]</code> (array of any type X)
-      </td>
-      <td>
-         <code>List&lt;X&gt;</code>
-      </td>
-      <td>&nbsp;</td>
-   </tr>
-   <tr>
-      <td>
-         <code>X[][]</code> (multi-dimensional arrays)
-      </td>
-      <td>
-         <code>List&lt;List&lt;X&gt;&gt;</code>
-         <br><code>List&lt;X[]&gt;</code>
-         <br><code>List[]&lt;X&gt;</code>
-      </td>
-      <td>&nbsp;</td>
-   </tr>
-   <tr>
-      <td>
-         <code>Enum</code>
-      </td>
-      <td>
-         <code>String</code>
-      </td>
-      <td>&nbsp;</td>
-   </tr>
-   <tr>
-      <td>
-         Bean
-      </td>
-      <td>
-         <code>Map</code>
-      </td>
-      <td>&nbsp;</td>
-   </tr>
-   <tr>
-      <td>
-         <code>String</code>
-      </td>
-      <td>
-         Anything
-      </td>
-      <td>
-         Arrays are converted to JSON arrays
-      </td>
-   </tr>
-   <tr>
-      <td>
-         Anything with one of the following methods:
-         <br><code><jk>public static</jk> T fromString(String)</code>
-         <br><code><jk>public static</jk> T valueOf(String)</code>
-         <br><code><jk>public</jk> T(String)</code>
-      </td>
-      <td>
-         <code>String</code>
-      </td>
-      <td>
-         <br>
-      </td>
-   </tr>
- </table></div>
-</li>
-</ul>
-</div>
-<div class="summary">
-<ul class="blockList">
-<li class="blockList">
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
-<!--   -->
-</a>
-<h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" 
summary="Constructor Summary table, listing constructors, and an explanation">
-<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Constructor and Description</th>
-</tr>
-<tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a 
href="../../../../org/apache/juneau/utils/ObjectUtils.html#ObjectUtils--">ObjectUtils</a></span>()</code>&nbsp;</td>
-</tr>
-</table>
-</li>
-</ul>
-<!-- ========== METHOD SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.summary">
-<!--   -->
-</a>
-<h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" 
summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span 
class="tabEnd">&nbsp;</span></span><span id="t1" class="tableTab"><span><a 
href="javascript:show(1);">Static Methods</a></span><span 
class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a 
href="javascript:show(8);">Concrete Methods</a></span><span 
class="tabEnd">&nbsp;</span></span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tr id="i0" class="altColor">
-<td class="colFirst"><code>static &lt;T&gt;&nbsp;T</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../org/apache/juneau/utils/ObjectUtils.html#convertToType-java.lang.Object-java.lang.Class-">convertToType</a></span>(<a
 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true";
 title="class or interface in java.lang">Object</a>&nbsp;value,
-             <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true";
 title="class or interface in java.lang">Class</a>&lt;T&gt;&nbsp;type)</code>
-<div class="block">Converts the specified object to the specified type.</div>
-</td>
-</tr>
-<tr id="i1" class="rowColor">
-<td class="colFirst"><code>static &lt;T&gt;&nbsp;T</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../org/apache/juneau/utils/ObjectUtils.html#convertToType-java.lang.Object-java.lang.Object-java.lang.Class-">convertToType</a></span>(<a
 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true";
 title="class or interface in java.lang">Object</a>&nbsp;outer,
-             <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true";
 title="class or interface in java.lang">Object</a>&nbsp;value,
-             <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true";
 title="class or interface in java.lang">Class</a>&lt;T&gt;&nbsp;type)</code>
-<div class="block">Converts the specified object to the specified type.</div>
-</td>
-</tr>
-</table>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;java.lang.<a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true";
 title="class or interface in java.lang">Object</a></h3>
-<code><a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#clone--";
 title="class or interface in java.lang">clone</a>, <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#equals-java.lang.Object-";
 title="class or interface in java.lang">equals</a>, <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#finalize--";
 title="class or interface in java.lang">finalize</a>, <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#getClass--";
 title="class or interface in java.lang">getClass</a>, <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#hashCode--";
 title="class or interface in java.lang">hashCode</a>, <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#notify--";
 title="class or interface in java.lang">notify</a>, <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang
 /Object.html?is-external=true#notifyAll--" title="class or interface in 
java.lang">notifyAll</a>, <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#toString--";
 title="class or interface in java.lang">toString</a>, <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#wait--";
 title="class or interface in java.lang">wait</a>, <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#wait-long-";
 title="class or interface in java.lang">wait</a>, <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#wait-long-int-";
 title="class or interface in java.lang">wait</a></code></li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<div class="details">
-<ul class="blockList">
-<li class="blockList">
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
-<!--   -->
-</a>
-<h3>Constructor Detail</h3>
-<a name="ObjectUtils--">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>ObjectUtils</h4>
-<pre>public&nbsp;<a 
href="../../../../src-html/org/apache/juneau/utils/ObjectUtils.html#line.147">ObjectUtils</a>()</pre>
-</li>
-</ul>
-</li>
-</ul>
-<!-- ============ METHOD DETAIL ========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.detail">
-<!--   -->
-</a>
-<h3>Method Detail</h3>
-<a name="convertToType-java.lang.Object-java.lang.Class-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>convertToType</h4>
-<pre>public static&nbsp;&lt;T&gt;&nbsp;T&nbsp;<a 
href="../../../../src-html/org/apache/juneau/utils/ObjectUtils.html#line.162">convertToType</a>(<a
 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true";
 title="class or interface in java.lang">Object</a>&nbsp;value,
-                                  <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true";
 title="class or interface in java.lang">Class</a>&lt;T&gt;&nbsp;type)</pre>
-<div class="block">Converts the specified object to the specified type.</div>
-<dl>
-<dt><span class="paramLabel">Type Parameters:</span></dt>
-<dd><code>T</code> - The class type to convert the value to.</dd>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>value</code> - The value to convert.</dd>
-<dd><code>type</code> - The class type to convert the value to.</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>The converted value.</dd>
-<dt><span class="throwsLabel">Throws:</span></dt>
-<dd><code><a 
href="../../../../org/apache/juneau/InvalidDataConversionException.html" 
title="class in org.apache.juneau">InvalidDataConversionException</a></code> - 
If the specified value cannot be converted to the specified type.</dd>
-</dl>
-</li>
-</ul>
-<a name="convertToType-java.lang.Object-java.lang.Object-java.lang.Class-">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>convertToType</h4>
-<pre>public static&nbsp;&lt;T&gt;&nbsp;T&nbsp;<a 
href="../../../../src-html/org/apache/juneau/utils/ObjectUtils.html#line.178">convertToType</a>(<a
 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true";
 title="class or interface in java.lang">Object</a>&nbsp;outer,
-                                  <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true";
 title="class or interface in java.lang">Object</a>&nbsp;value,
-                                  <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true";
 title="class or interface in java.lang">Class</a>&lt;T&gt;&nbsp;type)</pre>
-<div class="block">Converts the specified object to the specified type.</div>
-<dl>
-<dt><span class="paramLabel">Type Parameters:</span></dt>
-<dd><code>T</code> - The class type to convert the value to.</dd>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>outer</code> - If class is a member class, this is the instance of 
the containing class.
-   Should be <jk>null</jk> if not a member class.</dd>
-<dd><code>value</code> - The value to convert.</dd>
-<dd><code>type</code> - The class type to convert the value to.</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>The converted value.</dd>
-<dt><span class="throwsLabel">Throws:</span></dt>
-<dd><code><a 
href="../../../../org/apache/juneau/InvalidDataConversionException.html" 
title="class in org.apache.juneau">InvalidDataConversionException</a></code> - 
If the specified value cannot be converted to the specified type.</dd>
-</dl>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-</div>
-<!-- ========= END OF CLASS DATA ========= -->
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation 
links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../../../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../../../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../../../index-all.html">Index</a></li>
-<li><a href="../../../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../../../../org/apache/juneau/utils/MetadataMap.html" 
title="class in org.apache.juneau.utils"><span 
class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/apache/juneau/utils/PojoIntrospector.html" 
title="class in org.apache.juneau.utils"><span 
class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../../../../index.html?org/apache/juneau/utils/ObjectUtils.html" 
target="_top">Frames</a></li>
-<li><a href="ObjectUtils.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2017 <a 
href="http://www.apache.org/";>Apache</a>. All rights reserved.</small></p>
-</body>
-</html>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/b5c66cf1/content/site/apidocs/org/apache/juneau/utils/PojoIntrospector.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/utils/PojoIntrospector.html 
b/content/site/apidocs/org/apache/juneau/utils/PojoIntrospector.html
index 6829a2b..77eff34 100644
--- a/content/site/apidocs/org/apache/juneau/utils/PojoIntrospector.html
+++ b/content/site/apidocs/org/apache/juneau/utils/PojoIntrospector.html
@@ -48,7 +48,7 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/juneau/utils/ObjectUtils.html" 
title="class in org.apache.juneau.utils"><span 
class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/utils/MetadataMap.html" 
title="class in org.apache.juneau.utils"><span 
class="typeNameLink">Prev&nbsp;Class</span></a></li>
 <li><a href="../../../../org/apache/juneau/utils/PojoQuery.html" title="class 
in org.apache.juneau.utils"><span 
class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
@@ -351,7 +351,7 @@ extends <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/juneau/utils/ObjectUtils.html" 
title="class in org.apache.juneau.utils"><span 
class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/utils/MetadataMap.html" 
title="class in org.apache.juneau.utils"><span 
class="typeNameLink">Prev&nbsp;Class</span></a></li>
 <li><a href="../../../../org/apache/juneau/utils/PojoQuery.html" title="class 
in org.apache.juneau.utils"><span 
class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/b5c66cf1/content/site/apidocs/org/apache/juneau/utils/ProcBuilder.Matcher.html
----------------------------------------------------------------------
diff --git 
a/content/site/apidocs/org/apache/juneau/utils/ProcBuilder.Matcher.html 
b/content/site/apidocs/org/apache/juneau/utils/ProcBuilder.Matcher.html
index b069dc1..b2c6e5d 100644
--- a/content/site/apidocs/org/apache/juneau/utils/ProcBuilder.Matcher.html
+++ b/content/site/apidocs/org/apache/juneau/utils/ProcBuilder.Matcher.html
@@ -43,7 +43,7 @@
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../../org/apache/juneau/utils/ProcBuilder.html" 
title="class in org.apache.juneau.utils"><span 
class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/apache/juneau/utils/SearchArgs.html" title="class 
in org.apache.juneau.utils"><span 
class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/utils/ResourceFinder.html" 
title="class in org.apache.juneau.utils"><span 
class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a 
href="../../../../index.html?org/apache/juneau/utils/ProcBuilder.Matcher.html" 
target="_top">Frames</a></li>
@@ -196,7 +196,7 @@ extends <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../../org/apache/juneau/utils/ProcBuilder.html" 
title="class in org.apache.juneau.utils"><span 
class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/apache/juneau/utils/SearchArgs.html" title="class 
in org.apache.juneau.utils"><span 
class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/utils/ResourceFinder.html" 
title="class in org.apache.juneau.utils"><span 
class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a 
href="../../../../index.html?org/apache/juneau/utils/ProcBuilder.Matcher.html" 
target="_top">Frames</a></li>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/b5c66cf1/content/site/apidocs/org/apache/juneau/utils/ResourceFinder.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/utils/ResourceFinder.html 
b/content/site/apidocs/org/apache/juneau/utils/ResourceFinder.html
new file mode 100644
index 0000000..0207f92
--- /dev/null
+++ b/content/site/apidocs/org/apache/juneau/utils/ResourceFinder.html
@@ -0,0 +1,392 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" 
"http://www.w3.org/TR/html4/loose.dtd";>
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc -->
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>ResourceFinder (Apache Juneau (incubating) 
6.3.1-incubating-SNAPSHOT)</title>
+<link rel="stylesheet" type="text/css" href="../../../../javadoc.css" 
title="Style">
+<script type="text/javascript" src="../../../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="ResourceFinder (Apache Juneau (incubating) 
6.3.1-incubating-SNAPSHOT)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":10,"i1":10,"i2":10,"i3":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance 
Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation 
links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../index-all.html">Index</a></li>
+<li><a href="../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../../org/apache/juneau/utils/ProcBuilder.Matcher.html" 
title="class in org.apache.juneau.utils"><span 
class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/utils/SearchArgs.html" title="class 
in org.apache.juneau.utils"><span 
class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a 
href="../../../../index.html?org/apache/juneau/utils/ResourceFinder.html" 
target="_top">Frames</a></li>
+<li><a href="ResourceFinder.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">org.apache.juneau.utils</div>
+<h2 title="Class ResourceFinder" class="title">Class ResourceFinder</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li><a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true";
 title="class or interface in java.lang">java.lang.Object</a></li>
+<li>
+<ul class="inheritance">
+<li>org.apache.juneau.utils.ResourceFinder</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public class <a 
href="../../../../src-html/org/apache/juneau/utils/ResourceFinder.html#line.49">ResourceFinder</a>
+extends <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true";
 title="class or interface in java.lang">Object</a></pre>
+<div class="block">Utility class for finding resources for a class.
+
+ <p>
+ Same as <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true#getResourceAsStream-java.lang.String-";
 title="class or interface in 
java.lang"><code>Class.getResourceAsStream(String)</code></a> except if it 
doesn't find the resource on this class, searches
+ up the parent hierarchy chain.
+
+ <p>
+ If the resource cannot be found in the classpath, then an attempt is made to 
look in the JVM working directory.
+ <br>Path traversals outside the working directory are not allowed for 
security reasons.
+
+ <p>
+ If the <code>locale</code> 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>
+ Results are cached for fast lookup.</div>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" 
summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a 
href="../../../../org/apache/juneau/utils/ResourceFinder.html#ResourceFinder-java.lang.Class-">ResourceFinder</a></span>(<a
 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true";
 title="class or interface in 
java.lang">Class</a>&lt;?&gt;&nbsp;forClass)</code>
+<div class="block">Constructor.</div>
+</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" 
summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span 
class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a 
href="javascript:show(2);">Instance Methods</a></span><span 
class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a 
href="javascript:show(8);">Concrete Methods</a></span><span 
class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code><a 
href="http://docs.oracle.com/javase/7/docs/api/java/io/InputStream.html?is-external=true";
 title="class or interface in java.io">InputStream</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../org/apache/juneau/utils/ResourceFinder.html#getResourceAsStream-java.lang.String-">getResourceAsStream</a></span>(<a
 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;name)</code>
+<div class="block">Finds the resource with the given name.</div>
+</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code><a 
href="http://docs.oracle.com/javase/7/docs/api/java/io/InputStream.html?is-external=true";
 title="class or interface in java.io">InputStream</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../org/apache/juneau/utils/ResourceFinder.html#getResourceAsStream-java.lang.String-java.util.Locale-">getResourceAsStream</a></span>(<a
 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;name,
+                   <a 
href="http://docs.oracle.com/javase/7/docs/api/java/util/Locale.html?is-external=true";
 title="class or interface in java.util">Locale</a>&nbsp;locale)</code>
+<div class="block">Finds the resource with the given name for the specified 
locale.</div>
+</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code><a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../org/apache/juneau/utils/ResourceFinder.html#getResourceAsString-java.lang.String-">getResourceAsString</a></span>(<a
 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;name)</code>
+<div class="block">Finds the resource with the given name and converts it to a 
simple string.</div>
+</td>
+</tr>
+<tr id="i3" class="rowColor">
+<td class="colFirst"><code><a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../org/apache/juneau/utils/ResourceFinder.html#getResourceAsString-java.lang.String-java.util.Locale-">getResourceAsString</a></span>(<a
 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;name,
+                   <a 
href="http://docs.oracle.com/javase/7/docs/api/java/util/Locale.html?is-external=true";
 title="class or interface in java.util">Locale</a>&nbsp;locale)</code>
+<div class="block">Finds the resource with the given name and converts it to a 
simple string.</div>
+</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.<a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true";
 title="class or interface in java.lang">Object</a></h3>
+<code><a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#clone--";
 title="class or interface in java.lang">clone</a>, <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#equals-java.lang.Object-";
 title="class or interface in java.lang">equals</a>, <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#finalize--";
 title="class or interface in java.lang">finalize</a>, <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#getClass--";
 title="class or interface in java.lang">getClass</a>, <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#hashCode--";
 title="class or interface in java.lang">hashCode</a>, <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#notify--";
 title="class or interface in java.lang">notify</a>, <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang
 /Object.html?is-external=true#notifyAll--" title="class or interface in 
java.lang">notifyAll</a>, <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#toString--";
 title="class or interface in java.lang">toString</a>, <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#wait--";
 title="class or interface in java.lang">wait</a>, <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#wait-long-";
 title="class or interface in java.lang">wait</a>, <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#wait-long-int-";
 title="class or interface in java.lang">wait</a></code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="ResourceFinder-java.lang.Class-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>ResourceFinder</h4>
+<pre>public&nbsp;<a 
href="../../../../src-html/org/apache/juneau/utils/ResourceFinder.html#line.67">ResourceFinder</a>(<a
 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true";
 title="class or interface in java.lang">Class</a>&lt;?&gt;&nbsp;forClass)</pre>
+<div class="block">Constructor.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>forClass</code> - The class that this resource finder searches 
against.</dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="getResourceAsStream-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getResourceAsStream</h4>
+<pre>public&nbsp;<a 
href="http://docs.oracle.com/javase/7/docs/api/java/io/InputStream.html?is-external=true";
 title="class or interface in java.io">InputStream</a>&nbsp;<a 
href="../../../../src-html/org/apache/juneau/utils/ResourceFinder.html#line.78">getResourceAsStream</a>(<a
 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;name)
+                                throws <a 
href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true";
 title="class or interface in java.io">IOException</a></pre>
+<div class="block">Finds the resource with the given name.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>name</code> - Name of the desired resource.</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>An input stream to the object, or <jk>null</jk> if the resource could not 
be found.</dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a 
href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true";
 title="class or interface in java.io">IOException</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="getResourceAsStream-java.lang.String-java.util.Locale-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getResourceAsStream</h4>
+<pre>public&nbsp;<a 
href="http://docs.oracle.com/javase/7/docs/api/java/io/InputStream.html?is-external=true";
 title="class or interface in java.io">InputStream</a>&nbsp;<a 
href="../../../../src-html/org/apache/juneau/utils/ResourceFinder.html#line.90">getResourceAsStream</a>(<a
 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;name,
+                                       <a 
href="http://docs.oracle.com/javase/7/docs/api/java/util/Locale.html?is-external=true";
 title="class or interface in java.util">Locale</a>&nbsp;locale)
+                                throws <a 
href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true";
 title="class or interface in java.io">IOException</a></pre>
+<div class="block">Finds the resource with the given name for the specified 
locale.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>name</code> - Name of the desired resource.</dd>
+<dd><code>locale</code> - The locale.  Can be <jk>null</jk>.</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>An input stream to the object, or <jk>null</jk> if the resource could not 
be found.</dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a 
href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true";
 title="class or interface in java.io">IOException</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="getResourceAsString-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getResourceAsString</h4>
+<pre>public&nbsp;<a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;<a 
href="../../../../src-html/org/apache/juneau/utils/ResourceFinder.html#line.101">getResourceAsString</a>(<a
 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;name)
+                           throws <a 
href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true";
 title="class or interface in java.io">IOException</a></pre>
+<div class="block">Finds the resource with the given name and converts it to a 
simple string.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>name</code> - Name of the desired resource.</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>The resource converted to a string, or <jk>null</jk> if the resource could 
not be found.</dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a 
href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true";
 title="class or interface in java.io">IOException</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="getResourceAsString-java.lang.String-java.util.Locale-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>getResourceAsString</h4>
+<pre>public&nbsp;<a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;<a 
href="../../../../src-html/org/apache/juneau/utils/ResourceFinder.html#line.113">getResourceAsString</a>(<a
 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;name,
+                                  <a 
href="http://docs.oracle.com/javase/7/docs/api/java/util/Locale.html?is-external=true";
 title="class or interface in java.util">Locale</a>&nbsp;locale)
+                           throws <a 
href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true";
 title="class or interface in java.io">IOException</a></pre>
+<div class="block">Finds the resource with the given name and converts it to a 
simple string.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>name</code> - Name of the desired resource.</dd>
+<dd><code>locale</code> - The locale.  Can be <jk>null</jk>.</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>The resource converted to a string, or <jk>null</jk> if the resource could 
not be found.</dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a 
href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true";
 title="class or interface in java.io">IOException</a></code></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation 
links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../index-all.html">Index</a></li>
+<li><a href="../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../../org/apache/juneau/utils/ProcBuilder.Matcher.html" 
title="class in org.apache.juneau.utils"><span 
class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/utils/SearchArgs.html" title="class 
in org.apache.juneau.utils"><span 
class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a 
href="../../../../index.html?org/apache/juneau/utils/ResourceFinder.html" 
target="_top">Frames</a></li>
+<li><a href="ResourceFinder.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+<p class="legalCopy"><small>Copyright &#169; 2017 <a 
href="http://www.apache.org/";>Apache</a>. All rights reserved.</small></p>
+</body>
+</html>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/b5c66cf1/content/site/apidocs/org/apache/juneau/utils/SearchArgs.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/utils/SearchArgs.html 
b/content/site/apidocs/org/apache/juneau/utils/SearchArgs.html
index 30b5ba3..891ffb7 100644
--- a/content/site/apidocs/org/apache/juneau/utils/SearchArgs.html
+++ b/content/site/apidocs/org/apache/juneau/utils/SearchArgs.html
@@ -48,7 +48,7 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/juneau/utils/ProcBuilder.Matcher.html" 
title="class in org.apache.juneau.utils"><span 
class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/utils/ResourceFinder.html" 
title="class in org.apache.juneau.utils"><span 
class="typeNameLink">Prev&nbsp;Class</span></a></li>
 <li><a href="../../../../org/apache/juneau/utils/SearchArgs.Builder.html" 
title="class in org.apache.juneau.utils"><span 
class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
@@ -359,7 +359,7 @@ extends <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/juneau/utils/ProcBuilder.Matcher.html" 
title="class in org.apache.juneau.utils"><span 
class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/utils/ResourceFinder.html" 
title="class in org.apache.juneau.utils"><span 
class="typeNameLink">Prev&nbsp;Class</span></a></li>
 <li><a href="../../../../org/apache/juneau/utils/SearchArgs.Builder.html" 
title="class in org.apache.juneau.utils"><span 
class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/b5c66cf1/content/site/apidocs/org/apache/juneau/utils/package-frame.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/utils/package-frame.html 
b/content/site/apidocs/org/apache/juneau/utils/package-frame.html
index 80111be..f0911e5 100644
--- a/content/site/apidocs/org/apache/juneau/utils/package-frame.html
+++ b/content/site/apidocs/org/apache/juneau/utils/package-frame.html
@@ -26,12 +26,12 @@
 <li><a href="ManifestFile.html" title="class in org.apache.juneau.utils" 
target="classFrame">ManifestFile</a></li>
 <li><a href="MessageBundle.html" title="class in org.apache.juneau.utils" 
target="classFrame">MessageBundle</a></li>
 <li><a href="MetadataMap.html" title="class in org.apache.juneau.utils" 
target="classFrame">MetadataMap</a></li>
-<li><a href="ObjectUtils.html" title="class in org.apache.juneau.utils" 
target="classFrame">ObjectUtils</a></li>
 <li><a href="PojoIntrospector.html" title="class in org.apache.juneau.utils" 
target="classFrame">PojoIntrospector</a></li>
 <li><a href="PojoQuery.html" title="class in org.apache.juneau.utils" 
target="classFrame">PojoQuery</a></li>
 <li><a href="PojoRest.html" title="class in org.apache.juneau.utils" 
target="classFrame">PojoRest</a></li>
 <li><a href="ProcBuilder.html" title="class in org.apache.juneau.utils" 
target="classFrame">ProcBuilder</a></li>
 <li><a href="ProcBuilder.Matcher.html" title="class in 
org.apache.juneau.utils" target="classFrame">ProcBuilder.Matcher</a></li>
+<li><a href="ResourceFinder.html" title="class in org.apache.juneau.utils" 
target="classFrame">ResourceFinder</a></li>
 <li><a href="SearchArgs.html" title="class in org.apache.juneau.utils" 
target="classFrame">SearchArgs</a></li>
 <li><a href="SearchArgs.Builder.html" title="class in org.apache.juneau.utils" 
target="classFrame">SearchArgs.Builder</a></li>
 <li><a href="StringMessage.html" title="class in org.apache.juneau.utils" 
target="classFrame">StringMessage</a></li>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/b5c66cf1/content/site/apidocs/org/apache/juneau/utils/package-summary.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/utils/package-summary.html 
b/content/site/apidocs/org/apache/juneau/utils/package-summary.html
index 2924e33..3c3bf8c 100644
--- a/content/site/apidocs/org/apache/juneau/utils/package-summary.html
+++ b/content/site/apidocs/org/apache/juneau/utils/package-summary.html
@@ -158,41 +158,41 @@
 </td>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><a 
href="../../../../org/apache/juneau/utils/ObjectUtils.html" title="class in 
org.apache.juneau.utils">ObjectUtils</a></td>
-<td class="colLast">
-<div class="block">Utility class for efficiently converting objects between 
types.</div>
-</td>
-</tr>
-<tr class="rowColor">
 <td class="colFirst"><a 
href="../../../../org/apache/juneau/utils/PojoIntrospector.html" title="class 
in org.apache.juneau.utils">PojoIntrospector</a></td>
 <td class="colLast">
 <div class="block">Used to invoke methods on <code>Objects</code> using 
arguments in serialized form.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a 
href="../../../../org/apache/juneau/utils/PojoQuery.html" title="class in 
org.apache.juneau.utils">PojoQuery</a></td>
 <td class="colLast">
 <div class="block">Designed to provide search/view/sort/paging filtering on 
tabular in-memory POJO models.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a 
href="../../../../org/apache/juneau/utils/PojoRest.html" title="class in 
org.apache.juneau.utils">PojoRest</a></td>
 <td class="colLast">
 <div class="block">Provides the ability to perform standard REST operations 
(GET, PUT, POST, DELETE) against nodes in a POJO model.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a 
href="../../../../org/apache/juneau/utils/ProcBuilder.html" title="class in 
org.apache.juneau.utils">ProcBuilder</a></td>
 <td class="colLast">
 <div class="block">Utility class for running operating system processes.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a 
href="../../../../org/apache/juneau/utils/ProcBuilder.Matcher.html" 
title="class in org.apache.juneau.utils">ProcBuilder.Matcher</a></td>
 <td class="colLast">
 <div class="block">Specifies interface for defining OS-specific commands.</div>
 </td>
 </tr>
+<tr class="rowColor">
+<td class="colFirst"><a 
href="../../../../org/apache/juneau/utils/ResourceFinder.html" title="class in 
org.apache.juneau.utils">ResourceFinder</a></td>
+<td class="colLast">
+<div class="block">Utility class for finding resources for a class.</div>
+</td>
+</tr>
 <tr class="altColor">
 <td class="colFirst"><a 
href="../../../../org/apache/juneau/utils/SearchArgs.html" title="class in 
org.apache.juneau.utils">SearchArgs</a></td>
 <td class="colLast">

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/b5c66cf1/content/site/apidocs/org/apache/juneau/utils/package-tree.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/utils/package-tree.html 
b/content/site/apidocs/org/apache/juneau/utils/package-tree.html
index fcd1797..ac921f1 100644
--- a/content/site/apidocs/org/apache/juneau/utils/package-tree.html
+++ b/content/site/apidocs/org/apache/juneau/utils/package-tree.html
@@ -132,7 +132,6 @@
 </li>
 <li type="circle">org.apache.juneau.utils.<a 
href="../../../../org/apache/juneau/utils/IOPipe.html" title="class in 
org.apache.juneau.utils"><span class="typeNameLink">IOPipe</span></a></li>
 <li type="circle">org.apache.juneau.utils.<a 
href="../../../../org/apache/juneau/utils/MetadataMap.html" title="class in 
org.apache.juneau.utils"><span class="typeNameLink">MetadataMap</span></a></li>
-<li type="circle">org.apache.juneau.utils.<a 
href="../../../../org/apache/juneau/utils/ObjectUtils.html" title="class in 
org.apache.juneau.utils"><span class="typeNameLink">ObjectUtils</span></a></li>
 <li type="circle">org.apache.juneau.utils.<a 
href="../../../../org/apache/juneau/utils/PojoIntrospector.html" title="class 
in org.apache.juneau.utils"><span 
class="typeNameLink">PojoIntrospector</span></a></li>
 <li type="circle">org.apache.juneau.utils.<a 
href="../../../../org/apache/juneau/utils/PojoQuery.html" title="class in 
org.apache.juneau.utils"><span class="typeNameLink">PojoQuery</span></a></li>
 <li type="circle">org.apache.juneau.utils.<a 
href="../../../../org/apache/juneau/utils/PojoRest.html" title="class in 
org.apache.juneau.utils"><span class="typeNameLink">PojoRest</span></a></li>
@@ -143,6 +142,7 @@
 <li type="circle">org.apache.juneau.utils.<a 
href="../../../../org/apache/juneau/utils/MessageBundle.html" title="class in 
org.apache.juneau.utils"><span 
class="typeNameLink">MessageBundle</span></a></li>
 </ul>
 </li>
+<li type="circle">org.apache.juneau.utils.<a 
href="../../../../org/apache/juneau/utils/ResourceFinder.html" title="class in 
org.apache.juneau.utils"><span 
class="typeNameLink">ResourceFinder</span></a></li>
 <li type="circle">org.apache.juneau.utils.<a 
href="../../../../org/apache/juneau/utils/SearchArgs.html" title="class in 
org.apache.juneau.utils"><span class="typeNameLink">SearchArgs</span></a></li>
 <li type="circle">org.apache.juneau.utils.<a 
href="../../../../org/apache/juneau/utils/SearchArgs.Builder.html" title="class 
in org.apache.juneau.utils"><span 
class="typeNameLink">SearchArgs.Builder</span></a></li>
 <li type="circle">org.apache.juneau.utils.<a 
href="../../../../org/apache/juneau/utils/StringMessage.html" title="class in 
org.apache.juneau.utils"><span class="typeNameLink">StringMessage</span></a> 
(implements java.lang.<a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/CharSequence.html?is-external=true";
 title="class or interface in java.lang">CharSequence</a>, org.apache.juneau.<a 
href="../../../../org/apache/juneau/Writable.html" title="interface in 
org.apache.juneau">Writable</a>)</li>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/b5c66cf1/content/site/apidocs/overview-summary.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/overview-summary.html 
b/content/site/apidocs/overview-summary.html
index fbe0384..40d42d1 100644
--- a/content/site/apidocs/overview-summary.html
+++ b/content/site/apidocs/overview-summary.html
@@ -2837,7 +2837,7 @@
       },
       
       <jc>// Our stylesheet for the HTML rendition.</jc>
-      stylesheet=<js>"styles/devops.css"</js>,
+      styleImport=<js>"styles/devops.css"</js>,
       
       <jc>// Support GZIP encoding on Accept-Encoding header.</jc>
       encoders=GzipEncoder.<jk>class</jk>,
@@ -5039,7 +5039,7 @@
       },
       
       <jc>// Our stylesheet for the HTML rendition.</jc>
-      stylesheet=<js>"styles/devops.css"</js>,
+      styleImport=<js>"styles/devops.css"</js>,
       
       <jc>// Support GZIP encoding on Accept-Encoding header.</jc>
       encoders=GzipEncoder.<jk>class</jk>,
@@ -5862,7 +5862,7 @@
          <ja>@Property</ja>(name=<js>"DirectoryResource.allowDeletes"</js>, 
value=<js>"true"</js>), 
          <ja>@Property</ja>(name=<js>"DirectoryResource.allowPuts"</js>, 
value=<js>"false"</js>) 
       }, 
-      stylesheet=<js>"styles/devops.css"</js> 
+      styleImport=<js>"styles/devops.css"</js> 
    ) 
    <jk>public class</jk> TempDirResource <jk>extends</jk> DirectoryResource { 
       <jk>private static final long</jk> <jsf>serialVersionUID</jsf> = 1L; 
@@ -7112,7 +7112,7 @@
    <h5 class='toc'>What's new in each release</h5>
    <ul class='toc'>
       <li><p><a class='doclink' href='#6.3.1'>6.3.1 (TBD)</a></p>
-      <li><p><a class='doclink' href='#6.3.0'>6.3.0 (TBD)</a></p>
+      <li><p><a class='doclink' href='#6.3.0'>6.3.0 (Jun 30, 2017)</a></p>
       <li><p><a class='doclink' href='#6.2.0'>6.2.0 (Apr 28, 2017)</a></p>
       <li><p><a class='doclink' href='#6.1.0'>6.1.0 (Feb 25, 2017)</a></p>
       <li><p><a class='doclink' href='#6.0.1'>6.0.1 (Jan 3, 2017)</a></p>
@@ -7190,19 +7190,58 @@
       <ul class='spaced-list'>
          <li>
             <a href="org/apache/juneau/utils/PojoQuery.html" title="class in 
org.apache.juneau.utils"><code>PojoQuery</code></a> improvements.
-            <br>Search columns containing lists and maps.
-            <br>Sort columns containing lists and maps.
          <li>
             New <a 
href="org/apache/juneau/remoteable/RemoteMethod.html#returns--"><code>RemoteMethod.returns()</code></a>
 annotation.
+            <br>Allows you to specify whether the remote method returns the 
HTTP body or status code.
          <li>
             Fixed bugs with <a 
href="org/apache/juneau/BeanContext.html#BEAN_includeProperties"><code>BeanContext.BEAN_includeProperties</code></a>
 and <a 
href="org/apache/juneau/BeanContext.html#BEAN_excludeProperties"><code>BeanContext.BEAN_excludeProperties</code></a>
 settings.
+         <li>
+            New/modified settings in <a 
href="org/apache/juneau/html/HtmlDocSerializerContext.html" title="class in 
org.apache.juneau.html"><code>HtmlDocSerializerContext</code></a>:
+            <ul>
+               <li><a 
href="org/apache/juneau/html/HtmlDocSerializerContext.html#HTMLDOC_script"><code>HTMLDOC_script</code></a>
+               <li><a 
href="org/apache/juneau/html/HtmlDocSerializerContext.html#HTMLDOC_style"><code>HTMLDOC_style</code></a>
 - Was <jsf>HTMLDOC_css</jsf>.
+               <li><a 
href="org/apache/juneau/html/HtmlDocSerializerContext.html#HTMLDOC_styleImport"><code>HTMLDOC_styleImport</code></a>
 - Was <jsf>HTMLDOC_cssUrl</jsf>.  Now an array.
+            </ul>
+         <li>
+            New <a href="org/apache/juneau/utils/ResourceFinder.html" 
title="class in org.apache.juneau.utils"><code>ResourceFinder</code></a> 
utility class.
+            Allows you to search for resources up the parent hierarchy chain.
+            Also allows you to search for localized resources.
       </ul>
 
       <h6 class='topic'>org.apache.juneau.rest</h6>
       <ul class='spaced-list'>
          <li>
-            <a href="org/apache/juneau/rest/widget/QueryWidget.html" 
title="class in org.apache.juneau.rest.widget"><code>QueryWidget</code></a> 
improvements.
-            <br>Fields are pre-filled with current search arguments.
+            Improvements made to the <a 
href="org/apache/juneau/rest/widget/Widget.html" title="class in 
org.apache.juneau.rest.widget"><code>Widget</code></a> API.
+            <ul>
+               <li>
+                  You can now add arbitrary CSS and Javascript along with your 
widgets through new methods:
+                  <ul>
+                     <li><a 
href="org/apache/juneau/rest/widget/Widget.html#getHtml-org.apache.juneau.rest.RestRequest-"><code>Widget.getHtml(RestRequest)</code></a>
+                     <li><a 
href="org/apache/juneau/rest/widget/Widget.html#getScript-org.apache.juneau.rest.RestRequest-"><code>Widget.getScript(RestRequest)</code></a>
+                     <li><a 
href="org/apache/juneau/rest/widget/Widget.html#getStyle-org.apache.juneau.rest.RestRequest-"><code>Widget.getStyle(RestRequest)</code></a>
+                  </ul>
+               </li>
+               <li>
+                  New <a 
href="org/apache/juneau/rest/widget/MenuItemWidget.html" title="class in 
org.apache.juneau.rest.widget"><code>MenuItemWidget</code></a> can be used to 
create pull-down menu items.
+               <li>
+                  New <a 
href="org/apache/juneau/rest/widget/ContentTypeMenuItem.html" title="class in 
org.apache.juneau.rest.widget"><code>ContentTypeMenuItem</code></a> widget that 
provides a pull-down menu 
+                  with hyperlinks for all supported languages for that page:
+                  <br><img 
src='doc-files/ReleaseNotes_631_ContentTypeMenuItem.png'>
+               <li>
+                  Improved <a 
href="org/apache/juneau/rest/widget/QueryMenuItem.html" title="class in 
org.apache.juneau.rest.widget"><code>QueryMenuItem</code></a> widget that 
provides a pull-down menu
+                  of a search/view/order-by/page form:
+                  <br><img src='doc-files/ReleaseNotes_631_QueryMenuItem.png'>
+                  <br>Fields are now pre-filled with current query parameters.
+            </ul>
+         <li>
+            New/modified annotations on <a 
href="org/apache/juneau/rest/annotation/HtmlDoc.html" title="annotation in 
org.apache.juneau.rest.annotation"><code>@HtmlDoc</code></a>:
+            <ul>
+               <li><a 
href="org/apache/juneau/rest/annotation/HtmlDoc.html#style--"><code>style()</code></a>
 - Renamed from <code>css()</code>.
+               <li><a 
href="org/apache/juneau/rest/annotation/HtmlDoc.html#styleImport--"><code>styleImport()</code></a>
 - Renamed from <code>cssUrl()</code>.
+                  <br>Can now be a comma-delimited list of URLs.
+               <li><a 
href="org/apache/juneau/rest/annotation/HtmlDoc.html#script--"><code>script()</code></a>
 - Add arbitrary Javascript to page header.
+            </ul>
+      
          <li>
             Bug fix with <a 
href="org/apache/juneau/rest/annotation/HtmlDoc.html#nowrap--"><code>HtmlDoc.nowrap()</code></a>
 so that the setting only applies
             to the data contents, not the whole page.
@@ -7221,9 +7260,20 @@
             </ul>
          </li>
          <li>
+            Eliminated the <code>@RestResource.stylesheet()</code> annotation. 
 
+            It's no longer needed now that you can easily specify styles via 
<ja>@Htmldoc</ja>.
+         <li>
             <a 
href="org/apache/juneau/rest/annotation/HtmlDoc.html#title--"><code>HtmlDoc.title()</code></a>
 and <a 
href="org/apache/juneau/rest/annotation/HtmlDoc.html#description--"><code>HtmlDoc.description()</code></a>
             can now take HTML (phrasing content only since it's still inside 
H3 and H5 tags).
       </ul>
+
+      <h6 class='topic'>org.apache.juneau.rest.examples</h6>
+      <ul class='spaced-list'>
+         <li>
+            Added CONTENT-TYPE menu items to most pages.
+         <li>
+            Added improved QUERY menu items to PetStore page.
+      </ul>
    </div>
    
    <!-- 
========================================================================================================
 -->
@@ -7371,8 +7421,8 @@
                      <li><a 
href="org/apache/juneau/html/HtmlDocSerializerContext.html#HTMLDOC_aside"><code>HtmlDocSerializerContext.HTMLDOC_aside</code></a>
                      <li><a 
href="org/apache/juneau/html/HtmlDocSerializerContext.html#HTMLDOC_footer"><code>HtmlDocSerializerContext.HTMLDOC_footer</code></a>
                      <li><a 
href="org/apache/juneau/html/HtmlDocSerializerContext.html#HTMLDOC_noResultsMessage"><code>HtmlDocSerializerContext.HTMLDOC_noResultsMessage</code></a>
-                     <li><a 
href="org/apache/juneau/html/HtmlDocSerializerContext.html#HTMLDOC_cssUrl"><code>HtmlDocSerializerContext.HTMLDOC_cssUrl</code></a>
-                     <li><a 
href="org/apache/juneau/html/HtmlDocSerializerContext.html#HTMLDOC_css"><code>HtmlDocSerializerContext.HTMLDOC_css</code></a>
+                     
<li><code><del>HtmlDocSerializerContext.HTMLDOC_cssUrl</del></code>
+                     
<li><code><del>HtmlDocSerializerContext.HTMLDOC_css</del></code>
                      <li><a 
href="org/apache/juneau/html/HtmlDocSerializerContext.html#HTMLDOC_template"><code>HtmlDocSerializerContext.HTMLDOC_template</code></a>
                   </ul>
                <li>New interface <a 
href="org/apache/juneau/html/HtmlDocTemplate.html" title="interface in 
org.apache.juneau.html"><code>HtmlDocTemplate</code></a> that allows full 
control over rendering
@@ -7553,8 +7603,8 @@
                <li><a 
href="org/apache/juneau/rest/RestConfig.html#setHtmlNav-java.lang.String-"><code>setHtmlNav(String)</code></a>
                <li><a 
href="org/apache/juneau/rest/RestConfig.html#setHtmlAside-java.lang.String-"><code>setHtmlAside(String)</code></a>
                <li><a 
href="org/apache/juneau/rest/RestConfig.html#setHtmlFooter-java.lang.String-"><code>setHtmlFooter(String)</code></a>
-               <li><a 
href="org/apache/juneau/rest/RestConfig.html#setHtmlCss-java.lang.String-"><code>setHtmlCss(String)</code></a>
-               <li><a 
href="org/apache/juneau/rest/RestConfig.html#setHtmlCssUrl-java.lang.String-"><code>setHtmlCssUrl(String)</code></a>
+               <li><code><del>setHtmlCss(String)</del></code>
+               <li><code><del>setHtmlCssUrl(String)</del></code>
                <li><a 
href="org/apache/juneau/rest/RestConfig.html#setHtmlNoWrap-boolean-"><code>setHtmlNoWrap(boolean)</code></a>
                <li><a 
href="org/apache/juneau/rest/RestConfig.html#setHtmlNoResultsMessage-java.lang.String-"><code>setHtmlNoResultsMessage(String)</code></a>
                <li><a 
href="org/apache/juneau/rest/RestConfig.html#setHtmlTemplate-java.lang.Class-"><code>setHtmlTemplate(Class)</code></a>
@@ -7572,8 +7622,8 @@
                <li><a 
href="org/apache/juneau/rest/RestResponse.html#setHtmlNav-java.lang.Object-"><code>setHtmlNav(Object)</code></a>
                <li><a 
href="org/apache/juneau/rest/RestResponse.html#setHtmlAside-java.lang.Object-"><code>setHtmlAside(Object)</code></a>
                <li><a 
href="org/apache/juneau/rest/RestResponse.html#setHtmlFooter-java.lang.Object-"><code>setHtmlFooter(Object)</code></a>
-               <li><a 
href="org/apache/juneau/rest/RestResponse.html#setHtmlCss-java.lang.Object-"><code>setHtmlCss(Object)</code></a>
-               <li><a 
href="org/apache/juneau/rest/RestResponse.html#setHtmlCssUrl-java.lang.Object-"><code>setHtmlCssUrl(Object)</code></a>
+               <li><code><del>setHtmlCss(Object)</del></code>
+               <li><code><del>setHtmlCssUrl(Object)</del></code>
                <li><a 
href="org/apache/juneau/rest/RestResponse.html#setHtmlNoWrap-boolean-"><code>setHtmlNoWrap(boolean)</code></a>
                <li><a 
href="org/apache/juneau/rest/RestResponse.html#setHtmlNoResultsMessage-java.lang.Object-"><code>setHtmlNoResultsMessage(Object)</code></a>
                <li><a 
href="org/apache/juneau/rest/RestResponse.html#setHtmlTemplate-java.lang.Class-"><code>setHtmlTemplate(Class)</code></a>
@@ -7586,9 +7636,9 @@
             <ul>
                <li><a href="org/apache/juneau/rest/widget/Widget.html" 
title="class in org.apache.juneau.rest.widget"><code>Widget</code></a>
                <li><a 
href="org/apache/juneau/rest/widget/PoweredByJuneauWidget.html" title="class in 
org.apache.juneau.rest.widget"><code>PoweredByJuneauWidget</code></a>
-               <li><a 
href="org/apache/juneau/rest/widget/ContentTypeLinksColumnWidget.html" 
title="class in 
org.apache.juneau.rest.widget"><code>ContentTypeLinksColumnWidget</code></a>
-               <li><a 
href="org/apache/juneau/rest/widget/ContentTypeLinksRowWidget.html" 
title="class in 
org.apache.juneau.rest.widget"><code>ContentTypeLinksRowWidget</code></a>
-               <li><a href="org/apache/juneau/rest/widget/QueryWidget.html" 
title="class in org.apache.juneau.rest.widget"><code>QueryWidget</code></a>
+               <li><code><del>ContentTypeLinksColumnWidget</del></code>
+               <li><code><del>ContentTypeLinksRowWidget</del></code>
+               <li><code><del>QueryWidget</del></code>
             </ul>
          <li>
             <code>devops.css</code> cleaned up.
@@ -7818,7 +7868,7 @@
       
pageLinks=<js>"{up:'$R{requestParentURI}',options:'?method=OPTIONS'}"</js>
    )
             </p>
-         <li><a 
href="org/apache/juneau/rest/annotation/RestResource.html#stylesheet--"><code>RestResource.stylesheet()</code></a>
 can now take in a comma-delimited list of stylesheet paths.
+         <li><code><del>RestResource.stylesheet()</del></code> can now take in 
a comma-delimited list of stylesheet paths.
          <li><a href="org/apache/juneau/rest/StreamResource.html" title="class 
in org.apache.juneau.rest"><code>StreamResource</code></a> can now contain 
multiple sources from a variety of source types (e.g. 
<code><jk>byte</jk>[]</code> arrays, <code>InputStreams</code>, 
<code>Files</code>, etc...)
             and is now immutable.  It also includes a new <a 
href="org/apache/juneau/rest/StreamResource.Builder.html" title="class in 
org.apache.juneau.rest"><code>StreamResource.Builder</code></a> class.
          <li>Simplified remoteable proxies using the 
<code><ja>@RestMethod</ja>(name=<js>"PROXY"</js>)</code> annotation on REST 
methods.
@@ -8767,7 +8817,7 @@
          <li>Removed <code>RestServletProperties.REST_htDocsFolder</code>.  
Replaced with <a 
href="org/apache/juneau/rest/annotation/RestResource.html#staticFiles--"><code>RestResource.staticFiles()</code></a>.
          <li>New annotations on <a 
href="org/apache/juneau/rest/annotation/RestResource.html" title="annotation in 
org.apache.juneau.rest.annotation"><code>RestResource</code></a>.
             <ul>
-               <li><a 
href="org/apache/juneau/rest/annotation/RestResource.html#stylesheet--"><code>RestResource.stylesheet()</code></a>
+               <li><code><del>RestResource.stylesheet()</del></code>
                <li><a 
href="org/apache/juneau/rest/annotation/RestResource.html#favicon--"><code>RestResource.favicon()</code></a>
                <li><a 
href="org/apache/juneau/rest/annotation/RestResource.html#staticFiles--"><code>RestResource.staticFiles()</code></a>
             </ul>

Reply via email to