This is an automated email from the ASF dual-hosted git repository.
jamesbognar pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/juneau.git
The following commit(s) were added to refs/heads/master by this push:
new 58c6de8 Javadocs
58c6de8 is described below
commit 58c6de81bdfa7d007cb699bc638f335a255df5f1
Author: JamesBognar <jamesbog...@apache.org>
AuthorDate: Thu Sep 13 20:03:41 2018 -0400
Javadocs
---
.../apache/juneau/dto/cognos/doc-files/HTML.png | Bin 8476 -> 0 bytes
.../apache/juneau/dto/cognos/doc-files/JSON.png | Bin 6963 -> 0 bytes
.../apache/juneau/dto/cognos/doc-files/RDFXML.png | Bin 19981 -> 0 bytes
.../java/org/apache/juneau/dto/cognos/package.html | 183 ---------------------
.../org/apache/juneau/html/HtmlDocSerializer.java | 4 -
.../org/apache/juneau/html/HtmlSerializer.java | 6 +-
.../org/apache/juneau/html/annotation/Html.java | 2 +-
juneau-doc/juneau-doc.jar | Bin 20178 -> 19983 bytes
.../apache/juneau/doc/internal/DocLinkTester.java | 24 +--
.../doc-files/juneau-rest-server.restRPC.1.png} | Bin
.../doc-files/juneau-rest-server.restRPC.2.png} | Bin
.../doc-files/juneau-rest-server.restRPC.3.png} | Bin
.../doc-files/juneau-rest-server.restRPC.4.png} | Bin
.../doc-files/juneau-rest-server.restRPC.5.png} | Bin
.../doc-files/juneau-rest-server.restRPC.6.png} | Bin
.../doc-files/juneau-rest-server.restRPC.7.png} | Bin
.../doc-files/juneau-rest-server.restRPC.8.png} | Bin
.../doc-files/juneau-rest-server.restRPC.9.png} | Bin
juneau-doc/src/main/javadoc/overview.html | 46 +++---
.../src/main/javadoc/resources/juneau-doc.css | 11 +-
.../21.HtmlDetails/04.HtmlAnnotation.html | 4 +-
.../Topics/04.juneau-dto/04.SwaggerUI.html | 4 +-
.../Topics/07.juneau-rest-server/27.Swagger.html | 4 +-
.../27.Swagger/02.BasicSwaggerInfo.html | 2 +-
.../07.juneau-rest-server/27.Swagger/03.Tags.html | 4 +-
.../27.Swagger/04.Operations.html | 2 +-
.../27.Swagger/05.Parameters.html | 4 +-
.../27.Swagger/06.ParameterExamples.html | 6 +-
.../27.Swagger/07.Responses.html | 2 +-
.../27.Swagger/08.ResponseExamples.html | 8 +-
.../27.Swagger/09.Models.html | 6 +-
.../doc-files/juneau-rest-server.restRPC.1.png} | Bin
.../doc-files/juneau-rest-server.restRPC.2.png} | Bin
.../doc-files/juneau-rest-server.restRPC.3.png} | Bin
.../doc-files/juneau-rest-server.restRPC.4.png} | Bin
.../doc-files/juneau-rest-server.restRPC.5.png} | Bin
.../doc-files/juneau-rest-server.restRPC.6.png} | Bin
.../doc-files/juneau-rest-server.restRPC.7.png} | Bin
.../doc-files/juneau-rest-server.restRPC.8.png} | Bin
.../doc-files/juneau-rest-server.restRPC.9.png} | Bin
.../org/apache/juneau/rest/BasicRestServlet.java | 1 -
.../org/apache/juneau/rest/annotation/HtmlDoc.java | 2 +-
.../juneau/rest/widget/ContentTypeMenuItem.java | 4 -
43 files changed, 71 insertions(+), 258 deletions(-)
diff --git
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/cognos/doc-files/HTML.png
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/cognos/doc-files/HTML.png
deleted file mode 100644
index fd63c23..0000000
Binary files
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/cognos/doc-files/HTML.png
and /dev/null differ
diff --git
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/cognos/doc-files/JSON.png
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/cognos/doc-files/JSON.png
deleted file mode 100644
index 44785ad..0000000
Binary files
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/cognos/doc-files/JSON.png
and /dev/null differ
diff --git
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/cognos/doc-files/RDFXML.png
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/cognos/doc-files/RDFXML.png
deleted file mode 100644
index 081e949..0000000
Binary files
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/cognos/doc-files/RDFXML.png
and /dev/null differ
diff --git
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/cognos/package.html
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/cognos/package.html
deleted file mode 100644
index 3d811fd..0000000
---
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/cognos/package.html
+++ /dev/null
@@ -1,183 +0,0 @@
-<!DOCTYPE HTML>
-<!--
-/***************************************************************************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file
- * distributed with this work for additional information regarding copyright
ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the "License"); you may not
use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
-
***************************************************************************************************************************/
- -->
-<html>
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <style type="text/css">
- /* For viewing in Page Designer */
- @IMPORT url("../../../../../../javadoc.css");
-
- /* For viewing in REST interface */
- @IMPORT url("../htdocs/javadoc.css");
- body {
- margin: 20px;
- }
- </style>
- <script>
- /* Replace all @code and @link tags. */
- window.onload = function() {
- document.body.innerHTML =
document.body.innerHTML.replace(/\{\@code ([^\}]+)\}/g, '<code>$1</code>');
- document.body.innerHTML =
document.body.innerHTML.replace(/\{\@link (([^\}]+)\.)?([^\.\}]+)\}/g,
'<code>$3</code>');
- }
- </script>
-</head>
-<body>
-<p>Cognos Data Transfer Objects</p>
-<script>
- function toggle(x) {
- var div = x.nextSibling;
- while (div != null && div.nodeType != 1)
- div = div.nextSibling;
- if (div != null) {
- var d = div.style.display;
- if (d == 'block' || d == '') {
- div.style.display = 'none';
- x.className += " closed";
- } else {
- div.style.display = 'block';
- x.className =
x.className.replace(/(?:^|\s)closed(?!\S)/g , '' );
- }
- }
- }
-</script>
-<a id='TOC'></a><h5 class='toc'>Table of Contents</h5>
-<ol class='toc'>
- <li><p>{@doc package-summary.html#CognosSerializer Cognos serialization
support}</p>
- <li><p>{@doc package-summary.html#CognosParser Cognos parsing
support}</p>
-</ol>
-
-<!--
========================================================================================================
-->
-<a id="CognosSerializer"></a>
-<h2 class='topic' onclick='toggle(this)'>1 - Cognos serialization support</h2>
-<div class='topic'>
- <p>
- The {@link org.apache.juneau.dto.cognos.DataSet} class is a DTO
used to convert POJO models directly to Cognos-XML.
- </p>
- <p>
- Because of the nature of the Cognos XML syntax, only
<i>2-dimensional</i> POJO data structures can be serialized to Cognos-XML.
- </p>
- <p>
- For example...
- </p>
- <ul class='normal'>
- <li><code>Collection<Bean></code>
- <li><code>Collection<Map></code>
- <li>{@code MyBean[]}
- <li>{@code HashMap[]}
- </ul>
-
- <h5 class='topic'>Example:</h5>
- <p>
- The following example shows how to generate Cognos-XML from a
POJO.
- The example uses the <a class='doclink'
href='../../doc-files/AddressBook.html'>AddressBook</a> sample POJO.
- It should be noted that since the {@code AddressBook} class is
a subclass of {@code LinkedList}, it fulfills
- the requirement of being a tabular data structure.
- </p>
- <p class='bcode w800'>
- <jc>// Create our POJO with some entries.</jc>
- AddressBook addressBook = <jk>new</jk> AddressBook();
- addressBook.add(
- <jk>new</jk> Person(<js>"Barack Obama"</js>, <js>"Aug 4,
1961"</js>,
- <jk>new</jk> Address(<js>"1600 Pennsylvania Ave"</js>,
<js>"Washington"</js>, <js>"DC"</js>, 20500, <jk>true</jk>),
- <jk>new</jk> Address(<js>"5046 S Greenwood Ave"</js>,
<js>"Chicago"</js>, <js>"IL"</js>, 60615, <jk>false</jk>)
- )
- );
- addressBook.add(
- <jk>new</jk> Person(<js>"George Walker Bush"</js>, <js>"Jul 6,
1946"</js>,
- <jk>new</jk> Address(<js>"43 Prairie Chapel Rd"</js>,
<js>"Crawford"</js>, <js>"TX"</js>, 76638, <jk>true</jk>),
- <jk>new</jk> Address(<js>"1600 Pennsylvania Ave"</js>,
<js>"Washington"</js>, <js>"DC"</js>, 20500, <jk>false</jk>)
- )
- );
-
- <jc>// Define the Cognos metadata</jc>
- Column[] items = {
- <jk>new</jk> Column(<js>"name"</js>, <js>"xs:String"</js>, 255),
- <jk>new</jk> Column(<js>"age"</js>, <js>"xs:int"</js>),
- <jk>new</jk> Column(<js>"numAddresses"</js>, <js>"xs:int"</js>)
- .addPojoSwap(
- <jk>new</jk> PojoSwap<Person,Integer>() {
- <ja>@Override</ja>
- <jk>public</jk> Integer
swap(BeanSession session, Person p) {
- <jk>return</jk>
p.<jf>addresses</jf>.size();
- }
- }
- )
- };
-
- <jc>// Create the Cognos DataSet object</jc>
- DataSet ds = <jk>new</jk> DataSet(items, <jsf>addressBook</jsf>,
BeanContext.<jsf>DEFAULT</jsf>);
-
- <jc>// Serialize it to XML</jc>
- String xml = XmlSerializer.<jsf>DEFAULT_SQ</jsf>.serialize(ds);
- </p>
- <p>
- When run, this code produces the following XML...
- </p>
- <p class='bcode w800'>
- <xt><?xml</xt> <xa>version</xa>=<xs>'1.0'</xs>
<xa>encoding</xa>=<xs>'UTF-8'</xs><xt>?></xt>
- <xt><c:dataset
<xa>xmlns:c</xa>=<xs>'http://developer.cognos.com/schemas/xmldata/1/'</xs>></xt>
- <xt><c:metadata></xt>
- <xt><c:item</xt> <xa>name</xa>=<xs>'name'</xs>
<xa>type</xa>=<xs>'xs:String'</xs> <xa>length</xa>=<xs>'255'</xs><xt>/></xt>
- <xt><c:item</xt> <xa>name</xa>=<xs>'age'</xs>
<xa>type</xa>=<xs>'xs:int'</xs><xt>/></xt>
- <xt><c:item</xt>
<xa>name</xa>=<xs>'numAddresses'</xs>
<xa>type</xa>=<xs>'xs:int'</xs><xt>/></xt>
- <xt></c:metadata></xt>
- <xt><c:data></xt>
- <xt><c:row></xt>
- <xt><c:value></xt>Barack
Obama<xt></c:value></xt>
-
<xt><c:value></xt>52<xt></c:value></xt>
-
<xt><c:value></xt>2<xt></c:value></xt>
- <xt></c:row></xt>
- <xt><c:row></xt>
- <xt><c:value></xt>George Walker
Bush<xt></c:value></xt>
-
<xt><c:value></xt>67<xt></c:value></xt>
-
<xt><c:value></xt>2<xt></c:value></xt>
- <xt></c:row></xt>
- <xt></c:data></xt>
- <xt></c:dataset></xt>
- </p>
-
- <h5 class='topic'>Other data formats</h5>
- <p>
- The following shows examples of what this data structure looks
like when serialized to other formats:
- </p>
-
- <h5 class='figure'>HTML</h5>
- <img class='bordered' src='doc-files/HTML.png'>
-
- <h5 class='figure'>JSON</h5>
- <img class='bordered' src='doc-files/JSON.png'>
-
- <h5 class='figure'>RDF/XML</h5>
- <img class='bordered' src='doc-files/RDFXML.png'>
-</div>
-
-<!--
========================================================================================================
-->
-<a id="CognosParser"></a>
-<h2 class='topic' onclick='toggle(this)'>2 - Cognos parsing support</h2>
-<div class='topic'>
- <p>
- The {@link org.apache.juneau.dto.cognos.DataSet} class can be
reconstructed from Cognos/XML using one of the standard XML parsers.
- </p>
-
- <h5 class='topic'>Example:</h5>
- <p class='bcode w800'>
- <jc>// Parse XML back into original DataSet</jc>
- DataSet ds = XmlParser.<jsf>DEFAULT</jsf>.parse(xml,
DataSet.<jk>class</jk>);
- </p>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializer.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializer.java
index 72be779..db682b6 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializer.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializer.java
@@ -292,10 +292,6 @@ public class HtmlDocSerializer extends
HtmlStrippedDocSerializer {
* </p>
*
* <p>
- * ...to produce this list of links on the HTML page...
- * <img class='bordered' src='doc-files/HTML_LINKS.png'>
- *
- * <p>
* A shortcut on <ja>@RestResource</ja> is also provided for this
setting:
* <p class='bcode w800'>
* <ja>@RestResource</ja>(
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializer.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializer.java
index 1c20479..0738f90 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializer.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializer.java
@@ -518,7 +518,7 @@ public class HtmlSerializer extends XmlSerializer {
*
.uriContext(<js>"{authority:'http://localhost:10000',contextRoot:'/myContext',servletPath:'/myServlet',pathInfo:'/foo'}"</js>)
* .build();
*
- * <jc>// Produces: <a
href='/myContext/myServlet/bar/baz'>myServlet/bar/baz</a></jc>
+ * <jc>// Produces: <a
href='/myContext/myServlet/bar/baz'>myServlet/bar/baz</a></jc>
* String html = s1.serialize(<jk>new</jk> MyBean());
* </p>
* <li class='jf'>{@link AnchorText#SERVLET_RELATIVE
SERVLET_RELATIVE} - Same as {@link AnchorText#TO_STRING TO_STRING} but assumes
it's a servlet-relative path.
@@ -539,7 +539,7 @@ public class HtmlSerializer extends XmlSerializer {
*
.uriContext(<js>"{authority:'http://localhost:10000',contextRoot:'/myContext',servletPath:'/myServlet',pathInfo:'/foo'}"</js>)
* .build();
*
- * <jc>// Produces: <a
href='/myContext/myServlet/bar/baz'>bar/baz</a></jc>
+ * <jc>// Produces: <a
href='/myContext/myServlet/bar/baz'>bar/baz</a></jc>
* String html = s1.serialize(<jk>new</jk> MyBean());
* </p>
* <li class='jf'>{@link AnchorText#PATH_RELATIVE
PATH_RELATIVE} - Same as {@link AnchorText#TO_STRING TO_STRING} but assumes
it's a path-relative path.
@@ -560,7 +560,7 @@ public class HtmlSerializer extends XmlSerializer {
*
.uriContext(<js>"{authority:'http://localhost:10000',contextRoot:'/myContext',servletPath:'/myServlet',pathInfo:'/foo'}"</js>)
* .build();
*
- * <jc>// Produces: <a
href='/myContext/myServlet/foo/bar/baz'>bar/baz</a></jc>
+ * <jc>// Produces: <a
href='/myContext/myServlet/foo/bar/baz'>bar/baz</a></jc>
* String html = s1.serialize(<jk>new</jk> MyBean());
* </p>
* </ul>
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/Html.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/Html.java
index dc8b8be..be52db0 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/Html.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/Html.java
@@ -41,7 +41,7 @@ public @interface Html {
*
* <h5 class='figure'>Example:</h5>
* <p class='bcode w800'>
- * <jc>// Produces <a href='...'>drive</a> when
serialized to HTML.</jc>
+ * <jc>// Produces <a href='...'>drive</a> when
serialized to HTML.</jc>
* <ja>@Html</ja>(anchorText=<js>"drive"</js>)
* <ja>@URI</ja> <jc>// Treat property as a URL</jc>
* <jk>public</jk> String getDrive() {...}
diff --git a/juneau-doc/juneau-doc.jar b/juneau-doc/juneau-doc.jar
index 402c75c..d235e7f 100644
Binary files a/juneau-doc/juneau-doc.jar and b/juneau-doc/juneau-doc.jar differ
diff --git
a/juneau-doc/src/main/java/org/apache/juneau/doc/internal/DocLinkTester.java
b/juneau-doc/src/main/java/org/apache/juneau/doc/internal/DocLinkTester.java
index 67aaa46..630ac51 100644
--- a/juneau-doc/src/main/java/org/apache/juneau/doc/internal/DocLinkTester.java
+++ b/juneau-doc/src/main/java/org/apache/juneau/doc/internal/DocLinkTester.java
@@ -90,7 +90,7 @@ public class DocLinkTester {
while (m.find()) {
String link = m.group(2);
String anchor = null;
- if (link.startsWith("https://";) ||
link.startsWith("http://";) || link.startsWith("mailto:";))
+ if (link.startsWith("https://";) ||
link.startsWith("http://";) || link.startsWith("mailto:";) ||
link.startsWith("javascript:") || link.startsWith("$"))
continue;
links++;
if (link.indexOf('?') != -1)
@@ -99,17 +99,17 @@ public class DocLinkTester {
if (link.indexOf('#') != -1) {
anchor =
link.substring(link.lastIndexOf('#')+1);
link = link.substring(0, link.lastIndexOf('#'));
- File f2 = link.isEmpty() ? f : new
File(f.getParentFile().getAbsolutePath() + "/" + link);
- if (! f2.exists()) {
- error(f, "missingLink=["+link+"]");
- } else if (anchor != null) {
- if (f2.isFile()) {
- boolean foundAnchor =
hasAnchor(f2, anchor);
- if (! foundAnchor)
- error(f,
"missingAnchor=["+link+"#"+anchor+"]");
- } else {
- error(f,
"invalidAnchor=["+link+"#"+anchor+"]");
- }
+ }
+ File f2 = link.isEmpty() ? f : new
File(f.getParentFile().getAbsolutePath() + "/" + link);
+ if (! f2.exists()) {
+ error(f, "missingLink=["+link+"]");
+ } else if (anchor != null) {
+ if (f2.isFile()) {
+ boolean foundAnchor = hasAnchor(f2,
anchor);
+ if (! foundAnchor)
+ error(f,
"missingAnchor=["+link+"#"+anchor+"]");
+ } else {
+ error(f,
"invalidAnchor=["+link+"#"+anchor+"]");
}
}
}
diff --git
a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.rRPC.1.png
b/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.restRPC.1.png
similarity index 100%
rename from
juneau-doc/src/main/resources/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.rRPC.1.png
rename to juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.restRPC.1.png
diff --git
a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.rRPC.2.png
b/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.restRPC.2.png
similarity index 100%
rename from
juneau-doc/src/main/resources/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.rRPC.2.png
rename to juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.restRPC.2.png
diff --git
a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.rRPC.3.png
b/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.restRPC.3.png
similarity index 100%
rename from
juneau-doc/src/main/resources/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.rRPC.3.png
rename to juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.restRPC.3.png
diff --git
a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.rRPC.4.png
b/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.restRPC.4.png
similarity index 100%
rename from
juneau-doc/src/main/resources/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.rRPC.4.png
rename to juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.restRPC.4.png
diff --git
a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.rRPC.5.png
b/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.restRPC.5.png
similarity index 100%
rename from
juneau-doc/src/main/resources/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.rRPC.5.png
rename to juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.restRPC.5.png
diff --git
a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.rRPC.6.png
b/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.restRPC.6.png
similarity index 100%
rename from
juneau-doc/src/main/resources/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.rRPC.6.png
rename to juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.restRPC.6.png
diff --git
a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.rRPC.7.png
b/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.restRPC.7.png
similarity index 100%
rename from
juneau-doc/src/main/resources/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.rRPC.7.png
rename to juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.restRPC.7.png
diff --git
a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.rRPC.8.png
b/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.restRPC.8.png
similarity index 100%
rename from
juneau-doc/src/main/resources/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.rRPC.8.png
rename to juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.restRPC.8.png
diff --git
a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.rRPC.9.png
b/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.restRPC.9.png
similarity index 100%
rename from
juneau-doc/src/main/resources/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.rRPC.9.png
rename to juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.restRPC.9.png
diff --git a/juneau-doc/src/main/javadoc/overview.html
b/juneau-doc/src/main/javadoc/overview.html
index 4458e31..1de700a 100644
--- a/juneau-doc/src/main/javadoc/overview.html
+++ b/juneau-doc/src/main/javadoc/overview.html
@@ -7712,7 +7712,7 @@
<p class='bpcode w800'>
<jk>public class</jk> FileSpace {
<jc>// Add a hyperlink to this bean property.</jc>
- <ja>@Html</ja>(link=<js>"servlet:/drive/{drive}"</js>)
+ <ja>@Html</ja>(link=<js>"servlet:/drive/{drive}"</js>)
public String getDrive() {...}
}
</p>
@@ -7721,7 +7721,7 @@
</p>
<h5 class='figure'>Example:</h5>
<p class='bpcode w800'>
- <jc>// Produces <a href='...'>CLICK ME!</a> when serialized
to HTML.</jc>
+ <jc>// Produces <a href='...'>CLICK ME!</a> when
serialized to HTML.</jc>
<jk>public class</jk> FileSpace {
<jc>// Add a hyperlink to this bean property.</jc>
<ja>@Html</ja>(link=<js>"servlet:/drive/{drive}"</js>,
anchorText=<js>"CLICK ME!"</js>)
@@ -10696,12 +10696,12 @@
<p>
The <code>PetStore</code> example described later provides an example
of auto-generated Swagger JSON:
</p>
-<img class='bordered' style='width:900px' src='doc-files/SwaggerUI.json.png'>
+<img class='bordered w900' src='doc-files/SwaggerUI.json.png'>
<p>
Using {@link org.apache.juneau.dto.swagger.ui.SwaggerUI}, we're able to
render that JSON as a Swagger user interface
when the request is asking for HTML:
</p>
-<img class='bordered' style='width:900px' src='doc-files/SwaggerUI.html.png'>
+<img class='bordered w900' src='doc-files/SwaggerUI.html.png'>
<p>
The class itself is nothing more than a POJO swap that swaps out {@link
org.apache.juneau.dto.swagger.Swagger} beans
@@ -18431,11 +18431,11 @@
<p>
As described previously, the <code>PetStore</code> example provides an
example of auto-generated Swagger JSON:
</p>
-<img class='bordered' style='width:900px'
src='doc-files/juneau-rest-server.Swagger.1.png'>
+<img class='bordered w900' src='doc-files/juneau-rest-server.Swagger.1.png'>
<p>
Using {@link org.apache.juneau.dto.swagger.ui.SwaggerUI}, we're able to
render that JSON as a Swagger user interface:
</p>
-<img class='bordered' style='width:900px'
src='doc-files/juneau-rest-server.Swagger.2.png'>
+<img class='bordered w900' src='doc-files/juneau-rest-server.Swagger.2.png'>
<!--
====================================================================================================
-->
@@ -18532,7 +18532,7 @@
<p>
The top part of the page shows general information about the REST
interface:
</p>
-<img class='bordered' style='width:900px'
src='doc-files/juneau-rest-server.Swagger.3.png'>
+<img class='bordered w900' src='doc-files/juneau-rest-server.Swagger.3.png'>
<p>
The information is pulled from the {@link
org.apache.juneau.rest.annotation.RestResource#swagger()
@RestResource(swagger)} annotation.
</p>
@@ -18698,7 +18698,7 @@
<br>In the example below, the <code>pet</code> and <code>store</code>
tag sections are collapsed
and the <code>user</code> section is not:
</p>
-<img class='bordered' style='width:900px'
src='doc-files/juneau-rest-server.Swagger.4.png'>
+<img class='bordered w900' src='doc-files/juneau-rest-server.Swagger.4.png'>
<p>
Tags are also defined in the <ja>@ResourceSwagger</ja> annotation
</p>
@@ -18786,7 +18786,7 @@
as well as the <code>getOptions()</code> method inherited from
<code>BaseRestServlet</code>, so these
show up at the top of the page:
</p>
-<img class='bordered' style='width:900px'
src='doc-files/juneau-rest-server.Swagger.5.png'>
+<img class='bordered w900' src='doc-files/juneau-rest-server.Swagger.5.png'>
</div><!-- END: 7.27.3 - juneau-rest-server.Swagger.Tags -->
<!--
====================================================================================================
-->
@@ -18796,7 +18796,7 @@
<p>
<ja>@RestMethod</ja>-annotated methods automatically get rendered as
Swagger operations:
</p>
-<img class='bordered' style='width:900px'
src='doc-files/juneau-rest-server.Swagger.Operations.1.png'>
+<img class='bordered w900'
src='doc-files/juneau-rest-server.Swagger.Operations.1.png'>
<p>
The following shows the annotations defined on the <code>GET
/pet</code> operation:
</p>
@@ -18841,7 +18841,7 @@
<p>
Expanding operations shows you a list of parameters:
</p>
-<img class='bordered' style='width:900px'
src='doc-files/juneau-rest-server.Swagger.Operations.2.png'>
+<img class='bordered w900'
src='doc-files/juneau-rest-server.Swagger.Operations.2.png'>
<p>
Parameter information can be defined in a couple of ways. The typical
way is through annotations on parameters
being passed to your <ja>@RestMethod</ja>-annotated method, like so:
@@ -18950,7 +18950,7 @@
<p>
The parameter section contains information about the request body as
well for PUT and POST methods, as shown here:
</p>
-<img class='bordered' style='width:900px'
src='doc-files/juneau-rest-server.Swagger.Parameters.2.png'>
+<img class='bordered w900'
src='doc-files/juneau-rest-server.Swagger.Parameters.2.png'>
<p>
The definition of this method is shown here:
</p>
@@ -18981,7 +18981,7 @@
<p>
The <code>model</code> select box in the parameters can be expanded to
show examples:
</p>
-<img class='bordered' style='width:900px'
src='doc-files/juneau-rest-server.Swagger.Parameters.1.png'>
+<img class='bordered w900'
src='doc-files/juneau-rest-server.Swagger.Parameters.1.png'>
<p>
The examples for query/form-data/path/header parameters can be defined
using the <code>example</code> attribute on your annotated parameters as shown
here:
</p>
@@ -19033,14 +19033,14 @@
<p>
Examples for request bodies includes all supported
<code>Content-Type</code> values:
</p>
-<img class='bordered' style='width:900px'
src='doc-files/juneau-rest-server.Swagger.Parameters.3.png'>
+<img class='bordered w900'
src='doc-files/juneau-rest-server.Swagger.Parameters.3.png'>
<p>
These are based on the parsers registered on your servlet or method.
</p>
<p>
Selecting any of the content types shows you a representative example
for the POJO:
</p>
-<img class='bordered' style='width:900px'
src='doc-files/juneau-rest-server.Swagger.Parameters.4.png'>
+<img class='bordered w900'
src='doc-files/juneau-rest-server.Swagger.Parameters.4.png'>
<p>
There are several options for defining examples for request bodies:
</p>
@@ -19212,7 +19212,7 @@
<p>
Under the input parameters are listed the possible responses for the
resource:
</p>
-<img class='bordered' style='width:900px'
src='doc-files/juneau-rest-server.Swagger.Operations.3.png'>
+<img class='bordered w900'
src='doc-files/juneau-rest-server.Swagger.Operations.3.png'>
<p>
The <code>200</code> response is determined by the return type on the
method, in this case a collection of <code>Pet</code> objects:
</p>
@@ -19258,15 +19258,15 @@
The <code>model</code> select box in the responses can be expanded to
show examples:
</p>
<h5 class='figure'>PetStoreResource.getPet()</h5>
-<img class='bordered' style='width:900px'
src='doc-files/juneau-rest-server.Swagger.ResponseExamples.1.png'>
+<img class='bordered w900'
src='doc-files/juneau-rest-server.Swagger.ResponseExamples.1.png'>
<p>
Examples are provided for any supported <code>Accept</code> type based
on the serializers defined on your
servlet/method.
</p>
<h5 class='figure'>application/json+simple</h5>
-<img class='bordered' style='width:900px'
src='doc-files/juneau-rest-server.Swagger.ResponseExamples.2.png'>
+<img class='bordered w900'
src='doc-files/juneau-rest-server.Swagger.ResponseExamples.2.png'>
<h5 class='figure'>text/uon</h5>
-<img class='bordered' style='width:900px'
src='doc-files/juneau-rest-server.Swagger.ResponseExamples.3.png'>
+<img class='bordered w900'
src='doc-files/juneau-rest-server.Swagger.ResponseExamples.3.png'>
<p>
Examples are pulled from the <code>examples</code> attribute in the
response object of the generated Swagger JSON:
</p>
@@ -19402,7 +19402,7 @@
<p>
Response headers are also rendered in the Swagger UI:
</p>
-<img class='bordered' style='width:900px'
src='doc-files/juneau-rest-server.Swagger.ResponseExamples.4.png'>
+<img class='bordered w900'
src='doc-files/juneau-rest-server.Swagger.ResponseExamples.4.png'>
<p>
These can be auto-generated from {@link
org.apache.juneau.http.annotation.ResponseHeader @ResponseHeader} annotations
defined on either
method parameters or type classes.
@@ -19503,9 +19503,9 @@
In the Swagger UI, this causes bean definitions to show up in the
Models section at the bottom of the page:
</p>
<h5 class='figure'>Models section</h5>
-<img class='bordered' style='width:900px'
src='doc-files/juneau-rest-server.Swagger.Models.1.png'>
+<img class='bordered w900'
src='doc-files/juneau-rest-server.Swagger.Models.1.png'>
<h5 class='figure'>Models section with Order bean expanded</h5>
-<img class='bordered' style='width:900px'
src='doc-files/juneau-rest-server.Swagger.Models.2.png'>
+<img class='bordered w900'
src='doc-files/juneau-rest-server.Swagger.Models.2.png'>
<p>
In the generated Swagger JSON, embedded schema information for beans
will be replaced with references such as the one shown below for the
<code>Order</code> bean:
</p>
@@ -19571,7 +19571,7 @@
<p>
Note that this does not affect how the information is rendered for that
bean in the Swagger UI:
</p>
-<img class='bordered' style='width:900px'
src='doc-files/juneau-rest-server.Swagger.Models.3.png'>
+<img class='bordered w900'
src='doc-files/juneau-rest-server.Swagger.Models.3.png'>
</div><!-- END: 7.27.9 - juneau-rest-server.Swagger.Models -->
<!--
====================================================================================================
-->
diff --git a/juneau-doc/src/main/javadoc/resources/juneau-doc.css
b/juneau-doc/src/main/javadoc/resources/juneau-doc.css
index 57e5ecc..ae0c58f 100755
--- a/juneau-doc/src/main/javadoc/resources/juneau-doc.css
+++ b/juneau-doc/src/main/javadoc/resources/juneau-doc.css
@@ -112,6 +112,7 @@ h4.topic {
background-repeat: no-repeat;
background-position: left center;
cursor: zoom-out;
+ max-width: 1000px;
}
h2.topic { font-size: 14pt; }
h3.topic { font-size: 13pt; }
@@ -222,6 +223,7 @@ div.contentContainer > div.block > p:first-child {
background: linear-gradient(to bottom, #F5F5F5, #DEE3E9) repeat scroll
0% 0% transparent;
background: -moz-linear-gradient(to bottom, #F5F5F5, #DEE3E9) repeat
scroll 0% 0% transparent;
background: -webkit-gradient(linear, left top, left bottom,
from(#F5F5F5), to(#DEE3E9) );
+ max-width: 900px;
}
/* Dark-colored background headers */
@@ -318,11 +320,11 @@ l {
font-size: 1.2em;
}
-.spaced-list>li { padding:5px; }
-.footer .spaced-list ul { margin:0 }
+.spaced-list>li { padding:5px; max-width: 800px;}
+.footer .spaced-list ul { margin:0; max-width: 800px; }
/* Documentation Tree */
-.doctree li {}
+.doctree li { max-width: 800px; }
li.normal {
list-style-image:none;
}
@@ -396,4 +398,7 @@ a.doclink {
.w800 {
width:800px !important;
}
+.w900 {
+ width:900px !important;
+}
diff --git
a/juneau-doc/src/main/resources/Topics/02.juneau-marshall/21.HtmlDetails/04.HtmlAnnotation.html
b/juneau-doc/src/main/resources/Topics/02.juneau-marshall/21.HtmlDetails/04.HtmlAnnotation.html
index 00c668b..6f587f2 100644
---
a/juneau-doc/src/main/resources/Topics/02.juneau-marshall/21.HtmlDetails/04.HtmlAnnotation.html
+++
b/juneau-doc/src/main/resources/Topics/02.juneau-marshall/21.HtmlDetails/04.HtmlAnnotation.html
@@ -37,7 +37,7 @@
<p class='bpcode w800'>
<jk>public class</jk> FileSpace {
<jc>// Add a hyperlink to this bean property.</jc>
- <ja>@Html</ja>(link=<js>"servlet:/drive/{drive}"</js>)
+ <ja>@Html</ja>(link=<js>"servlet:/drive/{drive}"</js>)
public String getDrive() {...}
}
</p>
@@ -46,7 +46,7 @@
</p>
<h5 class='figure'>Example:</h5>
<p class='bpcode w800'>
- <jc>// Produces <a href='...'>CLICK ME!</a> when serialized
to HTML.</jc>
+ <jc>// Produces <a href='...'>CLICK ME!</a> when
serialized to HTML.</jc>
<jk>public class</jk> FileSpace {
<jc>// Add a hyperlink to this bean property.</jc>
<ja>@Html</ja>(link=<js>"servlet:/drive/{drive}"</js>,
anchorText=<js>"CLICK ME!"</js>)
diff --git
a/juneau-doc/src/main/resources/Topics/04.juneau-dto/04.SwaggerUI.html
b/juneau-doc/src/main/resources/Topics/04.juneau-dto/04.SwaggerUI.html
index 311a3d2..55585a6 100644
--- a/juneau-doc/src/main/resources/Topics/04.juneau-dto/04.SwaggerUI.html
+++ b/juneau-doc/src/main/resources/Topics/04.juneau-dto/04.SwaggerUI.html
@@ -22,12 +22,12 @@
<p>
The <code>PetStore</code> example described later provides an example
of auto-generated Swagger JSON:
</p>
-<img class='bordered' style='width:900px' src='doc-files/SwaggerUI.json.png'>
+<img class='bordered w900' src='doc-files/SwaggerUI.json.png'>
<p>
Using {@link oaj.dto.swagger.ui.SwaggerUI}, we're able to render that
JSON as a Swagger user interface
when the request is asking for HTML:
</p>
-<img class='bordered' style='width:900px' src='doc-files/SwaggerUI.html.png'>
+<img class='bordered w900' src='doc-files/SwaggerUI.html.png'>
<p>
The class itself is nothing more than a POJO swap that swaps out {@link
oaj.dto.swagger.Swagger} beans
diff --git
a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/27.Swagger.html
b/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/27.Swagger.html
index e0aac3a..893330f 100644
--- a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/27.Swagger.html
+++ b/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/27.Swagger.html
@@ -22,10 +22,10 @@
<p>
As described previously, the <code>PetStore</code> example provides an
example of auto-generated Swagger JSON:
</p>
-<img class='bordered' style='width:900px'
src='doc-files/juneau-rest-server.Swagger.1.png'>
+<img class='bordered w900' src='doc-files/juneau-rest-server.Swagger.1.png'>
<p>
Using {@link oaj.dto.swagger.ui.SwaggerUI}, we're able to render that
JSON as a Swagger user interface:
</p>
-<img class='bordered' style='width:900px'
src='doc-files/juneau-rest-server.Swagger.2.png'>
+<img class='bordered w900' src='doc-files/juneau-rest-server.Swagger.2.png'>
\ No newline at end of file
diff --git
a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/27.Swagger/02.BasicSwaggerInfo.html
b/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/27.Swagger/02.BasicSwaggerInfo.html
index ea83734..21fa34e 100644
---
a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/27.Swagger/02.BasicSwaggerInfo.html
+++
b/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/27.Swagger/02.BasicSwaggerInfo.html
@@ -21,7 +21,7 @@
<p>
The top part of the page shows general information about the REST
interface:
</p>
-<img class='bordered' style='width:900px'
src='doc-files/juneau-rest-server.Swagger.3.png'>
+<img class='bordered w900' src='doc-files/juneau-rest-server.Swagger.3.png'>
<p>
The information is pulled from the {@link
oajr.annotation.RestResource#swagger() @RestResource(swagger)} annotation.
</p>
diff --git
a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/27.Swagger/03.Tags.html
b/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/27.Swagger/03.Tags.html
index 4c6566d..8b638ef 100644
---
a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/27.Swagger/03.Tags.html
+++
b/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/27.Swagger/03.Tags.html
@@ -21,7 +21,7 @@
<br>In the example below, the <code>pet</code> and <code>store</code>
tag sections are collapsed
and the <code>user</code> section is not:
</p>
-<img class='bordered' style='width:900px'
src='doc-files/juneau-rest-server.Swagger.4.png'>
+<img class='bordered w900' src='doc-files/juneau-rest-server.Swagger.4.png'>
<p>
Tags are also defined in the <ja>@ResourceSwagger</ja> annotation
</p>
@@ -109,4 +109,4 @@
as well as the <code>getOptions()</code> method inherited from
<code>BaseRestServlet</code>, so these
show up at the top of the page:
</p>
-<img class='bordered' style='width:900px'
src='doc-files/juneau-rest-server.Swagger.5.png'>
+<img class='bordered w900' src='doc-files/juneau-rest-server.Swagger.5.png'>
diff --git
a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/27.Swagger/04.Operations.html
b/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/27.Swagger/04.Operations.html
index aabe7f1..8afff01 100644
---
a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/27.Swagger/04.Operations.html
+++
b/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/27.Swagger/04.Operations.html
@@ -18,7 +18,7 @@
<p>
<ja>@RestMethod</ja>-annotated methods automatically get rendered as
Swagger operations:
</p>
-<img class='bordered' style='width:900px'
src='doc-files/juneau-rest-server.Swagger.Operations.1.png'>
+<img class='bordered w900'
src='doc-files/juneau-rest-server.Swagger.Operations.1.png'>
<p>
The following shows the annotations defined on the <code>GET
/pet</code> operation:
</p>
diff --git
a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/27.Swagger/05.Parameters.html
b/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/27.Swagger/05.Parameters.html
index e3abc95..3510324 100644
---
a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/27.Swagger/05.Parameters.html
+++
b/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/27.Swagger/05.Parameters.html
@@ -18,7 +18,7 @@
<p>
Expanding operations shows you a list of parameters:
</p>
-<img class='bordered' style='width:900px'
src='doc-files/juneau-rest-server.Swagger.Operations.2.png'>
+<img class='bordered w900'
src='doc-files/juneau-rest-server.Swagger.Operations.2.png'>
<p>
Parameter information can be defined in a couple of ways. The typical
way is through annotations on parameters
being passed to your <ja>@RestMethod</ja>-annotated method, like so:
@@ -127,7 +127,7 @@
<p>
The parameter section contains information about the request body as
well for PUT and POST methods, as shown here:
</p>
-<img class='bordered' style='width:900px'
src='doc-files/juneau-rest-server.Swagger.Parameters.2.png'>
+<img class='bordered w900'
src='doc-files/juneau-rest-server.Swagger.Parameters.2.png'>
<p>
The definition of this method is shown here:
</p>
diff --git
a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/27.Swagger/06.ParameterExamples.html
b/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/27.Swagger/06.ParameterExamples.html
index c479f01..344b9eb 100644
---
a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/27.Swagger/06.ParameterExamples.html
+++
b/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/27.Swagger/06.ParameterExamples.html
@@ -18,7 +18,7 @@
<p>
The <code>model</code> select box in the parameters can be expanded to
show examples:
</p>
-<img class='bordered' style='width:900px'
src='doc-files/juneau-rest-server.Swagger.Parameters.1.png'>
+<img class='bordered w900'
src='doc-files/juneau-rest-server.Swagger.Parameters.1.png'>
<p>
The examples for query/form-data/path/header parameters can be defined
using the <code>example</code> attribute on your annotated parameters as shown
here:
</p>
@@ -70,14 +70,14 @@
<p>
Examples for request bodies includes all supported
<code>Content-Type</code> values:
</p>
-<img class='bordered' style='width:900px'
src='doc-files/juneau-rest-server.Swagger.Parameters.3.png'>
+<img class='bordered w900'
src='doc-files/juneau-rest-server.Swagger.Parameters.3.png'>
<p>
These are based on the parsers registered on your servlet or method.
</p>
<p>
Selecting any of the content types shows you a representative example
for the POJO:
</p>
-<img class='bordered' style='width:900px'
src='doc-files/juneau-rest-server.Swagger.Parameters.4.png'>
+<img class='bordered w900'
src='doc-files/juneau-rest-server.Swagger.Parameters.4.png'>
<p>
There are several options for defining examples for request bodies:
</p>
diff --git
a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/27.Swagger/07.Responses.html
b/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/27.Swagger/07.Responses.html
index 0b95178..0f11c8d 100644
---
a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/27.Swagger/07.Responses.html
+++
b/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/27.Swagger/07.Responses.html
@@ -18,7 +18,7 @@
<p>
Under the input parameters are listed the possible responses for the
resource:
</p>
-<img class='bordered' style='width:900px'
src='doc-files/juneau-rest-server.Swagger.Operations.3.png'>
+<img class='bordered w900'
src='doc-files/juneau-rest-server.Swagger.Operations.3.png'>
<p>
The <code>200</code> response is determined by the return type on the
method, in this case a collection of <code>Pet</code> objects:
</p>
diff --git
a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/27.Swagger/08.ResponseExamples.html
b/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/27.Swagger/08.ResponseExamples.html
index 028c864..4d25110 100644
---
a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/27.Swagger/08.ResponseExamples.html
+++
b/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/27.Swagger/08.ResponseExamples.html
@@ -19,15 +19,15 @@
The <code>model</code> select box in the responses can be expanded to
show examples:
</p>
<h5 class='figure'>PetStoreResource.getPet()</h5>
-<img class='bordered' style='width:900px'
src='doc-files/juneau-rest-server.Swagger.ResponseExamples.1.png'>
+<img class='bordered w900'
src='doc-files/juneau-rest-server.Swagger.ResponseExamples.1.png'>
<p>
Examples are provided for any supported <code>Accept</code> type based
on the serializers defined on your
servlet/method.
</p>
<h5 class='figure'>application/json+simple</h5>
-<img class='bordered' style='width:900px'
src='doc-files/juneau-rest-server.Swagger.ResponseExamples.2.png'>
+<img class='bordered w900'
src='doc-files/juneau-rest-server.Swagger.ResponseExamples.2.png'>
<h5 class='figure'>text/uon</h5>
-<img class='bordered' style='width:900px'
src='doc-files/juneau-rest-server.Swagger.ResponseExamples.3.png'>
+<img class='bordered w900'
src='doc-files/juneau-rest-server.Swagger.ResponseExamples.3.png'>
<p>
Examples are pulled from the <code>examples</code> attribute in the
response object of the generated Swagger JSON:
</p>
@@ -163,7 +163,7 @@
<p>
Response headers are also rendered in the Swagger UI:
</p>
-<img class='bordered' style='width:900px'
src='doc-files/juneau-rest-server.Swagger.ResponseExamples.4.png'>
+<img class='bordered w900'
src='doc-files/juneau-rest-server.Swagger.ResponseExamples.4.png'>
<p>
These can be auto-generated from {@link
oaj.http.annotation.ResponseHeader @ResponseHeader} annotations defined on
either
method parameters or type classes.
diff --git
a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/27.Swagger/09.Models.html
b/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/27.Swagger/09.Models.html
index 64e5eb1..23e09e2 100644
---
a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/27.Swagger/09.Models.html
+++
b/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/27.Swagger/09.Models.html
@@ -38,9 +38,9 @@
In the Swagger UI, this causes bean definitions to show up in the
Models section at the bottom of the page:
</p>
<h5 class='figure'>Models section</h5>
-<img class='bordered' style='width:900px'
src='doc-files/juneau-rest-server.Swagger.Models.1.png'>
+<img class='bordered w900'
src='doc-files/juneau-rest-server.Swagger.Models.1.png'>
<h5 class='figure'>Models section with Order bean expanded</h5>
-<img class='bordered' style='width:900px'
src='doc-files/juneau-rest-server.Swagger.Models.2.png'>
+<img class='bordered w900'
src='doc-files/juneau-rest-server.Swagger.Models.2.png'>
<p>
In the generated Swagger JSON, embedded schema information for beans
will be replaced with references such as the one shown below for the
<code>Order</code> bean:
</p>
@@ -106,4 +106,4 @@
<p>
Note that this does not affect how the information is rendered for that
bean in the Swagger UI:
</p>
-<img class='bordered' style='width:900px'
src='doc-files/juneau-rest-server.Swagger.Models.3.png'>
+<img class='bordered w900'
src='doc-files/juneau-rest-server.Swagger.Models.3.png'>
diff --git
a/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.rRPC.1.png
b/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.restRPC.1.png
similarity index 100%
rename from juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.rRPC.1.png
rename to
juneau-doc/src/main/resources/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.restRPC.1.png
diff --git
a/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.rRPC.2.png
b/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.restRPC.2.png
similarity index 100%
rename from juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.rRPC.2.png
rename to
juneau-doc/src/main/resources/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.restRPC.2.png
diff --git
a/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.rRPC.3.png
b/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.restRPC.3.png
similarity index 100%
rename from juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.rRPC.3.png
rename to
juneau-doc/src/main/resources/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.restRPC.3.png
diff --git
a/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.rRPC.4.png
b/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.restRPC.4.png
similarity index 100%
rename from juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.rRPC.4.png
rename to
juneau-doc/src/main/resources/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.restRPC.4.png
diff --git
a/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.rRPC.5.png
b/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.restRPC.5.png
similarity index 100%
rename from juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.rRPC.5.png
rename to
juneau-doc/src/main/resources/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.restRPC.5.png
diff --git
a/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.rRPC.6.png
b/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.restRPC.6.png
similarity index 100%
rename from juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.rRPC.6.png
rename to
juneau-doc/src/main/resources/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.restRPC.6.png
diff --git
a/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.rRPC.7.png
b/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.restRPC.7.png
similarity index 100%
rename from juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.rRPC.7.png
rename to
juneau-doc/src/main/resources/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.restRPC.7.png
diff --git
a/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.rRPC.8.png
b/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.restRPC.8.png
similarity index 100%
rename from juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.rRPC.8.png
rename to
juneau-doc/src/main/resources/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.restRPC.8.png
diff --git
a/juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.rRPC.9.png
b/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.restRPC.9.png
similarity index 100%
rename from juneau-doc/src/main/javadoc/doc-files/juneau-rest-server.rRPC.9.png
rename to
juneau-doc/src/main/resources/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.restRPC.9.png
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/BasicRestServlet.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/BasicRestServlet.java
index 8ab1d2b..4c8f26f 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/BasicRestServlet.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/BasicRestServlet.java
@@ -142,7 +142,6 @@ import org.apache.juneau.xmlschema.*;
* <p>
* This subclass also provides a default OPTIONS page by implementing a {@link
#getOptions(RestRequest)} that returns a
* POJO consisting of beans describing the class.
- * <img class='bordered' src='doc-files/OptionsPage.png'>
*
* <p>
* The OPTIONS page can be modified or augmented by overriding this method and
providing your own data.
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 de197b3..36728ee 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
@@ -184,7 +184,7 @@ public @interface HtmlDoc {
* htmldoc=<ja>@HtmlDoc</ja>(
* head={
* <jc>// Add a shortcut link in the
browser tab</jc>
- * <js>"<link rel='icon'
href='$U{servlet:/htdocs/mypageicon.ico}'>"</js>,
+ * <js>"<link rel='icon'
href='$U{servlet:/htdocs/mypageicon.ico}'>"</js>,
*
* <jc>// Reload the page every 5 seconds
</jc>
* <js>"<meta http-equiv='refresh'
content='5'>"</js>
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/widget/ContentTypeMenuItem.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/widget/ContentTypeMenuItem.java
index 5329534..af35301 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/widget/ContentTypeMenuItem.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/widget/ContentTypeMenuItem.java
@@ -53,10 +53,6 @@ import org.apache.juneau.utils.*;
* <jk>public</jk> Collection<Pet> getPets() {
* </p>
*
- * <p>
- * It renders the following popup-box:
- * <br><img class='bordered' src='doc-files/ContentTypeMenuItem.png'>
- *
* <h5 class='section'>See Also:</h5>
* <ul>
* <li class='link'>{@doc
juneau-rest-server.HtmlDocAnnotation.PredefinedWidgets}
