http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/62afb533/content/site/apidocs/org/apache/juneau/annotation/ParentProperty.html
----------------------------------------------------------------------
diff --git 
a/content/site/apidocs/org/apache/juneau/annotation/ParentProperty.html 
b/content/site/apidocs/org/apache/juneau/annotation/ParentProperty.html
index 2376fcf..81582fc 100644
--- a/content/site/apidocs/org/apache/juneau/annotation/ParentProperty.html
+++ b/content/site/apidocs/org/apache/juneau/annotation/ParentProperty.html
@@ -43,7 +43,7 @@
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../../org/apache/juneau/annotation/Overrideable.html" 
title="annotation in org.apache.juneau.annotation"><span 
class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/apache/juneau/annotation/Pojo.html" 
title="annotation in org.apache.juneau.annotation"><span 
class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/annotation/Swap.html" 
title="annotation in org.apache.juneau.annotation"><span 
class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a 
href="../../../../index.html?org/apache/juneau/annotation/ParentProperty.html" 
target="_top">Frames</a></li>
@@ -147,7 +147,7 @@ public @interface <a 
href="../../../../src-html/org/apache/juneau/annotation/Par
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../../org/apache/juneau/annotation/Overrideable.html" 
title="annotation in org.apache.juneau.annotation"><span 
class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/apache/juneau/annotation/Pojo.html" 
title="annotation in org.apache.juneau.annotation"><span 
class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/annotation/Swap.html" 
title="annotation in org.apache.juneau.annotation"><span 
class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a 
href="../../../../index.html?org/apache/juneau/annotation/ParentProperty.html" 
target="_top">Frames</a></li>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/62afb533/content/site/apidocs/org/apache/juneau/annotation/Pojo.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/annotation/Pojo.html 
b/content/site/apidocs/org/apache/juneau/annotation/Pojo.html
deleted file mode 100644
index e63d609..0000000
--- a/content/site/apidocs/org/apache/juneau/annotation/Pojo.html
+++ /dev/null
@@ -1,271 +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>Pojo (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="Pojo (Apache Juneau (incubating) 
6.3.2-incubating-SNAPSHOT)";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</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/annotation/ParentProperty.html" 
title="annotation in org.apache.juneau.annotation"><span 
class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/apache/juneau/annotation/ThreadSafe.html" 
title="annotation in org.apache.juneau.annotation"><span 
class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../../../../index.html?org/apache/juneau/annotation/Pojo.html" 
target="_top">Frames</a></li>
-<li><a href="Pojo.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>Field&nbsp;|&nbsp;</li>
-<li>Required&nbsp;|&nbsp;</li>
-<li><a href="#annotation.type.optional.element.summary">Optional</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#annotation.type.element.detail">Element</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.annotation</div>
-<h2 title="Annotation Type Pojo" class="title">Annotation Type Pojo</h2>
-</div>
-<div class="contentContainer">
-<div class="description">
-<ul class="blockList">
-<li class="blockList">
-<hr>
-<br>
-<pre><a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Documented.html?is-external=true";
 title="class or interface in java.lang.annotation">@Documented</a>
- <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Target.html?is-external=true";
 title="class or interface in java.lang.annotation">@Target</a>(<a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Target.html?is-external=true#value--";
 title="class or interface in java.lang.annotation">value</a>=<a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/ElementType.html?is-external=true#TYPE";
 title="class or interface in java.lang.annotation">TYPE</a>)
- <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Retention.html?is-external=true";
 title="class or interface in java.lang.annotation">@Retention</a>(<a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Retention.html?is-external=true#value--";
 title="class or interface in java.lang.annotation">value</a>=<a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/RetentionPolicy.html?is-external=true#RUNTIME";
 title="class or interface in java.lang.annotation">RUNTIME</a>)
- <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Inherited.html?is-external=true";
 title="class or interface in java.lang.annotation">@Inherited</a>
