You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juneau.apache.org by ja...@apache.org on 2017/08/14 00:27:52 UTC
[16/25] incubator-juneau-website git commit: Add @RestHook support.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/84931d4d/content/site/apidocs/org/apache/juneau/rest/jaxrs/package-summary.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/rest/jaxrs/package-summary.html b/content/site/apidocs/org/apache/juneau/rest/jaxrs/package-summary.html
index 21eb15b..dc5fc26 100644
--- a/content/site/apidocs/org/apache/juneau/rest/jaxrs/package-summary.html
+++ b/content/site/apidocs/org/apache/juneau/rest/jaxrs/package-summary.html
@@ -71,7 +71,7 @@
<div class="header">
<h1 title="Package" class="title">Package org.apache.juneau.rest.jaxrs</h1>
<div class="docSummary">
-<div class="block">JAX-RS / Wink integration components</div>
+<div class="block">JAX-RS integration components</div>
</div>
<p>See: <a href="#package.description">Description</a></p>
</div>
@@ -122,7 +122,7 @@
<!-- -->
</a>
<h2 title="Package org.apache.juneau.rest.jaxrs Description">Package org.apache.juneau.rest.jaxrs Description</h2>
-<div class="block"><p>JAX-RS / Wink integration components</p>
+<div class="block"><p>JAX-RS integration components</p>
<script>
function toggle(x) {
@@ -217,239 +217,6 @@
For the most part, when using these components, you'll either use the existing <code>DefaultProvider</code> or
<code>JuneauProvider</code> providers, or define your own by subclassing <code>BaseProvider</code>.
- <h6 class='topic'>Example:</h6>
- <p>
- The <code>juneau_sample.war</code> project contains a sample <code>HelloWorldResource</code> class that
- shows how to use the JAX-RS provider. It uses Wink as the JAX-RS implementation.
- </p>
- <p>
- Wink is configured by registering the following servlet in the <code>web.xml</code> file of the web app:
- </p>
- <p class='bcode'>
- <xt><?xml</xt> <xa>version</xa>=<xs>"1.0"</xs> <xa>encoding</xa>=<xs>"UTF-8"</xs><xt>?></xt>
- <xt><web-app</xt> <xa>version</xa>=<xs>"2.3"</xs><xt>></xt>
- <xt><servlet></xt>
- <xt><servlet-name></xt>WinkService<xt></servlet-name></xt>
- <xt><servlet-class></xt>org.apache.wink.server.internal.servlet.RestServlet<xt></servlet-class></xt>
- <xt><init-param></xt>
- <xt><param-name></xt>applicationConfigLocation<xt></param-name></xt>
- <xt><param-value></xt>/WEB-INF/wink.cfg<xt></param-value></xt>
- <xt></init-param></xt>
- <xt></servlet></xt>
- <xt><servlet-mapping></xt>
- <xt><servlet-name></xt>WinkService<xt></servlet-name></xt>
- <xt><url-pattern></xt>/wink/*<xt></url-pattern></xt>
- <xt></servlet-mapping></xt>
- <xt></web-app></xt>
- </p>
- <p>
- The <code>wink.cfg</code> file lists our default provider and our sample resource:
- </p>
- <p class='bcode'>
- org.apache.juneau.rest.jaxrs.DefaultProvider
- com.foo.sample.jaxrs.HelloWorldResource
- </p>
- <p>
- Interestingly, the <code>DefaultProvider</code> itself is a subclass of <code>BaseProvider</code>
- with no code at all. It consists of annotations only:
- </p>
- <p class='bcode'>
- <ja>@Provider</ja>
- <ja>@Produces</ja>(
- <js>"application/json,text/json,"</js>+ <jc>// JsonSerializer</jc>
- <js>"application/json+schema,text/json+schema,"</js>+ <jc>// JsonSchemaSerializer</jc>
- <js>"text/xml,"</js>+ <jc>// XmlDocSerializer</jc>
- <js>"text/xml+schema,"</js>+ <jc>// XmlDocSerializer</jc>
- <js>"text/html,"</js>+ <jc>// HtmlDocSerializer</jc>
- <js>"application/x-www-form-urlencoded,"</js>+ <jc>// UrlEncodingSerializer</jc>
- <js>"text/xml+soap,"</js>+ <jc>// SoapXmlSerializer</jc>
- <js>"text/xml+rdf,"</js>+ <jc>// RdfXmlDocSerializer</jc>
- <js>"application/x-java-serialized-object"</js> <jc>// JavaSerializedObjectSerializer</jc>
- )
- <ja>@Consumes</ja>(
- <js>"application/json,text/json,"</js>+ <jc>// JsonParser</jc>
- <js>"text/xml,"</js>+ <jc>// XmlParser</jc>
- <js>"text/html,"</js>+ <jc>// HtmlParser</jc>
- <js>"application/x-www-form-urlencoded"</js> <jc>// UrlEncodingParser</jc>
- )
- <ja>@JuneauProvider</ja>(
- serializers={
- JsonSerializer.<jk>class</jk>,
- JsonSchemaSerializer.<jk>class</jk>,
- XmlDocSerializer.<jk>class</jk>,
- XmlSchemaDocSerializer.<jk>class</jk>,
- HtmlDocSerializer.<jk>class</jk>,
- UrlEncodingSerializer.<jk>class</jk>,
- SoapXmlSerializer.<jk>class</jk>,
- RdfXmlDocSerializer.<jk>class</jk>,
- JavaSerializedObjectSerializer.<jk>class</jk>
- },
- parsers={
- JsonParser.<jk>class</jk>,
- XmlParser.<jk>class</jk>,
- HtmlParser.<jk>class</jk>,
- UrlEncodingParser.<jk>class</jk>
- }
- )
- <jk>public final class</jk> DefaultProvider <jk>extends</jk> BaseProvider {}
- </p>
- <p>
- Similarly, if you're defining your own JAX-RS provider, you can do so using annotations only.
- </p>
- <p>
- <p>
- Our sample resource is shown below.
- In this example, we've specified a <code><ja>@RestMethod</ja></code> annotation on the
- getter to show how properties can be overridden on the serializers/parsers at the method level.
- This annotation is optional.
- </p>
-
- <p class='bcode'>
- <ja>@Path</ja>(<js>"/helloworld"</js>)
- <jk>public class</jk> HelloWorldResource {
-
- <jc>// Our bean message class</jc>
- <jk>public static class</jk> Message {
-
- <jc>// No-arg bean constructor (needed for parsers)</jc>
- <jk>public</jk> Message() {}
-
- <jk>public</jk> Message(String text, String author) {
- <jk>this</jk>.text = text;
- <jk>this</jk>.author = author;
- }
-
- <jk>public</jk> String text;
- <jk>public</jk> String author;
- }
-
- <jk>private static</jk> Message message = <jk>new</jk> Message(<js>"Hello world"</js>, <js>"John Smith"</js>);
-
- <ja>@GET</ja>
- <ja>@Produces</ja>(<js>"*/*"</js>)
- <ja>@RestMethod</ja>( <jc>/* Override some properties */</jc>
- properties={
- <ja>@Property</ja>(name=SerializerContext.<jsf>SERIALIZER_useWhitespace</jsf>, value=<js>"true"</js>),
- <ja>@Property</ja>(name=JsonSerializerContext.<jsf>LAX_MODE</jsf>, value=<js>"true"</js>)
- }
- )
- <jk>public</jk> Message getMessage() {
- <jk>return</jk> message;
- }
-
- <ja>@PUT</ja>
- <ja>@Produces</ja>(<js>"*/*"</js>)
- <ja>@Consumes</ja>(<js>"*/*"</js>)
- <jk>public</jk> Message replaceMessage(Message message) {
- HelloWorldResource.message = message;
- <jk>return</jk> message;
- }
- }
- </p>
- <p>
- When we start up the servlet, we can interact with the resource using cURL.
- In these examples, note that the <jsf>SERIALIZER_useWhitespace</jsf> and <jsf>LAX_MODE</jsf> settings
- cause the output to be readable instead of condensed.
- </p>
- <p class='bcode'>
- C:\>curl.exe -H "Accept: text/json" -X GET http://localhost:9080/sample/wink/helloworld
- <ja>{
- text:"Hello world",
- author:"John Smith"
- }</ja>
- </p>
- <p class='bcode'>
- C:\>curl.exe -H "Accept: text/html" -X GET http://localhost:9080/sample/wink/helloworld
- <ja><html>
- <head>
- </head>
- <body>
- <table type="object">
- <tr>
- <th>
- <string>key</string>
- </th>
- <th>
- <string>value</string>
- </th>
- </tr>
- <tr>
- <td>
- <string>text</string>
- </td>
- <td>
- <string>Hello world</string>
- </td>
- </tr>
- <tr>
- <td>
- <string>author</string>
- </td>
- <td>
- <string>John Smith</string>
- </td>
- </tr>
- </table>
- </body>
- </html></ja>
- </p>
- <p class='bcode'>
- C:\>curl.exe -H "Accept: text/xml" -X GET http://localhost:9080/sample/wink/helloworld
- <ja><?xml version="1.0" encoding="UTF-8"?>
- <object>
- <text>Hello world</text>
- <author>John Smith</author>
- </object></ja>
- </p>
- <p class='bcode'>
- C:\>curl.exe -H "Accept: application/x-www-form-urlencoded" -X GET http://localhost:9080/sample/wink/helloworld
- <ja>text='Hello+world'&author='John+Smith'</ja>
- </p>
- <p class='bcode'>
- C:\>curl.exe -H "Accept: text/xml+schema" -X GET http://localhost:9080/sample/wink/helloworld
- <ja><?xml version="1.0" encoding="UTF-8"?>
- <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <xs:element name="object" nillable="true">
- <xs:complexType>
- <xs:sequence minOccurs="0" maxOccurs="unbounded">
- <xs:element name="text" type="xs:string" nillable="true" minOccurs="0"/>
- <xs:element name="author" type="xs:string" nillable="true" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="null"/>
- </xs:schema></ja>
- </p>
- <p class='bcode'>
- C:\>curl.exe -H "Accept: application/x-java-serialized-object" -X GET http://localhost:9080/sample/wink/helloworld
- <ja>detailMessaget ↕Ljava/lang/String;[ ption(Vx τå▬5☻ xr ↔java.io.ObjectStreamExceptiond├Σkì9√▀☻ xr ‼java.io.IOExcept
- stackTracet ▲[Ljava/lang/StackTraceElement;xpq t /org.apache.juneau.samples.jaxrs.HelloWorldResource$Messageur ▲[Ljava.lang.Sta
- lineNumberL ♫declaringClassq ~ ♠LfileNameq ~ ♠L
- methodNameq ~ ♠xp ♦át →java.io.ObjectOutputStreamt ↨ObjectOutputStream.javat ♀writeObject0sq ~ ♀ ☺[t →java.io.Obje
- 3org.apache.juneau.serializer.OutputStreamSerializert ←OutputStreamSerializer.javat serializesq ~ ♀ ^t &com.ib
- &t /org.apache.wink.server.handlers.AbstractHandlert ¶AbstractHandler.javat ♫handleResponsesq ~ ♀ →t 5org.apache.
- sq ~ ♀ Ct 5org.apache.wink.server.handlers.AbstractHandlersChaint →AbstractHandlersChain.javat doChainsq ~ ♀ 't
- ♠handlesq ~ ♀ ▬t 5org.apache.wink.server.handlers.ResponseHandlersChaint →ResponseHandlersChain.javat ♠handlesq ~
- ♫handleResponsesq ~ ♀ →t 5org.apache.wink.server.handlers.ResponseHandlersChaint →ResponseHandlersChain.javat ♠ha
- tHandlersChain.javat doChainsq ~ ♀ Zt -org.apache.wink.server.internal.log.Responsest ♫Responses.javat ♫handleResp
- eHandlersChain.javat ♠handlesq ~ ♀ Ct 5org.apache.wink.server.handlers.AbstractHandlersChaint →AbstractHandlersCha
- handleRequestsq ~ ♀ |t 3org.apache.wink.server.internal.servlet.RestServlett ►RestServlet.javat servicesq ~ ♀ ☻£t
- handleRequestsq ~ ♀ ├t -com.ibm.ws.webcontainer.channel.WCChannelLinkt ↕WCChannelLink.javat ♣readysq ~ ♀ ☺─t 4com
- ►handleNewRequestsq ~ ♀ ☺1t 4com.ibm.ws.http.channel.inbound.impl.HttpInboundLinkt ¶HttpInboundLink.javat ♫process
- nnectionInitialReadCallback.javat ¶sendToDiscriminatorssq ~ ♀ qt <com.ibm.ws.tcp.channel.impl.NewConnectionInitial
- ┘t $com.ibm.io.async.AbstractAsyncFuturet ↑AbstractAsyncFuture.javat ♫invokeCallbacksq ~ ♀ ít #com.ibm.io.async.
- t ↕ResultHandler.javatcompletesq ~ ♀ ♥t ▲com.ibm.io.async.ResultHandlert ↕ResultHandler.javat ▬runEventProcessingLo
- on: java.io.NotSerializableException: org.apache.juneau.samples.jaxrs.HelloWorldResource$Message</ja>
- </p>
- <p>
- The following shows the PUT method being invoked.
- In this case, we're passing in the new bean as a JSON object.
- Also notice how the response is in standard condensed JSON since we did not override any properties on the REST method.
- </p>
- <p class='bcode'>
- C:\>curl.exe -H "Content-Type: text/json" -H "Accept: text/json" -d "{text:'Hello again',author:'Jane Doe'}"
- -X PUT http://localhost:9080/sample/wink/helloworld
- <ja>{"text":"Hello again","author":"Jane Doe"}</ja>
</p>
</div></div>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/84931d4d/content/site/apidocs/org/apache/juneau/rest/jaxrs/rdf/package-summary.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/rest/jaxrs/rdf/package-summary.html b/content/site/apidocs/org/apache/juneau/rest/jaxrs/rdf/package-summary.html
index 6248aef..29a9eea 100644
--- a/content/site/apidocs/org/apache/juneau/rest/jaxrs/rdf/package-summary.html
+++ b/content/site/apidocs/org/apache/juneau/rest/jaxrs/rdf/package-summary.html
@@ -71,7 +71,7 @@
<div class="header">
<h1 title="Package" class="title">Package org.apache.juneau.rest.jaxrs.rdf</h1>
<div class="docSummary">
-<div class="block">JAX-RS / Wink integration components with RDF support</div>
+<div class="block">JAX-RS integration components with RDF support</div>
</div>
<p>See: <a href="#package.description">Description</a></p>
</div>
@@ -99,7 +99,7 @@
<!-- -->
</a>
<h2 title="Package org.apache.juneau.rest.jaxrs.rdf Description">Package org.apache.juneau.rest.jaxrs.rdf Description</h2>
-<div class="block"><p>JAX-RS / Wink integration components with RDF support</p></div>
+<div class="block"><p>JAX-RS integration components with RDF support</p></div>
</div>
<!-- ======= START OF BOTTOM NAVBAR ====== -->
<div class="bottomNav"><a name="navbar.bottom">
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/84931d4d/content/site/apidocs/org/apache/juneau/rest/jena/RestServletJenaDefault.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/rest/jena/RestServletJenaDefault.html b/content/site/apidocs/org/apache/juneau/rest/jena/RestServletJenaDefault.html
index 718cc35..0dcc194 100644
--- a/content/site/apidocs/org/apache/juneau/rest/jena/RestServletJenaDefault.html
+++ b/content/site/apidocs/org/apache/juneau/rest/jena/RestServletJenaDefault.html
@@ -367,7 +367,7 @@ extends <a href="../../../../../org/apache/juneau/rest/RestServlet.html" title="
<!-- -->
</a>
<h3>Methods inherited from class org.apache.juneau.rest.<a href="../../../../../org/apache/juneau/rest/RestServlet.html" title="class in org.apache.juneau.rest">RestServlet</a></h3>
-<code><a href="../../../../../org/apache/juneau/rest/RestServlet.html#destroy--">destroy</a>, <a href="../../../../../org/apache/juneau/rest/RestServlet.html#getBeanContext--">getBeanContext</a>, <a href="../../../../../org/apache/juneau/rest/RestServlet.html#getContext--">getContext</a>, <a href="../../../../../org/apache/juneau/rest/RestServlet.html#getMessages--">getMessages</a>, <a href="../../../../../org/apache/juneau/rest/RestServlet.html#getProperties--">getProperties</a>, <a href="../../../../../org/apache/juneau/rest/RestServlet.html#getServletConfig--">getServletConfig</a>, <a href="../../../../../org/apache/juneau/rest/RestServlet.html#init-org.apache.juneau.rest.RestConfig-">init</a>, <a href="../../../../../org/apache/juneau/rest/RestServlet.html#init-org.apache.juneau.rest.RestContext-">init</a>, <a href="../../../../../org/apache/juneau/rest/RestServlet.html#init-javax.servlet.ServletConfig-">init</a>, <a href="../../../../../org/apache/juneau/rest/RestServlet.html#l
og-java.util.logging.Level-java.lang.String-java.lang.Object...-">log</a>, <a href="../../../../../org/apache/juneau/rest/RestServlet.html#log-java.util.logging.Level-java.lang.Throwable-java.lang.String-java.lang.Object...-">log</a>, <a href="../../../../../org/apache/juneau/rest/RestServlet.html#onPostCall-org.apache.juneau.rest.RestRequest-org.apache.juneau.rest.RestResponse-">onPostCall</a>, <a href="../../../../../org/apache/juneau/rest/RestServlet.html#onPreCall-org.apache.juneau.rest.RestRequest-">onPreCall</a>, <a href="../../../../../org/apache/juneau/rest/RestServlet.html#onSuccess-org.apache.juneau.rest.RestRequest-org.apache.juneau.rest.RestResponse-long-">onSuccess</a>, <a href="../../../../../org/apache/juneau/rest/RestServlet.html#service-javax.servlet.http.HttpServletRequest-javax.servlet.http.HttpServletResponse-">service</a></code></li>
+<code><a href="../../../../../org/apache/juneau/rest/RestServlet.html#destroy--">destroy</a>, <a href="../../../../../org/apache/juneau/rest/RestServlet.html#getBeanContext--">getBeanContext</a>, <a href="../../../../../org/apache/juneau/rest/RestServlet.html#getContext--">getContext</a>, <a href="../../../../../org/apache/juneau/rest/RestServlet.html#getMessages--">getMessages</a>, <a href="../../../../../org/apache/juneau/rest/RestServlet.html#getProperties--">getProperties</a>, <a href="../../../../../org/apache/juneau/rest/RestServlet.html#getServletConfig--">getServletConfig</a>, <a href="../../../../../org/apache/juneau/rest/RestServlet.html#init-org.apache.juneau.rest.RestContext-">init</a>, <a href="../../../../../org/apache/juneau/rest/RestServlet.html#init-javax.servlet.ServletConfig-">init</a>, <a href="../../../../../org/apache/juneau/rest/RestServlet.html#log-java.util.logging.Level-java.lang.String-java.lang.Object...-">log</a>, <a href="../../../../../org/apache/junea
u/rest/RestServlet.html#log-java.util.logging.Level-java.lang.Throwable-java.lang.String-java.lang.Object...-">log</a>, <a href="../../../../../org/apache/juneau/rest/RestServlet.html#service-javax.servlet.http.HttpServletRequest-javax.servlet.http.HttpServletResponse-">service</a></code></li>
</ul>
<ul class="blockList">
<li class="blockList"><a name="methods.inherited.from.class.javax.servlet.http.HttpServlet">
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/84931d4d/content/site/apidocs/org/apache/juneau/rest/jena/RestServletJenaGroupDefault.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/rest/jena/RestServletJenaGroupDefault.html b/content/site/apidocs/org/apache/juneau/rest/jena/RestServletJenaGroupDefault.html
index 7d345e4..62f173e 100644
--- a/content/site/apidocs/org/apache/juneau/rest/jena/RestServletJenaGroupDefault.html
+++ b/content/site/apidocs/org/apache/juneau/rest/jena/RestServletJenaGroupDefault.html
@@ -205,7 +205,7 @@ extends <a href="../../../../../org/apache/juneau/rest/jena/RestServletJenaDefau
<!-- -->
</a>
<h3>Methods inherited from class org.apache.juneau.rest.<a href="../../../../../org/apache/juneau/rest/RestServlet.html" title="class in org.apache.juneau.rest">RestServlet</a></h3>
-<code><a href="../../../../../org/apache/juneau/rest/RestServlet.html#destroy--">destroy</a>, <a href="../../../../../org/apache/juneau/rest/RestServlet.html#getBeanContext--">getBeanContext</a>, <a href="../../../../../org/apache/juneau/rest/RestServlet.html#getContext--">getContext</a>, <a href="../../../../../org/apache/juneau/rest/RestServlet.html#getMessages--">getMessages</a>, <a href="../../../../../org/apache/juneau/rest/RestServlet.html#getProperties--">getProperties</a>, <a href="../../../../../org/apache/juneau/rest/RestServlet.html#getServletConfig--">getServletConfig</a>, <a href="../../../../../org/apache/juneau/rest/RestServlet.html#init-org.apache.juneau.rest.RestConfig-">init</a>, <a href="../../../../../org/apache/juneau/rest/RestServlet.html#init-org.apache.juneau.rest.RestContext-">init</a>, <a href="../../../../../org/apache/juneau/rest/RestServlet.html#init-javax.servlet.ServletConfig-">init</a>, <a href="../../../../../org/apache/juneau/rest/RestServlet.html#l
og-java.util.logging.Level-java.lang.String-java.lang.Object...-">log</a>, <a href="../../../../../org/apache/juneau/rest/RestServlet.html#log-java.util.logging.Level-java.lang.Throwable-java.lang.String-java.lang.Object...-">log</a>, <a href="../../../../../org/apache/juneau/rest/RestServlet.html#onPostCall-org.apache.juneau.rest.RestRequest-org.apache.juneau.rest.RestResponse-">onPostCall</a>, <a href="../../../../../org/apache/juneau/rest/RestServlet.html#onPreCall-org.apache.juneau.rest.RestRequest-">onPreCall</a>, <a href="../../../../../org/apache/juneau/rest/RestServlet.html#onSuccess-org.apache.juneau.rest.RestRequest-org.apache.juneau.rest.RestResponse-long-">onSuccess</a>, <a href="../../../../../org/apache/juneau/rest/RestServlet.html#service-javax.servlet.http.HttpServletRequest-javax.servlet.http.HttpServletResponse-">service</a></code></li>
+<code><a href="../../../../../org/apache/juneau/rest/RestServlet.html#destroy--">destroy</a>, <a href="../../../../../org/apache/juneau/rest/RestServlet.html#getBeanContext--">getBeanContext</a>, <a href="../../../../../org/apache/juneau/rest/RestServlet.html#getContext--">getContext</a>, <a href="../../../../../org/apache/juneau/rest/RestServlet.html#getMessages--">getMessages</a>, <a href="../../../../../org/apache/juneau/rest/RestServlet.html#getProperties--">getProperties</a>, <a href="../../../../../org/apache/juneau/rest/RestServlet.html#getServletConfig--">getServletConfig</a>, <a href="../../../../../org/apache/juneau/rest/RestServlet.html#init-org.apache.juneau.rest.RestContext-">init</a>, <a href="../../../../../org/apache/juneau/rest/RestServlet.html#init-javax.servlet.ServletConfig-">init</a>, <a href="../../../../../org/apache/juneau/rest/RestServlet.html#log-java.util.logging.Level-java.lang.String-java.lang.Object...-">log</a>, <a href="../../../../../org/apache/junea
u/rest/RestServlet.html#log-java.util.logging.Level-java.lang.Throwable-java.lang.String-java.lang.Object...-">log</a>, <a href="../../../../../org/apache/juneau/rest/RestServlet.html#service-javax.servlet.http.HttpServletRequest-javax.servlet.http.HttpServletResponse-">service</a></code></li>
</ul>
<ul class="blockList">
<li class="blockList"><a name="methods.inherited.from.class.javax.servlet.http.HttpServlet">
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/84931d4d/content/site/apidocs/org/apache/juneau/rest/jena/package-tree.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/rest/jena/package-tree.html b/content/site/apidocs/org/apache/juneau/rest/jena/package-tree.html
index 50dd2c3..32d7338 100644
--- a/content/site/apidocs/org/apache/juneau/rest/jena/package-tree.html
+++ b/content/site/apidocs/org/apache/juneau/rest/jena/package-tree.html
@@ -82,7 +82,7 @@
<ul>
<li type="circle">javax.servlet.<a href="http://docs.oracle.com/javaee/5/api/javax/servlet/GenericServlet.html?is-external=true" title="class or interface in javax.servlet"><span class="typeNameLink">GenericServlet</span></a> (implements java.io.<a href="http://docs.oracle.com/javase/7/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>, javax.servlet.<a href="http://docs.oracle.com/javaee/5/api/javax/servlet/Servlet.html?is-external=true" title="class or interface in javax.servlet">Servlet</a>, javax.servlet.<a href="http://docs.oracle.com/javaee/5/api/javax/servlet/ServletConfig.html?is-external=true" title="class or interface in javax.servlet">ServletConfig</a>)
<ul>
-<li type="circle">javax.servlet.http.<a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServlet.html?is-external=true" title="class or interface in javax.servlet.http"><span class="typeNameLink">HttpServlet</span></a> (implements java.io.<a href="http://docs.oracle.com/javase/7/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
+<li type="circle">javax.servlet.http.<a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServlet.html?is-external=true" title="class or interface in javax.servlet.http"><span class="typeNameLink">HttpServlet</span></a>
<ul>
<li type="circle">org.apache.juneau.rest.<a href="../../../../../org/apache/juneau/rest/RestServlet.html" title="class in org.apache.juneau.rest"><span class="typeNameLink">RestServlet</span></a>
<ul>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/84931d4d/content/site/apidocs/org/apache/juneau/rest/package-summary.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/rest/package-summary.html b/content/site/apidocs/org/apache/juneau/rest/package-summary.html
index b2d6d5b..8a3e5ff 100644
--- a/content/site/apidocs/org/apache/juneau/rest/package-summary.html
+++ b/content/site/apidocs/org/apache/juneau/rest/package-summary.html
@@ -2792,28 +2792,9 @@
<h3 class='topic' onclick='toggle(this)'>4.16 - Listener Methods</h3>
<div class='topic'>
<p>
- Various convenience listener methods are provided on the <a href="../../../../org/apache/juneau/rest/RestCallHandler.html" title="class in org.apache.juneau.rest"><code>RestCallHandler</code></a>
- class that subclasses can use to intercept requests:
+ Various convenience listener methods can be implemented by using the <a href="../../../../org/apache/juneau/rest/annotation/RestHook.html" title="annotation in org.apache.juneau.rest.annotation"><code>@RestHook</code></a>
+ annotation on methods in your resource class.
</p>
- <ul class='doctree'>
- <li class='jac'>
- <a href="../../../../org/apache/juneau/rest/RestCallHandler.html" title="class in org.apache.juneau.rest"><code>RestCallHandler</code></a>
- <ul>
- <li class='jm'>
- <a href="../../../../org/apache/juneau/rest/RestCallHandler.html#onPreCall-org.apache.juneau.rest.RestRequest-"><code>onPreCall(RestRequest)</code></a>
- <br>Callback method that gets invoked right before the REST Java method is invoked.
- <li class='jm'>
- <a href="../../../../org/apache/juneau/rest/RestCallHandler.html#onPostCall-org.apache.juneau.rest.RestRequest-org.apache.juneau.rest.RestResponse-"><code>onPostCall(RestRequest,RestResponse)</code></a>
- <br>Callback method that gets invoked right after the REST Java method is invoked, but before the serializer is invoked.
- <li class='jm'>
- <a href="../../../../org/apache/juneau/rest/RestCallHandler.html#onSuccess-org.apache.juneau.rest.RestRequest-org.apache.juneau.rest.RestResponse-long-"><code>onSuccess(RestRequest,RestResponse,long)</code></a>
- <br>Callback method for listening for successful completion of requests.
- <li class='jm'>
- <a href="../../../../org/apache/juneau/rest/RestLogger.html#onError-javax.servlet.http.HttpServletRequest-javax.servlet.http.HttpServletResponse-org.apache.juneau.rest.RestException-"><code>onError(HttpServletRequest,HttpServletResponse,RestException)</code></a>
- <br>Callback method for logging errors during HTTP requests.
- </ul>
- </li>
- </ul>
</div>
<!-- ======================================================================================================== -->
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/84931d4d/content/site/apidocs/org/apache/juneau/rest/package-tree.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/rest/package-tree.html b/content/site/apidocs/org/apache/juneau/rest/package-tree.html
index 6a46418..688b393 100644
--- a/content/site/apidocs/org/apache/juneau/rest/package-tree.html
+++ b/content/site/apidocs/org/apache/juneau/rest/package-tree.html
@@ -107,7 +107,7 @@
</li>
<li type="circle">javax.servlet.<a href="http://docs.oracle.com/javaee/5/api/javax/servlet/GenericServlet.html?is-external=true" title="class or interface in javax.servlet"><span class="typeNameLink">GenericServlet</span></a> (implements java.io.<a href="http://docs.oracle.com/javase/7/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>, javax.servlet.<a href="http://docs.oracle.com/javaee/5/api/javax/servlet/Servlet.html?is-external=true" title="class or interface in javax.servlet">Servlet</a>, javax.servlet.<a href="http://docs.oracle.com/javaee/5/api/javax/servlet/ServletConfig.html?is-external=true" title="class or interface in javax.servlet">ServletConfig</a>)
<ul>
-<li type="circle">javax.servlet.http.<a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServlet.html?is-external=true" title="class or interface in javax.servlet.http"><span class="typeNameLink">HttpServlet</span></a> (implements java.io.<a href="http://docs.oracle.com/javase/7/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
+<li type="circle">javax.servlet.http.<a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServlet.html?is-external=true" title="class or interface in javax.servlet.http"><span class="typeNameLink">HttpServlet</span></a>
<ul>
<li type="circle">org.apache.juneau.rest.<a href="../../../../org/apache/juneau/rest/RestServlet.html" title="class in org.apache.juneau.rest"><span class="typeNameLink">RestServlet</span></a>
<ul>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/84931d4d/content/site/apidocs/org/apache/juneau/rest/remoteable/RemoteableServlet.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/rest/remoteable/RemoteableServlet.html b/content/site/apidocs/org/apache/juneau/rest/remoteable/RemoteableServlet.html
index 4ef89b3..06093c0 100644
--- a/content/site/apidocs/org/apache/juneau/rest/remoteable/RemoteableServlet.html
+++ b/content/site/apidocs/org/apache/juneau/rest/remoteable/RemoteableServlet.html
@@ -222,7 +222,7 @@ extends <a href="../../../../../org/apache/juneau/rest/RestServletDefault.html"
<!-- -->
</a>
<h3>Methods inherited from class org.apache.juneau.rest.<a href="../../../../../org/apache/juneau/rest/RestServlet.html" title="class in org.apache.juneau.rest">RestServlet</a></h3>
-<code><a href="../../../../../org/apache/juneau/rest/RestServlet.html#destroy--">destroy</a>, <a href="../../../../../org/apache/juneau/rest/RestServlet.html#getBeanContext--">getBeanContext</a>, <a href="../../../../../org/apache/juneau/rest/RestServlet.html#getContext--">getContext</a>, <a href="../../../../../org/apache/juneau/rest/RestServlet.html#getMessages--">getMessages</a>, <a href="../../../../../org/apache/juneau/rest/RestServlet.html#getProperties--">getProperties</a>, <a href="../../../../../org/apache/juneau/rest/RestServlet.html#getServletConfig--">getServletConfig</a>, <a href="../../../../../org/apache/juneau/rest/RestServlet.html#init-org.apache.juneau.rest.RestConfig-">init</a>, <a href="../../../../../org/apache/juneau/rest/RestServlet.html#init-org.apache.juneau.rest.RestContext-">init</a>, <a href="../../../../../org/apache/juneau/rest/RestServlet.html#init-javax.servlet.ServletConfig-">init</a>, <a href="../../../../../org/apache/juneau/rest/RestServlet.html#l
og-java.util.logging.Level-java.lang.String-java.lang.Object...-">log</a>, <a href="../../../../../org/apache/juneau/rest/RestServlet.html#log-java.util.logging.Level-java.lang.Throwable-java.lang.String-java.lang.Object...-">log</a>, <a href="../../../../../org/apache/juneau/rest/RestServlet.html#onPostCall-org.apache.juneau.rest.RestRequest-org.apache.juneau.rest.RestResponse-">onPostCall</a>, <a href="../../../../../org/apache/juneau/rest/RestServlet.html#onPreCall-org.apache.juneau.rest.RestRequest-">onPreCall</a>, <a href="../../../../../org/apache/juneau/rest/RestServlet.html#onSuccess-org.apache.juneau.rest.RestRequest-org.apache.juneau.rest.RestResponse-long-">onSuccess</a>, <a href="../../../../../org/apache/juneau/rest/RestServlet.html#service-javax.servlet.http.HttpServletRequest-javax.servlet.http.HttpServletResponse-">service</a></code></li>
+<code><a href="../../../../../org/apache/juneau/rest/RestServlet.html#destroy--">destroy</a>, <a href="../../../../../org/apache/juneau/rest/RestServlet.html#getBeanContext--">getBeanContext</a>, <a href="../../../../../org/apache/juneau/rest/RestServlet.html#getContext--">getContext</a>, <a href="../../../../../org/apache/juneau/rest/RestServlet.html#getMessages--">getMessages</a>, <a href="../../../../../org/apache/juneau/rest/RestServlet.html#getProperties--">getProperties</a>, <a href="../../../../../org/apache/juneau/rest/RestServlet.html#getServletConfig--">getServletConfig</a>, <a href="../../../../../org/apache/juneau/rest/RestServlet.html#init-org.apache.juneau.rest.RestContext-">init</a>, <a href="../../../../../org/apache/juneau/rest/RestServlet.html#init-javax.servlet.ServletConfig-">init</a>, <a href="../../../../../org/apache/juneau/rest/RestServlet.html#log-java.util.logging.Level-java.lang.String-java.lang.Object...-">log</a>, <a href="../../../../../org/apache/junea
u/rest/RestServlet.html#log-java.util.logging.Level-java.lang.Throwable-java.lang.String-java.lang.Object...-">log</a>, <a href="../../../../../org/apache/juneau/rest/RestServlet.html#service-javax.servlet.http.HttpServletRequest-javax.servlet.http.HttpServletResponse-">service</a></code></li>
</ul>
<ul class="blockList">
<li class="blockList"><a name="methods.inherited.from.class.javax.servlet.http.HttpServlet">
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/84931d4d/content/site/apidocs/org/apache/juneau/rest/remoteable/package-tree.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/rest/remoteable/package-tree.html b/content/site/apidocs/org/apache/juneau/rest/remoteable/package-tree.html
index 7a7fa89..00e136c 100644
--- a/content/site/apidocs/org/apache/juneau/rest/remoteable/package-tree.html
+++ b/content/site/apidocs/org/apache/juneau/rest/remoteable/package-tree.html
@@ -82,7 +82,7 @@
<ul>
<li type="circle">javax.servlet.<a href="http://docs.oracle.com/javaee/5/api/javax/servlet/GenericServlet.html?is-external=true" title="class or interface in javax.servlet"><span class="typeNameLink">GenericServlet</span></a> (implements java.io.<a href="http://docs.oracle.com/javase/7/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>, javax.servlet.<a href="http://docs.oracle.com/javaee/5/api/javax/servlet/Servlet.html?is-external=true" title="class or interface in javax.servlet">Servlet</a>, javax.servlet.<a href="http://docs.oracle.com/javaee/5/api/javax/servlet/ServletConfig.html?is-external=true" title="class or interface in javax.servlet">ServletConfig</a>)
<ul>
-<li type="circle">javax.servlet.http.<a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServlet.html?is-external=true" title="class or interface in javax.servlet.http"><span class="typeNameLink">HttpServlet</span></a> (implements java.io.<a href="http://docs.oracle.com/javase/7/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
+<li type="circle">javax.servlet.http.<a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServlet.html?is-external=true" title="class or interface in javax.servlet.http"><span class="typeNameLink">HttpServlet</span></a>
<ul>
<li type="circle">org.apache.juneau.rest.<a href="../../../../../org/apache/juneau/rest/RestServlet.html" title="class in org.apache.juneau.rest"><span class="typeNameLink">RestServlet</span></a>
<ul>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/84931d4d/content/site/apidocs/overview-summary.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/overview-summary.html b/content/site/apidocs/overview-summary.html
index c6f4dfa..ede4aba 100644
--- a/content/site/apidocs/overview-summary.html
+++ b/content/site/apidocs/overview-summary.html
@@ -268,13 +268,13 @@
<tr class="altColor">
<td class="colFirst"><a href="org/apache/juneau/rest/jaxrs/package-summary.html">org.apache.juneau.rest.jaxrs</a></td>
<td class="colLast">
-<div class="block">JAX-RS / Wink integration components</div>
+<div class="block">JAX-RS integration components</div>
</td>
</tr>
<tr class="rowColor">
<td class="colFirst"><a href="org/apache/juneau/rest/jaxrs/rdf/package-summary.html">org.apache.juneau.rest.jaxrs.rdf</a></td>
<td class="colLast">
-<div class="block">JAX-RS / Wink integration components with RDF support</div>
+<div class="block">JAX-RS integration components with RDF support</div>
</td>
</tr>
<tr class="altColor">
@@ -4563,9 +4563,9 @@
<h6 class='figure'>Hypothetical RequestEchoResource.createSerializers() method</h6>
<p class='bcode'>
- <jd>/** Override the default rest serializers to add some transforms */</jd>
- <ja>@Override</ja>
- <jk>public synchronize void</jk> init(RestConfig config) throws Exception {
+ <jd>/** Override the default rest serializers to add some transforms through an INIT hook*/</jd>
+ <ja>@RestHook</ja>(<jsf>INIT</jsf>)
+ <jk>public void</jk> init(RestConfig config) throws Exception {
<jc>// Add bean filters for the HttpServletRequest, HttpSession, and ServletContext objects
// so that you don't show vendor-specific properties on subclasses.
// Add Enumeration POJO swap to be able to render the contents of Enumeration properties.
@@ -4577,9 +4577,6 @@
.setProperty(<jsf>SERIALIZER_maxDepth</jsf>, 10)
.setProperty(<jsf>SERIALIZER_detectRecursions</jsf>, <jk>true</jk>)
.setPageLinks(<js>"{...}"</js>);
-
- <jc>// Don't forget to call this!</jc>
- <jk>super</jk>.init(config);
}
</p>
<p>
@@ -7278,11 +7275,33 @@
<li>
New <a href="org/apache/juneau/utils/CalendarUtils.html" title="class in org.apache.juneau.utils"><code>CalendarUtils</code></a> class that encapsulates serialization/parsing logic from <a href="org/apache/juneau/transforms/CalendarSwap.html" title="class in org.apache.juneau.transforms"><code>CalendarSwap</code></a> and
<a href="org/apache/juneau/transforms/DateSwap.html" title="class in org.apache.juneau.transforms"><code>DateSwap</code></a>.
+ <li>
+ New annotation <a href="org/apache/juneau/html/annotation/Html.html#anchorText--"><code>Html.anchorText()</code></a>.
</ul>
<h6 class='topic'>org.apache.juneau.rest</h6>
<ul class='spaced-list'>
<li>
+ Revamped and simplified servlet and REST-call lifecycle handling through new
+ <a href="org/apache/juneau/rest/annotation/RestHook.html" title="annotation in org.apache.juneau.rest.annotation"><code>@RestHook</code></a> annotation.
+ <ul>
+ <li>The <a href="org/apache/juneau/rest/RestServlet.html#init-javax.servlet.ServletConfig-"><code>RestServlet.init(ServletConfig)</code></a> method is now final and can
+ no longer be extended.
+ <br>Instead, use <a href="org/apache/juneau/rest/annotation/HookEvent.html#INIT"><code>HookEvent.INIT</code></a> or
+ <a href="org/apache/juneau/rest/annotation/HookEvent.html#POST_INIT"><code>HookEvent.POST_INIT</code></a> for initialization.
+ <li>The following methods on <a href="org/apache/juneau/rest/RestServlet.html" title="class in org.apache.juneau.rest"><code>RestServlet</code></a> have been removed:
+ <ul>
+ <li><code>init(RestConfig)</code>
+ - Use <a href="org/apache/juneau/rest/annotation/HookEvent.html#INIT"><code>HookEvent.INIT</code></a> instead.
+ <li><code>onSuccess(RestRequest, RestResponse, long)</code>
+ - Use <a href="org/apache/juneau/rest/annotation/HookEvent.html#END_CALL"><code>HookEvent.END_CALL</code></a> instead.
+ <li><code>onPreCall(RestRequest)</code>
+ - Use <a href="org/apache/juneau/rest/annotation/HookEvent.html#PRE_CALL"><code>HookEvent.PRE_CALL</code></a> instead.
+ <li><code>onPostCall(RestRequest, RestResponse)</code>
+ - Use <a href="org/apache/juneau/rest/annotation/HookEvent.html#POST_CALL"><code>HookEvent.POST_CALL</code></a> instead.
+ </ul>
+ </ul>
+ <li>
Simplified <a href="org/apache/juneau/rest/widget/MenuItemWidget.html" title="class in org.apache.juneau.rest.widget"><code>MenuItemWidget</code></a>.
<br>Exposes an abstract method <a href="org/apache/juneau/rest/widget/MenuItemWidget.html#getContent-org.apache.juneau.rest.RestRequest-"><code>MenuItemWidget.getContent(RestRequest)</code></a> that
can return raw HTML via readers or char-sequences, or any other object (such as HTML5 beans) that will
@@ -7310,6 +7329,11 @@
</ul>
<li>
New tooltip template: <a href="org/apache/juneau/rest/widget/Tooltip.html" title="class in org.apache.juneau.rest.widget"><code>Tooltip</code></a>
+ <li>
+ New dark theme:
+ <br><img src='doc-files/ReleaseNotes_632_DarkStyle.png'>
+ <li>
+ Stylesheet selection now stored in HTTP session when passed in via <code>?stylesheet</code> query parameter.
</ul>
<h6 class='topic'>org.apache.juneau.rest.microservice</h6>
@@ -7320,7 +7344,6 @@
<li><a href="org/apache/juneau/microservice/RestMicroservice.html#addServlet-javax.servlet.Servlet-java.lang.String-"><code>addServlet(Servlet,String)</code></a>
<li><a href="org/apache/juneau/microservice/RestMicroservice.html#addServletAttribute-java.lang.String-java.lang.Object-"><code>addServletAttribute(String,Object)</code></a>
<li><a href="org/apache/juneau/microservice/RestMicroservice.html#getServer--"><code>getServer()</code></a>
- <li><a href="org/apache/juneau/microservice/RestMicroservice.html#getServletContextHandler--"><code>getServletContextHandler()</code></a>
</ul>
</ul>
@@ -8075,7 +8098,7 @@
The <a href="org/apache/juneau/rest/RestServlet.html" title="class in org.apache.juneau.rest"><code>RestServlet</code></a> class now has the following initialization method that allows you to override
the config settings define via annotations:
<ul>
- <li><a href="org/apache/juneau/rest/RestServlet.html#init-org.apache.juneau.rest.RestConfig-"><code>RestServlet.init(RestConfig)</code></a> - A modifiable configuration of a resource.
+ <li><code><del>RestServlet.init(RestConfig)</del></code> - A modifiable configuration of a resource.
</ul>
Non-<code>RestServlet</code> classes must have one of the following to allow it to be instantiated:
<ul>
@@ -8086,8 +8109,8 @@
<br>
Non-<code>RestServlet</code> classes can optionally include the following init methods to gain access to the config and context:
<ul>
- <li><code><jk>public</jk> init(RestConfig)</code>
- <li><code><jk>public</jk> init(RestContext)</code>
+ <li><code><del><jk>public</jk> init(RestConfig)</del></code>
+ <li><code><del><jk>public</jk> init(RestContext)</del></code>
</ul>
<li>New annotations added to <a href="org/apache/juneau/rest/annotation/RestResource.html" title="annotation in org.apache.juneau.rest.annotation"><code>@RestResource</code></a> to allow non-<code>RestServlet</code>
resources to do the same as subclassing directly from <code>RestServlet</code>:
@@ -9776,7 +9799,7 @@
methods that only look for parameters in the URL query string to prevent loading and parsing of URL-Encoded form posts.
<li>New <del><code>@QParam</code></del> and <del><code>@HasQParam</code></del> annotations for accessing query parameters from the URL query string.
<li><code>&plainText</code> parameter can now specify a false value.
- <li>Removed properties parameters from <a href="org/apache/juneau/rest/RestServlet.html#onPreCall-org.apache.juneau.rest.RestRequest-"><code>RestServlet.onPreCall(RestRequest)</code></a> and <a href="org/apache/juneau/rest/RestServlet.html#onPostCall-org.apache.juneau.rest.RestRequest-org.apache.juneau.rest.RestResponse-"><code>RestServlet.onPostCall(RestRequest,RestResponse)</code></a> methods
+ <li>Removed properties parameters from <code><del>RestServlet.onPreCall(RestRequest)</del></code> and <code><del>RestServlet#onPostCall(RestRequest,RestResponse)</del></code> methods
since the properties are already accessible through <code>RestRequest.getProperties()</code>.
<li>Added <a href="org/apache/juneau/uon/UonSerializer.html" title="class in org.apache.juneau.uon"><code>UonSerializer</code></a> and <a href="org/apache/juneau/uon/UonParser.html" title="class in org.apache.juneau.uon"><code>UonParser</code></a> to serializer and parser lists on
<a href="org/apache/juneau/rest/RestServletDefault.html" title="class in org.apache.juneau.rest"><code>RestServletDefault</code></a> and <a href="org/apache/juneau/rest/jena/RestServletJenaDefault.html" title="class in org.apache.juneau.rest.jena"><code>RestServletJenaDefault</code></a>.
@@ -10741,8 +10764,8 @@
<li>
New methods on <a href="org/apache/juneau/rest/RestServlet.html" title="class in org.apache.juneau.rest"><code>RestServlet</code></a>:
<ul>
- <li><a href="org/apache/juneau/rest/RestServlet.html#onPreCall-org.apache.juneau.rest.RestRequest-"><code>RestServlet.onPreCall(RestRequest)</code></a></li>
- <li><a href="org/apache/juneau/rest/RestServlet.html#onPostCall-org.apache.juneau.rest.RestRequest-org.apache.juneau.rest.RestResponse-"><code>RestServlet.onPostCall(RestRequest,RestResponse)</code></a></li>
+ <li><code><del>RestServlet.onPreCall(RestRequest)</del></code></li>
+ <li><code><del>RestServlet.onPostCall(RestRequest,RestResponse)</del></code></li>
</ul>
</li>
<li>
@@ -10817,7 +10840,7 @@
</p>
<ul class='spaced-list'>
<li>
- Juno-Wink integration components that have been requested my many for a long time!<br>
+ Juno-Wink integration components that have been requested by many for a long time!<br>
Refer to <a class='doclink' href='org/apache/juneau/rest/jaxrs/package-summary.html#TOC'>org.apache.juneau.rest.jaxrs</a> for information.
</li>
<li>
@@ -11063,7 +11086,7 @@
<li>New <js>"?noTrace"</js> URL parameter to prevent stack traces from being logged (for JUnit testing of error conditions).</li>
<li>New <code>RestServletProperties.REST_useStackTraceHashes</code> property to prevent the same stack trace from being logged multiple times.</li>
<li>New <code>RestServletProperties.REST_renderResponseStackTraces</code> property for preventing stack traces in responses for security reasons.</li>
- <li>New overridable <code>RestServlet.onError(HttpServletRequest,HttpServletResponse,RestException,boolean)</code> and <a href="org/apache/juneau/rest/RestServlet.html#onSuccess-org.apache.juneau.rest.RestRequest-org.apache.juneau.rest.RestResponse-long-"><code>RestServlet.onSuccess(RestRequest,RestResponse,long)</code></a> methods for plugging in your own logging and peformance monitoring.</li>
+ <li>New overridable <code>RestServlet.onError(HttpServletRequest,HttpServletResponse,RestException,boolean)</code> and <code><del>RestServlet.onSuccess(RestRequest,RestResponse,long)</del></code> methods for plugging in your own logging and peformance monitoring.</li>
<li>Eliminated <code>RestServlet.getInitParams()</code> method, since it's now redundant with <a href="org/apache/juneau/rest/RestServlet.html#getProperties--"><code>RestServlet.getProperties()</code></a>.</li>
<li>Header parameters passed as URL parameters are now case-insensitive.</li>
</ul>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/84931d4d/content/site/apidocs/overview-tree.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/overview-tree.html b/content/site/apidocs/overview-tree.html
index 84fcbac..2e8b9f8 100644
--- a/content/site/apidocs/overview-tree.html
+++ b/content/site/apidocs/overview-tree.html
@@ -604,7 +604,7 @@
</li>
<li type="circle">javax.servlet.<a href="http://docs.oracle.com/javaee/5/api/javax/servlet/GenericServlet.html?is-external=true" title="class or interface in javax.servlet"><span class="typeNameLink">GenericServlet</span></a> (implements java.io.<a href="http://docs.oracle.com/javase/7/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>, javax.servlet.<a href="http://docs.oracle.com/javaee/5/api/javax/servlet/Servlet.html?is-external=true" title="class or interface in javax.servlet">Servlet</a>, javax.servlet.<a href="http://docs.oracle.com/javaee/5/api/javax/servlet/ServletConfig.html?is-external=true" title="class or interface in javax.servlet">ServletConfig</a>)
<ul>
-<li type="circle">javax.servlet.http.<a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServlet.html?is-external=true" title="class or interface in javax.servlet.http"><span class="typeNameLink">HttpServlet</span></a> (implements java.io.<a href="http://docs.oracle.com/javase/7/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
+<li type="circle">javax.servlet.http.<a href="http://docs.oracle.com/javaee/5/api/javax/servlet/http/HttpServlet.html?is-external=true" title="class or interface in javax.servlet.http"><span class="typeNameLink">HttpServlet</span></a>
<ul>
<li type="circle">org.apache.juneau.rest.<a href="org/apache/juneau/rest/RestServlet.html" title="class in org.apache.juneau.rest"><span class="typeNameLink">RestServlet</span></a>
<ul>
@@ -1456,6 +1456,7 @@
<li type="circle">org.apache.juneau.jena.annotation.<a href="org/apache/juneau/jena/annotation/Rdf.html" title="annotation in org.apache.juneau.jena.annotation"><span class="typeNameLink">Rdf</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.rest.annotation.<a href="org/apache/juneau/rest/annotation/RestResource.html" title="annotation in org.apache.juneau.rest.annotation"><span class="typeNameLink">RestResource</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.rest.annotation.<a href="org/apache/juneau/rest/annotation/RestMethod.html" title="annotation in org.apache.juneau.rest.annotation"><span class="typeNameLink">RestMethod</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.rest.annotation.<a href="org/apache/juneau/rest/annotation/RestHook.html" title="annotation in org.apache.juneau.rest.annotation"><span class="typeNameLink">RestHook</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.rest.annotation.<a href="org/apache/juneau/rest/annotation/Response.html" title="annotation in org.apache.juneau.rest.annotation"><span class="typeNameLink">Response</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.rest.annotation.<a href="org/apache/juneau/rest/annotation/ResourceSwagger.html" title="annotation in org.apache.juneau.rest.annotation"><span class="typeNameLink">ResourceSwagger</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.rest.annotation.<a href="org/apache/juneau/rest/annotation/Query.html" title="annotation in org.apache.juneau.rest.annotation"><span class="typeNameLink">Query</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>
@@ -1494,6 +1495,7 @@
<li type="circle">org.apache.juneau.xml.annotation.<a href="org/apache/juneau/xml/annotation/XmlFormat.html" title="enum in org.apache.juneau.xml.annotation"><span class="typeNameLink">XmlFormat</span></a></li>
<li type="circle">org.apache.juneau.jena.<a href="org/apache/juneau/jena/RdfCollectionFormat.html" title="enum in org.apache.juneau.jena"><span class="typeNameLink">RdfCollectionFormat</span></a></li>
<li type="circle">org.apache.juneau.rest.annotation.<a href="org/apache/juneau/rest/annotation/Inherit.html" title="enum in org.apache.juneau.rest.annotation"><span class="typeNameLink">Inherit</span></a></li>
+<li type="circle">org.apache.juneau.rest.annotation.<a href="org/apache/juneau/rest/annotation/HookEvent.html" title="enum in org.apache.juneau.rest.annotation"><span class="typeNameLink">HookEvent</span></a></li>
<li type="circle">org.apache.juneau.rest.<a href="org/apache/juneau/rest/RestParamType.html" title="enum in org.apache.juneau.rest"><span class="typeNameLink">RestParamType</span></a></li>
<li type="circle">org.apache.juneau.rest.client.<a href="org/apache/juneau/rest/client/SSLOpts.CertValidate.html" title="enum in org.apache.juneau.rest.client"><span class="typeNameLink">SSLOpts.CertValidate</span></a></li>
<li type="circle">org.apache.juneau.rest.client.<a href="org/apache/juneau/rest/client/SSLOpts.HostVerify.html" title="enum in org.apache.juneau.rest.client"><span class="typeNameLink">SSLOpts.HostVerify</span></a></li>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/84931d4d/content/site/apidocs/src-html/org/apache/juneau/html/HtmlBeanPropertyMeta.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/html/HtmlBeanPropertyMeta.html b/content/site/apidocs/src-html/org/apache/juneau/html/HtmlBeanPropertyMeta.html
index 3315ef7..c453321 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/html/HtmlBeanPropertyMeta.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/html/HtmlBeanPropertyMeta.html
@@ -33,7 +33,7 @@
<span class="sourceLineNo">025</span><a name="line.25"></a>
<span class="sourceLineNo">026</span> private final boolean asXml, noTables, noTableHeaders, asPlainText;<a name="line.26"></a>
<span class="sourceLineNo">027</span> private final HtmlRender render;<a name="line.27"></a>
-<span class="sourceLineNo">028</span> private final String link;<a name="line.28"></a>
+<span class="sourceLineNo">028</span> private final String link, anchorText;<a name="line.28"></a>
<span class="sourceLineNo">029</span><a name="line.29"></a>
<span class="sourceLineNo">030</span> /**<a name="line.30"></a>
<span class="sourceLineNo">031</span> * Constructor.<a name="line.31"></a>
@@ -57,97 +57,112 @@
<span class="sourceLineNo">049</span> this.asPlainText = b.asPlainText;<a name="line.49"></a>
<span class="sourceLineNo">050</span> this.render = ClassUtils.newInstance(HtmlRender.class, b.render);<a name="line.50"></a>
<span class="sourceLineNo">051</span> this.link = b.link;<a name="line.51"></a>
-<span class="sourceLineNo">052</span> }<a name="line.52"></a>
-<span class="sourceLineNo">053</span><a name="line.53"></a>
-<span class="sourceLineNo">054</span> private static class Builder {<a name="line.54"></a>
-<span class="sourceLineNo">055</span> boolean asXml, noTables, noTableHeaders, asPlainText;<a name="line.55"></a>
-<span class="sourceLineNo">056</span> Class<? extends HtmlRender> render = HtmlRender.class;<a name="line.56"></a>
-<span class="sourceLineNo">057</span> String link;<a name="line.57"></a>
-<span class="sourceLineNo">058</span><a name="line.58"></a>
-<span class="sourceLineNo">059</span> void findHtmlInfo(Html html) {<a name="line.59"></a>
-<span class="sourceLineNo">060</span> if (html == null)<a name="line.60"></a>
-<span class="sourceLineNo">061</span> return;<a name="line.61"></a>
-<span class="sourceLineNo">062</span> if (html.asXml())<a name="line.62"></a>
-<span class="sourceLineNo">063</span> asXml = html.asXml();<a name="line.63"></a>
-<span class="sourceLineNo">064</span> if (html.noTables())<a name="line.64"></a>
-<span class="sourceLineNo">065</span> noTables = html.noTables();<a name="line.65"></a>
-<span class="sourceLineNo">066</span> if (html.noTableHeaders())<a name="line.66"></a>
-<span class="sourceLineNo">067</span> noTableHeaders = html.noTableHeaders();<a name="line.67"></a>
-<span class="sourceLineNo">068</span> if (html.asPlainText())<a name="line.68"></a>
-<span class="sourceLineNo">069</span> asPlainText = html.asPlainText();<a name="line.69"></a>
-<span class="sourceLineNo">070</span> if (html.render() != HtmlRender.class)<a name="line.70"></a>
-<span class="sourceLineNo">071</span> render = html.render();<a name="line.71"></a>
-<span class="sourceLineNo">072</span> if (! html.link().isEmpty())<a name="line.72"></a>
-<span class="sourceLineNo">073</span> link = html.link();<a name="line.73"></a>
-<span class="sourceLineNo">074</span> }<a name="line.74"></a>
-<span class="sourceLineNo">075</span> }<a name="line.75"></a>
-<span class="sourceLineNo">076</span><a name="line.76"></a>
-<span class="sourceLineNo">077</span> /**<a name="line.77"></a>
-<span class="sourceLineNo">078</span> * Returns whether this bean property should be serialized as XML instead of HTML.<a name="line.78"></a>
-<span class="sourceLineNo">079</span> *<a name="line.79"></a>
-<span class="sourceLineNo">080</span> * @return <jk>true</jk> if the the {@link Html} annotation is specified, and {@link Html#asXml()} is <jk>true</jk>.<a name="line.80"></a>
-<span class="sourceLineNo">081</span> */<a name="line.81"></a>
-<span class="sourceLineNo">082</span> protected boolean isAsXml() {<a name="line.82"></a>
-<span class="sourceLineNo">083</span> return asXml;<a name="line.83"></a>
-<span class="sourceLineNo">084</span> }<a name="line.84"></a>
-<span class="sourceLineNo">085</span><a name="line.85"></a>
-<span class="sourceLineNo">086</span> /**<a name="line.86"></a>
-<span class="sourceLineNo">087</span> * Returns whether this bean property should be serialized as plain text instead of HTML.<a name="line.87"></a>
-<span class="sourceLineNo">088</span> *<a name="line.88"></a>
-<span class="sourceLineNo">089</span> * @return<a name="line.89"></a>
-<span class="sourceLineNo">090</span> * <jk>true</jk> if the the {@link Html} annotation is specified, and {@link Html#asPlainText()} is<a name="line.90"></a>
-<span class="sourceLineNo">091</span> * <jk>true</jk>.<a name="line.91"></a>
-<span class="sourceLineNo">092</span> */<a name="line.92"></a>
-<span class="sourceLineNo">093</span> protected boolean isAsPlainText() {<a name="line.93"></a>
-<span class="sourceLineNo">094</span> return asPlainText;<a name="line.94"></a>
-<span class="sourceLineNo">095</span> }<a name="line.95"></a>
-<span class="sourceLineNo">096</span><a name="line.96"></a>
-<span class="sourceLineNo">097</span> /**<a name="line.97"></a>
-<span class="sourceLineNo">098</span> * Returns whether this bean property should not be serialized as an HTML table.<a name="line.98"></a>
-<span class="sourceLineNo">099</span> *<a name="line.99"></a>
-<span class="sourceLineNo">100</span> * @return<a name="line.100"></a>
-<span class="sourceLineNo">101</span> * <jk>true</jk> if the the {@link Html} annotation is specified, and {@link Html#noTables()} is<a name="line.101"></a>
-<span class="sourceLineNo">102</span> * <jk>true</jk>.<a name="line.102"></a>
-<span class="sourceLineNo">103</span> */<a name="line.103"></a>
-<span class="sourceLineNo">104</span> protected boolean isNoTables() {<a name="line.104"></a>
-<span class="sourceLineNo">105</span> return noTables;<a name="line.105"></a>
-<span class="sourceLineNo">106</span> }<a name="line.106"></a>
-<span class="sourceLineNo">107</span><a name="line.107"></a>
-<span class="sourceLineNo">108</span> /**<a name="line.108"></a>
-<span class="sourceLineNo">109</span> * Returns whether this bean property should not include table headers when serialized as an HTML table.<a name="line.109"></a>
-<span class="sourceLineNo">110</span> *<a name="line.110"></a>
-<span class="sourceLineNo">111</span> * @return<a name="line.111"></a>
-<span class="sourceLineNo">112</span> * <jk>true</jk> if the the {@link Html} annotation is specified, and {@link Html#noTableHeaders()} is<a name="line.112"></a>
-<span class="sourceLineNo">113</span> * <jk>true</jk>.<a name="line.113"></a>
-<span class="sourceLineNo">114</span> */<a name="line.114"></a>
-<span class="sourceLineNo">115</span> public boolean isNoTableHeaders() {<a name="line.115"></a>
-<span class="sourceLineNo">116</span> return noTableHeaders;<a name="line.116"></a>
-<span class="sourceLineNo">117</span> }<a name="line.117"></a>
-<span class="sourceLineNo">118</span><a name="line.118"></a>
-<span class="sourceLineNo">119</span> /**<a name="line.119"></a>
-<span class="sourceLineNo">120</span> * Returns the render class for rendering the style and contents of this property value in HTML.<a name="line.120"></a>
-<span class="sourceLineNo">121</span> *<a name="line.121"></a>
-<span class="sourceLineNo">122</span> * <p><a name="line.122"></a>
-<span class="sourceLineNo">123</span> * This value is specified via the {@link Html#render()} annotation.<a name="line.123"></a>
+<span class="sourceLineNo">052</span> this.anchorText = b.anchorText;<a name="line.52"></a>
+<span class="sourceLineNo">053</span> }<a name="line.53"></a>
+<span class="sourceLineNo">054</span><a name="line.54"></a>
+<span class="sourceLineNo">055</span> private static class Builder {<a name="line.55"></a>
+<span class="sourceLineNo">056</span> boolean asXml, noTables, noTableHeaders, asPlainText;<a name="line.56"></a>
+<span class="sourceLineNo">057</span> Class<? extends HtmlRender> render = HtmlRender.class;<a name="line.57"></a>
+<span class="sourceLineNo">058</span> String link, anchorText;<a name="line.58"></a>
+<span class="sourceLineNo">059</span><a name="line.59"></a>
+<span class="sourceLineNo">060</span> void findHtmlInfo(Html html) {<a name="line.60"></a>
+<span class="sourceLineNo">061</span> if (html == null)<a name="line.61"></a>
+<span class="sourceLineNo">062</span> return;<a name="line.62"></a>
+<span class="sourceLineNo">063</span> if (html.asXml())<a name="line.63"></a>
+<span class="sourceLineNo">064</span> asXml = html.asXml();<a name="line.64"></a>
+<span class="sourceLineNo">065</span> if (html.noTables())<a name="line.65"></a>
+<span class="sourceLineNo">066</span> noTables = html.noTables();<a name="line.66"></a>
+<span class="sourceLineNo">067</span> if (html.noTableHeaders())<a name="line.67"></a>
+<span class="sourceLineNo">068</span> noTableHeaders = html.noTableHeaders();<a name="line.68"></a>
+<span class="sourceLineNo">069</span> if (html.asPlainText())<a name="line.69"></a>
+<span class="sourceLineNo">070</span> asPlainText = html.asPlainText();<a name="line.70"></a>
+<span class="sourceLineNo">071</span> if (html.render() != HtmlRender.class)<a name="line.71"></a>
+<span class="sourceLineNo">072</span> render = html.render();<a name="line.72"></a>
+<span class="sourceLineNo">073</span> if (! html.link().isEmpty())<a name="line.73"></a>
+<span class="sourceLineNo">074</span> link = html.link();<a name="line.74"></a>
+<span class="sourceLineNo">075</span> if (! html.anchorText().isEmpty())<a name="line.75"></a>
+<span class="sourceLineNo">076</span> anchorText = html.anchorText();<a name="line.76"></a>
+<span class="sourceLineNo">077</span> }<a name="line.77"></a>
+<span class="sourceLineNo">078</span> }<a name="line.78"></a>
+<span class="sourceLineNo">079</span><a name="line.79"></a>
+<span class="sourceLineNo">080</span> /**<a name="line.80"></a>
+<span class="sourceLineNo">081</span> * Returns whether this bean property should be serialized as XML instead of HTML.<a name="line.81"></a>
+<span class="sourceLineNo">082</span> *<a name="line.82"></a>
+<span class="sourceLineNo">083</span> * @return <jk>true</jk> if the the {@link Html} annotation is specified, and {@link Html#asXml()} is <jk>true</jk>.<a name="line.83"></a>
+<span class="sourceLineNo">084</span> */<a name="line.84"></a>
+<span class="sourceLineNo">085</span> protected boolean isAsXml() {<a name="line.85"></a>
+<span class="sourceLineNo">086</span> return asXml;<a name="line.86"></a>
+<span class="sourceLineNo">087</span> }<a name="line.87"></a>
+<span class="sourceLineNo">088</span><a name="line.88"></a>
+<span class="sourceLineNo">089</span> /**<a name="line.89"></a>
+<span class="sourceLineNo">090</span> * Returns whether this bean property should be serialized as plain text instead of HTML.<a name="line.90"></a>
+<span class="sourceLineNo">091</span> *<a name="line.91"></a>
+<span class="sourceLineNo">092</span> * @return<a name="line.92"></a>
+<span class="sourceLineNo">093</span> * <jk>true</jk> if the the {@link Html} annotation is specified, and {@link Html#asPlainText()} is<a name="line.93"></a>
+<span class="sourceLineNo">094</span> * <jk>true</jk>.<a name="line.94"></a>
+<span class="sourceLineNo">095</span> */<a name="line.95"></a>
+<span class="sourceLineNo">096</span> protected boolean isAsPlainText() {<a name="line.96"></a>
+<span class="sourceLineNo">097</span> return asPlainText;<a name="line.97"></a>
+<span class="sourceLineNo">098</span> }<a name="line.98"></a>
+<span class="sourceLineNo">099</span><a name="line.99"></a>
+<span class="sourceLineNo">100</span> /**<a name="line.100"></a>
+<span class="sourceLineNo">101</span> * Returns whether this bean property should not be serialized as an HTML table.<a name="line.101"></a>
+<span class="sourceLineNo">102</span> *<a name="line.102"></a>
+<span class="sourceLineNo">103</span> * @return<a name="line.103"></a>
+<span class="sourceLineNo">104</span> * <jk>true</jk> if the the {@link Html} annotation is specified, and {@link Html#noTables()} is<a name="line.104"></a>
+<span class="sourceLineNo">105</span> * <jk>true</jk>.<a name="line.105"></a>
+<span class="sourceLineNo">106</span> */<a name="line.106"></a>
+<span class="sourceLineNo">107</span> protected boolean isNoTables() {<a name="line.107"></a>
+<span class="sourceLineNo">108</span> return noTables;<a name="line.108"></a>
+<span class="sourceLineNo">109</span> }<a name="line.109"></a>
+<span class="sourceLineNo">110</span><a name="line.110"></a>
+<span class="sourceLineNo">111</span> /**<a name="line.111"></a>
+<span class="sourceLineNo">112</span> * Returns whether this bean property should not include table headers when serialized as an HTML table.<a name="line.112"></a>
+<span class="sourceLineNo">113</span> *<a name="line.113"></a>
+<span class="sourceLineNo">114</span> * @return<a name="line.114"></a>
+<span class="sourceLineNo">115</span> * <jk>true</jk> if the the {@link Html} annotation is specified, and {@link Html#noTableHeaders()} is<a name="line.115"></a>
+<span class="sourceLineNo">116</span> * <jk>true</jk>.<a name="line.116"></a>
+<span class="sourceLineNo">117</span> */<a name="line.117"></a>
+<span class="sourceLineNo">118</span> public boolean isNoTableHeaders() {<a name="line.118"></a>
+<span class="sourceLineNo">119</span> return noTableHeaders;<a name="line.119"></a>
+<span class="sourceLineNo">120</span> }<a name="line.120"></a>
+<span class="sourceLineNo">121</span><a name="line.121"></a>
+<span class="sourceLineNo">122</span> /**<a name="line.122"></a>
+<span class="sourceLineNo">123</span> * Returns the render class for rendering the style and contents of this property value in HTML.<a name="line.123"></a>
<span class="sourceLineNo">124</span> *<a name="line.124"></a>
-<span class="sourceLineNo">125</span> * @return The render class, never <jk>null</jk>.<a name="line.125"></a>
-<span class="sourceLineNo">126</span> */<a name="line.126"></a>
-<span class="sourceLineNo">127</span> public HtmlRender getRender() {<a name="line.127"></a>
-<span class="sourceLineNo">128</span> return render;<a name="line.128"></a>
-<span class="sourceLineNo">129</span> }<a name="line.129"></a>
-<span class="sourceLineNo">130</span><a name="line.130"></a>
-<span class="sourceLineNo">131</span> /**<a name="line.131"></a>
-<span class="sourceLineNo">132</span> * Adds a hyperlink to this value in HTML.<a name="line.132"></a>
-<span class="sourceLineNo">133</span> *<a name="line.133"></a>
-<span class="sourceLineNo">134</span> * <p><a name="line.134"></a>
-<span class="sourceLineNo">135</span> * This value is specified via the {@link Html#link()} annotation.<a name="line.135"></a>
+<span class="sourceLineNo">125</span> * <p><a name="line.125"></a>
+<span class="sourceLineNo">126</span> * This value is specified via the {@link Html#render()} annotation.<a name="line.126"></a>
+<span class="sourceLineNo">127</span> *<a name="line.127"></a>
+<span class="sourceLineNo">128</span> * @return The render class, never <jk>null</jk>.<a name="line.128"></a>
+<span class="sourceLineNo">129</span> */<a name="line.129"></a>
+<span class="sourceLineNo">130</span> public HtmlRender getRender() {<a name="line.130"></a>
+<span class="sourceLineNo">131</span> return render;<a name="line.131"></a>
+<span class="sourceLineNo">132</span> }<a name="line.132"></a>
+<span class="sourceLineNo">133</span><a name="line.133"></a>
+<span class="sourceLineNo">134</span> /**<a name="line.134"></a>
+<span class="sourceLineNo">135</span> * Adds a hyperlink to this value in HTML.<a name="line.135"></a>
<span class="sourceLineNo">136</span> *<a name="line.136"></a>
-<span class="sourceLineNo">137</span> * @return The link string, or <jk>null</jk> if not specified.<a name="line.137"></a>
-<span class="sourceLineNo">138</span> */<a name="line.138"></a>
-<span class="sourceLineNo">139</span> public String getLink() {<a name="line.139"></a>
-<span class="sourceLineNo">140</span> return link;<a name="line.140"></a>
-<span class="sourceLineNo">141</span> }<a name="line.141"></a>
-<span class="sourceLineNo">142</span>}<a name="line.142"></a>
+<span class="sourceLineNo">137</span> * <p><a name="line.137"></a>
+<span class="sourceLineNo">138</span> * This value is specified via the {@link Html#link()} annotation.<a name="line.138"></a>
+<span class="sourceLineNo">139</span> *<a name="line.139"></a>
+<span class="sourceLineNo">140</span> * @return The link string, or <jk>null</jk> if not specified.<a name="line.140"></a>
+<span class="sourceLineNo">141</span> */<a name="line.141"></a>
+<span class="sourceLineNo">142</span> public String getLink() {<a name="line.142"></a>
+<span class="sourceLineNo">143</span> return link;<a name="line.143"></a>
+<span class="sourceLineNo">144</span> }<a name="line.144"></a>
+<span class="sourceLineNo">145</span><a name="line.145"></a>
+<span class="sourceLineNo">146</span> /**<a name="line.146"></a>
+<span class="sourceLineNo">147</span> * Specifies the anchor text for this property.<a name="line.147"></a>
+<span class="sourceLineNo">148</span> *<a name="line.148"></a>
+<span class="sourceLineNo">149</span> * <p><a name="line.149"></a>
+<span class="sourceLineNo">150</span> * This value is specified via the {@link Html#anchorText()} annotation.<a name="line.150"></a>
+<span class="sourceLineNo">151</span> *<a name="line.151"></a>
+<span class="sourceLineNo">152</span> * @return The link string, or <jk>null</jk> if not specified.<a name="line.152"></a>
+<span class="sourceLineNo">153</span> */<a name="line.153"></a>
+<span class="sourceLineNo">154</span> public String getAnchorText() {<a name="line.154"></a>
+<span class="sourceLineNo">155</span> return anchorText;<a name="line.155"></a>
+<span class="sourceLineNo">156</span> }<a name="line.156"></a>
+<span class="sourceLineNo">157</span>}<a name="line.157"></a>