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 2017/09/02 17:21:44 UTC
[12/19] incubator-juneau-website git commit: Update javadocs.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/4cba2c2c/content/site/apidocs/org/apache/juneau/svl/vars/package-tree.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/svl/vars/package-tree.html b/content/site/apidocs/org/apache/juneau/svl/vars/package-tree.html
index 74dfa5e..47f0cd6 100644
--- a/content/site/apidocs/org/apache/juneau/svl/vars/package-tree.html
+++ b/content/site/apidocs/org/apache/juneau/svl/vars/package-tree.html
@@ -87,7 +87,6 @@
<li type="circle">org.apache.juneau.svl.<a href="../../../../../org/apache/juneau/svl/DefaultingVar.html" title="class in org.apache.juneau.svl"><span class="typeNameLink">DefaultingVar</span></a>
<ul>
<li type="circle">org.apache.juneau.svl.vars.<a href="../../../../../org/apache/juneau/svl/vars/ArgsVar.html" title="class in org.apache.juneau.svl.vars"><span class="typeNameLink">ArgsVar</span></a></li>
-<li type="circle">org.apache.juneau.svl.vars.<a href="../../../../../org/apache/juneau/svl/vars/ConfigFileVar.html" title="class in org.apache.juneau.svl.vars"><span class="typeNameLink">ConfigFileVar</span></a></li>
<li type="circle">org.apache.juneau.svl.vars.<a href="../../../../../org/apache/juneau/svl/vars/EnvVariablesVar.html" title="class in org.apache.juneau.svl.vars"><span class="typeNameLink">EnvVariablesVar</span></a></li>
<li type="circle">org.apache.juneau.svl.vars.<a href="../../../../../org/apache/juneau/svl/vars/ManifestFileVar.html" title="class in org.apache.juneau.svl.vars"><span class="typeNameLink">ManifestFileVar</span></a></li>
<li type="circle">org.apache.juneau.svl.<a href="../../../../../org/apache/juneau/svl/MapVar.html" title="class in org.apache.juneau.svl"><span class="typeNameLink">MapVar</span></a>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/4cba2c2c/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 9c89150..208214e 100644
--- a/content/site/apidocs/org/apache/juneau/utils/PojoIntrospector.html
+++ b/content/site/apidocs/org/apache/juneau/utils/PojoIntrospector.html
@@ -49,7 +49,7 @@ var activeTableTab = "activeTableTab";
<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 Class</span></a></li>
-<li><a href="../../../../org/apache/juneau/utils/PojoQuery.html" title="class in org.apache.juneau.utils"><span class="typeNameLink">Next Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/utils/PojoMerge.html" title="class in org.apache.juneau.utils"><span class="typeNameLink">Next Class</span></a></li>
</ul>
<ul class="navList">
<li><a href="../../../../index.html?org/apache/juneau/utils/PojoIntrospector.html" target="_top">Frames</a></li>
@@ -352,7 +352,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/MetadataMap.html" title="class in org.apache.juneau.utils"><span class="typeNameLink">Prev Class</span></a></li>
-<li><a href="../../../../org/apache/juneau/utils/PojoQuery.html" title="class in org.apache.juneau.utils"><span class="typeNameLink">Next Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/utils/PojoMerge.html" title="class in org.apache.juneau.utils"><span class="typeNameLink">Next Class</span></a></li>
</ul>
<ul class="navList">
<li><a href="../../../../index.html?org/apache/juneau/utils/PojoIntrospector.html" target="_top">Frames</a></li>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/4cba2c2c/content/site/apidocs/org/apache/juneau/utils/PojoMerge.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/utils/PojoMerge.html b/content/site/apidocs/org/apache/juneau/utils/PojoMerge.html
new file mode 100644
index 0000000..fd2ac1c
--- /dev/null
+++ b/content/site/apidocs/org/apache/juneau/utils/PojoMerge.html
@@ -0,0 +1,374 @@
+<!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>PojoMerge (Apache Juneau (incubating) 6.3.2-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="PojoMerge (Apache Juneau (incubating) 6.3.2-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/PojoIntrospector.html" title="class in org.apache.juneau.utils"><span class="typeNameLink">Prev Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/utils/PojoQuery.html" title="class in org.apache.juneau.utils"><span class="typeNameLink">Next Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../index.html?org/apache/juneau/utils/PojoMerge.html" target="_top">Frames</a></li>
+<li><a href="PojoMerge.html" target="_top">No Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../../allclasses-noframe.html">All 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: </li>
+<li>Nested | </li>
+<li>Field | </li>
+<li><a href="#constructor.summary">Constr</a> | </li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail: </li>
+<li>Field | </li>
+<li><a href="#constructor.detail">Constr</a> | </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 PojoMerge" class="title">Class PojoMerge</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.PojoMerge</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/PojoMerge.html#line.73">PojoMerge</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 merging POJOs behind a single interface.
+
+ <p>
+ Useful in cases where you want to define beans with 'default' values.
+
+ <p>
+ For example, given the following bean classes...
+
+ <p class='bcode'>
+ <jk>public interface</jk> IA {
+ String getX();
+ <jk>void</jk> setX(String x);
+ }
+
+ <jk>public class</jk> A <jk>implements</jk> IA {
+ <jk>private</jk> String <jf>x</jf>;
+
+ <jk>public</jk> A(String x) {
+ <jk>this</jk>.<jf>x</jf> = x;
+ }
+
+ <jk>public</jk> String getX() {
+ <jk>return</jk> <jf>x</jf>;
+ }
+
+ <jk>public void</jk> setX(String x) {
+ <jk>this</jk>.<jf>x</jf> = x;
+ }
+ }
+ </p>
+
+ <p>
+ The getters will be called in order until the first non-null value is returned...
+
+ <p class='bcode'>
+ PojoMerge m;
+
+ m = PojoMerge.<jsm>merge</jsm>(IA.<jk>class</jk>, <jk>new</jk> A(<js>"1"</js>), <jk>new</jk> A(<js>"2"</js>));
+ <jsm>assertEquals</jsm>(<js>"1"</js>, m.getX());
+
+ m = PojoMerge.<jsm>merge</jsm>(IA.<jk>class</jk>, <jk>new</jk> A(<jk>null</jk>), <jk>new</jk> A(<js>"2"</js>));
+ <jsm>assertEquals</jsm>(<js>"2"</js>, m.getX());
+
+ m = PojoMerge.<jsm>merge</jsm>(IA.<jk>class</jk>, <jk>new</jk> A(<jk>null</jk>), <jk>new</jk> A(<jk>null</jk>));
+ <jsm>assertEquals</jsm>(<jk>null</jk>, m.getX());
+ </p>
+
+ <h5 class='section'>Notes:</h5>
+ <ul>
+ <li>Null POJOs are ignored.
+ <li>Non-getter methods are either invoked on the first POJO or all POJOs depending on the <code>callAllNonGetters</code> flag
+ passed into the constructor.
+ <li>For purposes of this interface, a getter is any method with zero arguments and a non-<code>void</code> return type.
+ </ul></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"> </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/PojoMerge.html#PojoMerge--">PojoMerge</a></span>()</code> </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"> </span></span><span id="t1" class="tableTab"><span><a href="javascript:show(1);">Static Methods</a></span><span class="tabEnd"> </span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd"> </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 <T> T</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/utils/PojoMerge.html#merge-java.lang.Class-boolean-T...-">merge</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><T> interfaceClass,
+ boolean callAllNonGetters,
+ T... pojos)</code>
+<div class="block">Create a proxy interface on top of zero or more POJOs.</div>
+</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>static <T> T</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/utils/PojoMerge.html#merge-java.lang.Class-T...-">merge</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><T> interfaceClass,
+ T... pojos)</code>
+<div class="block">Create a proxy interface on top of zero or more POJOs.</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 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="PojoMerge--">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>PojoMerge</h4>
+<pre>public <a href="../../../../src-html/org/apache/juneau/utils/PojoMerge.html#line.73">PojoMerge</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="merge-java.lang.Class-java.lang.Object:A-">
+<!-- -->
+</a><a name="merge-java.lang.Class-T...-">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>merge</h4>
+<pre>public static <T> T <a href="../../../../src-html/org/apache/juneau/utils/PojoMerge.html#line.87">merge</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><T> interfaceClass,
+ T... pojos)</pre>
+<div class="block">Create a proxy interface on top of zero or more POJOs.
+
+ <p>
+ This is a shortcut to calling <code>merge(interfaceClass, <jk>false</jk>, pojos);</code></div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>interfaceClass</code> - The common interface class.</dd>
+<dd><code>pojos</code> - Zero or more POJOs to merge.
+ <br>Can contain nulls.</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>A proxy interface over the merged POJOs.</dd>
+</dl>
+</li>
+</ul>
+<a name="merge-java.lang.Class-boolean-java.lang.Object:A-">
+<!-- -->
+</a><a name="merge-java.lang.Class-boolean-T...-">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>merge</h4>
+<pre>public static <T> T <a href="../../../../src-html/org/apache/juneau/utils/PojoMerge.html#line.104">merge</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><T> interfaceClass,
+ boolean callAllNonGetters,
+ T... pojos)</pre>
+<div class="block">Create a proxy interface on top of zero or more POJOs.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>interfaceClass</code> - The common interface class.</dd>
+<dd><code>callAllNonGetters</code> - If <jk>true</jk>, when calling a method that's not a getter, the method will be invoked on all POJOs.
+ <br>Otherwise, the method will only be called on the first POJO.</dd>
+<dd><code>pojos</code> - Zero or more POJOs to merge.
+ <br>Can contain nulls.</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>A proxy interface over the merged POJOs.</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/PojoIntrospector.html" title="class in org.apache.juneau.utils"><span class="typeNameLink">Prev Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/utils/PojoQuery.html" title="class in org.apache.juneau.utils"><span class="typeNameLink">Next Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../index.html?org/apache/juneau/utils/PojoMerge.html" target="_top">Frames</a></li>
+<li><a href="PojoMerge.html" target="_top">No Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../../allclasses-noframe.html">All 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: </li>
+<li>Nested | </li>
+<li>Field | </li>
+<li><a href="#constructor.summary">Constr</a> | </li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail: </li>
+<li>Field | </li>
+<li><a href="#constructor.detail">Constr</a> | </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 © 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/4cba2c2c/content/site/apidocs/org/apache/juneau/utils/PojoQuery.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/utils/PojoQuery.html b/content/site/apidocs/org/apache/juneau/utils/PojoQuery.html
index b2709aa..a4fa9a2 100644
--- a/content/site/apidocs/org/apache/juneau/utils/PojoQuery.html
+++ b/content/site/apidocs/org/apache/juneau/utils/PojoQuery.html
@@ -48,7 +48,7 @@ var activeTableTab = "activeTableTab";
</div>
<div class="subNav">
<ul class="navList">
-<li><a href="../../../../org/apache/juneau/utils/PojoIntrospector.html" title="class in org.apache.juneau.utils"><span class="typeNameLink">Prev Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/utils/PojoMerge.html" title="class in org.apache.juneau.utils"><span class="typeNameLink">Prev Class</span></a></li>
<li><a href="../../../../org/apache/juneau/utils/PojoRest.html" title="class in org.apache.juneau.utils"><span class="typeNameLink">Next Class</span></a></li>
</ul>
<ul class="navList">
@@ -434,7 +434,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/PojoIntrospector.html" title="class in org.apache.juneau.utils"><span class="typeNameLink">Prev Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/utils/PojoMerge.html" title="class in org.apache.juneau.utils"><span class="typeNameLink">Prev Class</span></a></li>
<li><a href="../../../../org/apache/juneau/utils/PojoRest.html" title="class in org.apache.juneau.utils"><span class="typeNameLink">Next Class</span></a></li>
</ul>
<ul class="navList">
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/4cba2c2c/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 9d6bbb1..896698a 100644
--- a/content/site/apidocs/org/apache/juneau/utils/package-frame.html
+++ b/content/site/apidocs/org/apache/juneau/utils/package-frame.html
@@ -29,6 +29,7 @@
<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="PojoIntrospector.html" title="class in org.apache.juneau.utils" target="classFrame">PojoIntrospector</a></li>
+<li><a href="PojoMerge.html" title="class in org.apache.juneau.utils" target="classFrame">PojoMerge</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>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/4cba2c2c/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 26db99d..7ebffd7 100644
--- a/content/site/apidocs/org/apache/juneau/utils/package-summary.html
+++ b/content/site/apidocs/org/apache/juneau/utils/package-summary.html
@@ -176,67 +176,73 @@
</td>
</tr>
<tr class="rowColor">
+<td class="colFirst"><a href="../../../../org/apache/juneau/utils/PojoMerge.html" title="class in org.apache.juneau.utils">PojoMerge</a></td>
+<td class="colLast">
+<div class="block">Utility class for merging POJOs behind a single interface.</div>
+</td>
+</tr>
+<tr class="altColor">
<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="altColor">
+<tr class="rowColor">
<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="rowColor">
+<tr class="altColor">
<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="altColor">
+<tr class="rowColor">
<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">
+<tr class="altColor">
<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">
+<tr class="rowColor">
<td class="colFirst"><a href="../../../../org/apache/juneau/utils/SearchArgs.html" title="class in org.apache.juneau.utils">SearchArgs</a></td>
<td class="colLast">
<div class="block">Encapsulates arguments for basic search/view/sort/position/limit functionality.</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a href="../../../../org/apache/juneau/utils/SearchArgs.Builder.html" title="class in org.apache.juneau.utils">SearchArgs.Builder</a></td>
<td class="colLast">
<div class="block">Builder for <a href="../../../../org/apache/juneau/utils/SearchArgs.html" title="class in org.apache.juneau.utils"><code>SearchArgs</code></a> class.</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="../../../../org/apache/juneau/utils/StringMessage.html" title="class in org.apache.juneau.utils">StringMessage</a></td>
<td class="colLast">
<div class="block">An encapsulated MessageFormat-style string and arguments.</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a href="../../../../org/apache/juneau/utils/StringObject.html" title="class in org.apache.juneau.utils">StringObject</a></td>
<td class="colLast">
<div class="block">A serializer/object pair used for delayed object serialization.</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="../../../../org/apache/juneau/utils/ZipFileList.html" title="class in org.apache.juneau.utils">ZipFileList</a></td>
<td class="colLast">
<div class="block">Utility class for representing the contents of a zip file as a list of entries whose contents don't resolve until
serialization time.</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a href="../../../../org/apache/juneau/utils/ZipFileList.FileEntry.html" title="class in org.apache.juneau.utils">ZipFileList.FileEntry</a></td>
<td class="colLast">
<div class="block">ZipFileList entry for File entry types.</div>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/4cba2c2c/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 e24777d..40c2ed5 100644
--- a/content/site/apidocs/org/apache/juneau/utils/package-tree.html
+++ b/content/site/apidocs/org/apache/juneau/utils/package-tree.html
@@ -143,6 +143,7 @@
<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/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/PojoMerge.html" title="class in org.apache.juneau.utils"><span class="typeNameLink">PojoMerge</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>
<li type="circle">org.apache.juneau.utils.<a href="../../../../org/apache/juneau/utils/ProcBuilder.html" title="class in org.apache.juneau.utils"><span class="typeNameLink">ProcBuilder</span></a></li>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/4cba2c2c/content/site/apidocs/org/apache/juneau/xml/annotation/XmlFormat.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/xml/annotation/XmlFormat.html b/content/site/apidocs/org/apache/juneau/xml/annotation/XmlFormat.html
index 6515f5a..841b5e0 100644
--- a/content/site/apidocs/org/apache/juneau/xml/annotation/XmlFormat.html
+++ b/content/site/apidocs/org/apache/juneau/xml/annotation/XmlFormat.html
@@ -476,7 +476,7 @@ the order they are declared.</div>
<ul class="blockList">
<li class="blockList">
<h4>values</h4>
-<pre>public static <a href="../../../../../org/apache/juneau/xml/annotation/XmlFormat.html" title="enum in org.apache.juneau.xml.annotation">XmlFormat</a>[] <a href="../../../../../src-html/org/apache/juneau/xml/annotation/XmlFormat.html#line.52">values</a>()</pre>
+<pre>public static <a href="../../../../../org/apache/juneau/xml/annotation/XmlFormat.html" title="enum in org.apache.juneau.xml.annotation">XmlFormat</a>[] <a href="../../../../../src-html/org/apache/juneau/xml/annotation/XmlFormat.html#line.21">values</a>()</pre>
<div class="block">Returns an array containing the constants of this enum type, in
the order they are declared. This method may be used to iterate
over the constants as follows:
@@ -496,7 +496,7 @@ for (XmlFormat c : XmlFormat.values())
<ul class="blockList">
<li class="blockList">
<h4>valueOf</h4>
-<pre>public static <a href="../../../../../org/apache/juneau/xml/annotation/XmlFormat.html" title="enum in org.apache.juneau.xml.annotation">XmlFormat</a> <a href="../../../../../src-html/org/apache/juneau/xml/annotation/XmlFormat.html#line.52">valueOf</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> name)</pre>
+<pre>public static <a href="../../../../../org/apache/juneau/xml/annotation/XmlFormat.html" title="enum in org.apache.juneau.xml.annotation">XmlFormat</a> <a href="../../../../../src-html/org/apache/juneau/xml/annotation/XmlFormat.html#line.21">valueOf</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> name)</pre>
<div class="block">Returns the enum constant of this type with the specified name.
The string must match <i>exactly</i> an identifier used to declare an
enum constant in this type. (Extraneous whitespace characters are
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/4cba2c2c/content/site/apidocs/overview-frame.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/overview-frame.html b/content/site/apidocs/overview-frame.html
index bab13e5..9f019b5 100644
--- a/content/site/apidocs/overview-frame.html
+++ b/content/site/apidocs/overview-frame.html
@@ -35,6 +35,7 @@
<li><a href="org/apache/juneau/json/annotation/package-frame.html" target="packageFrame">org.apache.juneau.json.annotation</a></li>
<li><a href="org/apache/juneau/microservice/package-frame.html" target="packageFrame">org.apache.juneau.microservice</a></li>
<li><a href="org/apache/juneau/microservice/resources/package-frame.html" target="packageFrame">org.apache.juneau.microservice.resources</a></li>
+<li><a href="org/apache/juneau/microservice/sample/package-frame.html" target="packageFrame">org.apache.juneau.microservice.sample</a></li>
<li><a href="org/apache/juneau/msgpack/package-frame.html" target="packageFrame">org.apache.juneau.msgpack</a></li>
<li><a href="org/apache/juneau/parser/package-frame.html" target="packageFrame">org.apache.juneau.parser</a></li>
<li><a href="org/apache/juneau/plaintext/package-frame.html" target="packageFrame">org.apache.juneau.plaintext</a></li>
@@ -44,8 +45,6 @@
<li><a href="org/apache/juneau/rest/client/package-frame.html" target="packageFrame">org.apache.juneau.rest.client</a></li>
<li><a href="org/apache/juneau/rest/converters/package-frame.html" target="packageFrame">org.apache.juneau.rest.converters</a></li>
<li><a href="org/apache/juneau/rest/jaxrs/package-frame.html" target="packageFrame">org.apache.juneau.rest.jaxrs</a></li>
-<li><a href="org/apache/juneau/rest/jaxrs/rdf/package-frame.html" target="packageFrame">org.apache.juneau.rest.jaxrs.rdf</a></li>
-<li><a href="org/apache/juneau/rest/jena/package-frame.html" target="packageFrame">org.apache.juneau.rest.jena</a></li>
<li><a href="org/apache/juneau/rest/labels/package-frame.html" target="packageFrame">org.apache.juneau.rest.labels</a></li>
<li><a href="org/apache/juneau/rest/matchers/package-frame.html" target="packageFrame">org.apache.juneau.rest.matchers</a></li>
<li><a href="org/apache/juneau/rest/remoteable/package-frame.html" target="packageFrame">org.apache.juneau.rest.remoteable</a></li>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/4cba2c2c/content/site/apidocs/overview-summary.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/overview-summary.html b/content/site/apidocs/overview-summary.html
index 4c62fee..6ff8830 100644
--- a/content/site/apidocs/overview-summary.html
+++ b/content/site/apidocs/overview-summary.html
@@ -218,172 +218,164 @@
</td>
</tr>
<tr class="altColor">
+<td class="colFirst"><a href="org/apache/juneau/microservice/sample/package-summary.html">org.apache.juneau.microservice.sample</a></td>
+<td class="colLast"> </td>
+</tr>
+<tr class="rowColor">
<td class="colFirst"><a href="org/apache/juneau/msgpack/package-summary.html">org.apache.juneau.msgpack</a></td>
<td class="colLast">
<div class="block">JSON serialization and parsing support</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a href="org/apache/juneau/parser/package-summary.html">org.apache.juneau.parser</a></td>
<td class="colLast">
<div class="block">Parser API</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="org/apache/juneau/plaintext/package-summary.html">org.apache.juneau.plaintext</a></td>
<td class="colLast">
<div class="block">Plain-text serialization and parsing support</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a href="org/apache/juneau/remoteable/package-summary.html">org.apache.juneau.remoteable</a></td>
<td class="colLast">
<div class="block">Remoteable interface proxies</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="org/apache/juneau/rest/package-summary.html">org.apache.juneau.rest</a></td>
<td class="colLast">
<div class="block">REST Servlet API</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a href="org/apache/juneau/rest/annotation/package-summary.html">org.apache.juneau.rest.annotation</a></td>
<td class="colLast">
<div class="block">REST servlet annotations</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="org/apache/juneau/rest/client/package-summary.html">org.apache.juneau.rest.client</a></td>
<td class="colLast">
<div class="block">REST client API</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a href="org/apache/juneau/rest/converters/package-summary.html">org.apache.juneau.rest.converters</a></td>
<td class="colLast">
<div class="block">Predefined REST response converters</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="org/apache/juneau/rest/jaxrs/package-summary.html">org.apache.juneau.rest.jaxrs</a></td>
<td class="colLast">
<div class="block">JAX-RS integration components</div>
</td>
</tr>
-<tr class="rowColor">
-<td class="colFirst"><a href="org/apache/juneau/rest/jaxrs/rdf/package-summary.html">org.apache.juneau.rest.jaxrs.rdf</a></td>
-<td class="colLast">
-<div class="block">JAX-RS integration components with RDF support</div>
-</td>
-</tr>
<tr class="altColor">
-<td class="colFirst"><a href="org/apache/juneau/rest/jena/package-summary.html">org.apache.juneau.rest.jena</a></td>
-<td class="colLast">
-<div class="block">RET servlet API with Jena components</div>
-</td>
-</tr>
-<tr class="rowColor">
<td class="colFirst"><a href="org/apache/juneau/rest/labels/package-summary.html">org.apache.juneau.rest.labels</a></td>
<td class="colLast">
<div class="block">Various REST interface label classes</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="org/apache/juneau/rest/matchers/package-summary.html">org.apache.juneau.rest.matchers</a></td>
<td class="colLast">
<div class="block">Predefined Matchers</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a href="org/apache/juneau/rest/remoteable/package-summary.html">org.apache.juneau.rest.remoteable</a></td>
<td class="colLast">
<div class="block">Remoteable service API</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="org/apache/juneau/rest/response/package-summary.html">org.apache.juneau.rest.response</a></td>
<td class="colLast">
<div class="block">HTTP Response handlers</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a href="org/apache/juneau/rest/vars/package-summary.html">org.apache.juneau.rest.vars</a></td>
<td class="colLast">
<div class="block">Predefined SVL variables</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="org/apache/juneau/rest/widget/package-summary.html">org.apache.juneau.rest.widget</a></td>
<td class="colLast"> </td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a href="org/apache/juneau/serializer/package-summary.html">org.apache.juneau.serializer</a></td>
<td class="colLast">
<div class="block">Serializer API</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="org/apache/juneau/soap/package-summary.html">org.apache.juneau.soap</a></td>
<td class="colLast">
<div class="block">SOAP/XML serialization and parsing support</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a href="org/apache/juneau/svl/package-summary.html">org.apache.juneau.svl</a></td>
<td class="colLast">
<div class="block">Simple Variable Language</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="org/apache/juneau/svl/vars/package-summary.html">org.apache.juneau.svl.vars</a></td>
<td class="colLast">
<div class="block">Simple Variable Language - Predefined variables</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a href="org/apache/juneau/transform/package-summary.html">org.apache.juneau.transform</a></td>
<td class="colLast">
<div class="block">Transform API</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="org/apache/juneau/transforms/package-summary.html">org.apache.juneau.transforms</a></td>
<td class="colLast">
<div class="block">Predefined Transform implementations</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a href="org/apache/juneau/uon/package-summary.html">org.apache.juneau.uon</a></td>
<td class="colLast">
<div class="block">UON notation serialization and parsing support</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="org/apache/juneau/urlencoding/package-summary.html">org.apache.juneau.urlencoding</a></td>
<td class="colLast">
<div class="block">URL encoding serialization and parsing support</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a href="org/apache/juneau/urlencoding/annotation/package-summary.html">org.apache.juneau.urlencoding.annotation</a></td>
<td class="colLast">
<div class="block">URL-Encoding annotations</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="org/apache/juneau/utils/package-summary.html">org.apache.juneau.utils</a></td>
<td class="colLast">
<div class="block">Utility classes</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a href="org/apache/juneau/xml/package-summary.html">org.apache.juneau.xml</a></td>
<td class="colLast">
<div class="block">XML serialization and parsing support</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="org/apache/juneau/xml/annotation/package-summary.html">org.apache.juneau.xml.annotation</a></td>
<td class="colLast">
<div class="block">XML annotations</div>
@@ -504,23 +496,6 @@
<li><p><a class='doclink' href='#Samples.ConfigResource'>ConfigResource</a></p>
<li><p><a class='doclink' href='#Samples.LogsResource'>LogsResource</a></p>
</ol>
- <li><p><a class='doclink' href='#Cookbook'>Cookbook Examples</a></p>
- <ol>
- <li><p><a class='doclink' href='#Cookbook.Core'>Core API</a></p>
- <li><p><a class='doclink' href='#Cookbook.Server'>Server API</a></p>
- <ol>
- <li><p><a class='doclink' href='#Cookbook.Server.applyDoubletransform'>Apply a transform that changes the
- format of doubles</a></p>
- <li><p><a class='doclink' href='#Cookbook.Server.applyTransformsSubset'>Apply transforms to a subset of
- serializers or parsers</a></p>
- </ol>
- <li><p><a class='doclink' href='#Cookbook.Client'>Client API</a></p>
- <ol>
- </ol>
- <li><p><a class='doclink' href='#Cookbook.Microservice'>Microservice API</a></p>
- <ol>
- </ol>
- </ol>
<li><p><a class='doclink' href='#BestPractices'>Best Practices</a></p>
<li><p><a class='doclink' href='#ImportantLinks'>Important Documentation Links</a></p>
<li><p><a class='doclink' href='#ReleaseNotes'>Release Notes</a></p>
@@ -5411,7 +5386,7 @@
* [OPTIONS /*]
* View resource options
*/</jd>
- <ja>@Override</ja> /* RestServletJenaDefault */
+ <ja>@Override</ja> /* RestServletDefault */
<ja>@RestMethod</ja>(name=<js>"OPTIONS"</js>, path=<js>"/*"</js>)
<jk>public</jk> Swagger getOptions(RestRequest req) {
<jk>return</jk> req.getSwagger();
@@ -7058,155 +7033,8 @@
</div>
<!-- ======================================================================================================== -->
-<a id="Cookbook"></a>
-<h2 class='topic' onclick='toggle(this)'>9 - Cookbook Examples</h2>
-<div class='topic'>
-
- <!-- ======================================================================================================== -->
- <a id="Cookbook.Core"></a>
- <h3 class='topic' onclick='toggle(this)'>9.1 - Core API</h3>
- <div class='topic'>
-
- <h6 class='topic'>TODO topics</h6>
- <ol>
- <li>Creating generic JSON objects
- <li>Defining XML namespaces
- </ol>
- </div>
-
- <!-- ======================================================================================================== -->
- <a id="Cookbook.Server"></a>
- <h3 class='topic' onclick='toggle(this)'>9.2 - Server API</h3>
- <div class='topic'>
- <!-- ======================================================================================================== -->
- <a id="Cookbook.Server.applyDoubleTransform"></a>
- <h3 class='topic' onclick='toggle(this)'>9.2.1 - Apply a transform that changes the format of doubles</h3>
- <div class='topic'>
- <p>
- The <a href="org/apache/juneau/rest/annotation/RestResource.html#pojoSwaps--"><code>RestResource.pojoSwaps()</code></a> annotation can be used to add
- POJO swaps to all the serializers and parsers registered with a servlet.
- </p>
- <p>
- In this example, you define a POJO swap that converts doubles to localized-format strings using
- the <l>NumberFormat</l> Java class.
- </p>
- <p class='bcode'>
- <ja>@RestResource</ja>(
- pojoSwaps={
- MyRestService.DoubleSwap.<jk>class</jk>
- }
- )
- <jk>public class</jk> MyRestService <jk>extends</jk> JazzDefaultRestResource {
-
- <jk>private static final</jk> NumberFormat <jsf>FORMAT</jsf> = NumberFormat.<jsm>getInstance()</jsm>;
-
- <jk>public static class</jk> DoubleSwap <jk>extends</jk> PojoSwap<Double,String> {
- <ja>@Override</ja> <jc>/* PojoSwap */</jc>
- <jk>public</jk> String swap(BeanSession session, Double o) <jk>throws</jk> SerializeException {
- <jk>return</jk> <jsf>FORMAT</jsf>.format(o);
- }
- }
- </p>
- </div>
-
- <!-- ======================================================================================================== -->
- <a id="Cookbook.Server.applyTransformsSubset"></a>
- <h3 class='topic' onclick='toggle(this)'>9.2.2 - Apply transforms to a subset of serializers or parsers</h3>
- <div class='topic'>
- <p>
- The <a href="org/apache/juneau/rest/RestConfig.html#addSerializers-java.lang.Class...-"><code>RestConfig.addSerializers(Class[])</code></a> and
- <a href="org/apache/juneau/rest/RestConfig.html#addParsers-java.lang.Class...-"><code>RestConfig.addParsers(Class[])</code></a>
- methods are the methods that get called during servlet initialization to create the serializer and
- parser groups.
- These methods can be overridden to customize individual serializers and parsers in a way that can't be
- done using annotations.
- </p>
- <p>
- In this example, you want to apply the swap from the previous example to change the rendered format for doubles.
- However, in this case, you apply the swap to only the HTML serializer.
- </p>
- <p class='bcode'>
- <ja>@Override</ja>
- <jk>public synchronized void</jk> init(RestServletConfig config) <jk>throws</jk> Exception {
- config.addSerializer(<jk>new</jk> HtmlSerializerBuilder().pojoSwaps(DoubleSwap.<jk>class</jk>).build());
- super.init(config);
- }
- </p>
- </div>
-
- <h6 class='topic'>TODO topics</h6>
- <ol>
- <li>Packaging as WAR files
- <li>Customizing OPTIONS pages
- <li>Rendering form entry pages
- <li>Using the ZipFileList response handler
- <li>Implementing console-output pages in HTML
- <li>Using configuration files
- <li>Making a bean traversable
- <li>Using the Queryable converter
- <li>Sending raw output
- <li>Retrieving raw input
- <li>Accessing request query parameters
- <li>Accessing request path variables
- <li>Accessing request content
- <li>Accessing request header values
- <li>Accessing the path pattern remainder
- <li>Creating ResourceGroup pages
- <li>Using matchers to define multiple Java methods to the same path pattern
- <li>Using the Remoteable API
- <li>Sending a redirect request
- <li>Changing the stylesheet used by the HTML serializer
- <li>Using the Introspector API to invoke methods on Java objects through REST calls
- <li>Customizing serializers and parsers at the method level
- <li>Accessing config file values
- <li>Accessing request query parameters on URL-Encoded FORM posts without triggering HTML body to be read
- <li>Accessing localized messages
- <li>Defining your own response handlers
- <li>Guarding access to a servlet or method
- <li>Handling servlet initialization errors
- <li>Handling exceptions that occur during response processing
- <li>Customizing logging
- <li>Creating an ATOM feed
- <li>Creating a REST API against a file system
- <li>Creating a Docker REST API
- <li>Creating a REST API for storing and retrieving images
- <li>Creating a REST API for echoing requests
- <li>Creating a Tumblr REST API
- <li>Creating a Cloudant REST API
- <li>Using onPreCall() to intercept requests before processing
- <li>Using onPostCall() to intercept requests after processing
- <li>Creating child resources programmatically
- <li>Defining default request headers
- <li>Defining default response headers
- <li>Defining your own var-resolver variables
- <li>Serving up static files inside the /htdocs embedded package
- <li>Defining MIME types of files in the /htdocs folder using the createMimitypesFileTypeMap() method
- <li>Defining the title and description of a servlet programmatically using getDescription() and getTitle().
- <li>Setting properties programmatically using RestServlet.setProperty()
- <li>Setting and saving config file properties
- <li>Defining your own abstract subclass of RestServlet or RestServletDefault
- <li>Adding GZip support
- <li>Accessing environment variables in config files
- </ol>
-
- </div>
-
- <!-- ======================================================================================================== -->
- <a id="Cookbook.Client"></a>
- <h3 class='topic' onclick='toggle(this)'>9.3 - Client API</h3>
- <div class='topic'>
- </div>
-
- <!-- ======================================================================================================== -->
- <a id="Cookbook.Microservice"></a>
- <h3 class='topic' onclick='toggle(this)'>9.4 - Microservice API</h3>
- <div class='topic'>
- </div>
-</div>
-
-<!-- ======================================================================================================== -->
<a id="BestPractices"></a>
-<h2 class='topic' onclick='toggle(this)'>10 - Best Practices</h2>
+<h2 class='topic' onclick='toggle(this)'>9 - Best Practices</h2>
<div class='topic'>
<ol class='spaced-list'>
<li>
@@ -7229,7 +7057,7 @@
<!-- ======================================================================================================== -->
<a id="ImportantLinks"></a>
-<h2 class='topic' onclick='toggle(this)'>11 - Important Document Links</h2>
+<h2 class='topic' onclick='toggle(this)'>10 - Important Document Links</h2>
<div class='topic'>
<p>
All up-to-date Juneau documentation is stored in Javadocs, especially package-level Javadocs.
@@ -7257,7 +7085,7 @@
<!-- ======================================================================================================== -->
<a id="ReleaseNotes"></a>
-<h2 class='topic' onclick='toggle(this)'>12 - Release Notes</h2>
+<h2 class='topic' onclick='toggle(this)'>11 - Release Notes</h2>
<div class='topic'>
<h5 class='toc'>What's new in each release</h5>
@@ -7336,9 +7164,187 @@
<h3 class='topic' onclick='toggle(this)'>6.3.2 (TBD)</h3>
<div class='topic'>
<p>
+ The major change in this release is the project structure
</p>
+ <p>
+ The library now consists of the following artifacts found in the Maven group <code>"org.apache.juneau"</code>:
+ </p>
+ <table class='styled' style='min-width:800px;'>
+ <tr>
+ <th>Category</th><th>Maven Artifacts</th><th>Description</th><th>Prereqs</th>
+ </tr>
+ <tr class='dark bb'>
+ <td rowspan="5" style='text-align:center;font-weight:bold;padding:20px;'><a class='doclink' href='#JuneauCore'>Juneau Core</a></td>
+ <td class='code'><a class='doclink' href='#juneau-marshall'>juneau-marshall</a></td>
+ <td>Serializers and parsers for:
+ <ul style='margin:0px 10px;'>
+ <li>JSON
+ <li>XML
+ <li>HTML
+ <li>UON
+ <li>URL-Encoding
+ <li>MessagePack
+ <li>SOAP/XML
+ <li>CSV
+ <li>BSON (coming soon)
+ <li>YAML (coming soon)
+ <li>Protobuf (coming soon)
+ </ul>
+ </td>
+ <td>
+ <ul style='margin:0px 10px;'>
+ <li>Java 6
+ </ul>
+ </td>
+ </tr>
+ <tr class='dark bb'>
+ <td class='code'><a class='doclink' href='#juneau-marshall-rdf'>juneau-marshall-rdf</a></td>
+ <td>
+ Serializers and parsers for:
+ <ul style='margin:0px 10px;'>
+ <li>RDF/XML
+ <li>RDF/XML-Abbrev
+ <li>N-Triple
+ <li>Turtle
+ <li>N3
+ </ul>
+ </td>
+ <td>
+ <ul style='margin:0px 10px;'>
+ <li>Java 6
+ <li>Apache Jena 2.7.1
+ </ul>
+ </td>
+ </tr>
+ <tr class='dark bb'>
+ <td class='code'><a class='doclink' href='#juneau-dto'>juneau-dto</a></td>
+ <td>
+ Data Transfer Objects for:
+ <ul style='margin:0px 10px;'>
+ <li>HTML5
+ <li>Atom
+ <li>Cognos
+ <li>JSON-Schema
+ <li>Swagger 2.0
+ </ul>
+ </td>
+ <td><ul style='margin:0px 10px;'><li>Java 6</li></ul></td>
+ </tr>
+ <tr class='dark bb'>
+ <td class='code'><a class='doclink' href='#juneau-svl'>juneau-svl</a></td>
+ <td>
+ Simple Variable Language API
+ </td>
+ <td><ul style='margin:0px 10px;'><li>Java 6</li></ul></td>
+ </tr>
+ <tr class='dark bb'>
+ <td class='code'><a class='doclink' href='#juneau-config'>juneau-config</a></td>
+ <td>
+ Configuration file API
+ </td>
+ <td><ul style='margin:0px 10px;'><li>Java 6</li></ul></td>
+ </tr>
+ <tr class='light bb'>
+ <td rowspan="5" style='text-align:center;font-weight:bold;padding:20px;'><a class='doclink' href='#JuneauRest'>Juneau REST</a></td>
+ <td class='code'><a class='doclink' href='#juneau-rest-server'>juneau-rest-server</a></td>
+ <td>
+ REST Servlet API
+ </td>
+ <td>
+ <ul style='margin:0px 10px;'>
+ <li>Java 6
+ <li>Servlet 3.1
+ </ul>
+ </td>
+ </tr>
+ <tr class='light bb'>
+ <td class='code'><a class='doclink' href='#juneau-rest-server-jaxrs'>juneau-rest-server-jaxrs</a></td>
+ <td>
+ Optional JAX-RS support
+ </td>
+ <td>
+ <ul style='margin:0px 10px;'>
+ <li>Java 6
+ <li>JAX-RS 2.0
+ </ul>
+ </td>
+ </tr>
+ <tr class='light bb'>
+ <td class='code'><a class='doclink' href='#juneau-rest-client'>juneau-rest-client</a></td>
+ <td>
+ REST Client API
+ </td>
+ <td>
+ <ul style='margin:0px 10px;'>
+ <li>Java 6
+ <li>Apache HttpClient 4.5
+ </ul>
+ </td>
+ </tr>
+ <tr class='light bb'>
+ <td class='code'><a class='doclink' href='#juneau-microservice'>juneau-microservice</a></td>
+ <td>
+ REST Microservice API
+ </td>
+ <td>
+ <ul style='margin:0px 10px;'>
+ <li>Java 8
+ <li>Eclipse Jetty 9.4.3
+ </ul>
+ </td>
+ </tr>
+ <tr class='light bb'>
+ <td class='code'><a class='doclink' href='#juneau-microservice-template'>juneau-microservice-template</a></td>
+ <td>
+ Developer template project
+ </td>
+ <td>
+ <ul style='margin:0px 10px;'>
+ <li>Java 8
+ <li>Eclipse Jetty 9.4.3
+ </ul>
+ </td>
+ </tr>
+ <tr class='dark bb'>
+ <td rowspan="2" style='text-align:center;font-weight:bold;padding:20px;'><a class='doclink' href='#Examples'>Examples</a></td>
+ <td class='code'><code>juneau-examples-core</code></td>
+ <td>
+ Core code examples
+ </td>
+ <td></td>
+ </tr>
+ <tr class='dark bb'>
+ <td class='code'><code>juneau-examples-rest</code></td>
+ <td>
+ REST code examples
+ </td>
+ <td></td>
+ </tr>
+ <tr class='light bb'>
+ <td rowspan="1" style='text-align:center;font-weight:bold;padding:20px;'><a class='doclink' href='#JuneauAll'>Juneau All</a></td>
+ <td class='code'><code>juneau-all</code></td>
+ <td>
+ Combination of the following:
+ <ul style='margin:0px 10px;'>
+ <li>juneau-marshall
+ <li>juneau-dto
+ <li>juneau-svl
+ <li>juneau-config
+ <li>juneau-rest-server
+ <li>juneau-rest-client
+ </ul>
+ </td>
+ <td>
+ <ul style='margin:0px 10px;'>
+ <li>Java 6
+ <li>Servlet 3.1
+ <li>Apache HttpClient 4.5
+ </ul>
+ </td>
+ </tr>
+ </table>
- <h6 class='topic'>org.apache.juneau</h6>
+ <h6 class='topic'>juneau-marshall</h6>
<ul class='spaced-list'>
<li>
Serializers can now serialize to <a href="http://docs.oracle.com/javase/7/docs/api/java/util/StringBuilder.html?is-external=true" title="class or interface in java.util"><code>StringBuilders</code></a>.
@@ -7384,9 +7390,6 @@
</p>
This is mostly an internal change and doesn't affect the existing APIs.
<li>
- <a href="org/apache/juneau/dto/html5/HtmlElementMixed.html#children-java.lang.Object...-"><code>HtmlElementMixed.children(Object...)</code></a> can now take in collections
- of objects.
- <li>
<a href="org/apache/juneau/transform/PojoSwap.html#swap-org.apache.juneau.BeanSession-T-"><code>PojoSwap.swap(BeanSession,Object)</code></a> and <a href="org/apache/juneau/transform/PojoSwap.html#unswap-org.apache.juneau.BeanSession-S-org.apache.juneau.ClassMeta-"><code>PojoSwap.unswap(BeanSession,Object,ClassMeta)</code></a>
can now throw arbitrary exceptions instead of having to wrap them in <code>SerializeException</code>/<code>ParseException</code>.
<li>
@@ -7426,7 +7429,7 @@
<li><a href="org/apache/juneau/utils/PojoRest.html#getWithDefault-java.lang.String-T-java.lang.reflect.Type-java.lang.reflect.Type...-"><code>getWithDefault(String,Object,Type,Type...)</code></a>
</ul>
<li>
- Fixed bug where <a href="org/apache/juneau/BeanSession.html#getMediaType--"><code>BeanSession.getMediaType()</code></a> wasn't returning <jk>.
+ Fixed bug where <a href="org/apache/juneau/BeanSession.html#getMediaType--"><code>BeanSession.getMediaType()</code></a> wasn't returning a value.
<li>
Eliminated the <ja>@Consumes</ja> and <ja>@Produces</ja> annotations.
<br>The supported media types are now passed in through the constructors.
@@ -7434,12 +7437,22 @@
the call to <code>getClass()</code> to retrieve the annotation value could not be called before calling
the <code><jk>super</jk>()</code> method.
<li>
+ New class: <a href="org/apache/juneau/utils/PojoMerge.html" title="class in org.apache.juneau.utils"><code>PojoMerge</code></a>
+ <li>
New doc: <a class='doclink' href='#Core.PojoAnnotation'>2.6.2 - @Pojo annotation</a>
<li>
New doc: <a class='doclink' href='#Core.SerializingReadersAndInputStreams'>2.6.5 - Serializing Readers and InputStreams</a>
</ul>
- <h6 class='topic'>org.apache.juneau.rest</h6>
+ <h6 class='topic'>juneau-dto</h6>
+ <ul class='spaced-list'>
+ <li>
+ <a href="org/apache/juneau/dto/html5/HtmlElementMixed.html#children-java.lang.Object...-"><code>HtmlElementMixed.children(Object...)</code></a> can now take in collections
+ of objects.
+ </ul>
+
+
+ <h6 class='topic'>juneau-rest-server</h6>
<ul class='spaced-list'>
<li>
Revamped and simplified servlet and REST-call lifecycle handling through new
@@ -7499,9 +7512,14 @@
Stylesheet selection now stored in HTTP session when passed in via <code>?stylesheet</code> query parameter.
<li>
New doc: <a class='doclink' href='/org/apache/juneau/rest/package-summary.html#RestResources.RestHooks'>Lifecycle Hooks</a>
+ <li>
+ Eliminated the <code>RestServletJenaDefault</code> class to remove the Jena dependency class on
+ the <code>juneau-rest-server</code> artifact.
+ <br>It's simple enough to simply extend <code>RestServletDefault</code> and add the RDF serializers and
+ parsers.
</ul>
- <h6 class='topic'>org.apache.juneau.rest.microservice</h6>
+ <h6 class='topic'>juneau-microservice</h6>
<ul class='spaced-list'>
<li>
New methods on <a href="org/apache/juneau/microservice/RestMicroservice.html" title="class in org.apache.juneau.microservice"><code>RestMicroservice</code></a>:
@@ -9270,7 +9288,7 @@
<li><code><del>RestServlet.getConfigMgr()</del></code>
</ul>
<li>Removed <a href="org/apache/juneau/jso/JsoParser.html" title="class in org.apache.juneau.jso"><code>JsoParser</code></a>
- from <a href="org/apache/juneau/rest/RestServletDefault.html" title="class in org.apache.juneau.rest"><code>RestServletDefault</code></a> and <a href="org/apache/juneau/rest/jena/RestServletJenaDefault.html" title="class in org.apache.juneau.rest.jena"><code>RestServletJenaDefault</code></a>.
+ from <a href="org/apache/juneau/rest/RestServletDefault.html" title="class in org.apache.juneau.rest"><code>RestServletDefault</code></a> and <code><del>RestServletJenaDefault</del></code>.
These may represent a security risk if not handled correctly, so removed
them as a precaution.
<li>Removed <code>RestServletProperties.REST_htDocsFolder</code>. Replaced with <a href="org/apache/juneau/rest/annotation/RestResource.html#staticFiles--"><code>RestResource.staticFiles()</code></a>.
@@ -9595,13 +9613,13 @@
<li><code>$E{var}</code> - Environment variables.
</ul>
<li>Added methods <code><del>RestServlet.getDescription(RestRequest)</del></code> and <del><code>RestServlet.getLabel(RestRequest)</code></del>.
- <li><a href="org/apache/juneau/rest/RestServletDefault.html" title="class in org.apache.juneau.rest"><code>RestServletDefault</code></a> and <a href="org/apache/juneau/rest/jena/RestServletJenaDefault.html" title="class in org.apache.juneau.rest.jena"><code>RestServletJenaDefault</code></a> now provide default HTML titles
+ <li><a href="org/apache/juneau/rest/RestServletDefault.html" title="class in org.apache.juneau.rest"><code>RestServletDefault</code></a> and <code><del>RestServletJenaDefault</del></code> now provide default HTML titles
and descriptions:
<p class='bcode'>
<ja>@Property</ja>(name=<jsf>HTMLDOC_title</jsf>, value=<js>"$R{servletTitle}"</js>),
<ja>@Property</ja>(name=<jsf>HTMLDOC_description</jsf>, value=<js>"$R{servletDescription}"</js>)
</p>
- <li>Options pages on <a href="org/apache/juneau/rest/RestServletDefault.html" title="class in org.apache.juneau.rest"><code>RestServletDefault</code></a> and <a href="org/apache/juneau/rest/jena/RestServletJenaDefault.html" title="class in org.apache.juneau.rest.jena"><code>RestServletJenaDefault</code></a> now provide default descriptions and back links:
+ <li>Options pages on <a href="org/apache/juneau/rest/RestServletDefault.html" title="class in org.apache.juneau.rest"><code>RestServletDefault</code></a> and <code><del>RestServletJenaDefault</del></code> now provide default descriptions and back links:
and descriptions:
<p class='bcode'>
<ja>@Property</ja>(name=<jsf>HTMLDOC_links</jsf>, value=<js>"{back:'$R{servletURI}"</js>),
@@ -9770,7 +9788,7 @@
<h6 class='topic'>Server</h6>
<ul class='spaced-list'>
- <li>Added a default OPTIONS page to <a href="org/apache/juneau/rest/RestServletDefault.html" title="class in org.apache.juneau.rest"><code>RestServletDefault</code></a> and <a href="org/apache/juneau/rest/jena/RestServletJenaDefault.html" title="class in org.apache.juneau.rest.jena"><code>RestServletJenaDefault</code></a>.
+ <li>Added a default OPTIONS page to <a href="org/apache/juneau/rest/RestServletDefault.html" title="class in org.apache.juneau.rest"><code>RestServletDefault</code></a> and <code><del>RestServletJenaDefault</del></code>.
<li><code>RestServletProperties.REST_allowMethodParam</code> has been enhanced to allow you to
explicitely specify which HTTP methods can be used in the <code>&method</code> parameter.
<li>New methods added to <a href="org/apache/juneau/rest/RestRequest.html" title="class in org.apache.juneau.rest"><code>RestRequest</code></a>:
@@ -9908,7 +9926,7 @@
<li><code>&noTrace=true</code> now prevents any errors from being logged in log file.
<li>Workaround for Jetty issue where <code>ServletContext.getContextPath()</code> always ends with <js>"null"</js>.
<li><code>RestServletProperties.REST_allowMethodParam</code> is now <jk>true</jk> by default on all subclasses
- of <a href="org/apache/juneau/rest/RestServletDefault.html" title="class in org.apache.juneau.rest"><code>RestServletDefault</code></a> and <a href="org/apache/juneau/rest/jena/RestServletJenaDefault.html" title="class in org.apache.juneau.rest.jena"><code>RestServletJenaDefault</code></a>.
+ of <a href="org/apache/juneau/rest/RestServletDefault.html" title="class in org.apache.juneau.rest"><code>RestServletDefault</code></a> and <code><del>RestServletJenaDefault</del></code>.
</ul>
<h6 class='topic'>Client</h6>
@@ -9967,7 +9985,7 @@
<li>Removed properties parameters from <code><del>RestServlet.onPreCall(RestRequest)</del></code> and <code><del>RestServlet#onPostCall(RestRequest,RestResponse)</del></code> methods
since the properties are already accessible through <code>RestRequest.getProperties()</code>.
<li>Added <a href="org/apache/juneau/uon/UonSerializer.html" title="class in org.apache.juneau.uon"><code>UonSerializer</code></a> and <a href="org/apache/juneau/uon/UonParser.html" title="class in org.apache.juneau.uon"><code>UonParser</code></a> to serializer and parser lists on
- <a href="org/apache/juneau/rest/RestServletDefault.html" title="class in org.apache.juneau.rest"><code>RestServletDefault</code></a> and <a href="org/apache/juneau/rest/jena/RestServletJenaDefault.html" title="class in org.apache.juneau.rest.jena"><code>RestServletJenaDefault</code></a>.
+ <a href="org/apache/juneau/rest/RestServletDefault.html" title="class in org.apache.juneau.rest"><code>RestServletDefault</code></a> and <code><del>RestServletJenaDefault</del></code>.
</ul>
<h6 class='topic'>Client</h6>
@@ -10891,10 +10909,10 @@
</ul>
</li>
<li>
- New <a href="org/apache/juneau/rest/jena/RestServletJenaDefault.html" title="class in org.apache.juneau.rest.jena"><code>RestServletJenaDefault</code></a> servlet that includes serialization/parsing support for all Jena-based serializers and parsers.
+ New <code><del>RestServletJenaDefault</del></code> servlet that includes serialization/parsing support for all Jena-based serializers and parsers.
</li>
<li>
- New <a href="org/apache/juneau/rest/jaxrs/rdf/DefaultJenaProvider.html" title="class in org.apache.juneau.rest.jaxrs.rdf"><code>DefaultJenaProvider</code></a> JAX-RS provider that includes serialization/parsing support for all Jena-based serializers and parsers.
+ New <code><del>DefaultJenaProvider</del></code> JAX-RS provider that includes serialization/parsing support for all Jena-based serializers and parsers.
</li>
<li>
Eliminated <code>RestServletChild</code> class.<br>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/4cba2c2c/content/site/apidocs/overview-tree.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/overview-tree.html b/content/site/apidocs/overview-tree.html
index 28648ff..6f1ac6b 100644
--- a/content/site/apidocs/overview-tree.html
+++ b/content/site/apidocs/overview-tree.html
@@ -94,6 +94,7 @@
<li><a href="org/apache/juneau/json/annotation/package-tree.html">org.apache.juneau.json.annotation</a>, </li>
<li><a href="org/apache/juneau/microservice/package-tree.html">org.apache.juneau.microservice</a>, </li>
<li><a href="org/apache/juneau/microservice/resources/package-tree.html">org.apache.juneau.microservice.resources</a>, </li>
+<li><a href="org/apache/juneau/microservice/sample/package-tree.html">org.apache.juneau.microservice.sample</a>, </li>
<li><a href="org/apache/juneau/msgpack/package-tree.html">org.apache.juneau.msgpack</a>, </li>
<li><a href="org/apache/juneau/parser/package-tree.html">org.apache.juneau.parser</a>, </li>
<li><a href="org/apache/juneau/plaintext/package-tree.html">org.apache.juneau.plaintext</a>, </li>
@@ -103,8 +104,6 @@
<li><a href="org/apache/juneau/rest/client/package-tree.html">org.apache.juneau.rest.client</a>, </li>
<li><a href="org/apache/juneau/rest/converters/package-tree.html">org.apache.juneau.rest.converters</a>, </li>
<li><a href="org/apache/juneau/rest/jaxrs/package-tree.html">org.apache.juneau.rest.jaxrs</a>, </li>
-<li><a href="org/apache/juneau/rest/jaxrs/rdf/package-tree.html">org.apache.juneau.rest.jaxrs.rdf</a>, </li>
-<li><a href="org/apache/juneau/rest/jena/package-tree.html">org.apache.juneau.rest.jena</a>, </li>
<li><a href="org/apache/juneau/rest/labels/package-tree.html">org.apache.juneau.rest.labels</a>, </li>
<li><a href="org/apache/juneau/rest/matchers/package-tree.html">org.apache.juneau.rest.matchers</a>, </li>
<li><a href="org/apache/juneau/rest/remoteable/package-tree.html">org.apache.juneau.rest.remoteable</a>, </li>
@@ -239,7 +238,6 @@
<li type="circle">org.apache.juneau.dto.atom.<a href="org/apache/juneau/dto/atom/AtomBuilder.html" title="class in org.apache.juneau.dto.atom"><span class="typeNameLink">AtomBuilder</span></a></li>
<li type="circle">org.apache.juneau.rest.jaxrs.<a href="org/apache/juneau/rest/jaxrs/BaseProvider.html" title="class in org.apache.juneau.rest.jaxrs"><span class="typeNameLink">BaseProvider</span></a> (implements javax.ws.rs.ext.MessageBodyReader<T>, javax.ws.rs.ext.MessageBodyWriter<T>)
<ul>
-<li type="circle">org.apache.juneau.rest.jaxrs.rdf.<a href="org/apache/juneau/rest/jaxrs/rdf/DefaultJenaProvider.html" title="class in org.apache.juneau.rest.jaxrs.rdf"><span class="typeNameLink">DefaultJenaProvider</span></a></li>
<li type="circle">org.apache.juneau.rest.jaxrs.<a href="org/apache/juneau/rest/jaxrs/DefaultProvider.html" title="class in org.apache.juneau.rest.jaxrs"><span class="typeNameLink">DefaultProvider</span></a></li>
</ul>
</li>
@@ -615,26 +613,20 @@
<ul>
<li type="circle">org.apache.juneau.microservice.resources.<a href="org/apache/juneau/microservice/resources/ConfigResource.html" title="class in org.apache.juneau.microservice.resources"><span class="typeNameLink">ConfigResource</span></a></li>
<li type="circle">org.apache.juneau.microservice.resources.<a href="org/apache/juneau/microservice/resources/DirectoryResource.html" title="class in org.apache.juneau.microservice.resources"><span class="typeNameLink">DirectoryResource</span></a></li>
+<li type="circle">org.apache.juneau.microservice.sample.<a href="org/apache/juneau/microservice/sample/HelloWorldResource.html" title="class in org.apache.juneau.microservice.sample"><span class="typeNameLink">HelloWorldResource</span></a></li>
<li type="circle">org.apache.juneau.microservice.resources.<a href="org/apache/juneau/microservice/resources/LogsResource.html" title="class in org.apache.juneau.microservice.resources"><span class="typeNameLink">LogsResource</span></a></li>
<li type="circle">org.apache.juneau.microservice.resources.<a href="org/apache/juneau/microservice/resources/ShutdownResource.html" title="class in org.apache.juneau.microservice.resources"><span class="typeNameLink">ShutdownResource</span></a></li>
</ul>
</li>
+<li type="circle">org.apache.juneau.microservice.<a href="org/apache/juneau/microservice/ResourceJena.html" title="class in org.apache.juneau.microservice"><span class="typeNameLink">ResourceJena</span></a></li>
<li type="circle">org.apache.juneau.rest.<a href="org/apache/juneau/rest/RestServletGroupDefault.html" title="class in org.apache.juneau.rest"><span class="typeNameLink">RestServletGroupDefault</span></a>
<ul>
<li type="circle">org.apache.juneau.microservice.<a href="org/apache/juneau/microservice/ResourceGroup.html" title="class in org.apache.juneau.microservice"><span class="typeNameLink">ResourceGroup</span></a>
<ul>
+<li type="circle">org.apache.juneau.microservice.sample.<a href="org/apache/juneau/microservice/sample/RootResources.html" title="class in org.apache.juneau.microservice.sample"><span class="typeNameLink">RootResources</span></a></li>
<li type="circle">org.apache.juneau.microservice.resources.<a href="org/apache/juneau/microservice/resources/SampleRootResource.html" title="class in org.apache.juneau.microservice.resources"><span class="typeNameLink">SampleRootResource</span></a></li>
</ul>
</li>
-</ul>
-</li>
-</ul>
-</li>
-<li type="circle">org.apache.juneau.rest.jena.<a href="org/apache/juneau/rest/jena/RestServletJenaDefault.html" title="class in org.apache.juneau.rest.jena"><span class="typeNameLink">RestServletJenaDefault</span></a>
-<ul>
-<li type="circle">org.apache.juneau.microservice.<a href="org/apache/juneau/microservice/ResourceJena.html" title="class in org.apache.juneau.microservice"><span class="typeNameLink">ResourceJena</span></a></li>
-<li type="circle">org.apache.juneau.rest.jena.<a href="org/apache/juneau/rest/jena/RestServletJenaGroupDefault.html" title="class in org.apache.juneau.rest.jena"><span class="typeNameLink">RestServletJenaGroupDefault</span></a>
-<ul>
<li type="circle">org.apache.juneau.microservice.<a href="org/apache/juneau/microservice/ResourceJenaGroup.html" title="class in org.apache.juneau.microservice"><span class="typeNameLink">ResourceJenaGroup</span></a></li>
</ul>
</li>
@@ -918,6 +910,7 @@
<li type="circle">org.apache.juneau.parser.<a href="org/apache/juneau/parser/ParserMatch.html" title="class in org.apache.juneau.parser"><span class="typeNameLink">ParserMatch</span></a></li>
<li type="circle">org.apache.juneau.parser.<a href="org/apache/juneau/parser/ParserPipe.html" title="class in org.apache.juneau.parser"><span class="typeNameLink">ParserPipe</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/PojoMerge.html" title="class in org.apache.juneau.utils"><span class="typeNameLink">PojoMerge</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>
<li type="circle">org.apache.juneau.transform.<a href="org/apache/juneau/transform/PojoSwap.html" title="class in org.apache.juneau.transform"><span class="typeNameLink">PojoSwap</span></a><T,S>
@@ -1318,7 +1311,7 @@
<li type="circle">org.apache.juneau.svl.<a href="org/apache/juneau/svl/DefaultingVar.html" title="class in org.apache.juneau.svl"><span class="typeNameLink">DefaultingVar</span></a>
<ul>
<li type="circle">org.apache.juneau.svl.vars.<a href="org/apache/juneau/svl/vars/ArgsVar.html" title="class in org.apache.juneau.svl.vars"><span class="typeNameLink">ArgsVar</span></a></li>
-<li type="circle">org.apache.juneau.svl.vars.<a href="org/apache/juneau/svl/vars/ConfigFileVar.html" title="class in org.apache.juneau.svl.vars"><span class="typeNameLink">ConfigFileVar</span></a></li>
+<li type="circle">org.apache.juneau.ini.<a href="org/apache/juneau/ini/ConfigFileVar.html" title="class in org.apache.juneau.ini"><span class="typeNameLink">ConfigFileVar</span></a></li>
<li type="circle">org.apache.juneau.svl.vars.<a href="org/apache/juneau/svl/vars/EnvVariablesVar.html" title="class in org.apache.juneau.svl.vars"><span class="typeNameLink">EnvVariablesVar</span></a></li>
<li type="circle">org.apache.juneau.rest.vars.<a href="org/apache/juneau/rest/vars/FileVar.html" title="class in org.apache.juneau.rest.vars"><span class="typeNameLink">FileVar</span></a></li>
<li type="circle">org.apache.juneau.svl.vars.<a href="org/apache/juneau/svl/vars/ManifestFileVar.html" title="class in org.apache.juneau.svl.vars"><span class="typeNameLink">ManifestFileVar</span></a></li>
@@ -1484,14 +1477,14 @@
<li type="circle">org.apache.juneau.<a href="org/apache/juneau/UriResolution.html" title="enum in org.apache.juneau"><span class="typeNameLink">UriResolution</span></a></li>
<li type="circle">org.apache.juneau.<a href="org/apache/juneau/UriRelativity.html" title="enum in org.apache.juneau"><span class="typeNameLink">UriRelativity</span></a></li>
<li type="circle">org.apache.juneau.<a href="org/apache/juneau/PartType.html" title="enum in org.apache.juneau"><span class="typeNameLink">PartType</span></a></li>
-<li type="circle">org.apache.juneau.dto.jsonschema.<a href="org/apache/juneau/dto/jsonschema/JsonType.html" title="enum in org.apache.juneau.dto.jsonschema"><span class="typeNameLink">JsonType</span></a></li>
<li type="circle">org.apache.juneau.http.<a href="org/apache/juneau/http/HttpMethod.html" title="enum in org.apache.juneau.http"><span class="typeNameLink">HttpMethod</span></a></li>
<li type="circle">org.apache.juneau.http.<a href="org/apache/juneau/http/ContentEncodingEnum.html" title="enum in org.apache.juneau.http"><span class="typeNameLink">ContentEncodingEnum</span></a></li>
-<li type="circle">org.apache.juneau.ini.<a href="org/apache/juneau/ini/ConfigFileFormat.html" title="enum in org.apache.juneau.ini"><span class="typeNameLink">ConfigFileFormat</span></a></li>
<li type="circle">org.apache.juneau.remoteable.<a href="org/apache/juneau/remoteable/ReturnValue.html" title="enum in org.apache.juneau.remoteable"><span class="typeNameLink">ReturnValue</span></a></li>
<li type="circle">org.apache.juneau.utils.<a href="org/apache/juneau/utils/CalendarUtils.Format.html" title="enum in org.apache.juneau.utils"><span class="typeNameLink">CalendarUtils.Format</span></a></li>
<li type="circle">org.apache.juneau.xml.annotation.<a href="org/apache/juneau/xml/annotation/XmlFormat.html" title="enum in org.apache.juneau.xml.annotation"><span class="typeNameLink">XmlFormat</span></a></li>
<li type="circle">org.apache.juneau.jena.<a href="org/apache/juneau/jena/RdfCollectionFormat.html" title="enum in org.apache.juneau.jena"><span class="typeNameLink">RdfCollectionFormat</span></a></li>
+<li type="circle">org.apache.juneau.dto.jsonschema.<a href="org/apache/juneau/dto/jsonschema/JsonType.html" title="enum in org.apache.juneau.dto.jsonschema"><span class="typeNameLink">JsonType</span></a></li>
+<li type="circle">org.apache.juneau.ini.<a href="org/apache/juneau/ini/ConfigFileFormat.html" title="enum in org.apache.juneau.ini"><span class="typeNameLink">ConfigFileFormat</span></a></li>
<li type="circle">org.apache.juneau.rest.annotation.<a href="org/apache/juneau/rest/annotation/Inherit.html" title="enum in org.apache.juneau.rest.annotation"><span class="typeNameLink">Inherit</span></a></li>
<li type="circle">org.apache.juneau.rest.annotation.<a href="org/apache/juneau/rest/annotation/HookEvent.html" title="enum in org.apache.juneau.rest.annotation"><span class="typeNameLink">HookEvent</span></a></li>
<li type="circle">org.apache.juneau.rest.<a href="org/apache/juneau/rest/RestParamType.html" title="enum in org.apache.juneau.rest"><span class="typeNameLink">RestParamType</span></a></li>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/4cba2c2c/content/site/apidocs/package-list
----------------------------------------------------------------------
diff --git a/content/site/apidocs/package-list b/content/site/apidocs/package-list
index 6457fe6..2f2c63a 100644
--- a/content/site/apidocs/package-list
+++ b/content/site/apidocs/package-list
@@ -20,6 +20,7 @@ org.apache.juneau.json
org.apache.juneau.json.annotation
org.apache.juneau.microservice
org.apache.juneau.microservice.resources
+org.apache.juneau.microservice.sample
org.apache.juneau.msgpack
org.apache.juneau.parser
org.apache.juneau.plaintext
@@ -29,8 +30,6 @@ org.apache.juneau.rest.annotation
org.apache.juneau.rest.client
org.apache.juneau.rest.converters
org.apache.juneau.rest.jaxrs
-org.apache.juneau.rest.jaxrs.rdf
-org.apache.juneau.rest.jena
org.apache.juneau.rest.labels
org.apache.juneau.rest.matchers
org.apache.juneau.rest.remoteable
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/4cba2c2c/content/site/apidocs/serialized-form.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/serialized-form.html b/content/site/apidocs/serialized-form.html
index 0919305..abf0064 100644
--- a/content/site/apidocs/serialized-form.html
+++ b/content/site/apidocs/serialized-form.html
@@ -307,12 +307,12 @@
<li class="blockList"><a name="org.apache.juneau.microservice.ResourceJena">
<!-- -->
</a>
-<h3>Class <a href="org/apache/juneau/microservice/ResourceJena.html" title="class in org.apache.juneau.microservice">org.apache.juneau.microservice.ResourceJena</a> extends <a href="org/apache/juneau/rest/jena/RestServletJenaDefault.html" title="class in org.apache.juneau.rest.jena">RestServletJenaDefault</a> implements Serializable</h3>
+<h3>Class <a href="org/apache/juneau/microservice/ResourceJena.html" title="class in org.apache.juneau.microservice">org.apache.juneau.microservice.ResourceJena</a> extends <a href="org/apache/juneau/rest/RestServletDefault.html" title="class in org.apache.juneau.rest">RestServletDefault</a> implements Serializable</h3>
</li>
<li class="blockList"><a name="org.apache.juneau.microservice.ResourceJenaGroup">
<!-- -->
</a>
-<h3>Class <a href="org/apache/juneau/microservice/ResourceJenaGroup.html" title="class in org.apache.juneau.microservice">org.apache.juneau.microservice.ResourceJenaGroup</a> extends <a href="org/apache/juneau/rest/jena/RestServletJenaGroupDefault.html" title="class in org.apache.juneau.rest.jena">RestServletJenaGroupDefault</a> implements Serializable</h3>
+<h3>Class <a href="org/apache/juneau/microservice/ResourceJenaGroup.html" title="class in org.apache.juneau.microservice">org.apache.juneau.microservice.ResourceJenaGroup</a> extends <a href="org/apache/juneau/rest/RestServletGroupDefault.html" title="class in org.apache.juneau.rest">RestServletGroupDefault</a> implements Serializable</h3>
</li>
</ul>
</li>
@@ -409,6 +409,29 @@
</ul>
</li>
<li class="blockList">
+<h2 title="Package">Package org.apache.juneau.microservice.sample</h2>
+<ul class="blockList">
+<li class="blockList"><a name="org.apache.juneau.microservice.sample.HelloWorldResource">
+<!-- -->
+</a>
+<h3>Class <a href="org/apache/juneau/microservice/sample/HelloWorldResource.html" title="class in org.apache.juneau.microservice.sample">org.apache.juneau.microservice.sample.HelloWorldResource</a> extends <a href="org/apache/juneau/microservice/Resource.html" title="class in org.apache.juneau.microservice">Resource</a> implements Serializable</h3>
+<dl class="nameValue">
+<dt>serialVersionUID:</dt>
+<dd>1L</dd>
+</dl>
+</li>
+<li class="blockList"><a name="org.apache.juneau.microservice.sample.RootResources">
+<!-- -->
+</a>
+<h3>Class <a href="org/apache/juneau/microservice/sample/RootResources.html" title="class in org.apache.juneau.microservice.sample">org.apache.juneau.microservice.sample.RootResources</a> extends <a href="org/apache/juneau/microservice/ResourceGroup.html" title="class in org.apache.juneau.microservice">ResourceGroup</a> implements Serializable</h3>
+<dl class="nameValue">
+<dt>serialVersionUID:</dt>
+<dd>1L</dd>
+</dl>
+</li>
+</ul>
+</li>
+<li class="blockList">
<h2 title="Package">Package org.apache.juneau.parser</h2>
<ul class="blockList">
<li class="blockList"><a name="org.apache.juneau.parser.ParseException">
@@ -700,29 +723,6 @@
</ul>
</li>
<li class="blockList">
-<h2 title="Package">Package org.apache.juneau.rest.jena</h2>
-<ul class="blockList">
-<li class="blockList"><a name="org.apache.juneau.rest.jena.RestServletJenaDefault">
-<!-- -->
-</a>
-<h3>Class <a href="org/apache/juneau/rest/jena/RestServletJenaDefault.html" title="class in org.apache.juneau.rest.jena">org.apache.juneau.rest.jena.RestServletJenaDefault</a> extends <a href="org/apache/juneau/rest/RestServlet.html" title="class in org.apache.juneau.rest">RestServlet</a> implements Serializable</h3>
-<dl class="nameValue">
-<dt>serialVersionUID:</dt>
-<dd>1L</dd>
-</dl>
-</li>
-<li class="blockList"><a name="org.apache.juneau.rest.jena.RestServletJenaGroupDefault">
-<!-- -->
-</a>
-<h3>Class <a href="org/apache/juneau/rest/jena/RestServletJenaGroupDefault.html" title="class in org.apache.juneau.rest.jena">org.apache.juneau.rest.jena.RestServletJenaGroupDefault</a> extends <a href="org/apache/juneau/rest/jena/RestServletJenaDefault.html" title="class in org.apache.juneau.rest.jena">RestServletJenaDefault</a> implements Serializable</h3>
-<dl class="nameValue">
-<dt>serialVersionUID:</dt>
-<dd>1L</dd>
-</dl>
-</li>
-</ul>
-</li>
-<li class="blockList">
<h2 title="Package">Package org.apache.juneau.rest.labels</h2>
<ul class="blockList">
<li class="blockList"><a name="org.apache.juneau.rest.labels.ChildResourceDescriptions">