-public @interface <a 
href="../../../../src-html/org/apache/juneau/annotation/Pojo.html#line.29">Pojo</a></pre>
-<div class="block">Used to tailor how POJOs get interpreted by the 
framework.</div>
-</li>
-</ul>
-</div>
-<div class="summary">
-<ul class="blockList">
-<li class="blockList">
-<!-- =========== ANNOTATION TYPE OPTIONAL MEMBER SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="annotation.type.optional.element.summary">
-<!--   -->
-</a>
-<h3>Optional Element Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" 
summary="Optional Element Summary table, listing optional elements, and an 
explanation">
-<caption><span>Optional Elements</span><span 
class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Optional Element and Description</th>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code><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;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../org/apache/juneau/annotation/Pojo.html#swap--">swap</a></span></code>
-<div class="block">Associate a <a 
href="../../../../org/apache/juneau/transform/PojoSwap.html" title="class in 
org.apache.juneau.transform"><code>PojoSwap</code></a> or <a 
href="../../../../org/apache/juneau/transform/SurrogateSwap.html" title="class 
in org.apache.juneau.transform"><code>SurrogateSwap</code></a> with this class 
type.</div>
-</td>
-</tr>
-</table>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<div class="details">
-<ul class="blockList">
-<li class="blockList">
-<!-- ============ ANNOTATION TYPE MEMBER DETAIL =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="annotation.type.element.detail">
-<!--   -->
-</a>
-<h3>Element Detail</h3>
-<a name="swap--">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>swap</h4>
-<pre>public abstract&nbsp;<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;<a 
href="../../../../src-html/org/apache/juneau/annotation/Pojo.html#line.83">swap</a></pre>
-<div class="block">Associate a <a 
href="../../../../org/apache/juneau/transform/PojoSwap.html" title="class in 
org.apache.juneau.transform"><code>PojoSwap</code></a> or <a 
href="../../../../org/apache/juneau/transform/SurrogateSwap.html" title="class 
in org.apache.juneau.transform"><code>SurrogateSwap</code></a> with this class 
type.
-
- <p>
- Supports the following class types:
- <ul>
-   <li>Subclasses of <a 
href="../../../../org/apache/juneau/transform/PojoSwap.html" title="class in 
org.apache.juneau.transform"><code>PojoSwap</code></a>.
-   <li>Any other class.  Will get interpreted as a <a 
href="../../../../org/apache/juneau/transform/SurrogateSwap.html" title="class 
in org.apache.juneau.transform"><code>SurrogateSwap</code></a>.
- </ul>
-
- <h5 class='section'>Example:</h5>
- <p>
- In this case, a swap is being applied to a bean that will force it to be 
serialized as a <code>String</code>:
- <p class='bcode'>
-   <jc>// Our bean class</jc>
-   <ja>@Pojo</ja>(swap=BSwap.<jk>class</jk>)
-   <jk>public class</jk> B {
-      <jk>public</jk> String <jf>f1</jf>;
-   }
-
-   <jc>// Our POJO swap to force the bean to be serialized as a String</jc>
-   <jk>public class</jk> BSwap <jk>extends</jk> PojoSwap&lt;B,String&gt; {
-      <jk>public</jk> String swap(BeanSession s, B o) <jk>throws</jk> 
SerializeException {
-         <jk>return</jk> o.f1;
-      }
-      <jk>public</jk> B unswap(BeanSession s, String f) <jk>throws</jk> 
ParseException { {
-         B b1 = <jk>new</jk> B();
-         b1.<jf>f1</jf> = f;
-         <jk>return</jk> b1;
-      }
-   }
-
-   <jk>public void</jk> test() <jk>throws</jk> Exception {
-      WriterSerializer s = JsonSerializer.<jsf>DEFAULT</jsf>;
-      B b = <jk>new</jk> B();
-      b.<jf>f1</jf> = <js>"bar"</js>;
-      String json = s.serialize(b);
-      <jsm>assertEquals</jsm>(<js>"\"bar\""</js>, json);
-
-      ReaderParser p = JsonParser.<jsf>DEFAULT</jsf>;
-      b = p.parse(json, B.<jk>class</jk>);
-      <jsm>assertEquals</jsm>(<js>"bar"</js>, b.<jf>f1</jf>);
-   }
- </p>
-
- <p>
- Note that using this annotation is functionally equivalent to adding swaps to 
the serializers and parsers:
- <p class='bcode'>
-   WriterSerializer s = <jk>new</jk> 
JsonSerializerBuilder().pojoSwaps(BSwap.<jk>class</jk>).build();
-   ReaderParser p = <jk>new</jk> 
JsonParserBuilder().pojoSwaps(BSwap.<jk>class</jk>).build();
- </p></div>
-<dl>
-<dt>Default:</dt>
-<dd>org.apache.juneau.annotation.Null.class</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/annotation/ParentProperty.html" 
title="annotation in org.apache.juneau.annotation"><span 
class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/apache/juneau/annotation/ThreadSafe.html" 
title="annotation in org.apache.juneau.annotation"><span 
class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../../../../index.html?org/apache/juneau/annotation/Pojo.html" 
target="_top">Frames</a></li>
-<li><a href="Pojo.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>Field&nbsp;|&nbsp;</li>
-<li>Required&nbsp;|&nbsp;</li>
-<li><a href="#annotation.type.optional.element.summary">Optional</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#annotation.type.element.detail">Element</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/62afb533/content/site/apidocs/org/apache/juneau/annotation/ThreadSafe.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/annotation/ThreadSafe.html 
b/content/site/apidocs/org/apache/juneau/annotation/ThreadSafe.html
index 326f861..7a3bcc6 100644
--- a/content/site/apidocs/org/apache/juneau/annotation/ThreadSafe.html
+++ b/content/site/apidocs/org/apache/juneau/annotation/ThreadSafe.html
@@ -42,7 +42,7 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/juneau/annotation/Pojo.html" 
title="annotation in org.apache.juneau.annotation"><span 
class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/annotation/Swaps.html" 
title="annotation in org.apache.juneau.annotation"><span 
class="typeNameLink">Prev&nbsp;Class</span></a></li>
 <li><a href="../../../../org/apache/juneau/annotation/URI.html" 
title="annotation in org.apache.juneau.annotation"><span 
class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
@@ -125,7 +125,7 @@ public @interface <a 
href="../../../../src-html/org/apache/juneau/annotation/Thr
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/juneau/annotation/Pojo.html" 
title="annotation in org.apache.juneau.annotation"><span 
class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/annotation/Swaps.html" 
title="annotation in org.apache.juneau.annotation"><span 
class="typeNameLink">Prev&nbsp;Class</span></a></li>
 <li><a href="../../../../org/apache/juneau/annotation/URI.html" 
title="annotation in org.apache.juneau.annotation"><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/62afb533/content/site/apidocs/org/apache/juneau/annotation/package-frame.html
----------------------------------------------------------------------
diff --git 
a/content/site/apidocs/org/apache/juneau/annotation/package-frame.html 
b/content/site/apidocs/org/apache/juneau/annotation/package-frame.html
index 701b524..710d541 100644
--- a/content/site/apidocs/org/apache/juneau/annotation/package-frame.html
+++ b/content/site/apidocs/org/apache/juneau/annotation/package-frame.html
@@ -25,7 +25,8 @@
 <li><a href="NameProperty.html" title="annotation in 
org.apache.juneau.annotation" target="classFrame">NameProperty</a></li>
 <li><a href="Overrideable.html" title="annotation in 
org.apache.juneau.annotation" target="classFrame">Overrideable</a></li>
 <li><a href="ParentProperty.html" title="annotation in 
org.apache.juneau.annotation" target="classFrame">ParentProperty</a></li>
-<li><a href="Pojo.html" title="annotation in org.apache.juneau.annotation" 
target="classFrame">Pojo</a></li>
+<li><a href="Swap.html" title="annotation in org.apache.juneau.annotation" 
target="classFrame">Swap</a></li>
+<li><a href="Swaps.html" title="annotation in org.apache.juneau.annotation" 
target="classFrame">Swaps</a></li>
 <li><a href="ThreadSafe.html" title="annotation in 
org.apache.juneau.annotation" target="classFrame">ThreadSafe</a></li>
 <li><a href="URI.html" title="annotation in org.apache.juneau.annotation" 
target="classFrame">URI</a></li>
 </ul>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/62afb533/content/site/apidocs/org/apache/juneau/annotation/package-summary.html
----------------------------------------------------------------------
diff --git 
a/content/site/apidocs/org/apache/juneau/annotation/package-summary.html 
b/content/site/apidocs/org/apache/juneau/annotation/package-summary.html
index f07c60d..c8a03d3 100644
--- a/content/site/apidocs/org/apache/juneau/annotation/package-summary.html
+++ b/content/site/apidocs/org/apache/juneau/annotation/package-summary.html
@@ -151,18 +151,24 @@
 </td>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><a 
href="../../../../org/apache/juneau/annotation/Pojo.html" title="annotation in 
org.apache.juneau.annotation">Pojo</a></td>
+<td class="colFirst"><a 
href="../../../../org/apache/juneau/annotation/Swap.html" title="annotation in 
org.apache.juneau.annotation">Swap</a></td>
 <td class="colLast">
-<div class="block">Used to tailor how POJOs get interpreted by the 
framework.</div>
+<div class="block">Associates <a 
href="../../../../org/apache/juneau/transform/PojoSwap.html" title="class in 
org.apache.juneau.transform"><code>PojoSwap</code></a> and <a 
href="../../../../org/apache/juneau/transform/Surrogate.html" title="interface 
in org.apache.juneau.transform"><code>Surrogate</code></a> classes with POJOs 
and bean properties.</div>
 </td>
 </tr>
 <tr class="rowColor">
+<td class="colFirst"><a 
href="../../../../org/apache/juneau/annotation/Swaps.html" title="annotation in 
org.apache.juneau.annotation">Swaps</a></td>
+<td class="colLast">
+<div class="block">Used to associate multiple swaps with the same POJO 
class.</div>
+</td>
+</tr>
+<tr class="altColor">
 <td class="colFirst"><a 
href="../../../../org/apache/juneau/annotation/ThreadSafe.html" 
title="annotation in org.apache.juneau.annotation">ThreadSafe</a></td>
 <td class="colLast">
 <div class="block">Identifies a class as being thread-safe.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a 
href="../../../../org/apache/juneau/annotation/URI.html" title="annotation in 
org.apache.juneau.annotation">URI</a></td>
 <td class="colLast">
 <div class="block">Used to identify a class or bean property as a URI.</div>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/62afb533/content/site/apidocs/org/apache/juneau/annotation/package-tree.html
----------------------------------------------------------------------
diff --git 
a/content/site/apidocs/org/apache/juneau/annotation/package-tree.html 
b/content/site/apidocs/org/apache/juneau/annotation/package-tree.html
index e7e4b9e..7d9f0e4 100644
--- a/content/site/apidocs/org/apache/juneau/annotation/package-tree.html
+++ b/content/site/apidocs/org/apache/juneau/annotation/package-tree.html
@@ -88,7 +88,8 @@
 <ul>
 <li type="circle">org.apache.juneau.annotation.<a 
href="../../../../org/apache/juneau/annotation/URI.html" title="annotation in 
org.apache.juneau.annotation"><span class="typeNameLink">URI</span></a> 
(implements java.lang.annotation.<a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Annotation.html?is-external=true";
 title="class or interface in java.lang.annotation">Annotation</a>)</li>
 <li type="circle">org.apache.juneau.annotation.<a 
href="../../../../org/apache/juneau/annotation/ThreadSafe.html" 
title="annotation in org.apache.juneau.annotation"><span 
class="typeNameLink">ThreadSafe</span></a> (implements java.lang.annotation.<a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Annotation.html?is-external=true";
 title="class or interface in java.lang.annotation">Annotation</a>)</li>
-<li type="circle">org.apache.juneau.annotation.<a 
href="../../../../org/apache/juneau/annotation/Pojo.html" title="annotation in 
org.apache.juneau.annotation"><span class="typeNameLink">Pojo</span></a> 
(implements java.lang.annotation.<a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Annotation.html?is-external=true";
 title="class or interface in java.lang.annotation">Annotation</a>)</li>
+<li type="circle">org.apache.juneau.annotation.<a 
href="../../../../org/apache/juneau/annotation/Swaps.html" title="annotation in 
org.apache.juneau.annotation"><span class="typeNameLink">Swaps</span></a> 
(implements java.lang.annotation.<a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Annotation.html?is-external=true";
 title="class or interface in java.lang.annotation">Annotation</a>)</li>
+<li type="circle">org.apache.juneau.annotation.<a 
href="../../../../org/apache/juneau/annotation/Swap.html" title="annotation in 
org.apache.juneau.annotation"><span class="typeNameLink">Swap</span></a> 
(implements java.lang.annotation.<a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Annotation.html?is-external=true";
 title="class or interface in java.lang.annotation">Annotation</a>)</li>
 <li type="circle">org.apache.juneau.annotation.<a 
href="../../../../org/apache/juneau/annotation/ParentProperty.html" 
title="annotation in org.apache.juneau.annotation"><span 
class="typeNameLink">ParentProperty</span></a> (implements 
java.lang.annotation.<a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Annotation.html?is-external=true";
 title="class or interface in java.lang.annotation">Annotation</a>)</li>
 <li type="circle">org.apache.juneau.annotation.<a 
href="../../../../org/apache/juneau/annotation/Overrideable.html" 
title="annotation in org.apache.juneau.annotation"><span 
class="typeNameLink">Overrideable</span></a> (implements 
java.lang.annotation.<a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Annotation.html?is-external=true";
 title="class or interface in java.lang.annotation">Annotation</a>)</li>
 <li type="circle">org.apache.juneau.annotation.<a 
href="../../../../org/apache/juneau/annotation/NameProperty.html" 
title="annotation in org.apache.juneau.annotation"><span 
class="typeNameLink">NameProperty</span></a> (implements 
java.lang.annotation.<a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Annotation.html?is-external=true";
 title="class or interface in java.lang.annotation">Annotation</a>)</li>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/62afb533/content/site/apidocs/org/apache/juneau/csv/CsvParserBuilder.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/csv/CsvParserBuilder.html 
b/content/site/apidocs/org/apache/juneau/csv/CsvParserBuilder.html
index 4171ad1..12520b8 100644
--- a/content/site/apidocs/org/apache/juneau/csv/CsvParserBuilder.html
+++ b/content/site/apidocs/org/apache/juneau/csv/CsvParserBuilder.html
@@ -2172,7 +2172,7 @@ extends <a 
href="../../../../org/apache/juneau/parser/ParserBuilder.html" title=
  There are two category of classes that can be passed in through this method:
  <ul>
    <li>Subclasses of <a 
href="../../../../org/apache/juneau/transform/PojoSwap.html" title="class in 
org.apache.juneau.transform"><code>PojoSwap</code></a>.
-   <li>Surrogate classes.  A shortcut for defining a <a 
href="../../../../org/apache/juneau/transform/SurrogateSwap.html" title="class 
in org.apache.juneau.transform"><code>SurrogateSwap</code></a>.
+   <li>Implementations of <a 
href="../../../../org/apache/juneau/transform/Surrogate.html" title="interface 
in org.apache.juneau.transform"><code>Surrogate</code></a>.
  </ul>
 
  <h5 class='section'>Notes:</h5>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/62afb533/content/site/apidocs/org/apache/juneau/csv/CsvSerializerBuilder.html
----------------------------------------------------------------------
diff --git 
a/content/site/apidocs/org/apache/juneau/csv/CsvSerializerBuilder.html 
b/content/site/apidocs/org/apache/juneau/csv/CsvSerializerBuilder.html
index d9c95a4..16121ba 100644
--- a/content/site/apidocs/org/apache/juneau/csv/CsvSerializerBuilder.html
+++ b/content/site/apidocs/org/apache/juneau/csv/CsvSerializerBuilder.html
@@ -2856,7 +2856,7 @@ extends <a 
href="../../../../org/apache/juneau/serializer/SerializerBuilder.html
  There are two category of classes that can be passed in through this method:
  <ul>
    <li>Subclasses of <a 
href="../../../../org/apache/juneau/transform/PojoSwap.html" title="class in 
org.apache.juneau.transform"><code>PojoSwap</code></a>.
-   <li>Surrogate classes.  A shortcut for defining a <a 
href="../../../../org/apache/juneau/transform/SurrogateSwap.html" title="class 
in org.apache.juneau.transform"><code>SurrogateSwap</code></a>.
+   <li>Implementations of <a 
href="../../../../org/apache/juneau/transform/Surrogate.html" title="interface 
in org.apache.juneau.transform"><code>Surrogate</code></a>.
  </ul>
 
  <h5 class='section'>Notes:</h5>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/62afb533/content/site/apidocs/org/apache/juneau/dto/atom/CommonEntry.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/dto/atom/CommonEntry.html 
b/content/site/apidocs/org/apache/juneau/dto/atom/CommonEntry.html
index d1ece80..6c40b38 100644
--- a/content/site/apidocs/org/apache/juneau/dto/atom/CommonEntry.html
+++ b/content/site/apidocs/org/apache/juneau/dto/atom/CommonEntry.html
@@ -667,7 +667,7 @@ public&nbsp;<a 
href="../../../../../org/apache/juneau/dto/atom/CommonEntry.html"
 <ul class="blockList">
 <li class="blockList">
 <h4>getUpdated</h4>
-<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" 
title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a 
href="../../../../../org/apache/juneau/annotation/BeanProperty.html#swap--">swap</a>=<a
 href="../../../../../org/apache/juneau/transforms/CalendarSwap.ISO8601DT.html" 
title="class in org.apache.juneau.transforms">CalendarSwap.ISO8601DT.class</a>)
+<pre><a href="../../../../../org/apache/juneau/annotation/Swap.html" 
title="annotation in org.apache.juneau.annotation">@Swap</a>(<a 
href="../../../../../org/apache/juneau/annotation/Swap.html#value--">value</a>=<a
 href="../../../../../org/apache/juneau/transforms/CalendarSwap.ISO8601DT.html" 
title="class in org.apache.juneau.transforms">CalendarSwap.ISO8601DT.class</a>)
 public&nbsp;<a 
