Repository: incubator-juneau Updated Branches: refs/heads/master 21a80b823 -> 926b7cf9a
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/926b7cf9/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestRequest.java ---------------------------------------------------------------------- diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestRequest.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestRequest.java index 861009f..5e030de 100644 --- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestRequest.java +++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestRequest.java @@ -95,6 +95,7 @@ public final class RestRequest extends HttpServletRequestWrapper { private ConfigFile cf; private Swagger swagger, fileSwagger; private Map<String,Widget> widgets; + private HtmlDocContext hdc; /** * Constructor. @@ -167,7 +168,7 @@ public final class RestRequest extends HttpServletRequestWrapper { final void init(Method javaMethod, ObjectMap properties, Map<String,String> defHeader, Map<String,String> defQuery, Map<String,String> defFormData, String defaultCharset, SerializerGroup mSerializers, ParserGroup mParsers, UrlEncodingParser mUrlEncodingParser, - BeanContext beanContext, EncoderGroup encoders, Map<String,Widget> widgets) { + BeanContext beanContext, EncoderGroup encoders, Map<String,Widget> widgets, HtmlDocContext hdc) { this.javaMethod = javaMethod; this.properties = properties; this.urlEncodingParser = mUrlEncodingParser; @@ -195,6 +196,7 @@ public final class RestRequest extends HttpServletRequestWrapper { this.defaultCharset = defaultCharset; this.defFormData = defFormData; this.widgets = widgets; + this.hdc = hdc; if (debug) { String msg = "" @@ -318,24 +320,24 @@ public final class RestRequest extends HttpServletRequestWrapper { char c2 = StringUtils.charAt(name, 0); if (c2 == 'a') { if ("aside".equals(name)) - return cm.htmlAside == null ? null : resolveVars(cm.htmlAside); + return resolveVars(hdc.aside); } else if (c2 == 'f') { if ("footer".equals(name)) - return cm.htmlFooter == null ? null : resolveVars(cm.htmlFooter); + return resolveVars(hdc.footer); } else if (c2 == 'h') { if ("header".equals(name)) - return cm.htmlHeader == null ? null : resolveVars(cm.htmlHeader); + return resolveVars(hdc.header); if ("head.list".equals(name)) - return resolveVars(cm.htmlHead); + return resolveVars(hdc.head); } else if (c2 == 'n') { if ("nav".equals(name)) - return cm.htmlNav == null ? null : resolveVars(cm.htmlNav); + return resolveVars(hdc.nav); if ("navlinks.list".equals(name)) { - if (cm.htmlNavLinks == null || cm.htmlNavLinks.length == 0) + if (hdc.navlinks == null || hdc.navlinks.length == 0) return null; try { List<String> la = new ArrayList<String>(); - for (String l : cm.htmlNavLinks) { + for (String l : hdc.navlinks) { // Temporary backwards compatibility with JSON object format. if (l.startsWith("{")) { ObjectMap m = new ObjectMap(l); @@ -351,14 +353,14 @@ public final class RestRequest extends HttpServletRequestWrapper { } } if ("noResultsMessage".equals(name)) - return cm.htmlNoResultsMessage == null ? null : resolveVars(cm.htmlNoResultsMessage); + return resolveVars(hdc.noResultsMessage); if ("nowrap".equals(name)) - return cm.htmlNoWrap; + return hdc.nowrap; } else if (c2 == 's') { if ("script.list".equals(name)) { Set<String> l = new LinkedHashSet<String>(); - if (cm.htmlScript != null) - l.add(resolveVars(cm.htmlScript)); + if (hdc.script != null) + l.add(resolveVars(hdc.script)); for (Widget w : getWidgets().values()) { String script; try { @@ -373,8 +375,8 @@ public final class RestRequest extends HttpServletRequestWrapper { } if ("style.list".equals(name)) { Set<String> l = new LinkedHashSet<String>(); - if (cm.htmlStyle != null) - l.add(resolveVars(cm.htmlStyle)); + if (hdc.style != null) + l.add(resolveVars(hdc.style)); for (Widget w : getWidgets().values()) { String style; try { @@ -391,12 +393,12 @@ public final class RestRequest extends HttpServletRequestWrapper { String s = getStylesheet(); // Exclude absolute URIs to stylesheets for security reasons. if (s == null || isAbsoluteUri(s)) - s = cm.htmlStylesheet; + s = hdc.stylesheet; return s == null ? null : resolveVars(s); } } else if (c2 == 't') { if ("template".equals(name)) - return cm.htmlTemplate; + return hdc.template; } } } else if (c == 'P') { http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/926b7cf9/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestResponse.java ---------------------------------------------------------------------- diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestResponse.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestResponse.java index fffd0c1..38e6b90 100644 --- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestResponse.java +++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestResponse.java @@ -21,14 +21,11 @@ import javax.servlet.http.*; import org.apache.juneau.*; import org.apache.juneau.encoders.*; -import org.apache.juneau.html.*; import org.apache.juneau.http.*; import org.apache.juneau.json.*; import org.apache.juneau.parser.*; -import org.apache.juneau.rest.annotation.*; import org.apache.juneau.serializer.*; import org.apache.juneau.urlencoding.*; -import org.apache.juneau.utils.*; import org.apache.juneau.xml.*; /** @@ -66,6 +63,7 @@ public final class RestResponse extends HttpServletResponseWrapper { private EncoderGroup encoders; private ServletOutputStream os; private PrintWriter w; + private HtmlDocBuilder htmlDocBuilder; /** * Constructor. @@ -180,6 +178,17 @@ public final class RestResponse extends HttpServletResponseWrapper { } /** + * Returns a programmatic interface for setting properties for the HTML doc view. + * + * @return A new programmatic interface for setting properties for the HTML doc view. + */ + public HtmlDocBuilder getHtmlDocBuilder() { + if (htmlDocBuilder == null) + htmlDocBuilder = new HtmlDocBuilder(properties); + return htmlDocBuilder; + } + + /** * Add a serializer property to send to the serializers to override a default value. * * <p> @@ -443,385 +452,6 @@ public final class RestResponse extends HttpServletResponseWrapper { super.setHeader(name, value); } - /** - * Sets the HTML header section contents. - * - * <p> - * The format of this value is HTML. - * - * <p> - * The page header normally contains the title and description, but this value can be used to override the contents - * to be whatever you want. - * - * <p> - * A value of <js>"NONE"</js> can be used to force no header. - * - * <p> - * This field can contain variables (e.g. <js>"$L{my.localized.variable}"</js>). - * <br>See {@link RestContext#getVarResolver()} for the list of supported variables. - * - * <p> - * This is the programmatic equivalent to the {@link HtmlDoc#header() @HtmlDoc.header()} annotation. - * - * @param value - * The HTML header section contents. - * Object will be converted to a string using {@link Object#toString()}. - * <p> - * <ul class='doctree'> - * <li class='info'> - * <b>Tip:</b> Use {@link StringMessage} to generate value with delayed serialization so as not to - * waste string concatenation cycles on non-HTML views. - * </ul> - * @return This object (for method chaining). - */ - public RestResponse setHtmlHeader(Object value) { - return setProperty(HtmlDocSerializerContext.HTMLDOC_header, value); - } - - /** - * Sets the links in the HTML nav section. - * - * <p> - * The format of this value is a lax-JSON map of key/value pairs where the keys are the link text and the values are - * relative (to the servlet) or absolute URLs. - * - * <p> - * The page links are positioned immediately under the title and text. - * - * <p> - * This field can contain variables (e.g. <js>"$L{my.localized.variable}"</js>). - * <br>See {@link RestContext#getVarResolver()} for the list of supported variables. - * - * <p> - * A value of <js>"NONE"</js> can be used to force no value. - * - * <p> - * This field can also use URIs of any support type in {@link UriResolver}. - * - * <p> - * This is the programmatic equivalent to the {@link HtmlDoc#navlinks() @HtmlDoc.navlinks()} annotation. - * - * @param value - * The HTML nav section links links. - * <p> - * <ul class='doctree'> - * <li class='info'> - * <b>Tip:</b> Use {@link StringMessage} to generate value with delayed serialization so as not to - * waste string concatenation cycles on non-HTML views. - * </ul> - * @return This object (for method chaining). - */ - public RestResponse setHtmlNavLinks(String[] value) { - properties.put(HtmlDocSerializerContext.HTMLDOC_navlinks, value); - return this; - } - - /** - * Sets the HTML nav section contents. - * - * <p> - * The format of this value is HTML. - * - * <p> - * The nav section of the page contains the links. - * - * <p> - * The format of this value is HTML. - * - * <p> - * When a value is specified, the {@link #setHtmlNavLinks(String[])} value will be ignored. - * - * <p> - * This field can contain variables (e.g. <js>"$L{my.localized.variable}"</js>). - * <br>See {@link RestContext#getVarResolver()} for the list of supported variables. - * - * <p> - * A value of <js>"NONE"</js> can be used to force no value. - * - * <p> - * This is the programmatic equivalent to the {@link HtmlDoc#nav() @HtmlDoc.nav()} annotation. - * - * @param value - * The HTML nav section contents. - * Object will be converted to a string using {@link Object#toString()}. - * <p> - * <ul class='doctree'> - * <li class='info'> - * <b>Tip:</b> Use {@link StringMessage} to generate value with delayed serialization so as not to - * waste string concatenation cycles on non-HTML views. - * </ul> - * @return This object (for method chaining). - */ - public RestResponse setHtmlNav(Object value) { - properties.put(HtmlDocSerializerContext.HTMLDOC_nav, value); - return this; - } - - /** - * Sets the HTML aside section contents. - * - * <p> - * The format of this value is HTML. - * - * <p> - * The aside section typically floats on the right side of the page. - * - * <p> - * This field can contain variables (e.g. <js>"$L{my.localized.variable}"</js>). - * <br>See {@link RestContext#getVarResolver()} for the list of supported variables. - * - * <p> - * A value of <js>"NONE"</js> can be used to force no value. - * - * <p> - * This is the programmatic equivalent to the {@link HtmlDoc#aside() @HtmlDoc.aside()} annotation. - * - * @param value - * The HTML aside section contents. - * Object will be converted to a string using {@link Object#toString()}. - * <p> - * <ul class='doctree'> - * <li class='info'> - * <b>Tip:</b> Use {@link StringMessage} to generate value with delayed serialization so as not to waste - * string concatenation cycles on non-HTML views. - * </ul> - * @return This object (for method chaining). - */ - public RestResponse setHtmlAside(Object value) { - properties.put(HtmlDocSerializerContext.HTMLDOC_aside, value); - return this; - } - - /** - * Sets the HTML footer section contents. - * - * <p> - * The format of this value is HTML. - * - * <p> - * The footer section typically floats on the bottom of the page. - * - * <p> - * This field can contain variables (e.g. <js>"$L{my.localized.variable}"</js>). - * <br>See {@link RestContext#getVarResolver()} for the list of supported variables. - * - * <p> - * A value of <js>"NONE"</js> can be used to force no value. - * - * <p> - * This is the programmatic equivalent to the {@link HtmlDoc#footer() @HtmlDoc.footer()} annotation. - * - * @param value - * The HTML footer section contents. - * Object will be converted to a string using {@link Object#toString()}. - * <p> - * <ul class='doctree'> - * <li class='info'> - * <b>Tip:</b> Use {@link StringMessage} to generate value with delayed serialization so as not to - * waste string concatenation cycles on non-HTML views. - * </ul> - * @return This object (for method chaining). - */ - public RestResponse setHtmlFooter(Object value) { - properties.put(HtmlDocSerializerContext.HTMLDOC_footer, value); - return this; - } - - /** - * Sets the HTML CSS style section contents. - * - * <p> - * The format of this value is CSS. - * - * <p> - * This field can contain variables (e.g. <js>"$L{my.localized.variable}"</js>). - * <br>See {@link RestContext#getVarResolver()} for the list of supported variables. - * - * <p> - * A value of <js>"NONE"</js> can be used to force no value. - * - * <p> - * This is the programmatic equivalent to the {@link HtmlDoc#style() @HtmlDoc.style()} annotation. - * - * @param value - * The HTML CSS style section contents. - * Object will be converted to a string using {@link Object#toString()}. - * <p> - * <ul class='doctree'> - * <li class='info'> - * <b>Tip:</b> Use {@link StringMessage} to generate value with delayed serialization so as not to - * waste string concatenation cycles on non-HTML views. - * </ul> - * @return This object (for method chaining). - */ - public RestResponse setHtmlStyle(Object value) { - properties.put(HtmlDocSerializerContext.HTMLDOC_style, value); - return this; - } - - /** - * Sets the CSS URL in the HTML CSS style section. - * - * <p> - * The format of this value is a comma-delimited list of URLs. - * - * <p> - * Specifies the URL to the stylesheet to add as a link in the style tag in the header. - * - * <p> - * The format of this value is CSS. - * - * <p> - * This field can contain variables (e.g. <js>"$L{my.localized.variable}"</js>) and can use URL protocols defined - * by {@link UriResolver}. - * <br>See {@link RestContext#getVarResolver()} for the list of supported variables. - * - * <p> - * This is the programmatic equivalent to the {@link HtmlDoc#stylesheet() @HtmlDoc.stylesheet()} annotation. - * - * @param value - * The CSS URL in the HTML CSS style section. - * Object will be converted to a string using {@link Object#toString()}. - * <p> - * <ul class='doctree'> - * <li class='info'> - * <b>Tip:</b> Use {@link StringMessage} to generate value with delayed serialization so as not to - * waste string concatenation cycles on non-HTML views. - * </ul> - * @return This object (for method chaining). - */ - public RestResponse setHtmlStylesheet(Object value) { - properties.put(HtmlDocSerializerContext.HTMLDOC_stylesheet, value); - return this; - } - - /** - * Sets the HTML script section contents. - * - * <p> - * The format of this value is Javascript. - * - * <p> - * This field can contain variables (e.g. <js>"$L{my.localized.variable}"</js>). - * <br>See {@link RestContext#getVarResolver()} for the list of supported variables. - * - * <p> - * A value of <js>"NONE"</js> can be used to force no value. - * - * <p> - * This is the programmatic equivalent to the {@link HtmlDoc#script() @HtmlDoc.script()} annotation. - * - * @param value - * The HTML script section contents. - * Object will be converted to a string using {@link Object#toString()}. - * <p> - * <ul class='doctree'> - * <li class='info'> - * <b>Tip:</b> Use {@link StringMessage} to generate value with delayed serialization so as not to - * waste string concatenation cycles on non-HTML views. - * </ul> - * @return This object (for method chaining). - */ - public RestResponse setHtmlScript(Object value) { - properties.put(HtmlDocSerializerContext.HTMLDOC_script, value); - return this; - } - - /** - * Sets the HTML head section contents. - * - * <p> - * The format of this value is HTML. - * - * <p> - * This field can contain variables (e.g. <js>"$L{my.localized.variable}"</js>). - * <br>See {@link RestContext#getVarResolver()} for the list of supported variables. - * - * <p> - * A value of <js>"NONE"</js> can be used to force no value. - * - * <p> - * This is the programmatic equivalent to the {@link HtmlDoc#head() @HtmlDoc.head()} annotation. - * - * @param value - * The HTML head section contents. - * <p> - * <ul class='doctree'> - * <li class='info'> - * <b>Tip:</b> Use {@link StringMessage} to generate value with delayed serialization so as not to - * waste string concatenation cycles on non-HTML views. - * </ul> - * @return This object (for method chaining). - */ - public RestResponse setHtmlHead(Object...value) { - properties.put(HtmlDocSerializerContext.HTMLDOC_head, value); - return this; - } - - /** - * Shorthand method for forcing the rendered HTML content to be no-wrap. - * - * <p> - * This is the programmatic equivalent to the {@link HtmlDoc#nowrap() @HtmlDoc.nowrap()} annotation. - * - * @param value The new nowrap setting. - * @return This object (for method chaining). - */ - public RestResponse setHtmlNoWrap(boolean value) { - properties.put(HtmlDocSerializerContext.HTMLDOC_nowrap, value); - return this; - } - - /** - * Specifies the text to display when serializing an empty array or collection. - * - * <p> - * This is the programmatic equivalent to the {@link HtmlDoc#noResultsMessage() @HtmlDoc.noResultsMessage()} - * annotation. - * - * @param value The text to display when serializing an empty array or collection. - * @return This object (for method chaining). - */ - public RestResponse setHtmlNoResultsMessage(Object value) { - properties.put(HtmlDocSerializerContext.HTMLDOC_noResultsMessage, value); - return this; - } - - /** - * Specifies the template class to use for rendering the HTML page. - * - * <p> - * By default, uses {@link HtmlDocTemplateBasic} to render the contents, although you can provide your own custom - * renderer or subclasses from the basic class to have full control over how the page is rendered. - * - * <p> - * This is the programmatic equivalent to the {@link HtmlDoc#template() @HtmlDoc.template()} annotation. - * - * @param value The HTML page template to use to render the HTML page. - * @return This object (for method chaining). - */ - public RestResponse setHtmlTemplate(Class<? extends HtmlDocTemplate> value) { - properties.put(HtmlDocSerializerContext.HTMLDOC_template, value); - return this; - } - - /** - * Specifies the template class to use for rendering the HTML page. - * - * <p> - * By default, uses {@link HtmlDocTemplateBasic} to render the contents, although you can provide your own custom - * renderer or subclasses from the basic class to have full control over how the page is rendered. - * - * <p> - * This is the programmatic equivalent to the {@link HtmlDoc#template() @HtmlDoc.template()} annotation. - * - * @param value The HTML page template to use to render the HTML page. - * @return This object (for method chaining). - */ - public RestResponse setHtmlTemplate(HtmlDocTemplate value) { - properties.put(HtmlDocSerializerContext.HTMLDOC_template, value); - return this; - } @Override /* ServletResponse */ public void flushBuffer() throws IOException { http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/926b7cf9/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/HtmlDoc.java ---------------------------------------------------------------------- diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/HtmlDoc.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/HtmlDoc.java index ef6d275..fe8622d 100644 --- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/HtmlDoc.java +++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/HtmlDoc.java @@ -108,7 +108,7 @@ public @interface HtmlDoc { * Multiple values are combined with newlines into a single string. * <li> * The programmatic equivalent to this annotation are the - * {@link RestConfig#setHtmlHeader(String)} and {@link RestResponse#setHtmlHeader(Object)} methods. + * {@link HtmlDocConfig#header(Object)} and {@link HtmlDocBuilder#header(Object)} methods. * <li> * On methods, this value is inherited from the <ja>@HtmlDoc</ja> annotation on the servlet/resource class. * <li> @@ -157,7 +157,7 @@ public @interface HtmlDoc { * This field can also use URIs of any support type in {@link UriResolver}. * <li> * The programmatic equivalent to this annotation are the - * {@link RestConfig#setHtmlNavLinks(String[])} and {@link RestResponse#setHtmlNavLinks(String[])} methods. + * {@link HtmlDocConfig#navlinks(Object[])} and {@link HtmlDocBuilder#navlinks(Object[])} methods. * <li> * On methods, this value is inherited from the <ja>@HtmlDoc</ja> annotation on the servlet/resource class. * <li> @@ -207,7 +207,7 @@ public @interface HtmlDoc { * Multiple values are combined with newlines into a single string. * <li> * The programmatic equivalent to this annotation are the - * {@link RestConfig#setHtmlNav(String)} and {@link RestResponse#setHtmlNav(Object)} methods. + * {@link HtmlDocConfig#nav(Object)} and {@link HtmlDocBuilder#nav(Object)} methods. * <li> * On methods, this value is inherited from the <ja>@HtmlDoc</ja> annotation on the servlet/resource class. * <li> @@ -250,7 +250,7 @@ public @interface HtmlDoc { * Multiple values are combined with newlines into a single string. * <li> * The programmatic equivalent to this annotation are the - * {@link RestConfig#setHtmlAside(String)} and {@link RestResponse#setHtmlAside(Object)} methods. + * {@link HtmlDocConfig#aside(Object)} and {@link HtmlDocBuilder#aside(Object)} methods. * <li> * On methods, this value is inherited from the <ja>@HtmlDoc</ja> annotation on the servlet/resource class. * <li> @@ -293,7 +293,7 @@ public @interface HtmlDoc { * Multiple values are combined with newlines into a single string. * <li> * The programmatic equivalent to this annotation are the - * {@link RestConfig#setHtmlFooter(String)} and {@link RestResponse#setHtmlFooter(Object)} methods. + * {@link HtmlDocConfig#footer(Object)} and {@link HtmlDocBuilder#footer(Object)} methods. * <li> * On methods, this value is inherited from the <ja>@HtmlDoc</ja> annotation on the servlet/resource class. * <li> @@ -334,7 +334,7 @@ public @interface HtmlDoc { * Multiple values are combined with newlines into a single string. * <li> * The programmatic equivalent to this annotation are the - * {@link RestConfig#setHtmlStyle(String)} and {@link RestResponse#setHtmlStyle(Object)} methods. + * {@link HtmlDocConfig#style(Object)} and {@link HtmlDocBuilder#style(Object)} methods. * <li> * On methods, this value is inherited from the <ja>@HtmlDoc</ja> annotation on the servlet/resource class. * <li> @@ -375,7 +375,7 @@ public @interface HtmlDoc { * <br>See {@link RestContext#getVarResolver()} for the list of supported variables. * <li> * The programmatic equivalent to this annotation are the - * {@link RestConfig#setHtmlStylesheet(String)}/{@link RestResponse#setHtmlStylesheet(Object)} methods. + * {@link HtmlDocConfig#stylesheet(Object)}/{@link HtmlDocBuilder#stylesheet(Object)} methods. * <li> * On methods, this value is inherited from the <ja>@HtmlDoc</ja> annotation on the servlet/resource class. * <li> @@ -413,7 +413,7 @@ public @interface HtmlDoc { * Multiple values are combined with newlines into a single string. * <li> * The programmatic equivalent to this annotation are the - * {@link RestConfig#setHtmlScript(String)} and {@link RestResponse#setHtmlScript(Object)} methods. + * {@link HtmlDocConfig#script(Object)} and {@link HtmlDocBuilder#script(Object)} methods. * <li> * On methods, this value is inherited from the <ja>@HtmlDoc</ja> annotation on the servlet/resource class. * <li> @@ -457,7 +457,7 @@ public @interface HtmlDoc { * The head content from the parent can be included by adding the literal <js>"INHERIT"</js> as a value. * <li> * The programmatic equivalent to this annotation are the - * {@link RestConfig#setHtmlHead(String[])} and {@link RestResponse#setHtmlHead(String[])} methods. + * {@link HtmlDocConfig#head(Object[])} and {@link HtmlDocBuilder#head(Object[])} methods. * <li> * On methods, this value is inherited from the <ja>@HtmlDoc</ja> annotation on the servlet/resource class. * <li> @@ -491,7 +491,7 @@ public @interface HtmlDoc { * <ul class='spaced-list'> * <li> * The programmatic equivalent to this annotation are the - * {@link RestConfig#setHtmlTemplate(Class)} and {@link RestResponse#setHtmlTemplate(Class)} methods. + * {@link HtmlDocConfig#template(Class)} and {@link HtmlDocBuilder#template(Class)} methods. * <li> * On methods, this value is inherited from the <ja>@HtmlDoc</ja> annotation on the servlet/resource class. * <li> http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/926b7cf9/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/package.html ---------------------------------------------------------------------- diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/package.html b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/package.html index eed626a..6def29e 100644 --- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/package.html +++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/package.html @@ -2974,12 +2974,6 @@ </td> </tr> <tr> - <td>{@link org.apache.juneau.rest.annotation.RestResource#favicon() favicon()}</td> - <td> - Favicon is searched for in child-to-parent order. - </td> - </tr> - <tr> <td>{@link org.apache.juneau.rest.annotation.RestResource#staticFiles() staticFiles()}</td> <td> Static files on child are combined with those on parent class. http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/926b7cf9/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/vars/UrlVar.java ---------------------------------------------------------------------- diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/vars/UrlVar.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/vars/UrlVar.java index 365d48e..7e0b3af 100644 --- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/vars/UrlVar.java +++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/vars/UrlVar.java @@ -31,7 +31,7 @@ import org.apache.juneau.svl.*; * See {@link UriResolver} for the kinds of URIs that can be resolved. * <ul> * <li>{@link HtmlDoc#widgets() @HtmlDoc.widgets()} - * <li>{@link RestConfig#addHtmlWidget(Class)} + * <li>{@link HtmlDocConfig#widget(Class)} * </ul> * * <p> http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/926b7cf9/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/vars/WidgetVar.java ---------------------------------------------------------------------- diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/vars/WidgetVar.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/vars/WidgetVar.java index 2c3516c..0d5c241 100644 --- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/vars/WidgetVar.java +++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/vars/WidgetVar.java @@ -30,7 +30,7 @@ import org.apache.juneau.svl.*; * They're registered via the following mechanisms: * <ul> * <li>{@link HtmlDoc#widgets() @HtmlDoc.widgets()} - * <li>{@link RestConfig#addHtmlWidget(Class)} + * <li>{@link HtmlDocConfig#widget(Class)} * </ul> * * @see org.apache.juneau.svl http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/926b7cf9/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/widget/Widget.java ---------------------------------------------------------------------- diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/widget/Widget.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/widget/Widget.java index e8a4812..7e6eb97 100644 --- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/widget/Widget.java +++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/widget/Widget.java @@ -26,7 +26,7 @@ import org.apache.juneau.utils.*; * Widgets are associated with resources through the following * <ul> * <li>{@link HtmlDoc#widgets() @HtmlDoc.widgets} - * <li>{@link RestConfig#addHtmlWidget(Class)} + * <li>{@link HtmlDocConfig#widget(Class)} * </ul> * * <p>
