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 2018/01/11 01:16:31 UTC
[41/51] [partial] juneau-website git commit: Update javadocs,
add google analytics scripts.
http://git-wip-us.apache.org/repos/asf/juneau-website/blob/b821a97a/content/site/apidocs/org/apache/juneau/annotation/BeanConstructor.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/annotation/BeanConstructor.html b/content/site/apidocs/org/apache/juneau/annotation/BeanConstructor.html
index 5ba6e60..d27fed3 100644
--- a/content/site/apidocs/org/apache/juneau/annotation/BeanConstructor.html
+++ b/content/site/apidocs/org/apache/juneau/annotation/BeanConstructor.html
@@ -96,7 +96,7 @@
<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#CONSTRUCTOR" title="class or interface in java.lang.annotation">CONSTRUCTOR</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/BeanConstructor.html#line.82">BeanConstructor</a></pre>
+public @interface <a href="../../../../src-html/org/apache/juneau/annotation/BeanConstructor.html#line.54">BeanConstructor</a></pre>
<div class="block">Maps constructor arguments to property names on beans with read-only properties.
<p>
@@ -106,36 +106,6 @@ public @interface <a href="../../../../src-html/org/apache/juneau/annotation/Bea
are available at runtime.
<p>
- The definition of a read-only bean is a bean with properties with only getters, like shown below...
- <p class='bcode'>
- <jk>public class</jk> Person {
- <jk>private final</jk> String <jf>name</jf>;
- <jk>private final int</jk> <jf>age</jf>;
-
- <ja>@BeanConstructor</ja>(properties=<js>"name,age"</js>})
- <jk>public</jk> Person(String name, <jk>int</jk> age) {
- <jk>this</jk>.<jf>name</jf> = name;
- <jk>this</jk>.<jf>age</jf> = age;
- }
-
- <jc>// Read only properties.</jc>
-
- <jk>public</jk> String getName() {
- <jk>return</jk> <jf>name</jf>;
- }
-
- <jk>public int</jk> getAge() {
- <jk>return</jk> <jf>age</jf>;
- }
- }
-
- String json = <js>"{name:'John Smith',age:45}"</js>;
- Person p = JsonParser.<jsf>DEFAULT</jsf>.parse(json);
- String name = p.getName(); <jc>// "John Smith"</jc>
- <jk>int</jk> age = p.getAge(); <jc>// 45</jc>
- </p>
-
- <p>
This annotation can only be applied to constructors and can only be applied to one constructor per class.
<p>
@@ -149,8 +119,10 @@ public @interface <a href="../../../../src-html/org/apache/juneau/annotation/Bea
will result in a <a href="../../../../org/apache/juneau/BeanRuntimeException.html" title="class in org.apache.juneau"><code>BeanRuntimeException</code></a> being thrown.
Multiple calls to <a href="../../../../org/apache/juneau/BeanMap.html#getBean--"><code>BeanMap.getBean()</code></a> will return the same bean instance.
- <p>
- Beans can be defined with a combination of read-only and read-write properties.</div>
+ <h6 class='topic'>Documentation</h6>
+ <ul>
+ <li><a class="doclink" href="../../../../overview-summary.html#juneau-marshall.BeanConstructorAnnotation">Overview > @BeanConstructor Annotation</a>
+ </ul></div>
</li>
</ul>
</div>
@@ -196,7 +168,7 @@ public @interface <a href="../../../../src-html/org/apache/juneau/annotation/Bea
<ul class="blockListLast">
<li class="blockList">
<h4>properties</h4>
-<pre>public abstract <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> <a href="../../../../src-html/org/apache/juneau/annotation/BeanConstructor.html#line.90">properties</a></pre>
+<pre>public abstract <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> <a href="../../../../src-html/org/apache/juneau/annotation/BeanConstructor.html#line.62">properties</a></pre>
<div class="block">The names of the properties of the constructor arguments.
<p>
@@ -273,6 +245,6 @@ public @interface <a href="../../../../src-html/org/apache/juneau/annotation/Bea
<!-- -->
</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>
+<p class="legalCopy"><small>Copyright © 2018 <a href="http://www.apache.org/">Apache</a>. All rights reserved.</small></p>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/juneau-website/blob/b821a97a/content/site/apidocs/org/apache/juneau/annotation/BeanIgnore.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/annotation/BeanIgnore.html b/content/site/apidocs/org/apache/juneau/annotation/BeanIgnore.html
index a88039c..fd959e9 100644
--- a/content/site/apidocs/org/apache/juneau/annotation/BeanIgnore.html
+++ b/content/site/apidocs/org/apache/juneau/annotation/BeanIgnore.html
@@ -43,7 +43,7 @@
<div class="subNav">
<ul class="navList">
<li><a href="../../../../org/apache/juneau/annotation/BeanConstructor.html" title="annotation in org.apache.juneau.annotation"><span class="typeNameLink">Prev Class</span></a></li>
-<li><a href="../../../../org/apache/juneau/annotation/BeanParam.html" title="annotation in org.apache.juneau.annotation"><span class="typeNameLink">Next Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation"><span class="typeNameLink">Next Class</span></a></li>
</ul>
<ul class="navList">
<li><a href="../../../../index.html?org/apache/juneau/annotation/BeanIgnore.html" target="_top">Frames</a></li>
@@ -96,7 +96,7 @@
<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#FIELD" title="class or interface in java.lang.annotation">FIELD</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/ElementType.html?is-external=true#METHOD" title="class or interface in java.lang.annotation">METHOD</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/BeanIgnore.html#line.38">BeanIgnore</a></pre>
+public @interface <a href="../../../../src-html/org/apache/juneau/annotation/BeanIgnore.html#line.43">BeanIgnore</a></pre>
<div class="block">Ignore classes, fields, and methods from being interpreted as bean or bean components.
<p>
@@ -108,7 +108,12 @@ public @interface <a href="../../../../src-html/org/apache/juneau/annotation/Bea
Applies to fields that should not be interpreted as bean property fields.
<p>
- Applies to getters or setters that should not be interpreted as bean property getters or setters.</div>
+ Applies to getters or setters that should not be interpreted as bean property getters or setters.
+
+ <h6 class='topic'>Documentation</h6>
+ <ul>
+ <li><a class="doclink" href="../../../../overview-summary.html#juneau-marshall.BeanIgnoreAnnotation">Overview > @BeanIgnore Annotation</a>
+ </ul></div>
</li>
</ul>
</div>
@@ -135,7 +140,7 @@ public @interface <a href="../../../../src-html/org/apache/juneau/annotation/Bea
<div class="subNav">
<ul class="navList">
<li><a href="../../../../org/apache/juneau/annotation/BeanConstructor.html" title="annotation in org.apache.juneau.annotation"><span class="typeNameLink">Prev Class</span></a></li>
-<li><a href="../../../../org/apache/juneau/annotation/BeanParam.html" title="annotation in org.apache.juneau.annotation"><span class="typeNameLink">Next Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation"><span class="typeNameLink">Next Class</span></a></li>
</ul>
<ul class="navList">
<li><a href="../../../../index.html?org/apache/juneau/annotation/BeanIgnore.html" target="_top">Frames</a></li>
@@ -173,6 +178,6 @@ public @interface <a href="../../../../src-html/org/apache/juneau/annotation/Bea
<!-- -->
</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>
+<p class="legalCopy"><small>Copyright © 2018 <a href="http://www.apache.org/">Apache</a>. All rights reserved.</small></p>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/juneau-website/blob/b821a97a/content/site/apidocs/org/apache/juneau/annotation/BeanParam.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/annotation/BeanParam.html b/content/site/apidocs/org/apache/juneau/annotation/BeanParam.html
deleted file mode 100644
index 52cb547..0000000
--- a/content/site/apidocs/org/apache/juneau/annotation/BeanParam.html
+++ /dev/null
@@ -1,218 +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>BeanParam (Apache Juneau 7.0.2-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="BeanParam (Apache Juneau 7.0.2-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/BeanIgnore.html" title="annotation in org.apache.juneau.annotation"><span class="typeNameLink">Prev Class</span></a></li>
-<li><a href="../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation"><span class="typeNameLink">Next Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../../../../index.html?org/apache/juneau/annotation/BeanParam.html" target="_top">Frames</a></li>
-<li><a href="BeanParam.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>Field | </li>
-<li>Required | </li>
-<li><a href="#annotation.type.optional.element.summary">Optional</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail: </li>
-<li>Field | </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 BeanParam" class="title">Annotation Type BeanParam</h2>
-</div>
-<div class="contentContainer">
-<div class="description">
-<ul class="blockList">
-<li class="blockList">
-<hr>
-<br>
-<pre>public @interface <a href="../../../../src-html/org/apache/juneau/annotation/BeanParam.html#line.19">BeanParam</a></pre>
-<div class="block">Future support for defining bean properties on constructor args.</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"> </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/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/annotation/BeanParam.html#value--">value</a></span></code>
-<div class="block">TODO</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="value--">
-<!-- -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>value</h4>
-<pre>public abstract <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> <a href="../../../../src-html/org/apache/juneau/annotation/BeanParam.html#line.24">value</a></pre>
-<div class="block">TODO</div>
-<dl>
-<dt>Default:</dt>
-<dd>""</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/BeanIgnore.html" title="annotation in org.apache.juneau.annotation"><span class="typeNameLink">Prev Class</span></a></li>
-<li><a href="../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation"><span class="typeNameLink">Next Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../../../../index.html?org/apache/juneau/annotation/BeanParam.html" target="_top">Frames</a></li>
-<li><a href="BeanParam.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>Field | </li>
-<li>Required | </li>
-<li><a href="#annotation.type.optional.element.summary">Optional</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail: </li>
-<li>Field | </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 © 2017 <a href="http://www.apache.org/">Apache</a>. All rights reserved.</small></p>
-</body>
-</html>
http://git-wip-us.apache.org/repos/asf/juneau-website/blob/b821a97a/content/site/apidocs/org/apache/juneau/annotation/BeanProperty.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/annotation/BeanProperty.html b/content/site/apidocs/org/apache/juneau/annotation/BeanProperty.html
index 212f404..ce17b10 100644
--- a/content/site/apidocs/org/apache/juneau/annotation/BeanProperty.html
+++ b/content/site/apidocs/org/apache/juneau/annotation/BeanProperty.html
@@ -42,7 +42,7 @@
</div>
<div class="subNav">
<ul class="navList">
-<li><a href="../../../../org/apache/juneau/annotation/BeanParam.html" title="annotation in org.apache.juneau.annotation"><span class="typeNameLink">Prev Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/annotation/BeanIgnore.html" title="annotation in org.apache.juneau.annotation"><span class="typeNameLink">Prev Class</span></a></li>
<li><a href="../../../../org/apache/juneau/annotation/NameProperty.html" title="annotation in org.apache.juneau.annotation"><span class="typeNameLink">Next Class</span></a></li>
</ul>
<ul class="navList">
@@ -96,36 +96,16 @@
<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#FIELD" title="class or interface in java.lang.annotation">FIELD</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/ElementType.html?is-external=true#METHOD" title="class or interface in java.lang.annotation">METHOD</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/BeanProperty.html#line.57">BeanProperty</a></pre>
+public @interface <a href="../../../../src-html/org/apache/juneau/annotation/BeanProperty.html#line.37">BeanProperty</a></pre>
<div class="block">Used tailor how bean properties get interpreted by the framework.
<p>
- Can be used to do the following:
- <ul class='spaced-list'>
- <li>
- Override the name of a property.
- <li>
- Identify a getter or setter with a non-standard naming convention.
- <li>
- Identify a specific subclass for a property with a general class type.
- <li>
- Identify class types of elements in properties of type <code>Collection</code> or <code>Map</code>.
- <li>
- Hide properties during serialization.
- <li>
- Associate transforms with bean property values, such as a POJO swap to convert a <code>Calendar</code> field
- to a string.
- <li>
- Override the list of properties during serialization on child elements of a property of type
- <code>Collection</code> or <code>Map</code>.
- <li>
- Identify a property as the URL for a bean.
- <li>
- Identify a property as the ID for a bean.
- </ul>
-
- <p>
- This annotation is applied to public fields and public getter/setter methods of beans.</div>
+ This annotation is applied to public fields and public getter/setter methods of beans.
+
+ <h6 class='topic'>Documentation</h6>
+ <ul>
+ <li><a class="doclink" href="../../../../overview-summary.html#juneau-marshall.BeanPropertyAnnotation">Overview > @BeanProperty Annotation</a>
+ </ul></div>
</li>
</ul>
</div>
@@ -147,7 +127,7 @@ public @interface <a href="../../../../src-html/org/apache/juneau/annotation/Bea
<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><?>[]</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/juneau/annotation/BeanProperty.html#beanDictionary--">beanDictionary</a></span></code>
-<div class="block">The list of classes that make up the bean dictionary for this bean property.</div>
+<div class="block">Bean dictionary.</div>
</td>
</tr>
<tr class="rowColor">
@@ -208,7 +188,7 @@ public @interface <a href="../../../../src-html/org/apache/juneau/annotation/Bea
<ul class="blockList">
<li class="blockList">
<h4>name</h4>
-<pre>public abstract <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> <a href="../../../../src-html/org/apache/juneau/annotation/BeanProperty.html#line.148">name</a></pre>
+<pre>public abstract <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> <a href="../../../../src-html/org/apache/juneau/annotation/BeanProperty.html#line.128">name</a></pre>
<div class="block">Identifies the name of the property.
<p>
@@ -311,7 +291,7 @@ public @interface <a href="../../../../src-html/org/apache/juneau/annotation/Bea
<ul class="blockList">
<li class="blockList">
<h4>value</h4>
-<pre>public abstract <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> <a href="../../../../src-html/org/apache/juneau/annotation/BeanProperty.html#line.162">value</a></pre>
+<pre>public abstract <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> <a href="../../../../src-html/org/apache/juneau/annotation/BeanProperty.html#line.142">value</a></pre>
<div class="block">A synonym for <a href="../../../../org/apache/juneau/annotation/BeanProperty.html#name--"><code>name()</code></a>.
<p>
@@ -337,7 +317,7 @@ public @interface <a href="../../../../src-html/org/apache/juneau/annotation/Bea
<ul class="blockList">
<li class="blockList">
<h4>type</h4>
-<pre>public abstract <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><?> <a href="../../../../src-html/org/apache/juneau/annotation/BeanProperty.html#line.186">type</a></pre>
+<pre>public abstract <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><?> <a href="../../../../src-html/org/apache/juneau/annotation/BeanProperty.html#line.166">type</a></pre>
<div class="block">Identifies a specialized class type for the property.
<p>
@@ -373,7 +353,7 @@ public @interface <a href="../../../../src-html/org/apache/juneau/annotation/Bea
<ul class="blockList">
<li class="blockList">
<h4>params</h4>
-<pre>public abstract <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><?>[] <a href="../../../../src-html/org/apache/juneau/annotation/BeanProperty.html#line.202">params</a></pre>
+<pre>public abstract <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><?>[] <a href="../../../../src-html/org/apache/juneau/annotation/BeanProperty.html#line.182">params</a></pre>
<div class="block">For bean properties of maps and collections, this annotation can be used to identify the class types of the
contents of the bean property object when the generic parameter types are interfaces or abstract classes.
@@ -401,7 +381,7 @@ public @interface <a href="../../../../src-html/org/apache/juneau/annotation/Bea
<ul class="blockList">
<li class="blockList">
<h4>properties</h4>
-<pre>public abstract <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> <a href="../../../../src-html/org/apache/juneau/annotation/BeanProperty.html#line.234">properties</a></pre>
+<pre>public abstract <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> <a href="../../../../src-html/org/apache/juneau/annotation/BeanProperty.html#line.214">properties</a></pre>
<div class="block">Used to limit which child properties are rendered by the serializers.
<p>
@@ -445,22 +425,15 @@ public @interface <a href="../../../../src-html/org/apache/juneau/annotation/Bea
<ul class="blockList">
<li class="blockList">
<h4>beanDictionary</h4>
-<pre>public abstract <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><?>[] <a href="../../../../src-html/org/apache/juneau/annotation/BeanProperty.html#line.254">beanDictionary</a></pre>
-<div class="block">The list of classes that make up the bean dictionary for this bean property.
-
- <p>
- The dictionary is a name/class mapping used to find class types during parsing when they cannot be inferred
- through reflection.
- The names are defined through the <a href="../../../../org/apache/juneau/annotation/Bean.html#typeName--"><code>Bean.typeName()</code></a> annotation defined on the bean class.
+<pre>public abstract <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><?>[] <a href="../../../../src-html/org/apache/juneau/annotation/BeanProperty.html#line.227">beanDictionary</a></pre>
+<div class="block">Bean dictionary.
<p>
- This list can consist of the following class types:
+ The list of classes that make up the bean dictionary this bean property.
+
+ <h5 class='section'>See Also:</h5>
<ul>
- <li>Any bean class that specifies a value for <a href="../../../../org/apache/juneau/annotation/Bean.html#typeName--"><code>@Bean.name()</code></a>;
- <li>Any subclass of <a href="../../../../org/apache/juneau/BeanDictionaryList.html" title="class in org.apache.juneau"><code>BeanDictionaryList</code></a> that defines an entire set of mappings.
- Note that the subclass MUST implement a no-arg constructor so that it can be instantiated.
- <li>Any subclass of <a href="../../../../org/apache/juneau/BeanDictionaryMap.html" title="class in org.apache.juneau"><code>BeanDictionaryMap</code></a> that defines an entire set of mappings.
- Note that the subclass MUST implement a no-arg constructor so that it can be instantiated.
+ <li class='jf'><a href="../../../../org/apache/juneau/BeanContext.html#BEAN_beanDictionary"><code>BeanContext.BEAN_beanDictionary</code></a>
</ul></div>
<dl>
<dt>Default:</dt>
@@ -477,7 +450,7 @@ public @interface <a href="../../../../src-html/org/apache/juneau/annotation/Bea
<ul class="blockListLast">
<li class="blockList">
<h4>format</h4>
-<pre>public abstract <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> <a href="../../../../src-html/org/apache/juneau/annotation/BeanProperty.html#line.272">format</a></pre>
+<pre>public abstract <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> <a href="../../../../src-html/org/apache/juneau/annotation/BeanProperty.html#line.245">format</a></pre>
<div class="block">Specifies a String format for converting the bean property value to a formatted string.
<p>
@@ -525,7 +498,7 @@ public @interface <a href="../../../../src-html/org/apache/juneau/annotation/Bea
</div>
<div class="subNav">
<ul class="navList">
-<li><a href="../../../../org/apache/juneau/annotation/BeanParam.html" title="annotation in org.apache.juneau.annotation"><span class="typeNameLink">Prev Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/annotation/BeanIgnore.html" title="annotation in org.apache.juneau.annotation"><span class="typeNameLink">Prev Class</span></a></li>
<li><a href="../../../../org/apache/juneau/annotation/NameProperty.html" title="annotation in org.apache.juneau.annotation"><span class="typeNameLink">Next Class</span></a></li>
</ul>
<ul class="navList">
@@ -564,6 +537,6 @@ public @interface <a href="../../../../src-html/org/apache/juneau/annotation/Bea
<!-- -->
</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>
+<p class="legalCopy"><small>Copyright © 2018 <a href="http://www.apache.org/">Apache</a>. All rights reserved.</small></p>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/juneau-website/blob/b821a97a/content/site/apidocs/org/apache/juneau/annotation/NameProperty.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/annotation/NameProperty.html b/content/site/apidocs/org/apache/juneau/annotation/NameProperty.html
index d82901d..09e234a 100644
--- a/content/site/apidocs/org/apache/juneau/annotation/NameProperty.html
+++ b/content/site/apidocs/org/apache/juneau/annotation/NameProperty.html
@@ -95,36 +95,18 @@
<pre><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#METHOD" title="class or interface in java.lang.annotation">METHOD</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/ElementType.html?is-external=true#FIELD" title="class or interface in java.lang.annotation">FIELD</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/NameProperty.html#line.54">NameProperty</a></pre>
+public @interface <a href="../../../../src-html/org/apache/juneau/annotation/NameProperty.html#line.36">NameProperty</a></pre>
<div class="block">Identifies a setter as a method for setting the name of a POJO as it's known by its parent object.
- <p>
- For example, the <code>Section</code> class must know the name it's known by it's parent <code>ConfigFileImpl</code> class,
- so parsers will call this method with the section name using the <code>Section.setName(String)</code> method.
- <p>
- A commonly-used case is when you're parsing a JSON map containing beans where one of the bean properties is the key
- used in the map.
-
- <p>
- For example:
- <p class='bcode'>
- {
- id1: {name: <js>'John Smith'</js>, sex:<js>'M'</js>},
- id2: {name: <js>'Jane Doe'</js>, sex:<js>'F'</js>}
- }
- </p>
- <p class='bcode'>
- <jk>public class</jk> Person {
- <ja>@NameProperty</ja> <jk>public</jk> String <jf>id</jf>;
- <jk>public</jk> String <jf>name</jf>;
- <jk>public char</jk> <jf>sex</jf>;
- }
- </p>
-
<h5 class='section'>Notes:</h5>
<ul>
<li>The annotated field or method does not need to be public.
- </ul></div>
+ </ul>
+
+ <h6 class='topic'>Documentation</h6>
+ <ul>
+ <li><a class="doclink" href="../../../../overview-summary.html#juneau-marshall.NamePropertyAnnotation">Overview > @NameProperty Annotation</a>
+ </ul></div>
</li>
</ul>
</div>
@@ -189,6 +171,6 @@ public @interface <a href="../../../../src-html/org/apache/juneau/annotation/Nam
<!-- -->
</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>
+<p class="legalCopy"><small>Copyright © 2018 <a href="http://www.apache.org/">Apache</a>. All rights reserved.</small></p>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/juneau-website/blob/b821a97a/content/site/apidocs/org/apache/juneau/annotation/Null.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/annotation/Null.html b/content/site/apidocs/org/apache/juneau/annotation/Null.html
index 88b2d00..1acce80 100644
--- a/content/site/apidocs/org/apache/juneau/annotation/Null.html
+++ b/content/site/apidocs/org/apache/juneau/annotation/Null.html
@@ -43,7 +43,7 @@
<div class="subNav">
<ul class="navList">
<li><a href="../../../../org/apache/juneau/annotation/NameProperty.html" title="annotation in org.apache.juneau.annotation"><span class="typeNameLink">Prev Class</span></a></li>
-<li><a href="../../../../org/apache/juneau/annotation/Overrideable.html" title="annotation in org.apache.juneau.annotation"><span class="typeNameLink">Next Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/annotation/ParentProperty.html" title="annotation in org.apache.juneau.annotation"><span class="typeNameLink">Next Class</span></a></li>
</ul>
<ul class="navList">
<li><a href="../../../../index.html?org/apache/juneau/annotation/Null.html" target="_top">Frames</a></li>
@@ -192,7 +192,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/annotation/NameProperty.html" title="annotation in org.apache.juneau.annotation"><span class="typeNameLink">Prev Class</span></a></li>
-<li><a href="../../../../org/apache/juneau/annotation/Overrideable.html" title="annotation in org.apache.juneau.annotation"><span class="typeNameLink">Next Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/annotation/ParentProperty.html" title="annotation in org.apache.juneau.annotation"><span class="typeNameLink">Next Class</span></a></li>
</ul>
<ul class="navList">
<li><a href="../../../../index.html?org/apache/juneau/annotation/Null.html" target="_top">Frames</a></li>
@@ -232,6 +232,6 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
<!-- -->
</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>
+<p class="legalCopy"><small>Copyright © 2018 <a href="http://www.apache.org/">Apache</a>. All rights reserved.</small></p>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/juneau-website/blob/b821a97a/content/site/apidocs/org/apache/juneau/annotation/Overrideable.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/annotation/Overrideable.html b/content/site/apidocs/org/apache/juneau/annotation/Overrideable.html
deleted file mode 100644
index 403b512..0000000
--- a/content/site/apidocs/org/apache/juneau/annotation/Overrideable.html
+++ /dev/null
@@ -1,166 +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>Overrideable (Apache Juneau 7.0.2-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="Overrideable (Apache Juneau 7.0.2-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/Null.html" title="class in org.apache.juneau.annotation"><span class="typeNameLink">Prev Class</span></a></li>
-<li><a href="../../../../org/apache/juneau/annotation/ParentProperty.html" title="annotation in org.apache.juneau.annotation"><span class="typeNameLink">Next Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../../../../index.html?org/apache/juneau/annotation/Overrideable.html" target="_top">Frames</a></li>
-<li><a href="Overrideable.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>Field | </li>
-<li>Required | </li>
-<li>Optional</li>
-</ul>
-<ul class="subNavList">
-<li>Detail: </li>
-<li>Field | </li>
-<li>Element</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 Overrideable" class="title">Annotation Type Overrideable</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#METHOD" title="class or interface in java.lang.annotation">METHOD</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/Overrideable.html#line.25">Overrideable</a></pre>
-<div class="block">Identifies a method as specifically designed to be overridden and augmented.</div>
-</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/Null.html" title="class in org.apache.juneau.annotation"><span class="typeNameLink">Prev Class</span></a></li>
-<li><a href="../../../../org/apache/juneau/annotation/ParentProperty.html" title="annotation in org.apache.juneau.annotation"><span class="typeNameLink">Next Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../../../../index.html?org/apache/juneau/annotation/Overrideable.html" target="_top">Frames</a></li>
-<li><a href="Overrideable.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>Field | </li>
-<li>Required | </li>
-<li>Optional</li>
-</ul>
-<ul class="subNavList">
-<li>Detail: </li>
-<li>Field | </li>
-<li>Element</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/juneau-website/blob/b821a97a/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 17470d2..1148a6d 100644
--- a/content/site/apidocs/org/apache/juneau/annotation/ParentProperty.html
+++ b/content/site/apidocs/org/apache/juneau/annotation/ParentProperty.html
@@ -42,7 +42,7 @@
</div>
<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 Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/annotation/Null.html" title="class in org.apache.juneau.annotation"><span class="typeNameLink">Prev Class</span></a></li>
<li><a href="../../../../org/apache/juneau/annotation/Swap.html" title="annotation in org.apache.juneau.annotation"><span class="typeNameLink">Next Class</span></a></li>
</ul>
<ul class="navList">
@@ -95,32 +95,21 @@
<pre><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#METHOD" title="class or interface in java.lang.annotation">METHOD</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/ElementType.html?is-external=true#FIELD" title="class or interface in java.lang.annotation">FIELD</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/ParentProperty.html#line.50">ParentProperty</a></pre>
+public @interface <a href="../../../../src-html/org/apache/juneau/annotation/ParentProperty.html#line.39">ParentProperty</a></pre>
<div class="block">Identifies a setter as a method for adding a parent reference to a child object.
<p>
Used by the parsers to add references to parent objects in child objects.
- For example, the <code>Section</code> class cannot exist outside the scope of a parent <code>ConfigFileImpl</code> class, so
- parsers will add a reference to the config file using the <code>Section.setParent(ConfigFileImpl)</code> method.
-
- <p>
- A commonly-used case is when you're parsing beans, and a child bean has a reference to a parent bean.
- <p class='bcode'>
- <jk>public class</jk> AddressBook {
- <jk>public</jk> List<Person> <jf>people</jf>;
- }
-
- <jk>public class</jk> Person {
- <ja>@ParentProperty</ja> <jk>public</jk> AddressBook <jf>addressBook</jf>;
- <jk>public</jk> String <jf>name</jf>;
- <jk>public char</jk> <jf>sex</jf>;
- }
- </p>
<h5 class='section'>Notes:</h5>
<ul>
<li>The annotated field or method does not need to be public.
- </ul></div>
+ </ul>
+
+ <h6 class='topic'>Documentation</h6>
+ <ul>
+ <li><a class="doclink" href="../../../../overview-summary.html#juneau-marshall.NamePropertyAnnotation">Overview > @NameProperty Annotation</a>
+ </ul></div>
</li>
</ul>
</div>
@@ -146,7 +135,7 @@ public @interface <a href="../../../../src-html/org/apache/juneau/annotation/Par
</div>
<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 Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/annotation/Null.html" title="class in org.apache.juneau.annotation"><span class="typeNameLink">Prev Class</span></a></li>
<li><a href="../../../../org/apache/juneau/annotation/Swap.html" title="annotation in org.apache.juneau.annotation"><span class="typeNameLink">Next Class</span></a></li>
</ul>
<ul class="navList">
@@ -185,6 +174,6 @@ public @interface <a href="../../../../src-html/org/apache/juneau/annotation/Par
<!-- -->
</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>
+<p class="legalCopy"><small>Copyright © 2018 <a href="http://www.apache.org/">Apache</a>. All rights reserved.</small></p>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/juneau-website/blob/b821a97a/content/site/apidocs/org/apache/juneau/annotation/Swap.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/annotation/Swap.html b/content/site/apidocs/org/apache/juneau/annotation/Swap.html
index c99d059..ca22900 100644
--- a/content/site/apidocs/org/apache/juneau/annotation/Swap.html
+++ b/content/site/apidocs/org/apache/juneau/annotation/Swap.html
@@ -96,29 +96,21 @@
<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/ElementType.html?is-external=true#ANNOTATION_TYPE" title="class or interface in java.lang.annotation">ANNOTATION_TYPE</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/ElementType.html?is-external=true#FIELD" title="class or interface in java.lang.annotation">FIELD</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/ElementType.html?is-external=true#METHOD" title="clas
s or interface in java.lang.annotation">METHOD</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/Swap.html#line.51">Swap</a></pre>
+public @interface <a href="../../../../src-html/org/apache/juneau/annotation/Swap.html#line.42">Swap</a></pre>
<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.
<p>
- A typical example is for rendering <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Date.html?is-external=true" title="class or interface in java.util"><code>Dates</code></a> and <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Calendar.html?is-external=true" title="class or interface in java.util"><code>Calendars</code></a> as a formatted string:
-
- <h5 class='section'>Example:</h5>
- <p class='bcode'>
- <jk>public class</jk> MyClass {
-
- <jc>// During serialization, convert to ISO8601 date-time string.</jc>
- <ja>@Swap</ja>(CalendarSwap.ISO8601DT.<jk>class</jk>)
- <jk>public</jk> Calendar getTime();
- }
- </p>
-
- <p>
This annotation can be used in the following locations:
<ul>
<li>Classes.
<li>Bean getters/setters/fields.
<li>Inside the <a href="../../../../org/apache/juneau/annotation/Swaps.html" title="annotation in org.apache.juneau.annotation"><code>@Swaps</code></a> annotation.
- </ul></div>
+ </ul>
+
+ <h6 class='topic'>Documentation</h6>
+ <ul>
+ <li><a class="doclink" href="../../../../overview-summary.html#juneau-marshall.SwapAnnotation">Overview > @Swap Annotation</a>
+ </ul></div>
</li>
</ul>
</div>
@@ -182,7 +174,7 @@ public @interface <a href="../../../../src-html/org/apache/juneau/annotation/Swa
<ul class="blockList">
<li class="blockList">
<h4>value</h4>
-<pre>public abstract <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><?> <a href="../../../../src-html/org/apache/juneau/annotation/Swap.html#line.59">value</a></pre>
+<pre>public abstract <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><?> <a href="../../../../src-html/org/apache/juneau/annotation/Swap.html#line.50">value</a></pre>
<div class="block">The <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> class.
<p>
@@ -202,7 +194,7 @@ public @interface <a href="../../../../src-html/org/apache/juneau/annotation/Swa
<ul class="blockList">
<li class="blockList">
<h4>impl</h4>
-<pre>public abstract <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><?> <a href="../../../../src-html/org/apache/juneau/annotation/Swap.html#line.67">impl</a></pre>
+<pre>public abstract <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><?> <a href="../../../../src-html/org/apache/juneau/annotation/Swap.html#line.58">impl</a></pre>
<div class="block">The <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> class.
<p>
@@ -222,7 +214,7 @@ public @interface <a href="../../../../src-html/org/apache/juneau/annotation/Swa
<ul class="blockList">
<li class="blockList">
<h4>template</h4>
-<pre>public abstract <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> <a href="../../../../src-html/org/apache/juneau/annotation/Swap.html#line.100">template</a></pre>
+<pre>public abstract <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> <a href="../../../../src-html/org/apache/juneau/annotation/Swap.html#line.96">template</a></pre>
<div class="block">Identifies a template string along with this swap.
<p>
@@ -235,8 +227,8 @@ public @interface <a href="../../../../src-html/org/apache/juneau/annotation/Swa
The following is an example of a templated swap class used to serialize POJOs to HTML using FreeMarker:
<p class='bcode'>
- <jc>// Our abstracted templated swap class.</jc>
- <jk>public abstract class</jk> FreeMarkerSwap <jk>extends</jk> PojoSwap<Object,Reader> {
+ <jc>// Our templated swap class.</jc>
+ <jk>public class</jk> FreeMarkerSwap <jk>extends</jk> PojoSwap<Object,Reader> {
<jk>public</jk> MediaType[] forMediaTypes() {
<jk>return</jk> MediaType.<jsm>forStrings</jsm>(<js>"*/html"</js>);
@@ -250,7 +242,12 @@ public @interface <a href="../../../../src-html/org/apache/juneau/annotation/Swa
<p class='bcode'>
<ja>@Swap</ja>(impl=FreeMarkerSwap.<jk>class</jk>, template=<js>"MyPojo.div.ftl"</js>)
<jk>public class</jk> MyPojo {}
- </p></div>
+ </p>
+
+ <h5 class='section'>Documentation:</h5>
+ <ul>
+ <li><a class="doclink" href="../../../../overview-summary.html#juneau-marshall.TemplatedSwaps">Overview > Templated Swaps</a>
+ </ul></div>
<dl>
<dt>Default:</dt>
<dd>""</dd>
@@ -266,7 +263,7 @@ public @interface <a href="../../../../src-html/org/apache/juneau/annotation/Swa
<ul class="blockListLast">
<li class="blockList">
<h4>mediaTypes</h4>
-<pre>public abstract <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>[] <a href="../../../../src-html/org/apache/juneau/annotation/Swap.html#line.119">mediaTypes</a></pre>
+<pre>public abstract <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>[] <a href="../../../../src-html/org/apache/juneau/annotation/Swap.html#line.120">mediaTypes</a></pre>
<div class="block">Identifies the media types that this swap is applicable for.
<p>
@@ -281,7 +278,12 @@ public @interface <a href="../../../../src-html/org/apache/juneau/annotation/Swa
<jk>return</jk> o.toString();
}
}
- </p></div>
+ </p>
+
+ <h5 class='section'>Documentation:</h5>
+ <ul>
+ <li><a class="doclink" href="../../../../overview-summary.html#juneau-marshall.PerMediaTypePojoSwaps">Overview > Per-media-type PojoSwaps</a>
+ </ul></div>
<dl>
<dt>Default:</dt>
<dd>{}</dd>
@@ -354,6 +356,6 @@ public @interface <a href="../../../../src-html/org/apache/juneau/annotation/Swa
<!-- -->
</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>
+<p class="legalCopy"><small>Copyright © 2018 <a href="http://www.apache.org/">Apache</a>. All rights reserved.</small></p>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/juneau-website/blob/b821a97a/content/site/apidocs/org/apache/juneau/annotation/Swaps.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/annotation/Swaps.html b/content/site/apidocs/org/apache/juneau/annotation/Swaps.html
index ebba0c8..05b00b0 100644
--- a/content/site/apidocs/org/apache/juneau/annotation/Swaps.html
+++ b/content/site/apidocs/org/apache/juneau/annotation/Swaps.html
@@ -43,7 +43,7 @@
<div class="subNav">
<ul class="navList">
<li><a href="../../../../org/apache/juneau/annotation/Swap.html" title="annotation in org.apache.juneau.annotation"><span class="typeNameLink">Prev Class</span></a></li>
-<li><a href="../../../../org/apache/juneau/annotation/ThreadSafe.html" title="annotation in org.apache.juneau.annotation"><span class="typeNameLink">Next Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/annotation/URI.html" title="annotation in org.apache.juneau.annotation"><span class="typeNameLink">Next Class</span></a></li>
</ul>
<ul class="navList">
<li><a href="../../../../index.html?org/apache/juneau/annotation/Swaps.html" target="_top">Frames</a></li>
@@ -96,7 +96,7 @@
<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/Swaps.html#line.38">Swaps</a></pre>
+public @interface <a href="../../../../src-html/org/apache/juneau/annotation/Swaps.html#line.43">Swaps</a></pre>
<div class="block">Used to associate multiple swaps with the same POJO class.
<p class='bcode'>
@@ -108,7 +108,12 @@ public @interface <a href="../../../../src-html/org/apache/juneau/annotation/Swa
}
)
<jk>public class</jk> MyPojo {}
- </p></div>
+ </p>
+
+ <h6 class='topic'>Documentation</h6>
+ <ul>
+ <li><a class="doclink" href="../../../../overview-summary.html#juneau-marshall.SwapAnnotation">Overview > @Swap Annotation</a>
+ </ul></div>
</li>
</ul>
</div>
@@ -154,7 +159,7 @@ public @interface <a href="../../../../src-html/org/apache/juneau/annotation/Swa
<ul class="blockListLast">
<li class="blockList">
<h4>value</h4>
-<pre>public abstract <a href="../../../../org/apache/juneau/annotation/Swap.html" title="annotation in org.apache.juneau.annotation">Swap</a>[] <a href="../../../../src-html/org/apache/juneau/annotation/Swaps.html#line.43">value</a></pre>
+<pre>public abstract <a href="../../../../org/apache/juneau/annotation/Swap.html" title="annotation in org.apache.juneau.annotation">Swap</a>[] <a href="../../../../src-html/org/apache/juneau/annotation/Swaps.html#line.48">value</a></pre>
<div class="block">The swaps to apply to this POJO class.</div>
<dl>
<dt>Default:</dt>
@@ -190,7 +195,7 @@ public @interface <a href="../../../../src-html/org/apache/juneau/annotation/Swa
<div class="subNav">
<ul class="navList">
<li><a href="../../../../org/apache/juneau/annotation/Swap.html" title="annotation in org.apache.juneau.annotation"><span class="typeNameLink">Prev Class</span></a></li>
-<li><a href="../../../../org/apache/juneau/annotation/ThreadSafe.html" title="annotation in org.apache.juneau.annotation"><span class="typeNameLink">Next Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/annotation/URI.html" title="annotation in org.apache.juneau.annotation"><span class="typeNameLink">Next Class</span></a></li>
</ul>
<ul class="navList">
<li><a href="../../../../index.html?org/apache/juneau/annotation/Swaps.html" target="_top">Frames</a></li>
@@ -228,6 +233,6 @@ public @interface <a href="../../../../src-html/org/apache/juneau/annotation/Swa
<!-- -->
</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>
+<p class="legalCopy"><small>Copyright © 2018 <a href="http://www.apache.org/">Apache</a>. All rights reserved.</small></p>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/juneau-website/blob/b821a97a/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
deleted file mode 100644
index be71ecd..0000000
--- a/content/site/apidocs/org/apache/juneau/annotation/ThreadSafe.html
+++ /dev/null
@@ -1,169 +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>ThreadSafe (Apache Juneau 7.0.2-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="ThreadSafe (Apache Juneau 7.0.2-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/Swaps.html" title="annotation in org.apache.juneau.annotation"><span class="typeNameLink">Prev Class</span></a></li>
-<li><a href="../../../../org/apache/juneau/annotation/URI.html" title="annotation in org.apache.juneau.annotation"><span class="typeNameLink">Next Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../../../../index.html?org/apache/juneau/annotation/ThreadSafe.html" target="_top">Frames</a></li>
-<li><a href="ThreadSafe.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>Field | </li>
-<li>Required | </li>
-<li>Optional</li>
-</ul>
-<ul class="subNavList">
-<li>Detail: </li>
-<li>Field | </li>
-<li>Element</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 ThreadSafe" class="title">Annotation Type ThreadSafe</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/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/ThreadSafe.html#line.28">ThreadSafe</a></pre>
-<div class="block">Identifies a class as being thread-safe.
-
- <p>
- Used for documentation purposes only.</div>
-</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/Swaps.html" title="annotation in org.apache.juneau.annotation"><span class="typeNameLink">Prev Class</span></a></li>
-<li><a href="../../../../org/apache/juneau/annotation/URI.html" title="annotation in org.apache.juneau.annotation"><span class="typeNameLink">Next Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../../../../index.html?org/apache/juneau/annotation/ThreadSafe.html" target="_top">Frames</a></li>
-<li><a href="ThreadSafe.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>Field | </li>
-<li>Required | </li>
-<li>Optional</li>
-</ul>
-<ul class="subNavList">
-<li>Detail: </li>
-<li>Field | </li>
-<li>Element</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/juneau-website/blob/b821a97a/content/site/apidocs/org/apache/juneau/annotation/URI.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/annotation/URI.html b/content/site/apidocs/org/apache/juneau/annotation/URI.html
index 8f3c40d..a888cfc 100644
--- a/content/site/apidocs/org/apache/juneau/annotation/URI.html
+++ b/content/site/apidocs/org/apache/juneau/annotation/URI.html
@@ -42,7 +42,7 @@
</div>
<div class="subNav">
<ul class="navList">
-<li><a href="../../../../org/apache/juneau/annotation/ThreadSafe.html" title="annotation in org.apache.juneau.annotation"><span class="typeNameLink">Prev Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/annotation/Swaps.html" title="annotation in org.apache.juneau.annotation"><span class="typeNameLink">Prev Class</span></a></li>
<li>Next Class</li>
</ul>
<ul class="navList">
@@ -96,54 +96,17 @@
<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/ElementType.html?is-external=true#FIELD" title="class or interface in java.lang.annotation">FIELD</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/ElementType.html?is-external=true#METHOD" title="class or interface in java.lang.annotation">METHOD</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/URI.html#line.77">URI</a></pre>
+public @interface <a href="../../../../src-html/org/apache/juneau/annotation/URI.html#line.36">URI</a></pre>
<div class="block">Used to identify a class or bean property as a URI.
<p>
- By default, instances of <a href="http://docs.oracle.com/javase/7/docs/api/java/net/URL.html?is-external=true" title="class or interface in java.net"><code>URL</code></a> and <a href="../../../../org/apache/juneau/annotation/URI.html" title="annotation in org.apache.juneau.annotation"><code>URI</code></a> are considered URIs during serialization, and are handled
- differently depending on the serializer (e.g. <code>HtmlSerializer</code> creates a hyperlink,
- <code>RdfXmlSerializer</code> creates an <code>rdf:resource</code> object, etc...).
-
- <p>
This annotation allows you to identify other classes that return URIs via <code>toString()</code> as URI objects.
- <p>
- URIs are automatically resolved to absolute or root-relative form based on the serializer
- <a href="../../../../org/apache/juneau/serializer/Serializer.html#SERIALIZER_uriResolution"><code>Serializer.SERIALIZER_uriResolution</code></a> and <a href="../../../../org/apache/juneau/serializer/Serializer.html#SERIALIZER_uriRelativity"><code>Serializer.SERIALIZER_uriRelativity</code></a>
- configuration settings, and the URI context defined by the <a href="../../../../org/apache/juneau/UriContext.html" title="class in org.apache.juneau"><code>UriContext</code></a> that's part of the serializer
- session.
-
- <p>
- Refer to the <a href="../../../../org/apache/juneau/UriResolver.html" title="class in org.apache.juneau"><code>UriResolver</code></a> class for information about the types of URIs that can be resolved during
- serialization.
-
- <p>
- This annotation can be applied to classes, interfaces, or bean property methods for fields.
-
- <h5 class='section'>Example:</h5>
- <p class='bcode'>
-
- <jc>// Applied to a class whose toString() method returns a URI.</jc>
- <ja>@URI</ja>
- <jk>public class</jk> MyURI {
- <ja>@Override</ja>
- <jk>public</jk> String toString() {
- <jk>return</jk> <js>"http://localhost:9080/foo/bar"</js>;
- }
- }
-
- <jc>// Applied to bean properties</jc>
- <jk>public class</jk> MyBean {
-
- <ja>@URI</ja>
- <jk>public</jk> String <jf>beanUri</jf>;
-
- <ja>@URI</ja>
- <jk>public</jk> String getParentUri() {
- ...
- }
- }
- </p></div>
+
+ <h6 class='topic'>Documentation</h6>
+ <ul>
+ <li><a class="doclink" href="../../../../overview-summary.html#juneau-marshall.URIAnnotation">Overview > @URI Annotation</a>
+ </ul></div>
</li>
</ul>
</div>
@@ -169,7 +132,7 @@ public @interface <a href="../../../../src-html/org/apache/juneau/annotation/URI
</div>
<div class="subNav">
<ul class="navList">
-<li><a href="../../../../org/apache/juneau/annotation/ThreadSafe.html" title="annotation in org.apache.juneau.annotation"><span class="typeNameLink">Prev Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/annotation/Swaps.html" title="annotation in org.apache.juneau.annotation"><span class="typeNameLink">Prev Class</span></a></li>
<li>Next Class</li>
</ul>
<ul class="navList">
@@ -208,6 +171,6 @@ public @interface <a href="../../../../src-html/org/apache/juneau/annotation/URI
<!-- -->
</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>
+<p class="legalCopy"><small>Copyright © 2018 <a href="http://www.apache.org/">Apache</a>. All rights reserved.</small></p>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/juneau-website/blob/b821a97a/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 435eea8..edd64ac 100644
--- a/content/site/apidocs/org/apache/juneau/annotation/package-frame.html
+++ b/content/site/apidocs/org/apache/juneau/annotation/package-frame.html
@@ -20,14 +20,11 @@
<li><a href="Bean.html" title="annotation in org.apache.juneau.annotation" target="classFrame">Bean</a></li>
<li><a href="BeanConstructor.html" title="annotation in org.apache.juneau.annotation" target="classFrame">BeanConstructor</a></li>
<li><a href="BeanIgnore.html" title="annotation in org.apache.juneau.annotation" target="classFrame">BeanIgnore</a></li>
-<li><a href="BeanParam.html" title="annotation in org.apache.juneau.annotation" target="classFrame">BeanParam</a></li>
<li><a href="BeanProperty.html" title="annotation in org.apache.juneau.annotation" target="classFrame">BeanProperty</a></li>
<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="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>
</div>
http://git-wip-us.apache.org/repos/asf/juneau-website/blob/b821a97a/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 4704c18..29f83fe 100644
--- a/content/site/apidocs/org/apache/juneau/annotation/package-summary.html
+++ b/content/site/apidocs/org/apache/juneau/annotation/package-summary.html
@@ -121,29 +121,17 @@
</td>
</tr>
<tr class="rowColor">
-<td class="colFirst"><a href="../../../../org/apache/juneau/annotation/BeanParam.html" title="annotation in org.apache.juneau.annotation">BeanParam</a></td>
-<td class="colLast">
-<div class="block">Future support for defining bean properties on constructor args.</div>
-</td>
-</tr>
-<tr class="altColor">
<td class="colFirst"><a href="../../../../org/apache/juneau/annotation/BeanProperty.html" title="annotation in org.apache.juneau.annotation">BeanProperty</a></td>
<td class="colLast">
<div class="block">Used tailor how bean properties get interpreted by the framework.</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a href="../../../../org/apache/juneau/annotation/NameProperty.html" title="annotation in org.apache.juneau.annotation">NameProperty</a></td>
<td class="colLast">
<div class="block">Identifies a setter as a method for setting the name of a POJO as it's known by its parent object.</div>
</td>
</tr>
-<tr class="altColor">
-<td class="colFirst"><a href="../../../../org/apache/juneau/annotation/Overrideable.html" title="annotation in org.apache.juneau.annotation">Overrideable</a></td>
-<td class="colLast">
-<div class="block">Identifies a method as specifically designed to be overridden and augmented.</div>
-</td>
-</tr>
<tr class="rowColor">
<td class="colFirst"><a href="../../../../org/apache/juneau/annotation/ParentProperty.html" title="annotation in org.apache.juneau.annotation">ParentProperty</a></td>
<td class="colLast">
@@ -163,12 +151,6 @@
</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="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>
@@ -230,6 +212,6 @@
<!-- -->
</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>
+<p class="legalCopy"><small>Copyright © 2018 <a href="http://www.apache.org/">Apache</a>. All rights reserved.</small></p>
</body>
</html>