href="http://docs.oracle.com/javase/7/docs/api/java/util/Calendar.html?is-external=true";
 title="class or interface in java.util">Calendar</a>&nbsp;<a 
href="../../../../../src-html/org/apache/juneau/dto/atom/CommonEntry.html#line.275">getUpdated</a>()</pre>
 <div class="block">Returns the update timestamp of this object.</div>
 <dl>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/62afb533/content/site/apidocs/org/apache/juneau/dto/atom/Entry.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/dto/atom/Entry.html 
b/content/site/apidocs/org/apache/juneau/dto/atom/Entry.html
index 9338138..dd273e8 100644
--- a/content/site/apidocs/org/apache/juneau/dto/atom/Entry.html
+++ b/content/site/apidocs/org/apache/juneau/dto/atom/Entry.html
@@ -474,7 +474,7 @@ public&nbsp;<a 
href="../../../../../org/apache/juneau/dto/atom/Entry.html" title
 <ul class="blockList">
 <li class="blockList">
 <h4>getPublished</h4>
-<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" 
title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a 
href="../../../../../org/apache/juneau/annotation/BeanProperty.html#swap--">swap</a>=<a
 href="../../../../../org/apache/juneau/transforms/CalendarSwap.ISO8601DT.html" 
title="class in org.apache.juneau.transforms">CalendarSwap.ISO8601DT.class</a>)
+<pre><a href="../../../../../org/apache/juneau/annotation/Swap.html" 
title="annotation in org.apache.juneau.annotation">@Swap</a>(<a 
href="../../../../../org/apache/juneau/annotation/Swap.html#value--">value</a>=<a
 href="../../../../../org/apache/juneau/transforms/CalendarSwap.ISO8601DT.html" 
title="class in org.apache.juneau.transforms">CalendarSwap.ISO8601DT.class</a>)
 public&nbsp;<a 
href="http://docs.oracle.com/javase/7/docs/api/java/util/Calendar.html?is-external=true";
 title="class or interface in java.util">Calendar</a>&nbsp;<a 
href="../../../../../src-html/org/apache/juneau/dto/atom/Entry.html#line.127">getPublished</a>()</pre>
 <div class="block">Returns the publish timestamp of this entry.</div>
 <dl>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/62afb533/content/site/apidocs/org/apache/juneau/dto/jsonschema/Schema.BooleanOrSchemaArraySwap.html
----------------------------------------------------------------------
diff --git 
a/content/site/apidocs/org/apache/juneau/dto/jsonschema/Schema.BooleanOrSchemaArraySwap.html
 
b/content/site/apidocs/org/apache/juneau/dto/jsonschema/Schema.BooleanOrSchemaArraySwap.html
index 66a9878..2da975f 100644
--- 
a/content/site/apidocs/org/apache/juneau/dto/jsonschema/Schema.BooleanOrSchemaArraySwap.html
+++ 
b/content/site/apidocs/org/apache/juneau/dto/jsonschema/Schema.BooleanOrSchemaArraySwap.html
@@ -201,7 +201,7 @@ extends <a 
href="../../../../../org/apache/juneau/transform/PojoSwap.html" title
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.apache.juneau.transform.<a 
href="../../../../../org/apache/juneau/transform/PojoSwap.html" title="class in 
org.apache.juneau.transform">PojoSwap</a></h3>
-<code><a 
href="../../../../../org/apache/juneau/transform/PojoSwap.html#getNormalClass--">getNormalClass</a>,
 <a 
href="../../../../../org/apache/juneau/transform/PojoSwap.html#getSwapClass--">getSwapClass</a>,
 <a 
href="../../../../../org/apache/juneau/transform/PojoSwap.html#getSwapClassMeta-org.apache.juneau.BeanContext-">getSwapClassMeta</a>,
 <a 
href="../../../../../org/apache/juneau/transform/PojoSwap.html#isNormalObject-java.lang.Object-">isNormalObject</a>,
 <a 
href="../../../../../org/apache/juneau/transform/PojoSwap.html#isSwappedObject-java.lang.Object-">isSwappedObject</a>,
 <a 
href="../../../../../org/apache/juneau/transform/PojoSwap.html#toString--">toString</a></code></li>
+<code><a 
href="../../../../../org/apache/juneau/transform/PojoSwap.html#forMediaTypes--">forMediaTypes</a>,
 <a 
href="../../../../../org/apache/juneau/transform/PojoSwap.html#forMediaTypes-org.apache.juneau.http.MediaType:A-">forMediaTypes</a>,
 <a 
href="../../../../../org/apache/juneau/transform/PojoSwap.html#getNormalClass--">getNormalClass</a>,
 <a 
href="../../../../../org/apache/juneau/transform/PojoSwap.html#getSwapClass--">getSwapClass</a>,
 <a 
href="../../../../../org/apache/juneau/transform/PojoSwap.html#getSwapClassMeta-org.apache.juneau.BeanSession-">getSwapClassMeta</a>,
 <a 
href="../../../../../org/apache/juneau/transform/PojoSwap.html#isNormalObject-java.lang.Object-">isNormalObject</a>,
 <a 
href="../../../../../org/apache/juneau/transform/PojoSwap.html#isSwappedObject-java.lang.Object-">isSwappedObject</a>,
 <a 
href="../../../../../org/apache/juneau/transform/PojoSwap.html#match-org.apache.juneau.BeanSession-">match</a>,
 <a href="../../../../../org/apache/juneau/transform/Poj
 oSwap.html#swap-org.apache.juneau.BeanSession-T-java.lang.String-">swap</a>, 
<a 
href="../../../../../org/apache/juneau/transform/PojoSwap.html#toString--">toString</a>,
 <a 
href="../../../../../org/apache/juneau/transform/PojoSwap.html#unswap-org.apache.juneau.BeanSession-S-org.apache.juneau.ClassMeta-java.lang.String-">unswap</a>,
 <a 
href="../../../../../org/apache/juneau/transform/PojoSwap.html#withTemplate--">withTemplate</a>,
 <a 
href="../../../../../org/apache/juneau/transform/PojoSwap.html#withTemplate-java.lang.String-">withTemplate</a></code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/62afb533/content/site/apidocs/org/apache/juneau/dto/jsonschema/Schema.BooleanOrSchemaSwap.html
----------------------------------------------------------------------
diff --git 
a/content/site/apidocs/org/apache/juneau/dto/jsonschema/Schema.BooleanOrSchemaSwap.html
 
b/content/site/apidocs/org/apache/juneau/dto/jsonschema/Schema.BooleanOrSchemaSwap.html
index 125127f..1d3650d 100644
--- 
a/content/site/apidocs/org/apache/juneau/dto/jsonschema/Schema.BooleanOrSchemaSwap.html
+++ 
b/content/site/apidocs/org/apache/juneau/dto/jsonschema/Schema.BooleanOrSchemaSwap.html
@@ -201,7 +201,7 @@ extends <a 
href="../../../../../org/apache/juneau/transform/PojoSwap.html" title
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.apache.juneau.transform.<a 
href="../../../../../org/apache/juneau/transform/PojoSwap.html" title="class in 
org.apache.juneau.transform">PojoSwap</a></h3>
-<code><a 
href="../../../../../org/apache/juneau/transform/PojoSwap.html#getNormalClass--">getNormalClass</a>,
 <a 
href="../../../../../org/apache/juneau/transform/PojoSwap.html#getSwapClass--">getSwapClass</a>,
 <a 
href="../../../../../org/apache/juneau/transform/PojoSwap.html#getSwapClassMeta-org.apache.juneau.BeanContext-">getSwapClassMeta</a>,
 <a 
href="../../../../../org/apache/juneau/transform/PojoSwap.html#isNormalObject-java.lang.Object-">isNormalObject</a>,
 <a 
href="../../../../../org/apache/juneau/transform/PojoSwap.html#isSwappedObject-java.lang.Object-">isSwappedObject</a>,
 <a 
href="../../../../../org/apache/juneau/transform/PojoSwap.html#toString--">toString</a></code></li>
+<code><a 
href="../../../../../org/apache/juneau/transform/PojoSwap.html#forMediaTypes--">forMediaTypes</a>,
 <a 
href="../../../../../org/apache/juneau/transform/PojoSwap.html#forMediaTypes-org.apache.juneau.http.MediaType:A-">forMediaTypes</a>,
 <a 
href="../../../../../org/apache/juneau/transform/PojoSwap.html#getNormalClass--">getNormalClass</a>,
 <a 
href="../../../../../org/apache/juneau/transform/PojoSwap.html#getSwapClass--">getSwapClass</a>,
 <a 
href="../../../../../org/apache/juneau/transform/PojoSwap.html#getSwapClassMeta-org.apache.juneau.BeanSession-">getSwapClassMeta</a>,
 <a 
href="../../../../../org/apache/juneau/transform/PojoSwap.html#isNormalObject-java.lang.Object-">isNormalObject</a>,
 <a 
href="../../../../../org/apache/juneau/transform/PojoSwap.html#isSwappedObject-java.lang.Object-">isSwappedObject</a>,
 <a 
href="../../../../../org/apache/juneau/transform/PojoSwap.html#match-org.apache.juneau.BeanSession-">match</a>,
 <a href="../../../../../org/apache/juneau/transform/Poj
 oSwap.html#swap-org.apache.juneau.BeanSession-T-java.lang.String-">swap</a>, 
<a 
href="../../../../../org/apache/juneau/transform/PojoSwap.html#toString--">toString</a>,
 <a 
href="../../../../../org/apache/juneau/transform/PojoSwap.html#unswap-org.apache.juneau.BeanSession-S-org.apache.juneau.ClassMeta-java.lang.String-">unswap</a>,
 <a 
href="../../../../../org/apache/juneau/transform/PojoSwap.html#withTemplate--">withTemplate</a>,
 <a 
href="../../../../../org/apache/juneau/transform/PojoSwap.html#withTemplate-java.lang.String-">withTemplate</a></code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/62afb533/content/site/apidocs/org/apache/juneau/dto/jsonschema/Schema.JsonTypeOrJsonTypeArraySwap.html
----------------------------------------------------------------------
diff --git 
a/content/site/apidocs/org/apache/juneau/dto/jsonschema/Schema.JsonTypeOrJsonTypeArraySwap.html
 
b/content/site/apidocs/org/apache/juneau/dto/jsonschema/Schema.JsonTypeOrJsonTypeArraySwap.html
index 6b2eb07..e3b5504 100644
--- 
a/content/site/apidocs/org/apache/juneau/dto/jsonschema/Schema.JsonTypeOrJsonTypeArraySwap.html
+++ 
b/content/site/apidocs/org/apache/juneau/dto/jsonschema/Schema.JsonTypeOrJsonTypeArraySwap.html
@@ -201,7 +201,7 @@ extends <a 
href="../../../../../org/apache/juneau/transform/PojoSwap.html" title
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.apache.juneau.transform.<a 
href="../../../../../org/apache/juneau/transform/PojoSwap.html" title="class in 
org.apache.juneau.transform">PojoSwap</a></h3>
-<code><a 
href="../../../../../org/apache/juneau/transform/PojoSwap.html#getNormalClass--">getNormalClass</a>,
 <a 
href="../../../../../org/apache/juneau/transform/PojoSwap.html#getSwapClass--">getSwapClass</a>,
 <a 
href="../../../../../org/apache/juneau/transform/PojoSwap.html#getSwapClassMeta-org.apache.juneau.BeanContext-">getSwapClassMeta</a>,
 <a 
href="../../../../../org/apache/juneau/transform/PojoSwap.html#isNormalObject-java.lang.Object-">isNormalObject</a>,
 <a 
href="../../../../../org/apache/juneau/transform/PojoSwap.html#isSwappedObject-java.lang.Object-">isSwappedObject</a>,
 <a 
href="../../../../../org/apache/juneau/transform/PojoSwap.html#toString--">toString</a></code></li>
+<code><a 
href="../../../../../org/apache/juneau/transform/PojoSwap.html#forMediaTypes--">forMediaTypes</a>,
 <a 
href="../../../../../org/apache/juneau/transform/PojoSwap.html#forMediaTypes-org.apache.juneau.http.MediaType:A-">forMediaTypes</a>,
 <a 
href="../../../../../org/apache/juneau/transform/PojoSwap.html#getNormalClass--">getNormalClass</a>,
 <a 
href="../../../../../org/apache/juneau/transform/PojoSwap.html#getSwapClass--">getSwapClass</a>,
 <a 
href="../../../../../org/apache/juneau/transform/PojoSwap.html#getSwapClassMeta-org.apache.juneau.BeanSession-">getSwapClassMeta</a>,
 <a 
href="../../../../../org/apache/juneau/transform/PojoSwap.html#isNormalObject-java.lang.Object-">isNormalObject</a>,
 <a 
href="../../../../../org/apache/juneau/transform/PojoSwap.html#isSwappedObject-java.lang.Object-">isSwappedObject</a>,
 <a 
href="../../../../../org/apache/juneau/transform/PojoSwap.html#match-org.apache.juneau.BeanSession-">match</a>,
 <a href="../../../../../org/apache/juneau/transform/Poj
 oSwap.html#swap-org.apache.juneau.BeanSession-T-java.lang.String-">swap</a>, 
<a 
href="../../../../../org/apache/juneau/transform/PojoSwap.html#toString--">toString</a>,
 <a 
href="../../../../../org/apache/juneau/transform/PojoSwap.html#unswap-org.apache.juneau.BeanSession-S-org.apache.juneau.ClassMeta-java.lang.String-">unswap</a>,
 <a 
href="../../../../../org/apache/juneau/transform/PojoSwap.html#withTemplate--">withTemplate</a>,
 <a 
href="../../../../../org/apache/juneau/transform/PojoSwap.html#withTemplate-java.lang.String-">withTemplate</a></code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/62afb533/content/site/apidocs/org/apache/juneau/dto/jsonschema/Schema.SchemaOrSchemaArraySwap.html
----------------------------------------------------------------------
diff --git 
a/content/site/apidocs/org/apache/juneau/dto/jsonschema/Schema.SchemaOrSchemaArraySwap.html
 
b/content/site/apidocs/org/apache/juneau/dto/jsonschema/Schema.SchemaOrSchemaArraySwap.html
index 7978e52..5a5a2b4 100644
--- 
a/content/site/apidocs/org/apache/juneau/dto/jsonschema/Schema.SchemaOrSchemaArraySwap.html
+++ 
b/content/site/apidocs/org/apache/juneau/dto/jsonschema/Schema.SchemaOrSchemaArraySwap.html
@@ -201,7 +201,7 @@ extends <a 
href="../../../../../org/apache/juneau/transform/PojoSwap.html" title
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.apache.juneau.transform.<a 
href="../../../../../org/apache/juneau/transform/PojoSwap.html" title="class in 
org.apache.juneau.transform">PojoSwap</a></h3>
-<code><a 
href="../../../../../org/apache/juneau/transform/PojoSwap.html#getNormalClass--">getNormalClass</a>,
 <a 
href="../../../../../org/apache/juneau/transform/PojoSwap.html#getSwapClass--">getSwapClass</a>,
 <a 
href="../../../../../org/apache/juneau/transform/PojoSwap.html#getSwapClassMeta-org.apache.juneau.BeanContext-">getSwapClassMeta</a>,
 <a 
href="../../../../../org/apache/juneau/transform/PojoSwap.html#isNormalObject-java.lang.Object-">isNormalObject</a>,
 <a 
href="../../../../../org/apache/juneau/transform/PojoSwap.html#isSwappedObject-java.lang.Object-">isSwappedObject</a>,
 <a 
href="../../../../../org/apache/juneau/transform/PojoSwap.html#toString--">toString</a></code></li>
+<code><a 
href="../../../../../org/apache/juneau/transform/PojoSwap.html#forMediaTypes--">forMediaTypes</a>,
 <a 
href="../../../../../org/apache/juneau/transform/PojoSwap.html#forMediaTypes-org.apache.juneau.http.MediaType:A-">forMediaTypes</a>,
 <a 
href="../../../../../org/apache/juneau/transform/PojoSwap.html#getNormalClass--">getNormalClass</a>,
 <a 
href="../../../../../org/apache/juneau/transform/PojoSwap.html#getSwapClass--">getSwapClass</a>,
 <a 
href="../../../../../org/apache/juneau/transform/PojoSwap.html#getSwapClassMeta-org.apache.juneau.BeanSession-">getSwapClassMeta</a>,
 <a 
href="../../../../../org/apache/juneau/transform/PojoSwap.html#isNormalObject-java.lang.Object-">isNormalObject</a>,
 <a 
href="../../../../../org/apache/juneau/transform/PojoSwap.html#isSwappedObject-java.lang.Object-">isSwappedObject</a>,
 <a 
href="../../../../../org/apache/juneau/transform/PojoSwap.html#match-org.apache.juneau.BeanSession-">match</a>,
 <a href="../../../../../org/apache/juneau/transform/Poj
 oSwap.html#swap-org.apache.juneau.BeanSession-T-java.lang.String-">swap</a>, 
<a 
href="../../../../../org/apache/juneau/transform/PojoSwap.html#toString--">toString</a>,
 <a 
href="../../../../../org/apache/juneau/transform/PojoSwap.html#unswap-org.apache.juneau.BeanSession-S-org.apache.juneau.ClassMeta-java.lang.String-">unswap</a>,
 <a 
href="../../../../../org/apache/juneau/transform/PojoSwap.html#withTemplate--">withTemplate</a>,
 <a 
href="../../../../../org/apache/juneau/transform/PojoSwap.html#withTemplate-java.lang.String-">withTemplate</a></code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/62afb533/content/site/apidocs/org/apache/juneau/dto/jsonschema/Schema.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/dto/jsonschema/Schema.html 
b/content/site/apidocs/org/apache/juneau/dto/jsonschema/Schema.html
index b2f96bb..af578fa 100644
--- a/content/site/apidocs/org/apache/juneau/dto/jsonschema/Schema.html
+++ b/content/site/apidocs/org/apache/juneau/dto/jsonschema/Schema.html
@@ -984,7 +984,7 @@ public&nbsp;<a 
href="../../../../../org/apache/juneau/dto/jsonschema/Schema.html
 <ul class="blockList">
 <li class="blockList">
 <h4>getType</h4>
-<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" 
title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a 
href="../../../../../org/apache/juneau/annotation/BeanProperty.html#swap--">swap</a>=<a
 
href="../../../../../org/apache/juneau/dto/jsonschema/Schema.JsonTypeOrJsonTypeArraySwap.html"
 title="class in 
org.apache.juneau.dto.jsonschema">Schema.JsonTypeOrJsonTypeArraySwap.class</a>)
+<pre><a href="../../../../../org/apache/juneau/annotation/Swap.html" 
title="annotation in org.apache.juneau.annotation">@Swap</a>(<a 
href="../../../../../org/apache/juneau/annotation/Swap.html#value--">value</a>=<a
 
href="../../../../../org/apache/juneau/dto/jsonschema/Schema.JsonTypeOrJsonTypeArraySwap.html"
 title="class in 
org.apache.juneau.dto.jsonschema">Schema.JsonTypeOrJsonTypeArraySwap.class</a>)
 public&nbsp;<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;<a 
href="../../../../../src-html/org/apache/juneau/dto/jsonschema/Schema.html#line.230">getType</a>()</pre>
 <div class="block">Bean property getter:  <property>type</property>.</div>
 <dl>
@@ -1314,7 +1314,7 @@ public&nbsp;<a 
href="../../../../../org/apache/juneau/dto/jsonschema/JsonTypeArr
 <ul class="blockList">
 <li class="blockList">
 <h4>getItems</h4>
-<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" 
title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a 
href="../../../../../org/apache/juneau/annotation/BeanProperty.html#swap--">swap</a>=<a
 
href="../../../../../org/apache/juneau/dto/jsonschema/Schema.SchemaOrSchemaArraySwap.html"
 title="class in 
org.apache.juneau.dto.jsonschema">Schema.SchemaOrSchemaArraySwap.class</a>)
+<pre><a href="../../../../../org/apache/juneau/annotation/Swap.html" 
title="annotation in org.apache.juneau.annotation">@Swap</a>(<a 
href="../../../../../org/apache/juneau/annotation/Swap.html#value--">value</a>=<a
 
href="../../../../../org/apache/juneau/dto/jsonschema/Schema.SchemaOrSchemaArraySwap.html"
 title="class in 
org.apache.juneau.dto.jsonschema">Schema.SchemaOrSchemaArraySwap.class</a>)
 public&nbsp;<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;<a 
href="../../../../../src-html/org/apache/juneau/dto/jsonschema/Schema.html#line.554">getItems</a>()</pre>
 <div class="block">Bean property getter:  <property>items</property>.</div>
 <dl>
@@ -1643,7 +1643,7 @@ public&nbsp;<a 
href="../../../../../org/apache/juneau/dto/jsonschema/SchemaArray
 <ul class="blockList">
 <li class="blockList">
 <h4>getAdditionalItems</h4>
-<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" 
title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a 
href="../../../../../org/apache/juneau/annotation/BeanProperty.html#swap--">swap</a>=<a
 
href="../../../../../org/apache/juneau/dto/jsonschema/Schema.BooleanOrSchemaArraySwap.html"
 title="class in 
org.apache.juneau.dto.jsonschema">Schema.BooleanOrSchemaArraySwap.class</a>)
+<pre><a href="../../../../../org/apache/juneau/annotation/Swap.html" 
title="annotation in org.apache.juneau.annotation">@Swap</a>(<a 
href="../../../../../org/apache/juneau/annotation/Swap.html#value--">value</a>=<a
 
href="../../../../../org/apache/juneau/dto/jsonschema/Schema.BooleanOrSchemaArraySwap.html"
 title="class in 
org.apache.juneau.dto.jsonschema">Schema.BooleanOrSchemaArraySwap.class</a>)
 public&nbsp;<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;<a 
href="../../../../../src-html/org/apache/juneau/dto/jsonschema/Schema.html#line.831">getAdditionalItems</a>()</pre>
 <div class="block">Bean property getter:  
<property>additionalItems</property>.</div>
 <dl>
@@ -1961,7 +1961,7 @@ public&nbsp;<a 
href="http://docs.oracle.com/javase/7/docs/api/java/util/List.htm
 <ul class="blockList">
 <li class="blockList">
 <h4>getAdditionalProperties</h4>
-<pre><a href="../../../../../org/apache/juneau/annotation/BeanProperty.html" 
title="annotation in org.apache.juneau.annotation">@BeanProperty</a>(<a 
href="../../../../../org/apache/juneau/annotation/BeanProperty.html#swap--">swap</a>=<a
 
href="../../../../../org/apache/juneau/dto/jsonschema/Schema.BooleanOrSchemaSwap.html"
 title="class in 
org.apache.juneau.dto.jsonschema">Schema.BooleanOrSchemaSwap.class</a>)
+<pre><a href="../../../../../org/apache/juneau/annotation/Swap.html" 
title="annotation in org.apache.juneau.annotation">@Swap</a>(<a 
href="../../../../../org/apache/juneau/annotation/Swap.html#value--">value</a>=<a
 
href="../../../../../org/apache/juneau/dto/jsonschema/Schema.BooleanOrSchemaSwap.html"
 title="class in 
org.apache.juneau.dto.jsonschema">Schema.BooleanOrSchemaSwap.class</a>)
 public&nbsp;<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;<a 
href="../../../../../src-html/org/apache/juneau/dto/jsonschema/Schema.html#line.1111">getAdditionalProperties</a>()</pre>
 <div class="block">Bean property getter:  
<property>additionalProperties</property>.</div>
 <dl>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/62afb533/content/site/apidocs/org/apache/juneau/html/HtmlParserBuilder.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/html/HtmlParserBuilder.html 
b/content/site/apidocs/org/apache/juneau/html/HtmlParserBuilder.html
index c28820e..88cdd41 100644
--- a/content/site/apidocs/org/apache/juneau/html/HtmlParserBuilder.html
+++ b/content/site/apidocs/org/apache/juneau/html/HtmlParserBuilder.html
@@ -2374,7 +2374,7 @@ extends <a 
href="../../../../org/apache/juneau/xml/XmlParserBuilder.html" title=
  There are two category of classes that can be passed in through this method:
  <ul>
    <li>Subclasses of <a 
href="../../../../org/apache/juneau/transform/PojoSwap.html" title="class in 
org.apache.juneau.transform"><code>PojoSwap</code></a>.
-   <li>Surrogate classes.  A shortcut for defining a <a 
href="../../../../org/apache/juneau/transform/SurrogateSwap.html" title="class 
in org.apache.juneau.transform"><code>SurrogateSwap</code></a>.
+   <li>Implementations of <a 
href="../../../../org/apache/juneau/transform/Surrogate.html" title="interface 
in org.apache.juneau.transform"><code>Surrogate</code></a>.
  </ul>
 
  <h5 class='section'>Notes:</h5>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/62afb533/content/site/apidocs/org/apache/juneau/html/HtmlSerializerBuilder.html
----------------------------------------------------------------------
diff --git 
a/content/site/apidocs/org/apache/juneau/html/HtmlSerializerBuilder.html 
b/content/site/apidocs/org/apache/juneau/html/HtmlSerializerBuilder.html
index 0aa6a26..a504054 100644
--- a/content/site/apidocs/org/apache/juneau/html/HtmlSerializerBuilder.html
+++ b/content/site/apidocs/org/apache/juneau/html/HtmlSerializerBuilder.html
@@ -3322,7 +3322,7 @@ extends <a 
href="../../../../org/apache/juneau/xml/XmlSerializerBuilder.html" ti
  There are two category of classes that can be passed in through this method:
  <ul>
    <li>Subclasses of <a 
href="../../../../org/apache/juneau/transform/PojoSwap.html" title="class in 
org.apache.juneau.transform"><code>PojoSwap</code></a>.
-   <li>Surrogate classes.  A shortcut for defining a <a 
href="../../../../org/apache/juneau/transform/SurrogateSwap.html" title="class 
in org.apache.juneau.transform"><code>SurrogateSwap</code></a>.
+   <li>Implementations of <a 
href="../../../../org/apache/juneau/transform/Surrogate.html" title="interface 
in org.apache.juneau.transform"><code>Surrogate</code></a>.
  </ul>
 
  <h5 class='section'>Notes:</h5>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/62afb533/content/site/apidocs/org/apache/juneau/http/Accept.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/http/Accept.html 
b/content/site/apidocs/org/apache/juneau/http/Accept.html
index e207fe1..7e903f1 100644
--- a/content/site/apidocs/org/apache/juneau/http/Accept.html
+++ b/content/site/apidocs/org/apache/juneau/http/Accept.html
@@ -372,7 +372,7 @@ extends <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>hasSubtypePart</h4>
-<pre>public&nbsp;boolean&nbsp;<a 
href="../../../../src-html/org/apache/juneau/http/Accept.html#line.245">hasSubtypePart</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;part)</pre>
+<pre>public&nbsp;boolean&nbsp;<a 
href="../../../../src-html/org/apache/juneau/http/Accept.html#line.246">hasSubtypePart</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;part)</pre>
 <div class="block">Convenience method for searching through all of the 
subtypes of all the media ranges in this header for the
  presence of a subtype fragment.
 
@@ -393,7 +393,7 @@ extends <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockListLast">
 <li class="blockList">
 <h4>toString</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/http/Accept.html#line.255">toString</a>()</pre>
+<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/http/Accept.html#line.256">toString</a>()</pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
 <dd><code><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></code>&nbsp;in 
class&nbsp;<code><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></code></dd>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/62afb533/content/site/apidocs/org/apache/juneau/http/ContentType.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/http/ContentType.html 
b/content/site/apidocs/org/apache/juneau/http/ContentType.html
index 68507eb..d18866d 100644
--- a/content/site/apidocs/org/apache/juneau/http/ContentType.html
+++ b/content/site/apidocs/org/apache/juneau/http/ContentType.html
@@ -203,7 +203,7 @@ extends <a 
href="../../../../org/apache/juneau/http/MediaType.html" title="class
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.apache.juneau.http.<a 
href="../../../../org/apache/juneau/http/MediaType.html" title="class in 
org.apache.juneau.http">MediaType</a></h3>
-<code><a 
href="../../../../org/apache/juneau/http/MediaType.html#compareTo-org.apache.juneau.http.MediaType-">compareTo</a>,
 <a 
href="../../../../org/apache/juneau/http/MediaType.html#equals-java.lang.Object-">equals</a>,
 <a 
href="../../../../org/apache/juneau/http/MediaType.html#getParameters--">getParameters</a>,
 <a 
href="../../../../org/apache/juneau/http/MediaType.html#getSubType--">getSubType</a>,
 <a 
href="../../../../org/apache/juneau/http/MediaType.html#getSubTypes--">getSubTypes</a>,
 <a 
href="../../../../org/apache/juneau/http/MediaType.html#getType--">getType</a>, 
<a 
href="../../../../org/apache/juneau/http/MediaType.html#hashCode--">hashCode</a>,
 <a 
href="../../../../org/apache/juneau/http/MediaType.html#hasSubType-java.lang.String-">hasSubType</a>,
 <a 
href="../../../../org/apache/juneau/http/MediaType.html#match-org.apache.juneau.http.MediaType-">match</a>,
 <a 
href="../../../../org/apache/juneau/http/MediaType.html#matches-org.apache.juneau.http.MediaType-">matches</a>,
 <
 a 
href="../../../../org/apache/juneau/http/MediaType.html#toString--">toString</a></code></li>
+<code><a 
href="../../../../org/apache/juneau/http/MediaType.html#compareTo-org.apache.juneau.http.MediaType-">compareTo</a>,
 <a 
href="../../../../org/apache/juneau/http/MediaType.html#equals-java.lang.Object-">equals</a>,
 <a 
href="../../../../org/apache/juneau/http/MediaType.html#forStrings-java.lang.String...-">forStrings</a>,
 <a 
href="../../../../org/apache/juneau/http/MediaType.html#getParameters--">getParameters</a>,
 <a 
href="../../../../org/apache/juneau/http/MediaType.html#getSubType--">getSubType</a>,
 <a 
href="../../../../org/apache/juneau/http/MediaType.html#getSubTypes--">getSubTypes</a>,
 <a 
href="../../../../org/apache/juneau/http/MediaType.html#getType--">getType</a>, 
<a 
href="../../../../org/apache/juneau/http/MediaType.html#hashCode--">hashCode</a>,
 <a 
href="../../../../org/apache/juneau/http/MediaType.html#hasSubType-java.lang.String-">hasSubType</a>,
 <a 
href="../../../../org/apache/juneau/http/MediaType.html#isMeta--">isMeta</a>, 
<a href="../../../../org/apache/juneau
 
/http/MediaType.html#match-org.apache.juneau.http.MediaType-boolean-">match</a>,
 <a 
href="../../../../org/apache/juneau/http/MediaType.html#toString--">toString</a></code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">

Reply via email to