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 2025/09/28 19:55:00 UTC

(juneau) branch master updated: Convert juneau-dto docs to juneau-bean.

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 878e2f66c Convert juneau-dto docs to juneau-bean.
878e2f66c is described below

commit 878e2f66ce813831f902572a467c424494123d70
Author: James Bognar <ja...@salesforce.com>
AuthorDate: Sun Sep 28 15:54:51 2025 -0400

    Convert juneau-dto docs to juneau-bean.
---
 juneau-bean/juneau-bean-swagger/.gitignore         |    6 -
 juneau-bean/juneau-bean-swagger/pom.xml            |   93 -
 .../java/org/apache/juneau/dto/LinkString.java     |  192 --
 .../java/org/apache/juneau/dto/ResultSetList.java  |  112 --
 .../org/apache/juneau/dto/atom/AtomBuilder.java    |  236 ---
 .../java/org/apache/juneau/dto/atom/Category.java  |  179 --
 .../java/org/apache/juneau/dto/atom/Common.java    |  122 --
 .../org/apache/juneau/dto/atom/CommonEntry.java    |  392 ----
 .../java/org/apache/juneau/dto/atom/Content.java   |  158 --
 .../java/org/apache/juneau/dto/atom/Entry.java     |  325 ---
 .../main/java/org/apache/juneau/dto/atom/Feed.java |  343 ----
 .../java/org/apache/juneau/dto/atom/Generator.java |  177 --
 .../main/java/org/apache/juneau/dto/atom/Icon.java |  123 --
 .../main/java/org/apache/juneau/dto/atom/Id.java   |  107 -
 .../main/java/org/apache/juneau/dto/atom/Link.java |  276 ---
 .../main/java/org/apache/juneau/dto/atom/Logo.java |  126 --
 .../java/org/apache/juneau/dto/atom/Person.java    |  174 --
 .../java/org/apache/juneau/dto/atom/Source.java    |  280 ---
 .../main/java/org/apache/juneau/dto/atom/Text.java |  157 --
 .../java/org/apache/juneau/dto/atom/Utils.java     |   39 -
 .../juneau/dto/atom/doc-files/Example_HTML.png     |  Bin 31484 -> 0 bytes
 .../org/apache/juneau/dto/atom/package-info.java   |   26 -
 .../java/org/apache/juneau/dto/atom/package.html   |  536 -----
 .../main/java/org/apache/juneau/dto/html5/A.java   |  535 -----
 .../java/org/apache/juneau/dto/html5/Abbr.java     |  437 ----
 .../java/org/apache/juneau/dto/html5/Address.java  |  435 ----
 .../java/org/apache/juneau/dto/html5/Area.java     |  567 ------
 .../java/org/apache/juneau/dto/html5/Article.java  |  479 -----
 .../java/org/apache/juneau/dto/html5/Aside.java    |  435 ----
 .../java/org/apache/juneau/dto/html5/Audio.java    |  573 ------
 .../main/java/org/apache/juneau/dto/html5/B.java   |  435 ----
 .../java/org/apache/juneau/dto/html5/Base.java     |  464 -----
 .../main/java/org/apache/juneau/dto/html5/Bdi.java |  429 ----
 .../main/java/org/apache/juneau/dto/html5/Bdo.java |  436 ----
 .../org/apache/juneau/dto/html5/Blockquote.java    |  450 -----
 .../java/org/apache/juneau/dto/html5/Body.java     |  507 -----
 .../main/java/org/apache/juneau/dto/html5/Br.java  |  414 ----
 .../java/org/apache/juneau/dto/html5/Button.java   |  631 ------
 .../java/org/apache/juneau/dto/html5/Canvas.java   |  469 -----
 .../java/org/apache/juneau/dto/html5/Caption.java  |  435 ----
 .../java/org/apache/juneau/dto/html5/Cite.java     |  435 ----
 .../java/org/apache/juneau/dto/html5/Code.java     |  435 ----
 .../main/java/org/apache/juneau/dto/html5/Col.java |  439 ----
 .../java/org/apache/juneau/dto/html5/Colgroup.java |  451 -----
 .../java/org/apache/juneau/dto/html5/Data.java     |  453 -----
 .../java/org/apache/juneau/dto/html5/Datalist.java |  436 ----
 .../main/java/org/apache/juneau/dto/html5/Dd.java  |  435 ----
 .../main/java/org/apache/juneau/dto/html5/Del.java |  463 -----
 .../main/java/org/apache/juneau/dto/html5/Dfn.java |  435 ----
 .../main/java/org/apache/juneau/dto/html5/Div.java |  435 ----
 .../main/java/org/apache/juneau/dto/html5/Dl.java  |  435 ----
 .../main/java/org/apache/juneau/dto/html5/Dt.java  |  435 ----
 .../main/java/org/apache/juneau/dto/html5/Em.java  |  435 ----
 .../java/org/apache/juneau/dto/html5/Embed.java    |  496 -----
 .../java/org/apache/juneau/dto/html5/Fieldset.java |  479 -----
 .../org/apache/juneau/dto/html5/Figcaption.java    |  435 ----
 .../java/org/apache/juneau/dto/html5/Figure.java   |  435 ----
 .../java/org/apache/juneau/dto/html5/Footer.java   |  435 ----
 .../java/org/apache/juneau/dto/html5/Form.java     |  570 ------
 .../main/java/org/apache/juneau/dto/html5/H1.java  |  435 ----
 .../main/java/org/apache/juneau/dto/html5/H2.java  |  435 ----
 .../main/java/org/apache/juneau/dto/html5/H3.java  |  435 ----
 .../main/java/org/apache/juneau/dto/html5/H4.java  |  435 ----
 .../main/java/org/apache/juneau/dto/html5/H5.java  |  435 ----
 .../main/java/org/apache/juneau/dto/html5/H6.java  |  435 ----
 .../java/org/apache/juneau/dto/html5/Head.java     |  435 ----
 .../java/org/apache/juneau/dto/html5/Header.java   |  435 ----
 .../main/java/org/apache/juneau/dto/html5/Hr.java  |  414 ----
 .../java/org/apache/juneau/dto/html5/Html.java     |  449 -----
 .../juneau/dto/html5/HtmlBeanDictionary.java       |  144 --
 .../org/apache/juneau/dto/html5/HtmlBuilder.java   | 2100 --------------------
 .../org/apache/juneau/dto/html5/HtmlElement.java   |  936 ---------
 .../juneau/dto/html5/HtmlElementContainer.java     |  520 -----
 .../apache/juneau/dto/html5/HtmlElementMixed.java  |  527 -----
 .../juneau/dto/html5/HtmlElementRawText.java       |  442 ----
 .../apache/juneau/dto/html5/HtmlElementText.java   |  441 ----
 .../apache/juneau/dto/html5/HtmlElementVoid.java   |  409 ----
 .../java/org/apache/juneau/dto/html5/HtmlText.java |   51 -
 .../main/java/org/apache/juneau/dto/html5/I.java   |  435 ----
 .../java/org/apache/juneau/dto/html5/Iframe.java   |  538 -----
 .../main/java/org/apache/juneau/dto/html5/Img.java |  542 -----
 .../java/org/apache/juneau/dto/html5/Input.java    |  915 ---------
 .../main/java/org/apache/juneau/dto/html5/Ins.java |  463 -----
 .../main/java/org/apache/juneau/dto/html5/Kbd.java |  435 ----
 .../java/org/apache/juneau/dto/html5/Keygen.java   |  502 -----
 .../java/org/apache/juneau/dto/html5/Label.java    |  463 -----
 .../java/org/apache/juneau/dto/html5/Legend.java   |  435 ----
 .../main/java/org/apache/juneau/dto/html5/Li.java  |  435 ----
 .../java/org/apache/juneau/dto/html5/Link.java     |  535 -----
 .../java/org/apache/juneau/dto/html5/Main.java     |  435 ----
 .../main/java/org/apache/juneau/dto/html5/Map.java |  449 -----
 .../java/org/apache/juneau/dto/html5/Mark.java     |  435 ----
 .../java/org/apache/juneau/dto/html5/Meta.java     |  473 -----
 .../java/org/apache/juneau/dto/html5/Meter.java    |  531 -----
 .../main/java/org/apache/juneau/dto/html5/Nav.java |  435 ----
 .../java/org/apache/juneau/dto/html5/Noscript.java |  436 ----
 .../java/org/apache/juneau/dto/html5/Object_.java  |  556 ------
 .../main/java/org/apache/juneau/dto/html5/Ol.java  |  482 -----
 .../java/org/apache/juneau/dto/html5/Optgroup.java |  465 -----
 .../java/org/apache/juneau/dto/html5/Option.java   |  502 -----
 .../java/org/apache/juneau/dto/html5/Output.java   |  477 -----
 .../main/java/org/apache/juneau/dto/html5/P.java   |  435 ----
 .../java/org/apache/juneau/dto/html5/Param.java    |  456 -----
 .../main/java/org/apache/juneau/dto/html5/Pre.java |  447 -----
 .../java/org/apache/juneau/dto/html5/Progress.java |  467 -----
 .../main/java/org/apache/juneau/dto/html5/Q.java   |  449 -----
 .../main/java/org/apache/juneau/dto/html5/Rb.java  |  435 ----
 .../main/java/org/apache/juneau/dto/html5/Rp.java  |  435 ----
 .../main/java/org/apache/juneau/dto/html5/Rt.java  |  435 ----
 .../main/java/org/apache/juneau/dto/html5/Rtc.java |  435 ----
 .../java/org/apache/juneau/dto/html5/Ruby.java     |  435 ----
 .../main/java/org/apache/juneau/dto/html5/S.java   |  435 ----
 .../java/org/apache/juneau/dto/html5/Samp.java     |  435 ----
 .../java/org/apache/juneau/dto/html5/Script.java   |  534 -----
 .../java/org/apache/juneau/dto/html5/Section.java  |  435 ----
 .../java/org/apache/juneau/dto/html5/Select.java   |  562 ------
 .../java/org/apache/juneau/dto/html5/Small.java    |  435 ----
 .../java/org/apache/juneau/dto/html5/Source.java   |  465 -----
 .../java/org/apache/juneau/dto/html5/Span.java     |  435 ----
 .../java/org/apache/juneau/dto/html5/Strong.java   |  435 ----
 .../java/org/apache/juneau/dto/html5/Style.java    |  470 -----
 .../main/java/org/apache/juneau/dto/html5/Sub.java |  435 ----
 .../main/java/org/apache/juneau/dto/html5/Sup.java |  435 ----
 .../java/org/apache/juneau/dto/html5/Table.java    |  448 -----
 .../java/org/apache/juneau/dto/html5/Tbody.java    |  435 ----
 .../main/java/org/apache/juneau/dto/html5/Td.java  |  481 -----
 .../java/org/apache/juneau/dto/html5/Template.java |  436 ----
 .../java/org/apache/juneau/dto/html5/Textarea.java |  658 ------
 .../java/org/apache/juneau/dto/html5/Tfoot.java    |  435 ----
 .../main/java/org/apache/juneau/dto/html5/Th.java  |  523 -----
 .../java/org/apache/juneau/dto/html5/Thead.java    |  435 ----
 .../java/org/apache/juneau/dto/html5/Time.java     |  450 -----
 .../java/org/apache/juneau/dto/html5/Title.java    |  429 ----
 .../main/java/org/apache/juneau/dto/html5/Tr.java  |  435 ----
 .../java/org/apache/juneau/dto/html5/Track.java    |  509 -----
 .../main/java/org/apache/juneau/dto/html5/U.java   |  435 ----
 .../main/java/org/apache/juneau/dto/html5/Ul.java  |  435 ----
 .../main/java/org/apache/juneau/dto/html5/Var.java |  435 ----
 .../java/org/apache/juneau/dto/html5/Video.java    |  621 ------
 .../main/java/org/apache/juneau/dto/html5/Wbr.java |  414 ----
 .../java/org/apache/juneau/dto/html5/package2.html |  311 ---
 .../apache/juneau/dto/jsonschema/JsonSchema.java   | 1458 --------------
 .../juneau/dto/jsonschema/JsonSchemaArray.java     |   50 -
 .../juneau/dto/jsonschema/JsonSchemaMap.java       |  135 --
 .../juneau/dto/jsonschema/JsonSchemaProperty.java  |   44 -
 .../jsonschema/JsonSchemaPropertySimpleArray.java  |   44 -
 .../juneau/dto/jsonschema/JsonSchemaRef.java       |   46 -
 .../org/apache/juneau/dto/jsonschema/JsonType.java |  103 -
 .../juneau/dto/jsonschema/JsonTypeArray.java       |   50 -
 .../dto/jsonschema/doc-files/Example_Html.png      |  Bin 31260 -> 0 bytes
 .../dto/jsonschema/doc-files/Example_Json.png      |  Bin 22006 -> 0 bytes
 .../dto/jsonschema/doc-files/Example_Options.png   |  Bin 41887 -> 0 bytes
 .../dto/jsonschema/doc-files/Example_Turtle.png    |  Bin 28988 -> 0 bytes
 .../jsonschema/doc-files/Example_UrlEncoded.png    |  Bin 21715 -> 0 bytes
 .../dto/jsonschema/doc-files/Example_Xml.png       |  Bin 28095 -> 0 bytes
 .../jsonschema/doc-files/Example_XmlRdfAbbrev.png  |  Bin 36296 -> 0 bytes
 .../org/apache/juneau/dto/jsonschema/package2.html |  504 -----
 .../org/apache/juneau/dto/openapi3/Contact.java    |  213 --
 .../apache/juneau/dto/openapi3/Discriminator.java  |  167 --
 .../org/apache/juneau/dto/openapi3/Encoding.java   |  266 ---
 .../org/apache/juneau/dto/openapi3/Example.java    |  241 ---
 .../juneau/dto/openapi3/ExternalDocumentation.java |  156 --
 .../org/apache/juneau/dto/openapi3/HeaderInfo.java |  474 -----
 .../java/org/apache/juneau/dto/openapi3/Info.java  |  330 ---
 .../java/org/apache/juneau/dto/openapi3/Items.java |  801 --------
 .../org/apache/juneau/dto/openapi3/License.java    |  175 --
 .../java/org/apache/juneau/dto/openapi3/Link.java  |  315 ---
 .../org/apache/juneau/dto/openapi3/MediaType.java  |  232 ---
 .../org/apache/juneau/dto/openapi3/OAuthFlow.java  |  250 ---
 .../org/apache/juneau/dto/openapi3/OAuthFlows.java |  288 ---
 .../apache/juneau/dto/openapi3/OpenApiElement.java |  182 --
 .../juneau/dto/openapi3/RequestBodyInfo.java       |  206 --
 .../org/apache/juneau/dto/openapi3/Response.java   |  252 ---
 .../org/apache/juneau/dto/openapi3/SchemaInfo.java | 1320 ------------
 .../juneau/dto/openapi3/SecuritySchemeInfo.java    |  474 -----
 .../org/apache/juneau/dto/openapi3/Server.java     |  197 --
 .../apache/juneau/dto/openapi3/ServerVariable.java |  244 ---
 .../java/org/apache/juneau/dto/openapi3/Tag.java   |  212 --
 .../java/org/apache/juneau/dto/openapi3/Xml.java   |  286 ---
 .../apache/juneau/dto/openapi3/package-info.java   |   17 -
 .../java/org/apache/juneau/dto/package-info.java   |   17 -
 .../org/apache/juneau/dto/swagger/Contact.java     |  216 --
 .../juneau/dto/swagger/ExternalDocumentation.java  |  185 --
 .../org/apache/juneau/dto/swagger/HeaderInfo.java  |  801 --------
 .../java/org/apache/juneau/dto/swagger/Info.java   |  368 ----
 .../java/org/apache/juneau/dto/swagger/Items.java  |  774 --------
 .../org/apache/juneau/dto/swagger/License.java     |  184 --
 .../org/apache/juneau/dto/swagger/Operation.java   |  863 --------
 .../apache/juneau/dto/swagger/OperationMap.java    |   82 -
 .../apache/juneau/dto/swagger/ParameterInfo.java   | 1033 ----------
 .../apache/juneau/dto/swagger/ResponseInfo.java    |  345 ----
 .../org/apache/juneau/dto/swagger/SchemaInfo.java  | 1145 -----------
 .../apache/juneau/dto/swagger/SecurityScheme.java  |  443 -----
 .../org/apache/juneau/dto/swagger/Swagger.java     |  967 ---------
 .../apache/juneau/dto/swagger/SwaggerBuilder.java  |  410 ----
 .../apache/juneau/dto/swagger/SwaggerElement.java  |  184 --
 .../java/org/apache/juneau/dto/swagger/Tag.java    |  220 --
 .../java/org/apache/juneau/dto/swagger/Xml.java    |  297 ---
 .../apache/juneau/dto/swagger/package-info.java    |   17 -
 .../apache/juneau/dto/swagger/ui/SwaggerUI.java    |  401 ----
 .../apache/juneau/dto/swagger/ui/package-info.java |   17 -
 .../org/apache/juneau/dto/swagger/ui/SwaggerUI.css |  342 ----
 .../org/apache/juneau/dto/swagger/ui/SwaggerUI.js  |   56 -
 .../topics/01.01.00.JuneauEcosystemOverview.md     |   28 +-
 juneau-docs/docs/topics/02.11.01.SwapBasics.md     |    2 +-
 ...auDtoBasics.md => 04.01.00.JuneauBeanBasics.md} |   10 +-
 ....02.00.Html5.md => 04.02.00.JuneauBeanHtml5.md} |    4 +-
 ...04.03.00.Atom.md => 04.03.00.JuneauBeanAtom.md} |    4 +-
 .../docs/topics/04.04.00.JuneauBeanJsonSchema.md   |   40 +
 juneau-docs/docs/topics/04.04.00.Swagger.md        |  156 --
 .../docs/topics/04.05.00.JuneauBeanOpenApi3.md     |  200 ++
 juneau-docs/docs/topics/04.05.00.SwaggerUi.md      |   77 -
 .../docs/topics/04.06.00.JuneauBeanCommon.md       |   26 +
 .../15.02.00.MyJettyMicroserviceInstalling.md      |    2 +-
 .../16.02.00.MySpringBootMicroserviceInstalling.md |    2 +-
 juneau-docs/sidebars.ts                            |   27 +-
 juneau-docs/src/pages/about.md                     |  204 +-
 217 files changed, 326 insertions(+), 79989 deletions(-)

diff --git a/juneau-bean/juneau-bean-swagger/.gitignore b/juneau-bean/juneau-bean-swagger/.gitignore
deleted file mode 100644
index 34acf885c..000000000
--- a/juneau-bean/juneau-bean-swagger/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-/target/
-**/.DS_Store
-.classpath
-.project
-/.settings/
-/bin/
diff --git a/juneau-bean/juneau-bean-swagger/pom.xml b/juneau-bean/juneau-bean-swagger/pom.xml
deleted file mode 100644
index 0d3855062..000000000
--- a/juneau-bean/juneau-bean-swagger/pom.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ***************************************************************************************************************************
- * 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.                                              *
- ***************************************************************************************************************************
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-	<modelVersion>4.0.0</modelVersion>
-
-	<parent>
-		<groupId>org.apache.juneau</groupId>
-		<artifactId>juneau-bean</artifactId>
-		<version>9.2.0-SNAPSHOT</version>
-	</parent>
-
-	<artifactId>juneau-bean-swagger</artifactId>
-	<name>juneau/bean/swagger</name>
-	<description>Apache Juneau Serializable Beans - Swagger</description>
-	<packaging>bundle</packaging>
-
-	<properties>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-	</properties>
-
-	<dependencies>
-		<dependency>
-			<groupId>org.apache.juneau</groupId>
-			<artifactId>juneau-marshall</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-	</dependencies>
-
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.felix</groupId>
-				<artifactId>maven-bundle-plugin</artifactId>
-				<extensions>true</extensions>
-				<configuration>
-					<instructions>
-						<Automatic-Module-Name>org.apache.juneau.dto</Automatic-Module-Name>
-					</instructions>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-source-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>attach-sources</id>
-						<phase>verify</phase>
-						<goals>
-							<goal>jar-no-fork</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jar-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.jacoco</groupId>
-				<artifactId>jacoco-maven-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>default-prepare-agent</id>
-						<goals>
-							<goal>prepare-agent</goal>
-						</goals>
-					</execution>
-					<execution>
-						<id>default-report</id>
-						<phase>prepare-package</phase>
-						<goals>
-							<goal>report</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-</project>
diff --git a/juneau-bean/juneau-bean-swagger/src/main/java/org/apache/juneau/dto/LinkString.java b/juneau-bean/juneau-bean-swagger/src/main/java/org/apache/juneau/dto/LinkString.java
deleted file mode 100644
index 6e530da9b..000000000
--- a/juneau-bean/juneau-bean-swagger/src/main/java/org/apache/juneau/dto/LinkString.java
+++ /dev/null
@@ -1,192 +0,0 @@
-// ***************************************************************************************************************************
-// * 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.                                              *
-// ***************************************************************************************************************************
-package org.apache.juneau.dto;
-
-import static org.apache.juneau.common.internal.StringUtils.*;
-import static org.apache.juneau.common.internal.ThrowableUtils.*;
-import static org.apache.juneau.internal.ObjectUtils.eq;
-
-import java.text.*;
-
-import org.apache.juneau.annotation.*;
-import org.apache.juneau.html.*;
-import org.apache.juneau.html.annotation.*;
-import org.apache.juneau.httppart.*;
-import org.apache.juneau.oapi.*;
-import org.apache.juneau.objecttools.*;
-import org.apache.juneau.serializer.*;
-
-/**
- * Simple bean that implements a hyperlink for the HTML serializer.
- *
- * <p>
- * The name and url properties correspond to the following parts of a hyperlink in an HTML document...
- * <p class='bxml'>
- * 	<xt>&lt;a</xt> <xa>href</xa>=<xs>'href'</xs><xt>&gt;</xt>name<xt>&lt;/a&gt;</xt>
- * </p>
- *
- * <p>
- * When encountered by the {@link HtmlSerializer} class, this object gets converted to a hyperlink.
- * All other serializers simply convert it to a simple bean.
- *
- * <h5 class='section'>See Also:</h5><ul>
- * </ul>
- */
-@HtmlLink
-@Bean(findFluentSetters=true)
-public class LinkString implements Comparable<LinkString> {
-	private String name;
-	private java.net.URI uri;
-
-	/** No-arg constructor. */
-	public LinkString() {}
-
-	/**
-	 * Constructor.
-	 *
-	 * @param name Corresponds to the text inside of the <xt>&lt;A&gt;</xt> element.
-	 * @param uri Corresponds to the value of the <xa>href</xa> attribute of the <xt>&lt;A&gt;</xt> element.
-	 * @param uriArgs Optional arguments for {@link MessageFormat} style arguments in the href.
-	 */
-	public LinkString(String name, String uri, Object...uriArgs) {
-		setName(name);
-		setUri(uri, uriArgs);
-	}
-
-
-	//-----------------------------------------------------------------------------------------------------------------
-	// Bean properties
-	//-----------------------------------------------------------------------------------------------------------------
-
-	/**
-	 * Bean property getter:  <property>name</property>.
-	 *
-	 * <p>
-	 * Corresponds to the text inside of the <xt>&lt;A&gt;</xt> element.
-	 *
-	 * @return The property value, or <jk>null</jk> if it is not set.
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * Bean property setter:  <property>name</property>.
-	 *
-	 * <p>
-	 * Corresponds to the text inside of the <xt>&lt;A&gt;</xt> element.
-	 *
-	 * @param value
-	 * 	The new value for this property.
-	 * 	<br>Can be <jk>null</jk> to unset the property.
-	 * @return This object
-	 */
-	public LinkString setName(String value) {
-		this.name = value;
-		return this;
-	}
-
-	//-----------------------------------------------------------------------------------------------------------------
-	// uri
-	//-----------------------------------------------------------------------------------------------------------------
-
-	/**
-	 * Bean property getter:  <property>uri</property>.
-	 *
-	 * <p>
-	 * Corresponds to the value of the <xa>href</xa> attribute of the <xt>&lt;A&gt;</xt> element.
-	 *
-	 * @return The property value, or <jk>null</jk> if it is not set.
-	 */
-	public java.net.URI getUri() {
-		return uri;
-	}
-
-	/**
-	 * Bean property setter:  <property>uri</property>.
-	 *
-	 * <p>
-	 * Corresponds to the value of the <xa>href</xa> attribute of the <xt>&lt;A&gt;</xt> element.
-	 *
-	 * @param value
-	 * 	The new value for this property.
-	 * 	<br>Can be <jk>null</jk> to unset the property.
-	 * @return This object
-	 */
-	public LinkString setUri(java.net.URI value) {
-		this.uri = value;
-		return this;
-	}
-	/**
-	 * Bean property fluent setter:  <property>uri</property>.
-	 *
-	 * <p>
-	 * Corresponds to the value of the <xa>href</xa> attribute of the <xt>&lt;A&gt;</xt> element.
-	 *
-	 * @param value
-	 * 	The new value for this property.
-	 * 	<br>Can be <jk>null</jk> to unset the property.
-	 * @return This object.
-	 */
-	public LinkString setUri(String value) {
-		setUri(value, new Object[0]);  // NOSONAR - Not fixable.
-		return this;
-	}
-
-	/**
-	 * Bean property fluent setter:  <property>uri</property>.
-	 *
-	 * <p>
-	 * Corresponds to the value of the <xa>href</xa> attribute of the <xt>&lt;A&gt;</xt> element.
-	 *
-	 * @param value
-	 * 	The new value for this property.
-	 * 	<br>Can be <jk>null</jk> to unset the property.
-	 * @param args {@link MessageFormat}-style arguments in the URL.
-	 * @return This object.
-	 */
-	public LinkString setUri(String value, Object...args) {
-		for (var i = 0; i < args.length; i++)
-			try {
-				args[i] = OpenApiSerializer.DEFAULT.getSession().serialize(HttpPartType.PATH, null, args[i]);
-			} catch (SchemaValidationException | SerializeException e) {
-				throw asRuntimeException(e);
-			}
-		this.uri = java.net.URI.create(format(value, args));
-		return this;
-	}
-
-
-	/**
-	 * Returns the name so that the {@link ObjectSearcher} class can search against it.
-	 */
-	@Override /* Object */
-	public String toString() {
-		return name;
-	}
-
-	@Override /* Comparable */
-	public int compareTo(LinkString o) {
-		return name.compareTo(o.name);
-	}
-
-	@Override /* Object */
-	public boolean equals(Object o) {
-		return (o instanceof LinkString o2) && eq(this, o2, (x,y)->x.name.equals(y.name));
-	}
-
-	@Override /* Object */
-	public int hashCode() {
-		return super.hashCode();
-	}
-}
\ No newline at end of file
diff --git a/juneau-bean/juneau-bean-swagger/src/main/java/org/apache/juneau/dto/ResultSetList.java b/juneau-bean/juneau-bean-swagger/src/main/java/org/apache/juneau/dto/ResultSetList.java
deleted file mode 100644
index 88fcdfca2..000000000
--- a/juneau-bean/juneau-bean-swagger/src/main/java/org/apache/juneau/dto/ResultSetList.java
+++ /dev/null
@@ -1,112 +0,0 @@
-// ***************************************************************************************************************************
-// * 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.                                              *
-// ***************************************************************************************************************************
-package org.apache.juneau.dto;
-
-import static org.apache.juneau.common.internal.IOUtils.*;
-
-import java.sql.*;
-import java.util.*;
-
-import org.apache.juneau.internal.*;
-
-/**
- * Transforms an SQL {@link ResultSet ResultSet} into a list of maps.
- * <p>
- * Loads the entire result set into an in-memory data structure, and then closes the result set object.
- *
- * <h5 class='section'>See Also:</h5><ul>
- * </ul>
- *
- * @serial exclude
- */
-public final class ResultSetList extends LinkedList<Map<String,Object>> {
-
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * Constructor.
-	 *
-	 * @param rs The result set to load into this DTO.
-	 * @param pos The start position (zero-indexed).
-	 * @param limit The maximum number of rows to retrieve.
-	 * @param includeRowNums Make the first column be the row number.
-	 * @throws SQLException Database error.
-	 */
-	public ResultSetList(ResultSet rs, int pos, int limit, boolean includeRowNums) throws SQLException {
-		try {
-			var rowNum = pos;
-
-			// Get the column names.
-			var rsmd = rs.getMetaData();
-			var offset = (includeRowNums ? 1 : 0);
-			var cc = rsmd.getColumnCount();
-			var columns = new String[cc + offset];
-			if (includeRowNums)
-				columns[0] = "ROW";
-			var colTypes = new int[cc];
-
-			for (var i = 0; i < cc; i++) {
-				columns[i+offset] = rsmd.getColumnName(i+1);
-				colTypes[i] = rsmd.getColumnType(i+1);
-			}
-
-			while (--pos > 0 && rs.next()) { /* Skip to the specified position. */ }
-
-			// Get the rows.
-			while (limit-- > 0 && rs.next()) {
-				var row = new Object[cc + offset];
-				if (includeRowNums)
-					row[0] = rowNum++;
-				for (var i = 0; i < cc; i++) {
-					var o = readEntry(rs, i+1, colTypes[i]);
-					row[i+offset] = o;
-				}
-				add(new SimpleMap<>(columns, row));
-			}
-		} finally {
-			rs.close();
-		}
-	}
-
-	/**
-	 * Reads the specified column from the current row in the result set.
-	 *
-	 * <p>
-	 * Subclasses can override this method to handle specific data types in special ways.
-	 *
-	 * @param rs The result set to read from.
-	 * @param col The column number (indexed by 1).
-	 * @param dataType The {@link Types type} of the entry.
-	 * @return The entry as an Object.
-	 */
-	static Object readEntry(ResultSet rs, int col, int dataType) {
-		try {
-			return switch (dataType) {
-				case Types.BLOB -> {
-					var b = rs.getBlob(col);
-					yield "blob[" + b.length() + "]";
-				}
-				case Types.CLOB -> {
-					var c = rs.getClob(col);
-					yield "clob[" + c.length() + "]";
-				}
-				case Types.LONGVARBINARY -> "longvarbinary[" + count(rs.getBinaryStream(col)) + "]";
-				case Types.LONGVARCHAR -> "longvarchar[" + count(rs.getAsciiStream(col)) + "]";
-				case Types.LONGNVARCHAR -> "longnvarchar[" + count(rs.getCharacterStream(col)) + "]";
-				case Types.TIMESTAMP -> rs.getTimestamp(col); // Oracle returns com.oracle.TIMESTAMP objects from getObject()
-				default -> rs.getObject(col); };
-		} catch (Exception e) {
-			return e.getLocalizedMessage();
-		}
-	}
-}
\ No newline at end of file
diff --git a/juneau-bean/juneau-bean-swagger/src/main/java/org/apache/juneau/dto/atom/AtomBuilder.java b/juneau-bean/juneau-bean-swagger/src/main/java/org/apache/juneau/dto/atom/AtomBuilder.java
deleted file mode 100644
index 0a14a53dc..000000000
--- a/juneau-bean/juneau-bean-swagger/src/main/java/org/apache/juneau/dto/atom/AtomBuilder.java
+++ /dev/null
@@ -1,236 +0,0 @@
-// ***************************************************************************************************************************
-// * 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.                                              *
-// ***************************************************************************************************************************
-package org.apache.juneau.dto.atom;
-
-import java.net.*;
-import java.util.*;
-
-import org.apache.juneau.*;
-
-/**
- * Various useful static methods for creating ATOM elements.
- *
- * <p>
- * Typically, you'll want to do a static import on this class and then call the methods like so...
- * <p class='bjava'>
- * 	<jk>import static</jk> org.apache.juneau.dto.atom.AtomBuilder.*;
- *
- * 	Feed <jv>feed</jv> =
- * 		<jsm>feed</jsm>(<js>"tag:juneau.sample.com,2013:1"</js>, <js>"Juneau ATOM specification"</js>,
- * 			<js>"2013-05-08T12:29:29Z"</js>)
- * 		.subtitle(<jsm>text</jsm>(<js>"html"</js>)
- * 			.children(<js>"A &lt;em&gt;lot&lt;/em&gt; of effort went into making this effortless"</js>))
- * 		.links(
- * 			<jsm>link</jsm>(<js>"alternate"</js>, <js>"text/html"</js>, <js>"http://www.sample.com/"</js>)
- * 				.hreflang(<js>"en"</js>),
- * 			<jsm>link</jsm>(<js>"self"</js>, <js>"application/atom+xml"</js>, <js>"http://www.sample.com/feed.atom"</js>)
- * 		);
- * </p>
- *
- * <h5 class='section'>See Also:</h5><ul>
- * 	<li class='link'><a class="doclink" href="../../../../../index.html#jd.Atom">Overview &gt; juneau-dto &gt; Atom</a>
- * </ul>
- */
-public class AtomBuilder {
-
-	/**
-	 * Constructor.
-	 */
-	protected AtomBuilder() {}
-
-	/**
-	 * Creates a {@link Category} element with the specified {@link Category#setTerm(String)} attribute.
-	 *
-	 * @param term The {@link Category#setTerm(String)} attribute.
-	 * @return The new element.
-	 */
-	public static final Category category(String term) {
-		return new Category(term);
-	}
-
-	/**
-	 * Creates a {@link Content} element with the specified {@link Content#setType(String)} attribute.
-	 *
-	 * @return The new element.
-	 */
-	public static final Content content() {
-		return new Content();
-	}
-
-	/**
-	 * Creates a {@link Content} element.
-	 *
-	 * @param type The {@link Content#setType(String)} attribute.
-	 * @return The new element.
-	 */
-	public static final Content content(String type) {
-		return new Content(type);
-	}
-
-	/**
-	 * Creates an {@link Entry} element with the specified {@link Entry#setId(Id)}, {@link Entry#setTitle(Text)}, and
-	 * {@link Entry#setUpdated(Calendar)} attributes.
-	 *
-	 * @param id The {@link Entry#setId(Id)} attribute.
-	 * @param title The {@link Entry#setTitle(Text)} attribute.
-	 * @param updated The {@link Entry#setUpdated(Calendar)} attribute.
-	 * @return The new element.
-	 */
-	public static final Entry entry(Id id, Text title, Calendar updated) {
-		return new Entry(id, title, updated);
-	}
-
-	/**
-	 * Creates an {@link Entry} element with the specified {@link Entry#setId(Id)}, {@link Entry#setTitle(Text)}, and
-	 * {@link Entry#setUpdated(Calendar)} attributes.
-	 *
-	 * @param id The {@link Entry#setId(Id)} attribute.
-	 * @param title The {@link Entry#setTitle(Text)} attribute.
-	 * @param updated The {@link Entry#setUpdated(Calendar)} attribute.
-	 * @return The new element.
-	 */
-	public static final Entry entry(String id, String title, String updated) {
-		return new Entry(id, title, updated);
-	}
-
-	/**
-	 * Creates a {@link Feed} element with the specified {@link Feed#setId(Id)}, {@link Entry#setTitle(Text)}, and
-	 * {@link Feed#setUpdated(Calendar)} attributes.
-	 *
-	 * @param id The {@link Feed#setId(Id)} attribute.
-	 * @param title The {@link Feed#setTitle(Text)} attribute.
-	 * @param updated The {@link Feed#setUpdated(Calendar)} attribute.
-	 * @return The new element.
-	 */
-	public static final Feed feed(Id id, Text title, Calendar updated) {
-		return new Feed(id, title, updated);
-	}
-
-	/**
-	 * Creates a {@link Feed} element with the specified {@link Feed#setId(Id)}, {@link Entry#setTitle(Text)}, and
-	 * {@link Feed#setUpdated(Calendar)} attributes.
-	 *
-	 * @param id The {@link Feed#setId(Id)} attribute.
-	 * @param title The {@link Feed#setTitle(Text)} attribute.
-	 * @param updated The {@link Feed#setUpdated(Calendar)} attribute.
-	 * @return The new element.
-	 */
-	public static final Feed feed(String id, String title, String updated) {
-		return new Feed(id, title, updated);
-	}
-
-	/**
-	 * Creates a {@link Generator} element with the specified {@link Generator#setText(String)} child node.
-	 *
-	 * @param text The {@link Generator#setText(String)} child node.
-	 * @return The new element.
-	 */
-	public static final Generator generator(String text) {
-		return new Generator(text);
-	}
-
-	/**
-	 * Creates an {@link Icon} element with the specified {@link Icon#setUri(Object)} attribute.
-	 *
-	 * <p>
-	 * The value can be of any of the following types: {@link URI}, {@link URL}, {@link String}.
-	 * Strings must be valid URIs.
-	 *
-	 * <p>
-	 * URIs defined by {@link UriResolver} can be used for values.
-	 *
-	 * @param uri The {@link Icon#setUri(Object)} attribute.
-	 * @return The new element.
-	 */
-	public static final Icon icon(Object uri) {
-		return new Icon(uri);
-	}
-
-	/**
-	 * Creates an {@link Id} element with the specified {@link Id#setText(String)} child node.
-	 *
-	 * @param text The {@link Id#setText(String)} child node.
-	 * @return The new element.
-	 */
-	public static final Id id(String text) {
-		return new Id(text);
-	}
-
-	/**
-	 * Creates a {@link Link} element with the specified {@link Link#setRel(String)}, {@link Link#setType(String)}, and
-	 * {@link Link#setHref(String)} attributes.
-	 *
-	 * @param rel The {@link Link#setRel(String)} attribute.
-	 * @param type The {@link Link#setType(String)} attribute.
-	 * @param href The {@link Link#setHref(String)} attribute.
-	 * @return The new element.
-	 */
-	public static final Link link(String rel, String type, String href) {
-		return new Link(rel, type, href);
-	}
-
-	/**
-	 * Creates a {@link Logo} element with the specified {@link Logo#setUri(Object)} attribute.
-	 *
-	 * <p>
-	 * The value can be of any of the following types: {@link URI}, {@link URL}, {@link String}.
-	 * Strings must be valid URIs.
-	 *
-	 * <p>
-	 * URIs defined by {@link UriResolver} can be used for values.
-	 *
-	 * @param uri The {@link Logo#setUri(Object)} attribute.
-	 * @return The new element.
-	 */
-	public static final Logo logo(Object uri) {
-		return new Logo(uri);
-	}
-
-	/**
-	 * Creates a {@link Person} element with the specified {@link Person#setName(String)} attribute.
-	 *
-	 * @param name The {@link Person#setName(String)} attribute.
-	 * @return The new element.
-	 */
-	public static final Person person(String name) {
-		return new Person(name);
-	}
-
-	/**
-	 * Creates a {@link Source} element.
-	 *
-	 * @return The new element.
-	 */
-	public static final Source source() {
-		return new Source();
-	}
-
-	/**
-	 * Creates a {@link Text} element.
-	 *
-	 * @return The new element.
-	 */
-	public static final Text text() {
-		return new Text();
-	}
-
-	/**
-	 * Creates a {@link Text} element with the specified {@link Text#setType(String)} attribute.
-	 *
-	 * @param type The {@link Text#setType(String)} attribute.
-	 * @return The new element.
-	 */
-	public static final Text text(String type) {
-		return new Text(type);
-	}
-}
\ No newline at end of file
diff --git a/juneau-bean/juneau-bean-swagger/src/main/java/org/apache/juneau/dto/atom/Category.java b/juneau-bean/juneau-bean-swagger/src/main/java/org/apache/juneau/dto/atom/Category.java
deleted file mode 100644
index c56010a29..000000000
--- a/juneau-bean/juneau-bean-swagger/src/main/java/org/apache/juneau/dto/atom/Category.java
+++ /dev/null
@@ -1,179 +0,0 @@
-// ***************************************************************************************************************************
-// * 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.                                              *
-// ***************************************************************************************************************************
-package org.apache.juneau.dto.atom;
-
-import static org.apache.juneau.common.internal.StringUtils.*;
-import static org.apache.juneau.xml.annotation.XmlFormat.*;
-
-import java.net.*;
-
-import org.apache.juneau.annotation.*;
-import org.apache.juneau.internal.*;
-import org.apache.juneau.xml.annotation.*;
-
-/**
- * Represents an <c>atomCategory</c> construct in the RFC4287 specification.
- *
- * <h5 class='figure'>Schema</h5>
- * <p class='bschema'>
- * 	atomCategory =
- * 		element atom:category {
- * 			atomCommonAttributes,
- * 			attribute term { text },
- * 			attribute scheme { atomUri }?,
- * 			attribute label { text }?,
- * 			undefinedContent
- * 		}
- * </p>
- *
- * <h5 class='section'>See Also:</h5><ul>
- * 	<li class='link'><a class="doclink" href="../../../../../index.html#jd.Atom">Overview &gt; juneau-dto &gt; Atom</a>
- * </ul>
- */
-@Bean(typeName="category")
-@FluentSetters
-public class Category extends Common {
-
-	private String term;
-	private URI scheme;
-	private String label;
-
-	/**
-	 * Normal constructor.
-	 *
-	 * @param term The category term.
-	 */
-	public Category(String term) {
-		setTerm(term);
-	}
-
-	/** Bean constructor. */
-	public Category() {}
-
-
-	//-----------------------------------------------------------------------------------------------------------------
-	// Bean properties
-	//-----------------------------------------------------------------------------------------------------------------
-
-	/**
-	 * Bean property getter:  <property>term</property>.
-	 *
-	 * <p>
-	 * The category term.
-	 *
-	 * @return The property value, or <jk>null</jk> if it is not set.
-	 */
-	@Xml(format=ATTR)
-	public String getTerm() {
-		return term;
-	}
-
-	/**
-	 * Bean property setter:  <property>term</property>.
-	 *
-	 * <p>
-	 * The category term.
-	 *
-	 * @param value
-	 * 	The new value for this property.
-	 * 	<br>Can be <jk>null</jk> to unset the property.
-	 * @return This object
-	 */
-	@Xml(format=ATTR)
-	public Category setTerm(String value) {
-		this.term = value;
-		return this;
-	}
-
-	/**
-	 * Bean property getter:  <property>scheme</property>.
-	 *
-	 * <p>
-	 * The category scheme.
-	 *
-	 * @return The property value, or <jk>null</jk> if it is not set.
-	 */
-	@Xml(format=ATTR)
-	public URI getScheme() {
-		return scheme;
-	}
-
-	/**
-	 * Bean property setter:  <property>scheme</property>.
-	 *
-	 * <p>
-	 * The category scheme.
-	 *
-	 * <p>
-	 * The value can be of any of the following types: {@link URI}, {@link URL}, {@link String}.
-	 * Strings must be valid URIs.
-	 *
-	 * @param value
-	 * 	The new value for this property.
-	 * 	<br>Can be <jk>null</jk> to unset the property.
-	 * @return This object
-	 */
-	public Category setScheme(Object value) {
-		this.scheme = toURI(value);
-		return this;
-	}
-
-	/**
-	 * Bean property getter:  <property>label</property>.
-	 *
-	 * <p>
-	 * The category label.
-	 *
-	 * @return The property value, or <jk>null</jk> if it is not set.
-	 */
-	@Xml(format=ATTR)
-	public String getLabel() {
-		return label;
-	}
-
-	/**
-	 * Bean property setter:  <property>scheme</property>.
-	 *
-	 * <p>
-	 * The category label.
-	 *
-	 * @param value
-	 * 	The new value for this property.
-	 * 	<br>Can be <jk>null</jk> to unset the property.
-	 * @return This object
-	 */
-	public Category setLabel(String value) {
-		this.label = value;
-		return this;
-	}
-
-	//-----------------------------------------------------------------------------------------------------------------
-	// Overridden setters (to simplify method chaining)
-	//-----------------------------------------------------------------------------------------------------------------
-
-	// <FluentSetters>
-
-	@Override /* GENERATED - org.apache.juneau.dto.atom.Common */
-	public Category setBase(Object value) {
-		super.setBase(value);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.atom.Common */
-	public Category setLang(String value) {
-		super.setLang(value);
-		return this;
-	}
-
-	// </FluentSetters>
-}
\ No newline at end of file
diff --git a/juneau-bean/juneau-bean-swagger/src/main/java/org/apache/juneau/dto/atom/Common.java b/juneau-bean/juneau-bean-swagger/src/main/java/org/apache/juneau/dto/atom/Common.java
deleted file mode 100644
index c6f5b4e2e..000000000
--- a/juneau-bean/juneau-bean-swagger/src/main/java/org/apache/juneau/dto/atom/Common.java
+++ /dev/null
@@ -1,122 +0,0 @@
-// ***************************************************************************************************************************
-// * 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.                                              *
-// ***************************************************************************************************************************
-package org.apache.juneau.dto.atom;
-
-import static org.apache.juneau.common.internal.StringUtils.*;
-import static org.apache.juneau.xml.annotation.XmlFormat.*;
-
-import java.net.*;
-
-import org.apache.juneau.internal.*;
-import org.apache.juneau.xml.*;
-import org.apache.juneau.xml.annotation.*;
-
-/**
- * Represents an <c>atomCommonAttributes</c> construct in the RFC4287 specification.
- *
- * <h5 class='figure'>Schema</h5>
- * <p class='bschema'>
- * 	atomCommonAttributes =
- * 		attribute xml:base { atomUri }?,
- * 		attribute xml:lang { atomLanguageTag }?,
- * 		undefinedAttribute*
- * </p>
- *
- * <h5 class='section'>See Also:</h5><ul>
- * 	<li class='link'><a class="doclink" href="../../../../../index.html#jd.Atom">Overview &gt; juneau-dto &gt; Atom</a>
- * </ul>
- */
-@FluentSetters
-public abstract class Common {
-
-	private URI base;
-	private String lang;
-
-
-	//-----------------------------------------------------------------------------------------------------------------
-	// Bean properties
-	//-----------------------------------------------------------------------------------------------------------------
-
-	/**
-	 * Bean property getter:  <property>base</property>.
-	 *
-	 * <p>
-	 * The URI base of this object.
-	 *
-	 * @return The property value, or <jk>null</jk> if it is not set.
-	 */
-	@Xml(prefix="xml", format=ATTR)
-	public URI getBase() {
-		return base;
-	}
-
-	/**
-	 * Bean property setter:  <property>term</property>.
-	 *
-	 * <p>
-	 * The URI base of this object.
-	 *
-	 * <p>
-	 * The value can be of any of the following types: {@link URI}, {@link URL}, {@link String}.
-	 * Strings must be valid URIs.
-	 *
-	 * @param value
-	 * 	The new value for this property.
-	 * 	<br>Can be <jk>null</jk> to unset the property.
-	 * @return This object
-	 */
-	@FluentSetter
-	public Common setBase(Object value) {
-		this.base = toURI(value);
-		return this;
-	}
-
-	/**
-	 * Bean property getter:  <property>lang</property>.
-	 *
-	 * <p>
-	 * The language of this object.
-	 *
-	 * @return The property value, or <jk>null</jk> if it is not set.
-	 */
-	@Xml(prefix="xml", format=ATTR)
-	public String getLang() {
-		return lang;
-	}
-
-	/**
-	 * Bean property setter:  <property>lang</property>.
-	 *
-	 * <p>
-	 * The language of this object.
-	 *
-	 * @param value
-	 * 	The new value for this property.
-	 * 	<br>Can be <jk>null</jk> to unset the property.
-	 * @return This object
-	 */
-	@FluentSetter
-	public Common setLang(String value) {
-		this.lang = value;
-		return this;
-	}
-
-	// <FluentSetters>
-
-	// </FluentSetters>
-
-	@Override /* Object */
-	public String toString() {
-		return XmlSerializer.DEFAULT_SQ.toString(this);
-	}
-}
\ No newline at end of file
diff --git a/juneau-bean/juneau-bean-swagger/src/main/java/org/apache/juneau/dto/atom/CommonEntry.java b/juneau-bean/juneau-bean-swagger/src/main/java/org/apache/juneau/dto/atom/CommonEntry.java
deleted file mode 100644
index 2dc866f32..000000000
--- a/juneau-bean/juneau-bean-swagger/src/main/java/org/apache/juneau/dto/atom/CommonEntry.java
+++ /dev/null
@@ -1,392 +0,0 @@
-// ***************************************************************************************************************************
-// * 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.                                              *
-// ***************************************************************************************************************************
-package org.apache.juneau.dto.atom;
-
-import static org.apache.juneau.dto.atom.Utils.*;
-import static org.apache.juneau.xml.annotation.XmlFormat.*;
-
-import java.util.*;
-
-import org.apache.juneau.internal.*;
-import org.apache.juneau.xml.annotation.*;
-
-/**
- * Parent class of {@link Entry}, {@link Feed}, and {@link Source}.
- *
- * <h5 class='section'>See Also:</h5><ul>
- * 	<li class='link'><a class="doclink" href="../../../../../index.html#jd.Atom">Overview &gt; juneau-dto &gt; Atom</a>
- * </ul>
- */
-@FluentSetters
-public class CommonEntry extends Common {
-
-	private Person[] authors;
-	private Category[] categories;
-	private Person[] contributors;
-	private Id id;
-	private Link[] links;
-	private Text rights;
-	private Text title;
-	private Calendar updated;
-
-
-	/**
-	 * Normal constructor.
-	 *
-	 * @param id The ID of this object.
-	 * @param title The title of this object.
-	 * @param updated The updated timestamp of this object.
-	 */
-	public CommonEntry(Id id, Text title, Calendar updated) {
-		setId(id).setTitle(title).setUpdated(updated);
-	}
-
-	/**
-	 * Normal constructor.
-	 *
-	 * @param id The ID of this object.
-	 * @param title The title of this object.
-	 * @param updated The updated timestamp of this object.
-	 */
-	public CommonEntry(String id, String title, String updated) {
-		setId(id).setTitle(title).setUpdated(updated);
-	}
-
-	/** Bean constructor. */
-	public CommonEntry() {}
-
-
-	//-----------------------------------------------------------------------------------------------------------------
-	// Bean properties
-	//-----------------------------------------------------------------------------------------------------------------
-
-	/**
-	 * Bean property getter:  <property>authors</property>.
-	 *
-	 * <p>
-	 * The list of authors for this object.
-	 *
-	 * @return The property value, or <jk>null</jk> if it is not set.
-	 */
-	@Xml(format=COLLAPSED, childName="author")
-	public Person[] getAuthors() {
-		return authors;
-	}
-
-	/**
-	 * Bean property setter:  <property>authors</property>.
-	 *
-	 * <p>
-	 * The list of authors for this object.
-	 *
-	 * @param value
-	 * 	The new value for this property.
-	 * 	<br>Can be <jk>null</jk> to unset the property.
-	 * @return This object
-	 */
-	@FluentSetter
-	public CommonEntry setAuthors(Person...value) {
-		this.authors = value;
-		return this;
-	}
-
-	/**
-	 * Bean property getter:  <property>categories</property>.
-	 *
-	 * <p>
-	 * The list of categories of this object.
-	 *
-	 * @return The property value, or <jk>null</jk> if it is not set.
-	 */
-	@Xml(format=COLLAPSED, childName="category")
-	public Category[] getCategories() {
-		return categories;
-	}
-
-	/**
-	 * Bean property setter:  <property>categories</property>.
-	 *
-	 * <p>
-	 * The list of categories of this object.
-	 *
-	 * @param value
-	 * 	The new value for this property.
-	 * 	<br>Can be <jk>null</jk> to unset the property.
-	 * @return This object
-	 */
-	@FluentSetter
-	public CommonEntry setCategories(Category...value) {
-		this.categories = value;
-		return this;
-	}
-
-	/**
-	 * Bean property getter:  <property>contributors</property>.
-	 *
-	 * <p>
-	 * The list of contributors of this object.
-	 *
-	 * @return The property value, or <jk>null</jk> if it is not set.
-	 */
-	@Xml(format=COLLAPSED, childName="contributor")
-	public Person[] getContributors() {
-		return contributors;
-	}
-
-	/**
-	 * Bean property setter:  <property>contributors</property>.
-	 *
-	 * <p>
-	 * The list of contributors of this object.
-	 *
-	 * @param value
-	 * 	The new value for this property.
-	 * 	<br>Can be <jk>null</jk> to unset the property.
-	 * @return This object
-	 */
-	@FluentSetter
-	public CommonEntry setContributors(Person...value) {
-		this.contributors = value;
-		return this;
-	}
-
-	/**
-	 * Bean property getter:  <property>id</property>.
-	 *
-	 * <p>
-	 * The ID of this object.
-	 *
-	 * @return The property value, or <jk>null</jk> if it is not set.
-	 */
-	public Id getId() {
-		return id;
-	}
-
-	/**
-	 * Bean property setter:  <property>id</property>.
-	 *
-	 * <p>
-	 * The ID of this object.
-	 *
-	 * @param value
-	 * 	The new value for this property.
-	 * 	<br>Can be <jk>null</jk> to unset the property.
-	 * @return This object
-	 */
-	@FluentSetter
-	public CommonEntry setId(Id value) {
-		this.id = value;
-		return this;
-	}
-
-	/**
-	 * Bean property fluent setter:  <property>id</property>.
-	 *
-	 * <p>
-	 * The ID of this object.
-	 *
-	 * @param value
-	 * 	The new value for this property.
-	 * 	<br>Can be <jk>null</jk> to unset the property.
-	 * @return This object.
-	 */
-	@FluentSetter
-	public CommonEntry setId(String value) {
-		setId(new Id(value));
-		return this;
-	}
-
-	/**
-	 * Bean property getter:  <property>links</property>.
-	 *
-	 * <p>
-	 * The list of links of this object.
-	 *
-	 * @return The property value, or <jk>null</jk> if it is not set.
-	 */
-	@Xml(format=COLLAPSED)
-	public Link[] getLinks() {
-		return links;
-	}
-
-	/**
-	 * Bean property setter:  <property>links</property>.
-	 *
-	 * <p>
-	 * The list of links of this object.
-	 *
-	 * @param value
-	 * 	The new value for this property.
-	 * 	<br>Can be <jk>null</jk> to unset the property.
-	 * @return This object
-	 */
-	@FluentSetter
-	public CommonEntry setLinks(Link...value) {
-		this.links = value;
-		return this;
-	}
-
-	/**
-	 * Bean property getter:  <property>rights</property>.
-	 *
-	 * <p>
-	 * The rights statement of this object.
-	 *
-	 * @return The property value, or <jk>null</jk> if it is not set.
-	 */
-	public Text getRights() {
-		return rights;
-	}
-
-	/**
-	 * Bean property setter:  <property>rights</property>.
-	 *
-	 * <p>
-	 * The rights statement of this object.
-	 *
-	 * @param value
-	 * 	The new value for this property.
-	 * 	<br>Can be <jk>null</jk> to unset the property.
-	 * @return This object
-	 */
-	@FluentSetter
-	public CommonEntry setRights(Text value) {
-		this.rights = value;
-		return this;
-	}
-
-	/**
-	 * Bean property fluent setter:  <property>rights</property>.
-	 *
-	 * <p>
-	 * The rights statement of this object.
-	 *
-	 * @param value
-	 * 	The new value for this property.
-	 * 	<br>Can be <jk>null</jk> to unset the property.
-	 * @return This object.
-	 */
-	@FluentSetter
-	public CommonEntry setRights(String value) {
-		setRights(new Text().setText(value));
-		return this;
-	}
-
-	/**
-	 * Bean property getter:  <property>title</property>.
-	 *
-	 * <p>
-	 * The title of this object.
-	 *
-	 * @return The property value, or <jk>null</jk> if it is not set.
-	 */
-	public Text getTitle() {
-		return title;
-	}
-
-	/**
-	 * Bean property setter:  <property>title</property>.
-	 *
-	 * <p>
-	 * The title of this object.
-	 *
-	 * @param value
-	 * 	The new value for this property.
-	 * 	<br>Can be <jk>null</jk> to unset the property.
-	 * @return This object
-	 */
-	@FluentSetter
-	public CommonEntry setTitle(Text value) {
-		this.title = value;
-		return this;
-	}
-
-	/**
-	 * Bean property fluent setter:  <property>title</property>.
-	 *
-	 * <p>
-	 * The title of this object.
-	 *
-	 * @param value
-	 * 	The new value for this property.
-	 * 	<br>Can be <jk>null</jk> to unset the property.
-	 * @return This object.
-	 */
-	@FluentSetter
-	public CommonEntry setTitle(String value) {
-		setTitle(new Text().setText(value));
-		return this;
-	}
-
-	/**
-	 * Bean property getter:  <property>updated</property>.
-	 *
-	 * <p>
-	 * The update timestamp of this object.
-	 *
-	 * @return The property value, or <jk>null</jk> if it is not set.
-	 */
-	public Calendar getUpdated() {
-		return updated;
-	}
-
-	/**
-	 * Bean property setter:  <property>updated</property>.
-	 *
-	 * <p>
-	 * The update timestamp of this object.
-	 *
-	 * @param value
-	 * 	The new value for this property.
-	 * 	<br>Can be <jk>null</jk> to unset the property.
-	 * @return This object
-	 */
-	@FluentSetter
-	public CommonEntry setUpdated(Calendar value) {
-		this.updated = value;
-		return this;
-	}
-
-	/**
-	 * Bean property fluent setter:  <property>updated</property>.
-	 *
-	 * <p>
-	 * The update timestamp of this object.
-	 *
-	 * @param value
-	 * 	The new value for this property.
-	 * 	<br>Can be <jk>null</jk> to unset the property.
-	 * @return This object.
-	 */
-	@FluentSetter
-	public CommonEntry setUpdated(String value) {
-		setUpdated(parseDateTime(value));
-		return this;
-	}
-
-	// <FluentSetters>
-
-	@Override /* GENERATED - org.apache.juneau.dto.atom.Common */
-	public CommonEntry setBase(Object value) {
-		super.setBase(value);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.atom.Common */
-	public CommonEntry setLang(String value) {
-		super.setLang(value);
-		return this;
-	}
-
-	// </FluentSetters>
-}
\ No newline at end of file
diff --git a/juneau-bean/juneau-bean-swagger/src/main/java/org/apache/juneau/dto/atom/Content.java b/juneau-bean/juneau-bean-swagger/src/main/java/org/apache/juneau/dto/atom/Content.java
deleted file mode 100644
index 760fe8f31..000000000
--- a/juneau-bean/juneau-bean-swagger/src/main/java/org/apache/juneau/dto/atom/Content.java
+++ /dev/null
@@ -1,158 +0,0 @@
-// ***************************************************************************************************************************
-// * 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.                                              *
-// ***************************************************************************************************************************
-package org.apache.juneau.dto.atom;
-
-import static org.apache.juneau.common.internal.StringUtils.*;
-import static org.apache.juneau.xml.annotation.XmlFormat.*;
-
-import java.net.*;
-
-import org.apache.juneau.internal.*;
-import org.apache.juneau.xml.annotation.*;
-
-/**
- * Represents an <c>atomContent</c> construct in the RFC4287 specification.
- *
- * <h5 class='figure'>Schema</h5>
- * <p class='bschema'>
- * 	atomContent = atomInlineTextContent
- * 		| atomInlineXHTMLContent
- * 		| atomInlineOtherContent
- * 		| atomOutOfLineContent
- *
- * 	atomInlineTextContent =
- * 		element atom:content {
- * 			atomCommonAttributes,
- * 			attribute type { "text" | "html" }?,
- * 			(text)*
- * 		}
- *
- * 	atomInlineXHTMLContent =
- * 		element atom:content {
- * 			atomCommonAttributes,
- * 			attribute type { "xhtml" },
- * 			xhtmlDiv
- * 		}
- *
- * 	atomInlineOtherContent =
- * 		element atom:content {
- * 			atomCommonAttributes,
- * 			attribute type { atomMediaType }?,
- * 			(text|anyElement)*
- * 	}
- *
- * 	atomOutOfLineContent =
- * 		element atom:content {
- * 			atomCommonAttributes,
- * 			attribute type { atomMediaType }?,
- * 			attribute src { atomUri },
- * 			empty
- * 	}
- * </p>
- *
- * <h5 class='section'>See Also:</h5><ul>
- * 	<li class='link'><a class="doclink" href="../../../../../index.html#jd.Atom">Overview &gt; juneau-dto &gt; Atom</a>
- * </ul>
- */
-@FluentSetters
-public class Content extends Text {
-
-	private URI src;
-
-
-	/**
-	 * Normal content.
-	 *
-	 * @param type The content type of this content.
-	 */
-	public Content(String type) {
-		super(type);
-	}
-
-	/**
-	 * Normal content.
-	 */
-	public Content() {
-	}
-
-
-	//-----------------------------------------------------------------------------------------------------------------
-	// Bean properties
-	//-----------------------------------------------------------------------------------------------------------------
-
-	/**
-	 * Bean property getter:  <property>src</property>.
-	 *
-	 * <p>
-	 * The source URI.
-	 *
-	 * @return The property value, or <jk>null</jk> if it is not set.
-	 */
-	@Xml(format=ATTR)
-	public URI getSrc() {
-		return src;
-	}
-
-	/**
-	 * Bean property setter:  <property>src</property>.
-	 *
-	 * <p>
-	 * The source URI.
-	 *
-	 * <p>
-	 * The value can be of any of the following types: {@link URI}, {@link URL}, {@link String}.
-	 * Strings must be valid URIs.
-	 *
-	 * @param value
-	 * 	The new value for this property.
-	 * 	<br>Can be <jk>null</jk> to unset the property.
-	 * @return This object
-	 */
-	public Content setSrc(Object value) {
-		this.src = toURI(value);
-		return this;
-	}
-
-
-	//-----------------------------------------------------------------------------------------------------------------
-	// Overridden setters (to simplify method chaining)
-	//-----------------------------------------------------------------------------------------------------------------
-
-	@Override /* Text */
-	public Content setText(String text) {
-		super.setText(text);
-		return this;
-	}
-
-	@Override /* Text */
-	public Content setType(String type) {
-		super.setType(type);
-		return this;
-	}
-
-	// <FluentSetters>
-
-	@Override /* GENERATED - org.apache.juneau.dto.atom.Common */
-	public Content setBase(Object value) {
-		super.setBase(value);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.atom.Common */
-	public Content setLang(String value) {
-		super.setLang(value);
-		return this;
-	}
-
-	// </FluentSetters>
-}
\ No newline at end of file
diff --git a/juneau-bean/juneau-bean-swagger/src/main/java/org/apache/juneau/dto/atom/Entry.java b/juneau-bean/juneau-bean-swagger/src/main/java/org/apache/juneau/dto/atom/Entry.java
deleted file mode 100644
index 6d9d43007..000000000
--- a/juneau-bean/juneau-bean-swagger/src/main/java/org/apache/juneau/dto/atom/Entry.java
+++ /dev/null
@@ -1,325 +0,0 @@
-// ***************************************************************************************************************************
-// * 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.                                              *
-// ***************************************************************************************************************************
-package org.apache.juneau.dto.atom;
-
-import static org.apache.juneau.dto.atom.Utils.*;
-
-import java.util.*;
-
-import org.apache.juneau.annotation.*;
-import org.apache.juneau.internal.*;
-
-/**
- * Represents an <c>atomEntry</c> construct in the RFC4287 specification.
- *
- * <h5 class='figure'>Schema</h5>
- * <p class='bschema'>
- * 	atomEntry =
- * 		element atom:entry {
- * 			atomCommonAttributes,
- * 			(atomAuthor*
- * 			&amp; atomCategory*
- * 			&amp; atomContent?
- * 			&amp; atomContributor*
- * 			&amp; atomId
- * 			&amp; atomLink*
- * 			&amp; atomPublished?
- * 			&amp; atomRights?
- * 			&amp; atomSource?
- * 			&amp; atomSummary?
- * 			&amp; atomTitle
- * 			&amp; atomUpdated
- * 			&amp; extensionElement*)
- * 		}
- * </p>
- *
- * <h5 class='section'>See Also:</h5><ul>
- * 	<li class='link'><a class="doclink" href="../../../../../index.html#jd.Atom">Overview &gt; juneau-dto &gt; Atom</a>
- * </ul>
- */
-@Bean(typeName="entry")
-@FluentSetters
-public class Entry extends CommonEntry {
-
-	private Content content;
-	private Calendar published;
-	private Source source;
-	private Text summary;
-
-	/**
-	 * Normal constructor.
-	 *
-	 * @param id The ID of this entry.
-	 * @param title The title of this entry.
-	 * @param updated The updated timestamp of this entry.
-	 */
-	public Entry(Id id, Text title, Calendar updated) {
-		super(id, title, updated);
-	}
-
-	/**
-	 * Normal constructor.
-	 *
-	 * @param id The ID of this entry.
-	 * @param title The title of this entry.
-	 * @param updated The updated timestamp of this entry.
-	 */
-	public Entry(String id, String title, String updated) {
-		super(id, title, updated);
-	}
-
-	/** Bean constructor. */
-	public Entry() {}
-
-
-	//-----------------------------------------------------------------------------------------------------------------
-	// Bean properties
-	//-----------------------------------------------------------------------------------------------------------------
-
-	/**
-	 * Bean property getter:  <property>content</property>.
-	 *
-	 * <p>
-	 * The content of this entry.
-	 *
-	 * @return The property value, or <jk>null</jk> if it is not set.
-	 */
-	public Content getContent() {
-		return content;
-	}
-
-	/**
-	 * Bean property setter:  <property>content</property>.
-	 *
-	 * <p>
-	 * The content of this entry.
-	 *
-	 * @param value
-	 * 	The new value for this property.
-	 * 	<br>Can be <jk>null</jk> to unset the property.
-	 * @return This object
-	 */
-	public Entry setContent(Content value) {
-		this.content = value;
-		return this;
-	}
-
-	/**
-	 * Bean property getter:  <property>published</property>.
-	 *
-	 * <p>
-	 * The publish timestamp of this entry.
-	 *
-	 * @return The property value, or <jk>null</jk> if it is not set.
-	 */
-	public Calendar getPublished() {
-		return published;
-	}
-
-	/**
-	 * Bean property setter:  <property>published</property>.
-	 *
-	 * <p>
-	 * The publish timestamp of this entry.
-	 *
-	 * @param value
-	 * 	The new value for this property.
-	 * 	<br>Can be <jk>null</jk> to unset the property.
-	 * @return This object
-	 */
-	public Entry setPublished(Calendar value) {
-		this.published = value;
-		return this;
-	}
-
-	/**
-	 * Bean property fluent setter:  <property>published</property>.
-	 *
-	 * <p>
-	 * The publish timestamp of this entry.
-	 *
-	 * @param value
-	 * 	The new value for this property.
-	 * 	<br>Can be <jk>null</jk> to unset the property.
-	 * @return This object.
-	 */
-	public Entry setPublished(String value) {
-		setPublished(parseDateTime(value));
-		return this;
-	}
-
-	/**
-	 * Bean property getter:  <property>source</property>.
-	 *
-	 * <p>
-	 * The source of this entry.
-	 *
-	 * @return The property value, or <jk>null</jk> if it is not set.
-	 */
-	public Source getSource() {
-		return source;
-	}
-
-	/**
-	 * Bean property setter:  <property>source</property>.
-	 *
-	 * <p>
-	 * The source of this entry.
-	 *
-	 * @param value
-	 * 	The new value for this property.
-	 * 	<br>Can be <jk>null</jk> to unset the property.
-	 * @return This object
-	 */
-	public Entry setSource(Source value) {
-		this.source = value;
-		return this;
-	}
-
-	/**
-	 * Bean property getter:  <property>summary</property>.
-	 *
-	 * <p>
-	 * The summary of this entry.
-	 *
-	 * @return The property value, or <jk>null</jk> if it is not set.
-	 */
-	public Text getSummary() {
-		return summary;
-	}
-
-	/**
-	 * Bean property setter:  <property>summary</property>.
-	 *
-	 * <p>
-	 * The summary of this entry.
-	 *
-	 * @param value
-	 * 	The new value for this property.
-	 * 	<br>Can be <jk>null</jk> to unset the property.
-	 * @return This object
-	 */
-	public Entry setSummary(Text value) {
-		this.summary = value;
-		return this;
-	}
-
-	/**
-	 * Bean property fluent setter:  <property>summary</property>.
-	 *
-	 * <p>
-	 * The summary of this entry.
-	 *
-	 * @param value
-	 * 	The new value for this property.
-	 * 	<br>Can be <jk>null</jk> to unset the property.
-	 * @return This object.
-	 */
-	public Entry setSummary(String value) {
-		setSummary(new Text(value));
-		return this;
-	}
-
-
-	//-----------------------------------------------------------------------------------------------------------------
-	// Overridden setters (to simplify method chaining)
-	//-----------------------------------------------------------------------------------------------------------------
-
-	// <FluentSetters>
-
-	@Override /* GENERATED - org.apache.juneau.dto.atom.Common */
-	public Entry setBase(Object value) {
-		super.setBase(value);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.atom.Common */
-	public Entry setLang(String value) {
-		super.setLang(value);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.atom.CommonEntry */
-	public Entry setAuthors(Person...value) {
-		super.setAuthors(value);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.atom.CommonEntry */
-	public Entry setCategories(Category...value) {
-		super.setCategories(value);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.atom.CommonEntry */
-	public Entry setContributors(Person...value) {
-		super.setContributors(value);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.atom.CommonEntry */
-	public Entry setId(String value) {
-		super.setId(value);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.atom.CommonEntry */
-	public Entry setId(Id value) {
-		super.setId(value);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.atom.CommonEntry */
-	public Entry setLinks(Link...value) {
-		super.setLinks(value);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.atom.CommonEntry */
-	public Entry setRights(String value) {
-		super.setRights(value);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.atom.CommonEntry */
-	public Entry setRights(Text value) {
-		super.setRights(value);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.atom.CommonEntry */
-	public Entry setTitle(String value) {
-		super.setTitle(value);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.atom.CommonEntry */
-	public Entry setTitle(Text value) {
-		super.setTitle(value);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.atom.CommonEntry */
-	public Entry setUpdated(String value) {
-		super.setUpdated(value);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.atom.CommonEntry */
-	public Entry setUpdated(Calendar value) {
-		super.setUpdated(value);
-		return this;
-	}
-
-	// </FluentSetters>
-}
\ No newline at end of file
diff --git a/juneau-bean/juneau-bean-swagger/src/main/java/org/apache/juneau/dto/atom/Feed.java b/juneau-bean/juneau-bean-swagger/src/main/java/org/apache/juneau/dto/atom/Feed.java
deleted file mode 100644
index d4cc84a0a..000000000
--- a/juneau-bean/juneau-bean-swagger/src/main/java/org/apache/juneau/dto/atom/Feed.java
+++ /dev/null
@@ -1,343 +0,0 @@
-// ***************************************************************************************************************************
-// * 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.                                              *
-// ***************************************************************************************************************************
-package org.apache.juneau.dto.atom;
-
-import static org.apache.juneau.xml.annotation.XmlFormat.*;
-
-import java.util.*;
-
-import org.apache.juneau.annotation.*;
-import org.apache.juneau.internal.*;
-import org.apache.juneau.xml.annotation.*;
-
-/**
- * Top-level ATOM feed object.
- *
- * <p>
- * Represents an <c>atomFeed</c> construct in the RFC4287 specification.
- *
- * <h5 class='figure'>Schema</h5>
- * <p class='bschema'>
- * 	atomFeed =
- * 		element atom:feed {
- * 			atomCommonAttributes,
- * 			(atomAuthor*
- * 			 &amp; atomCategory*
- * 			 &amp; atomContributor*
- * 			 &amp; atomGenerator?
- * 			 &amp; atomIcon?
- * 			 &amp; atomId
- * 			 &amp; atomLink*
- * 			 &amp; atomLogo?
- * 			 &amp; atomRights?
- * 			 &amp; atomSubtitle?
- * 			 &amp; atomTitle
- * 			 &amp; atomUpdated
- * 			 &amp; extensionElement*),
- * 			atomEntry*
- * 		}
- * </p>
- *
- * <h5 class='section'>See Also:</h5><ul>
- * 	<li class='link'><a class="doclink" href="../../../../../index.html#jd.Atom">Overview &gt; juneau-dto &gt; Atom</a>
- * </ul>
- */
-@Bean(typeName="feed")
-@FluentSetters
-public class Feed extends CommonEntry {
-
-	private Generator generator;  // atomGenerator?
-	private Icon icon;            // atomIcon?
-	private Logo logo;            // atomLogo?
-	private Text subtitle;        // atomSubtitle?
-	private Entry[] entries;      // atomEntry*
-
-	/**
-	 * Normal constructor.
-	 *
-	 * @param id The feed identifier.
-	 * @param title The feed title.
-	 * @param updated The feed updated timestamp.
-	 */
-	public Feed(Id id, Text title, Calendar updated) {
-		super(id, title, updated);
-	}
-
-	/**
-	 * Normal constructor.
-	 *
-	 * @param id The feed identifier.
-	 * @param title The feed title.
-	 * @param updated The feed updated timestamp.
-	 */
-	public Feed(String id, String title, String updated) {
-		super(id, title, updated);
-	}
-
-	/** Bean constructor. */
-	public Feed() {}
-
-
-	//-----------------------------------------------------------------------------------------------------------------
-	// Bean properties
-	//-----------------------------------------------------------------------------------------------------------------
-
-	/**
-	 * Bean property getter:  <property>generator</property>.
-	 *
-	 * <p>
-	 * The generator information on this feed.
-	 *
-	 * @return The property value, or <jk>null</jk> if it is not set.
-	 */
-	public Generator getGenerator() {
-		return generator;
-	}
-
-	/**
-	 * Bean property setter:  <property>generator</property>.
-	 *
-	 * <p>
-	 * The generator information on this feed.
-	 *
-	 * @param value
-	 * 	The new value for this property.
-	 * 	<br>Can be <jk>null</jk> to unset the property.
-	 * @return This object
-	 */
-	public Feed setGenerator(Generator value) {
-		this.generator = value;
-		return this;
-	}
-
-	/**
-	 * Bean property getter:  <property>icon</property>.
-	 *
-	 * <p>
-	 * The feed icon.
-	 *
-	 * @return The property value, or <jk>null</jk> if it is not set.
-	 */
-	public Icon getIcon() {
-		return icon;
-	}
-
-	/**
-	 * Bean property setter:  <property>icon</property>.
-	 *
-	 * <p>
-	 * The feed icon.
-	 *
-	 * @param value
-	 * 	The new value for this property.
-	 * 	<br>Can be <jk>null</jk> to unset the property.
-	 * @return This object
-	 */
-	public Feed setIcon(Icon value) {
-		this.icon = value;
-		return this;
-	}
-
-	/**
-	 * Bean property getter:  <property>logo</property>.
-	 *
-	 * <p>
-	 * The feed logo.
-	 *
-	 * @return The property value, or <jk>null</jk> if it is not set.
-	 */
-	public Logo getLogo() {
-		return logo;
-	}
-
-	/**
-	 * Bean property setter:  <property>logo</property>.
-	 *
-	 * <p>
-	 * The feed logo.
-	 *
-	 * @param value
-	 * 	The new value for this property.
-	 * 	<br>Can be <jk>null</jk> to unset the property.
-	 * @return This object
-	 */
-	public Feed setLogo(Logo value) {
-		this.logo = value;
-		return this;
-	}
-
-	/**
-	 * Bean property getter:  <property>subtitle</property>.
-	 *
-	 * <p>
-	 * The feed subtitle.
-	 *
-	 * @return The property value, or <jk>null</jk> if it is not set.
-	 */
-	public Text getSubtitle() {
-		return subtitle;
-	}
-
-	/**
-	 * Bean property setter:  <property>subtitle</property>.
-	 *
-	 * <p>
-	 * The feed subtitle.
-	 *
-	 * @param value
-	 * 	The new value for this property.
-	 * 	<br>Can be <jk>null</jk> to unset the property.
-	 * @return This object
-	 */
-	public Feed setSubtitle(Text value) {
-		this.subtitle = value;
-		return this;
-	}
-
-	/**
-	 * Bean property fluent setter:  <property>subtitle</property>.
-	 *
-	 * <p>
-	 * The feed subtitle.
-	 *
-	 * @param value
-	 * 	The new value for this property.
-	 * 	<br>Can be <jk>null</jk> to unset the property.
-	 * @return This object.
-	 */
-	public Feed setSubtitle(String value) {
-		setSubtitle(new Text(value));
-		return this;
-	}
-
-	/**
-	 * Bean property getter:  <property>entries</property>.
-	 *
-	 * <p>
-	 * The entries in the feed.
-	 *
-	 * @return The property value, or <jk>null</jk> if it is not set.
-	 */
-	@Xml(format=COLLAPSED)
-	public Entry[] getEntries() {
-		return entries;
-	}
-
-	/**
-	 * Bean property setter:  <property>entries</property>.
-	 *
-	 * <p>
-	 * The entries in the feed.
-	 *
-	 * @param value
-	 * 	The new value for this property.
-	 * 	<br>Can be <jk>null</jk> to unset the property.
-	 * @return This object
-	 */
-	public Feed setEntries(Entry...value) {
-		this.entries = value;
-		return this;
-	}
-
-	//-----------------------------------------------------------------------------------------------------------------
-	// Overridden setters (to simplify method chaining)
-	//-----------------------------------------------------------------------------------------------------------------
-
-	// <FluentSetters>
-
-	@Override /* GENERATED - org.apache.juneau.dto.atom.Common */
-	public Feed setBase(Object value) {
-		super.setBase(value);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.atom.Common */
-	public Feed setLang(String value) {
-		super.setLang(value);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.atom.CommonEntry */
-	public Feed setAuthors(Person...value) {
-		super.setAuthors(value);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.atom.CommonEntry */
-	public Feed setCategories(Category...value) {
-		super.setCategories(value);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.atom.CommonEntry */
-	public Feed setContributors(Person...value) {
-		super.setContributors(value);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.atom.CommonEntry */
-	public Feed setId(String value) {
-		super.setId(value);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.atom.CommonEntry */
-	public Feed setId(Id value) {
-		super.setId(value);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.atom.CommonEntry */
-	public Feed setLinks(Link...value) {
-		super.setLinks(value);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.atom.CommonEntry */
-	public Feed setRights(String value) {
-		super.setRights(value);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.atom.CommonEntry */
-	public Feed setRights(Text value) {
-		super.setRights(value);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.atom.CommonEntry */
-	public Feed setTitle(String value) {
-		super.setTitle(value);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.atom.CommonEntry */
-	public Feed setTitle(Text value) {
-		super.setTitle(value);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.atom.CommonEntry */
-	public Feed setUpdated(String value) {
-		super.setUpdated(value);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.atom.CommonEntry */
-	public Feed setUpdated(Calendar value) {
-		super.setUpdated(value);
-		return this;
-	}
-
-	// </FluentSetters>
-}
\ No newline at end of file
diff --git a/juneau-bean/juneau-bean-swagger/src/main/java/org/apache/juneau/dto/atom/Generator.java b/juneau-bean/juneau-bean-swagger/src/main/java/org/apache/juneau/dto/atom/Generator.java
deleted file mode 100644
index 7173c2386..000000000
--- a/juneau-bean/juneau-bean-swagger/src/main/java/org/apache/juneau/dto/atom/Generator.java
+++ /dev/null
@@ -1,177 +0,0 @@
-// ***************************************************************************************************************************
-// * 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.                                              *
-// ***************************************************************************************************************************
-package org.apache.juneau.dto.atom;
-
-import static org.apache.juneau.common.internal.StringUtils.*;
-import static org.apache.juneau.xml.annotation.XmlFormat.*;
-
-import java.net.*;
-
-import org.apache.juneau.annotation.*;
-import org.apache.juneau.internal.*;
-import org.apache.juneau.xml.annotation.*;
-
-/**
- * Represents an <c>atomGenerator</c> construct in the RFC4287 specification.
- *
- * <h5 class='figure'>Schema</h5>
- * <p class='bschema'>
- * 	atomGenerator = element atom:generator {
- * 		atomCommonAttributes,
- * 		attribute uri { atomUri }?,
- * 		attribute version { text }?,
- * 		text
- * 	}
- * </p>
- *
- * <h5 class='section'>See Also:</h5><ul>
- * 	<li class='link'><a class="doclink" href="../../../../../index.html#jd.Atom">Overview &gt; juneau-dto &gt; Atom</a>
- * </ul>
- */
-@Bean(typeName="generator")
-@FluentSetters
-public class Generator extends Common {
-
-	private URI uri;
-	private String version;
-	private String text;
-
-
-	/**
-	 * Normal constructor.
-	 *
-	 * @param text The generator statement content.
-	 */
-	public Generator(String text) {
-		this.text = text;
-	}
-
-	/** Bean constructor. */
-	public Generator() {}
-
-
-	//-----------------------------------------------------------------------------------------------------------------
-	// Bean properties
-	//-----------------------------------------------------------------------------------------------------------------
-
-	/**
-	 * Bean property getter:  <property>uri</property>.
-	 *
-	 * <p>
-	 * The URI of this generator statement.
-	 *
-	 * @return The property value, or <jk>null</jk> if it is not set.
-	 */
-	@Xml(format=ATTR)
-	public URI getUri() {
-		return uri;
-	}
-
-	/**
-	 * Bean property setter:  <property>uri</property>.
-	 *
-	 * <p>
-	 * The URI of this generator statement.
-	 *
-	 * <p>
-	 * The value can be of any of the following types: {@link URI}, {@link URL}, {@link String}.
-	 * Strings must be valid URIs.
-	 *
-	 * @param value
-	 * 	The new value for this property.
-	 * 	<br>Can be <jk>null</jk> to unset the property.
-	 * @return This object
-	 */
-	public Generator setUri(Object value) {
-		this.uri = toURI(value);
-		return this;
-	}
-
-	/**
-	 * Bean property getter:  <property>version</property>.
-	 *
-	 * <p>
-	 * The version of this generator statement.
-	 *
-	 * @return The property value, or <jk>null</jk> if it is not set.
-	 */
-	@Xml(format=ATTR)
-	public String getVersion() {
-		return version;
-	}
-
-	/**
-	 * Bean property setter:  <property>version</property>.
-	 *
-	 * <p>
-	 * The version of this generator statement.
-	 *
-	 * @param value
-	 * 	The new value for this property.
-	 * 	<br>Can be <jk>null</jk> to unset the property.
-	 * @return This object
-	 */
-	public Generator setVersion(String value) {
-		this.version = value;
-		return this;
-	}
-
-	/**
-	 * Bean property getter:  <property>text</property>.
-	 *
-	 * <p>
-	 * The content of this generator statement.
-	 *
-	 * @return The property value, or <jk>null</jk> if it is not set.
-	 */
-	@Xml(format=TEXT)
-	public String getText() {
-		return text;
-	}
-
-	/**
-	 * Bean property setter:  <property>text</property>.
-	 *
-	 * <p>
-	 * The content of this generator statement.
-	 *
-	 * @param value
-	 * 	The new value for this property.
-	 * 	<br>Can be <jk>null</jk> to unset the property.
-	 * @return This object
-	 */
-	public Generator setText(String value) {
-		this.text = value;
-		return this;
-	}
-
-	//-----------------------------------------------------------------------------------------------------------------
-	// Overridden setters (to simplify method chaining)
-	//-----------------------------------------------------------------------------------------------------------------
-
-	// <FluentSetters>
-
-	@Override /* GENERATED - org.apache.juneau.dto.atom.Common */
-	public Generator setBase(Object value) {
-		super.setBase(value);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.atom.Common */
-	public Generator setLang(String value) {
-		super.setLang(value);
-		return this;
-	}
-
-	// </FluentSetters>
-}
\ No newline at end of file
diff --git a/juneau-bean/juneau-bean-swagger/src/main/java/org/apache/juneau/dto/atom/Icon.java b/juneau-bean/juneau-bean-swagger/src/main/java/org/apache/juneau/dto/atom/Icon.java
deleted file mode 100644
index 5f2527613..000000000
--- a/juneau-bean/juneau-bean-swagger/src/main/java/org/apache/juneau/dto/atom/Icon.java
+++ /dev/null
@@ -1,123 +0,0 @@
-// ***************************************************************************************************************************
-// * 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.                                              *
-// ***************************************************************************************************************************
-package org.apache.juneau.dto.atom;
-
-import static org.apache.juneau.common.internal.StringUtils.*;
-import static org.apache.juneau.xml.annotation.XmlFormat.*;
-
-import java.net.*;
-
-import org.apache.juneau.*;
-import org.apache.juneau.annotation.*;
-import org.apache.juneau.internal.*;
-import org.apache.juneau.xml.annotation.*;
-
-/**
- * Represents an <c>atomIcon</c> construct in the RFC4287 specification.
- *
- * <h5 class='figure'>Schema</h5>
- * <p class='bschema'>
- * 	atomIcon = element atom:icon {
- * 		atomCommonAttributes,
- * 		(atomUri)
- * 	}
- * </p>
- *
- * <h5 class='section'>See Also:</h5><ul>
- * 	<li class='link'><a class="doclink" href="../../../../../index.html#jd.Atom">Overview &gt; juneau-dto &gt; Atom</a>
- * </ul>
- */
-@Bean(typeName="icon")
-@FluentSetters
-public class Icon extends Common {
-
-	private URI uri;
-
-
-	/**
-	 * Normal constructor.
-	 *
-	 * <p>
-	 * The value can be of any of the following types: {@link URI}, {@link URL}, {@link String}.
-	 * Strings must be valid URIs.
-	 *
-	 * <p>
-	 * URIs defined by {@link UriResolver} can be used for values.
-	 *
-	 * @param uri The URI of the icon.
-	 */
-	public Icon(Object uri) {
-		setUri(uri);
-	}
-
-	/** Bean constructor. */
-	public Icon() {}
-
-
-	//-----------------------------------------------------------------------------------------------------------------
-	// Bean properties
-	//-----------------------------------------------------------------------------------------------------------------
-
-	/**
-	 * Bean property getter:  <property>uri</property>.
-	 *
-	 * <p>
-	 * The URI of this icon.
-	 *
-	 * @return The property value, or <jk>null</jk> if it is not set.
-	 */
-	@Xml(format=ELEMENTS)
-	public URI getUri() {
-		return uri;
-	}
-
-	/**
-	 * Bean property setter:  <property>uri</property>.
-	 *
-	 * <p>
-	 * The URI of this icon.
-	 *
-	 * <p>
-	 * The value can be of any of the following types: {@link URI}, {@link URL}, {@link String}.
-	 * Strings must be valid URIs.
-	 *
-	 * @param value
-	 * 	The new value for this property.
-	 * 	<br>Can be <jk>null</jk> to unset the property.
-	 * @return This object
-	 */
-	public Icon setUri(Object value) {
-		this.uri = toURI(value);
-		return this;
-	}
-
-	//-----------------------------------------------------------------------------------------------------------------
-	// Overridden setters (to simplify method chaining)
-	//-----------------------------------------------------------------------------------------------------------------
-
-	// <FluentSetters>
-
-	@Override /* GENERATED - org.apache.juneau.dto.atom.Common */
-	public Icon setBase(Object value) {
-		super.setBase(value);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.atom.Common */
-	public Icon setLang(String value) {
-		super.setLang(value);
-		return this;
-	}
-
-	// </FluentSetters>
-}
\ No newline at end of file
diff --git a/juneau-bean/juneau-bean-swagger/src/main/java/org/apache/juneau/dto/atom/Id.java b/juneau-bean/juneau-bean-swagger/src/main/java/org/apache/juneau/dto/atom/Id.java
deleted file mode 100644
index 954f5dc1e..000000000
--- a/juneau-bean/juneau-bean-swagger/src/main/java/org/apache/juneau/dto/atom/Id.java
+++ /dev/null
@@ -1,107 +0,0 @@
-// ***************************************************************************************************************************
-// * 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.                                              *
-// ***************************************************************************************************************************
-package org.apache.juneau.dto.atom;
-
-import static org.apache.juneau.xml.annotation.XmlFormat.*;
-
-import org.apache.juneau.annotation.*;
-import org.apache.juneau.internal.*;
-import org.apache.juneau.xml.annotation.*;
-
-/**
- * Represents an <c>atomId</c> construct in the RFC4287 specification.
- *
- * <h5 class='figure'>Schema</h5>
- * <p class='bschema'>
- * 	atomId = element atom:id {
- * 		atomCommonAttributes,
- * 		(atomUri)
- * 	}
- * </p>
- *
- * <h5 class='section'>See Also:</h5><ul>
- * 	<li class='link'><a class="doclink" href="../../../../../index.html#jd.Atom">Overview &gt; juneau-dto &gt; Atom</a>
- * </ul>
- */
-@Bean(typeName="id")
-@FluentSetters
-public class Id extends Common {
-
-	private String text;
-
-	/**
-	 * Normal constructor.
-	 *
-	 * @param text The id element contents.
-	 */
-	public Id(String text) {
-		setText(text);
-	}
-
-	/** Bean constructor. */
-	public Id() {}
-
-
-	//-----------------------------------------------------------------------------------------------------------------
-	// Bean properties
-	//-----------------------------------------------------------------------------------------------------------------
-
-	/**
-	 * Bean property getter:  <property>text</property>.
-	 *
-	 * <p>
-	 * The content of this identifier.
-	 *
-	 * @return The property value, or <jk>null</jk> if it is not set.
-	 */
-	@Xml(format=TEXT)
-	public String getText() {
-		return text;
-	}
-
-	/**
-	 * Bean property setter:  <property>text</property>.
-	 *
-	 * <p>
-	 * The content of this identifier.
-	 *
-	 * @param value
-	 * 	The new value for this property.
-	 * 	<br>Can be <jk>null</jk> to unset the property.
-	 * @return This object
-	 */
-	public Id setText(String value) {
-		this.text = value;
-		return this;
-	}
-
-	//-----------------------------------------------------------------------------------------------------------------
-	// Overridden setters (to simplify method chaining)
-	//-----------------------------------------------------------------------------------------------------------------
-
-	// <FluentSetters>
-
-	@Override /* GENERATED - org.apache.juneau.dto.atom.Common */
-	public Id setBase(Object value) {
-		super.setBase(value);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.atom.Common */
-	public Id setLang(String value) {
-		super.setLang(value);
-		return this;
-	}
-
-	// </FluentSetters>
-}
\ No newline at end of file
diff --git a/juneau-bean/juneau-bean-swagger/src/main/java/org/apache/juneau/dto/atom/Link.java b/juneau-bean/juneau-bean-swagger/src/main/java/org/apache/juneau/dto/atom/Link.java
deleted file mode 100644
index c3d990fb4..000000000
--- a/juneau-bean/juneau-bean-swagger/src/main/java/org/apache/juneau/dto/atom/Link.java
+++ /dev/null
@@ -1,276 +0,0 @@
-// ***************************************************************************************************************************
-// * 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.                                              *
-// ***************************************************************************************************************************
-package org.apache.juneau.dto.atom;
-
-import static org.apache.juneau.xml.annotation.XmlFormat.*;
-
-import org.apache.juneau.annotation.*;
-import org.apache.juneau.internal.*;
-import org.apache.juneau.xml.annotation.*;
-
-/**
- * Represents an <c>atomLink</c> construct in the RFC4287 specification.
- *
- * <h5 class='figure'>Schema</h5>
- * <p class='bschema'>
- * 	atomLink =
- * 		element atom:link {
- * 			atomCommonAttributes,
- * 			attribute href { atomUri },
- * 			attribute rel { atomNCName | atomUri }?,
- * 			attribute type { atomMediaType }?,
- * 			attribute hreflang { atomLanguageTag }?,
- * 			attribute title { text }?,
- * 			attribute length { text }?,
- * 			undefinedContent
- * 		}
- * </p>
- *
- * <h5 class='section'>See Also:</h5><ul>
- * 	<li class='link'><a class="doclink" href="../../../../../index.html#jd.Atom">Overview &gt; juneau-dto &gt; Atom</a>
- * </ul>
- */
-@Bean(typeName="link")
-@FluentSetters
-public class Link extends Common {
-
-	private String href;
-	private String rel;
-	private String type;
-	private String hreflang;
-	private String title;
-	private Integer length;
-
-
-	/**
-	 * Normal constructor.
-	 *
-	 * @param rel The rel of the link.
-	 * @param type The type of the link.
-	 * @param href The URI of the link.
-	 */
-	public Link(String rel, String type, String href) {
-		setRel(rel).setType(type).setHref(href);
-	}
-
-	/** Bean constructor. */
-	public Link() {}
-
-
-	//-----------------------------------------------------------------------------------------------------------------
-	// Bean properties
-	//-----------------------------------------------------------------------------------------------------------------
-
-	/**
-	 * Bean property getter:  <property>href</property>.
-	 *
-	 * <p>
-	 * The href of the target of this link.
-	 *
-	 * @return The property value, or <jk>null</jk> if it is not set.
-	 */
-	@Xml(format=ATTR)
-	public String getHref() {
-		return href;
-	}
-
-	/**
-	 * Bean property setter:  <property>href</property>.
-	 *
-	 * <p>
-	 * The href of the target of this link.
-	 *
-	 * @param value
-	 * 	The new value for this property.
-	 * 	<br>Can be <jk>null</jk> to unset the property.
-	 * @return This object
-	 */
-	public Link setHref(String value) {
-		this.href = value;
-		return this;
-	}
-
-	/**
-	 * Bean property getter:  <property>rel</property>.
-	 *
-	 * <p>
-	 * The rel of this link.
-	 *
-	 * @return The property value, or <jk>null</jk> if it is not set.
-	 */
-	@Xml(format=ATTR)
-	public String getRel() {
-		return rel;
-	}
-
-	/**
-	 * Bean property setter:  <property>rel</property>.
-	 *
-	 * <p>
-	 * The rel of this link.
-	 *
-	 * @param value
-	 * 	The new value for this property.
-	 * 	<br>Can be <jk>null</jk> to unset the property.
-	 * @return This object
-	 */
-	public Link setRel(String value) {
-		this.rel = value;
-		return this;
-	}
-
-	/**
-	 * Bean property getter:  <property>type</property>.
-	 *
-	 * <p>
-	 * The content type of the target of this link.
-	 *
-	 * @return The property value, or <jk>null</jk> if it is not set.
-	 */
-	@Xml(format=ATTR)
-	public String getType() {
-		return type;
-	}
-
-	/**
-	 * Bean property setter:  <property>type</property>.
-	 *
-	 * <p>
-	 * The content type of the target of this link.
-	 *
-	 * <p>
-	 * Must be one of the following:
-	 * <ul>
-	 * 	<li><js>"text"</js>
-	 * 	<li><js>"html"</js>
-	 * 	<li><js>"xhtml"</js>
-	 * 	<li><jk>null</jk> (defaults to <js>"text"</js>)
-	 * </ul>
-	 *
-	 * @param value
-	 * 	The new value for this property.
-	 * 	<br>Can be <jk>null</jk> to unset the property.
-	 * @return This object
-	 */
-	public Link setType(String value) {
-		this.type = value;
-		return this;
-	}
-
-	/**
-	 * Bean property getter:  <property>hreflang</property>.
-	 *
-	 * <p>
-	 * The language of the target of this link.
-	 *
-	 * @return The property value, or <jk>null</jk> if it is not set.
-	 */
-	@Xml(format=ATTR)
-	public String getHreflang() {
-		return hreflang;
-	}
-
-	/**
-	 * Bean property setter:  <property>hreflang</property>.
-	 *
-	 * <p>
-	 * The language of the target of this link.
-	 *
-	 * @param value
-	 * 	The new value for this property.
-	 * 	<br>Can be <jk>null</jk> to unset the property.
-	 * @return This object
-	 */
-	public Link setHreflang(String value) {
-		this.hreflang = value;
-		return this;
-	}
-
-	/**
-	 * Bean property getter:  <property>title</property>.
-	 *
-	 * <p>
-	 * The title of the target of this link.
-	 *
-	 * @return The property value, or <jk>null</jk> if it is not set.
-	 */
-	@Xml(format=ATTR)
-	public String getTitle() {
-		return title;
-	}
-
-	/**
-	 * Bean property setter:  <property>title</property>.
-	 *
-	 * <p>
-	 * The title of the target of this link.
-	 *
-	 * @param value
-	 * 	The new value for this property.
-	 * 	<br>Can be <jk>null</jk> to unset the property.
-	 * @return This object
-	 */
-	public Link setTitle(String value) {
-		this.title = value;
-		return this;
-	}
-
-	/**
-	 * Bean property getter:  <property>length</property>.
-	 *
-	 * <p>
-	 * The length of the contents of the target of this link.
-	 *
-	 * @return The property value, or <jk>null</jk> if it is not set.
-	 */
-	@Xml(format=ATTR)
-	public Integer getLength() {
-		return length;
-	}
-
-	/**
-	 * Bean property setter:  <property>length</property>.
-	 *
-	 * <p>
-	 * The length of the contents of the target of this link.
-	 *
-	 * @param value
-	 * 	The new value for this property.
-	 * 	<br>Can be <jk>null</jk> to unset the property.
-	 * @return This object
-	 */
-	public Link setLength(Integer value) {
-		this.length = value;
-		return this;
-	}
-
-	//-----------------------------------------------------------------------------------------------------------------
-	// Overridden setters (to simplify method chaining)
-	//-----------------------------------------------------------------------------------------------------------------
-
-	// <FluentSetters>
-
-	@Override /* GENERATED - org.apache.juneau.dto.atom.Common */
-	public Link setBase(Object value) {
-		super.setBase(value);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.atom.Common */
-	public Link setLang(String value) {
-		super.setLang(value);
-		return this;
-	}
-
-	// </FluentSetters>
-}
\ No newline at end of file
diff --git a/juneau-bean/juneau-bean-swagger/src/main/java/org/apache/juneau/dto/atom/Logo.java b/juneau-bean/juneau-bean-swagger/src/main/java/org/apache/juneau/dto/atom/Logo.java
deleted file mode 100644
index 38c50c190..000000000
--- a/juneau-bean/juneau-bean-swagger/src/main/java/org/apache/juneau/dto/atom/Logo.java
+++ /dev/null
@@ -1,126 +0,0 @@
-// ***************************************************************************************************************************
-// * 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.                                              *
-// ***************************************************************************************************************************
-package org.apache.juneau.dto.atom;
-
-import static org.apache.juneau.common.internal.StringUtils.*;
-import static org.apache.juneau.xml.annotation.XmlFormat.*;
-
-import java.net.*;
-
-import org.apache.juneau.*;
-import org.apache.juneau.annotation.*;
-import org.apache.juneau.internal.*;
-import org.apache.juneau.xml.annotation.*;
-
-/**
- * Represents an <c>atomLogo</c> construct in the RFC4287 specification.
- *
- * <h5 class='figure'>Schema</h5>
- * <p class='bschema'>
- * 	atomLogo = element atom:logo {
- * 		atomCommonAttributes,
- * 		(atomUri)
- * 	}
- * </p>
- *
- * <h5 class='section'>See Also:</h5><ul>
- * 	<li class='link'><a class="doclink" href="../../../../../index.html#jd.Atom">Overview &gt; juneau-dto &gt; Atom</a>
- * </ul>
- */
-@Bean(typeName="logo")
-@FluentSetters
-public class Logo extends Common {
-
-	private URI uri;
-
-
-	/**
-	 * Normal constructor.
-	 *
-	 * <p>
-	 * The value can be of any of the following types: {@link URI}, {@link URL}, {@link String}.
-	 * <br>Strings must be valid URIs.
-	 *
-	 * <p>
-	 * URIs defined by {@link UriResolver} can be used for values.
-	 *
-	 * @param uri The URI of the logo.
-	 */
-	public Logo(Object uri) {
-		setUri(uri);
-	}
-
-	/** Bean constructor. */
-	public Logo() {}
-
-
-	//-----------------------------------------------------------------------------------------------------------------
-	// Bean properties
-	//-----------------------------------------------------------------------------------------------------------------
-
-	/**
-	 * Bean property getter:  <property>uri</property>.
-	 *
-	 * <p>
-	 * The URI of the logo.
-	 *
-	 * @return The property value, or <jk>null</jk> if it is not set.
-	 */
-	@Xml(format=ELEMENTS)
-	public URI getUri() {
-		return uri;
-	}
-
-	/**
-	 * Bean property setter:  <property>uri</property>.
-	 *
-	 * <p>
-	 * The URI of the logo.
-	 *
-	 * <p>
-	 * The value can be of any of the following types: {@link URI}, {@link URL}, {@link String}.
-	 * <br>Strings must be valid URIs.
-	 *
-	 * <p>
-	 * URIs defined by {@link UriResolver} can be used for values.
-	 *
-	 * @param value
-	 * 	The new value for this property.
-	 * 	<br>Can be <jk>null</jk> to unset the property.
-	 * @return This object
-	 */
-	public Logo setUri(Object value) {
-		this.uri = toURI(value);
-		return this;
-	}
-
-	//-----------------------------------------------------------------------------------------------------------------
-	// Overridden setters (to simplify method chaining)
-	//-----------------------------------------------------------------------------------------------------------------
-
-	// <FluentSetters>
-
-	@Override /* GENERATED - org.apache.juneau.dto.atom.Common */
-	public Logo setBase(Object value) {
-		super.setBase(value);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.atom.Common */
-	public Logo setLang(String value) {
-		super.setLang(value);
-		return this;
-	}
-
-	// </FluentSetters>
-}
\ No newline at end of file
diff --git a/juneau-bean/juneau-bean-swagger/src/main/java/org/apache/juneau/dto/atom/Person.java b/juneau-bean/juneau-bean-swagger/src/main/java/org/apache/juneau/dto/atom/Person.java
deleted file mode 100644
index 3ac768ecc..000000000
--- a/juneau-bean/juneau-bean-swagger/src/main/java/org/apache/juneau/dto/atom/Person.java
+++ /dev/null
@@ -1,174 +0,0 @@
-// ***************************************************************************************************************************
-// * 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.                                              *
-// ***************************************************************************************************************************
-package org.apache.juneau.dto.atom;
-
-import static org.apache.juneau.common.internal.StringUtils.*;
-
-import java.net.*;
-
-import org.apache.juneau.*;
-import org.apache.juneau.internal.*;
-
-/**
- * Represents an <c>atomPersonConstruct</c> construct in the RFC4287 specification.
- *
- * <h5 class='figure'>Schema</h5>
- * <p class='bschema'>
- * 	atomPersonConstruct =
- * 		atomCommonAttributes,
- * 		(element atom:name { text }
- * 		&amp; element atom:uri { atomUri }?
- * 		&amp; element atom:email { atomEmailAddress }?
- * 		&amp; extensionElement*)
- * </p>
- *
- * <h5 class='section'>See Also:</h5><ul>
- * 	<li class='link'><a class="doclink" href="../../../../../index.html#jd.Atom">Overview &gt; juneau-dto &gt; Atom</a>
- * </ul>
- */
-@FluentSetters
-public class Person extends Common {
-
-	private String name;
-	private URI uri;
-	private String email;
-
-
-	/**
-	 * Normal constructor.
-	 *
-	 * @param name The name of the person.
-	 */
-	public Person(String name) {
-		setName(name);
-	}
-
-	/** Bean constructor. */
-	public Person() {}
-
-
-	//-----------------------------------------------------------------------------------------------------------------
-	// Bean properties
-	//-----------------------------------------------------------------------------------------------------------------
-
-	/**
-	 * Bean property getter:  <property>name</property>.
-	 *
-	 * <p>
-	 * The name of the person.
-	 *
-	 * @return The property value, or <jk>null</jk> if it is not set.
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * Bean property setter:  <property>name</property>.
-	 *
-	 * <p>
-	 * The name of the person.
-	 *
-	 * @param value
-	 * 	The new value for this property.
-	 * 	<br>Can be <jk>null</jk> to unset the property.
-	 * @return This object
-	 */
-	public Person setName(String value) {
-		this.name = value;
-		return this;
-	}
-
-	/**
-	 * Bean property getter:  <property>uri</property>.
-	 *
-	 * <p>
-	 * The URI of the person.
-	 *
-	 * @return The property value, or <jk>null</jk> if it is not set.
-	 */
-	public URI getUri() {
-		return uri;
-	}
-
-	/**
-	 * Bean property setter:  <property>uri</property>.
-	 *
-	 * <p>
-	 * The URI of the person.
-	 *
-	 * <p>
-	 * The value can be of any of the following types: {@link URI}, {@link URL}, {@link String}.
-	 * Strings must be valid URIs.
-	 *
-	 * <p>
-	 * URIs defined by {@link UriResolver} can be used for values.
-	 *
-	 * @param value
-	 * 	The new value for this property.
-	 * 	<br>Can be <jk>null</jk> to unset the property.
-	 * @return This object
-	 */
-	public Person setUri(Object value) {
-		this.uri = toURI(value);
-		return this;
-	}
-
-	/**
-	 * Bean property getter:  <property>email</property>.
-	 *
-	 * <p>
-	 * The email address of the person.
-	 *
-	 * @return The property value, or <jk>null</jk> if it is not set.
-	 */
-	public String getEmail() {
-		return email;
-	}
-
-	/**
-	 * Bean property setter:  <property>email</property>.
-	 *
-	 * <p>
-	 * The email address of the person.
-	 *
-	 * @param value
-	 * 	The new value for this property.
-	 * 	<br>Can be <jk>null</jk> to unset the property.
-	 * @return This object
-	 */
-	public Person setEmail(String value) {
-		this.email = value;
-		return this;
-	}
-
-	//-----------------------------------------------------------------------------------------------------------------
-	// Overridden setters (to simplify method chaining)
-	//-----------------------------------------------------------------------------------------------------------------
-
-	// <FluentSetters>
-
-	@Override /* GENERATED - org.apache.juneau.dto.atom.Common */
-	public Person setBase(Object value) {
-		super.setBase(value);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.atom.Common */
-	public Person setLang(String value) {
-		super.setLang(value);
-		return this;
-	}
-
-	// </FluentSetters>
-}
\ No newline at end of file
diff --git a/juneau-bean/juneau-bean-swagger/src/main/java/org/apache/juneau/dto/atom/Source.java b/juneau-bean/juneau-bean-swagger/src/main/java/org/apache/juneau/dto/atom/Source.java
deleted file mode 100644
index 8895a2349..000000000
--- a/juneau-bean/juneau-bean-swagger/src/main/java/org/apache/juneau/dto/atom/Source.java
+++ /dev/null
@@ -1,280 +0,0 @@
-// ***************************************************************************************************************************
-// * 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.                                              *
-// ***************************************************************************************************************************
-package org.apache.juneau.dto.atom;
-
-import java.util.*;
-
-import org.apache.juneau.internal.*;
-
-/**
- * Represents an <c>atomSource</c> construct in the RFC4287 specification.
- *
- * <h5 class='figure'>Schema</h5>
- * <p class='bschema'>
- * 	atomSource =
- * 		element atom:source {
- * 			atomCommonAttributes,
- * 			(atomAuthor*
- * 			&amp; atomCategory*
- * 			&amp; atomContributor*
- * 			&amp; atomGenerator?
- * 			&amp; atomIcon?
- * 			&amp; atomId?
- * 			&amp; atomLink*
- * 			&amp; atomLogo?
- * 			&amp; atomRights?
- * 			&amp; atomSubtitle?
- * 			&amp; atomTitle?
- * 			&amp; atomUpdated?
- * 			&amp; extensionElement*)
- * 		}
- * </p>
- *
- * <h5 class='section'>See Also:</h5><ul>
- * 	<li class='link'><a class="doclink" href="../../../../../index.html#jd.Atom">Overview &gt; juneau-dto &gt; Atom</a>
- * </ul>
- */
-@FluentSetters
-public class Source extends CommonEntry {
-
-	private Generator generator;
-	private Icon icon;
-	private Logo logo;
-	private Text subtitle;
-
-
-	//-----------------------------------------------------------------------------------------------------------------
-	// Bean properties
-	//-----------------------------------------------------------------------------------------------------------------
-
-	/**
-	 * Bean property getter:  <property>generator</property>.
-	 *
-	 * <p>
-	 * The generator info of this source.
-	 *
-	 * @return The property value, or <jk>null</jk> if it is not set.
-	 */
-	public Generator getGenerator() {
-		return generator;
-	}
-
-	/**
-	 * Bean property setter:  <property>generator</property>.
-	 *
-	 * <p>
-	 * The generator info of this source.
-	 *
-	 * @param value
-	 * 	The new value for this property.
-	 * 	<br>Can be <jk>null</jk> to unset the property.
-	 * @return This object
-	 */
-	public Source setGenerator(Generator value) {
-		this.generator = value;
-		return this;
-	}
-
-	/**
-	 * Bean property getter:  <property>icon</property>.
-	 *
-	 * <p>
-	 * The icon of this source.
-	 *
-	 * @return The property value, or <jk>null</jk> if it is not set.
-	 */
-	public Icon getIcon() {
-		return icon;
-	}
-
-	/**
-	 * Bean property setter:  <property>icon</property>.
-	 *
-	 * <p>
-	 * The icon of this source.
-	 *
-	 * @param value
-	 * 	The new value for this property.
-	 * 	<br>Can be <jk>null</jk> to unset the property.
-	 * @return This object
-	 */
-	public Source setIcon(Icon value) {
-		this.icon = value;
-		return this;
-	}
-
-	/**
-	 * Bean property getter:  <property>logo</property>.
-	 *
-	 * <p>
-	 * The logo of this source.
-	 *
-	 * @return The property value, or <jk>null</jk> if it is not set.
-	 */
-	public Logo getLogo() {
-		return logo;
-	}
-
-	/**
-	 * Bean property setter:  <property>logo</property>.
-	 *
-	 * <p>
-	 * The logo of this source.
-	 *
-	 * @param value
-	 * 	The new value for this property.
-	 * 	<br>Can be <jk>null</jk> to unset the property.
-	 * @return This object
-	 */
-	public Source setLogo(Logo value) {
-		this.logo = value;
-		return this;
-	}
-
-	/**
-	 * Bean property getter:  <property>subtitle</property>.
-	 *
-	 * <p>
-	 * The subtitle of this source.
-	 *
-	 * @return The property value, or <jk>null</jk> if it is not set.
-	 */
-	public Text getSubtitle() {
-		return subtitle;
-	}
-
-	/**
-	 * Bean property setter:  <property>subtitle</property>.
-	 *
-	 * <p>
-	 * The subtitle of this source.
-	 *
-	 * @param value
-	 * 	The new value for this property.
-	 * 	<br>Can be <jk>null</jk> to unset the property.
-	 * @return This object
-	 */
-	public Source setSubtitle(Text value) {
-		this.subtitle = value;
-		return this;
-	}
-
-	/**
-	 * Bean property fluent setter:  <property>subtitle</property>.
-	 *
-	 * <p>
-	 * The subtitle of this source.
-	 *
-	 * @param value
-	 * 	The new value for this property.
-	 * 	<br>Can be <jk>null</jk> to unset the property.
-	 * @return This object.
-	 */
-	public Source setSubtitle(String value) {
-		setSubtitle(new Text(value));
-		return this;
-	}
-
-
-	//-----------------------------------------------------------------------------------------------------------------
-	// Overridden setters (to simplify method chaining)
-	//-----------------------------------------------------------------------------------------------------------------
-
-	// <FluentSetters>
-
-	@Override /* GENERATED - org.apache.juneau.dto.atom.Common */
-	public Source setBase(Object value) {
-		super.setBase(value);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.atom.Common */
-	public Source setLang(String value) {
-		super.setLang(value);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.atom.CommonEntry */
-	public Source setAuthors(Person...value) {
-		super.setAuthors(value);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.atom.CommonEntry */
-	public Source setCategories(Category...value) {
-		super.setCategories(value);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.atom.CommonEntry */
-	public Source setContributors(Person...value) {
-		super.setContributors(value);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.atom.CommonEntry */
-	public Source setId(String value) {
-		super.setId(value);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.atom.CommonEntry */
-	public Source setId(Id value) {
-		super.setId(value);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.atom.CommonEntry */
-	public Source setLinks(Link...value) {
-		super.setLinks(value);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.atom.CommonEntry */
-	public Source setRights(String value) {
-		super.setRights(value);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.atom.CommonEntry */
-	public Source setRights(Text value) {
-		super.setRights(value);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.atom.CommonEntry */
-	public Source setTitle(String value) {
-		super.setTitle(value);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.atom.CommonEntry */
-	public Source setTitle(Text value) {
-		super.setTitle(value);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.atom.CommonEntry */
-	public Source setUpdated(String value) {
-		super.setUpdated(value);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.atom.CommonEntry */
-	public Source setUpdated(Calendar value) {
-		super.setUpdated(value);
-		return this;
-	}
-
-	// </FluentSetters>
-}
\ No newline at end of file
diff --git a/juneau-bean/juneau-bean-swagger/src/main/java/org/apache/juneau/dto/atom/Text.java b/juneau-bean/juneau-bean-swagger/src/main/java/org/apache/juneau/dto/atom/Text.java
deleted file mode 100644
index c65ac6b28..000000000
--- a/juneau-bean/juneau-bean-swagger/src/main/java/org/apache/juneau/dto/atom/Text.java
+++ /dev/null
@@ -1,157 +0,0 @@
-// ***************************************************************************************************************************
-// * 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.                                              *
-// ***************************************************************************************************************************
-package org.apache.juneau.dto.atom;
-
-import static org.apache.juneau.xml.annotation.XmlFormat.*;
-
-import org.apache.juneau.internal.*;
-import org.apache.juneau.xml.annotation.*;
-
-/**
- * Represents an <c>atomTextConstruct</c> construct in the RFC4287 specification.
- *
- * <h5 class='figure'>Schema</h5>
- * <p class='bschema'>
- * 	atomTextConstruct = atomPlainTextConstruct | atomXHTMLTextConstruct
- *
- * 	atomPlainTextConstruct =
- * 		atomCommonAttributes,
- * 		attribute type { "text" | "html" }?,
- * 		text
- *
- * 	atomXHTMLTextConstruct =
- * 		atomCommonAttributes,
- * 		attribute type { "xhtml" },
- * 		xhtmlDiv
- *
- * 	xhtmlDiv = element xhtml:div {
- * 		(attribute * { text }
- * 		| text
- * 		| anyXHTML)*
- * 	}
- * </p>
- *
- * <h5 class='section'>See Also:</h5><ul>
- * 	<li class='link'><a class="doclink" href="../../../../../index.html#jd.Atom">Overview &gt; juneau-dto &gt; Atom</a>
- * </ul>
- */
-@FluentSetters
-public class Text extends Common {
-
-	private String type;
-	private String text;  // NOSONAR - Intentional naming.
-
-	/**
-	 * Normal content.
-	 *
-	 * @param type The content type of this content.
-	 */
-	public Text(String type) {
-		setType(type);
-	}
-
-	/** Bean constructor. */
-	public Text() {}
-
-
-	//-----------------------------------------------------------------------------------------------------------------
-	// Bean properties
-	//-----------------------------------------------------------------------------------------------------------------
-
-	/**
-	 * Bean property getter:  <property>type</property>.
-	 *
-	 * <p>
-	 * The content type of this content.
-	 *
-	 * @return The property value, or <jk>null</jk> if it is not set.
-	 */
-	@Xml(format=ATTR)
-	public String getType() {
-		return type;
-	}
-
-	/**
-	 * Bean property setter:  <property>type</property>.
-	 *
-	 * <p>
-	 * The content type of this content.
-	 *
-	 * <p>
-	 * Must be one of the following:
-	 * <ul>
-	 * 	<li><js>"text"</js>
-	 * 	<li><js>"html"</js>
-	 * 	<li><js>"xhtml"</js>
-	 * 	<li><jk>null</jk> (defaults to <js>"text"</js>)
-	 * </ul>
-	 *
-	 * @param value
-	 * 	The new value for this property.
-	 * 	<br>Can be <jk>null</jk> to unset the property.
-	 * @return This object
-	 */
-	public Text setType(String value) {
-		this.type = value;
-		return this;
-	}
-
-	/**
-	 * Bean property getter:  <property>text</property>.
-	 *
-	 * <p>
-	 * The content of this content.
-	 *
-	 * @return The property value, or <jk>null</jk> if it is not set.
-	 */
-	@Xml(format=XMLTEXT)
-	public String getText() {
-		return text;
-	}
-
-	/**
-	 * Bean property setter:  <property>text</property>.
-	 *
-	 * <p>
-	 * The content of this content.
-	 *
-	 * @param value
-	 * 	The new value for this property.
-	 * 	<br>Can be <jk>null</jk> to unset the property.
-	 * @return This object
-	 */
-	public Text setText(String value) {
-		this.text = value;
-		return this;
-	}
-
-	//-----------------------------------------------------------------------------------------------------------------
-	// Overridden setters (to simplify method chaining)
-	//-----------------------------------------------------------------------------------------------------------------
-
-	// <FluentSetters>
-
-	@Override /* GENERATED - org.apache.juneau.dto.atom.Common */
-	public Text setBase(Object value) {
-		super.setBase(value);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.atom.Common */
-	public Text setLang(String value) {
-		super.setLang(value);
-		return this;
-	}
-
-	// </FluentSetters>
-}
\ No newline at end of file
diff --git a/juneau-bean/juneau-bean-swagger/src/main/java/org/apache/juneau/dto/atom/Utils.java b/juneau-bean/juneau-bean-swagger/src/main/java/org/apache/juneau/dto/atom/Utils.java
deleted file mode 100644
index 4b731fa5a..000000000
--- a/juneau-bean/juneau-bean-swagger/src/main/java/org/apache/juneau/dto/atom/Utils.java
+++ /dev/null
@@ -1,39 +0,0 @@
-// ***************************************************************************************************************************
-// * 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.                                              *
-// ***************************************************************************************************************************
-package org.apache.juneau.dto.atom;
-
-import java.util.*;
-
-import jakarta.xml.bind.*;
-
-/**
- * Static utility methods for ATOM marshalling code.
- *
- * <h5 class='section'>See Also:</h5><ul>
- * 	<li class='link'><a class="doclink" href="../../../../../index.html#jd.Atom">Overview &gt; juneau-dto &gt; Atom</a>
- * </ul>
- */
-final class Utils {
-
-	private Utils() {}
-
-	/**
-	 * Converts an ISO8601 date-time string to a {@link Calendar}.
-	 *
-	 * @param lexicalXSDDateTime The ISO8601 date-time string.
-	 * @return A new {@link Calendar} object.
-	 */
-	static final Calendar parseDateTime(String lexicalXSDDateTime) {
-		return DatatypeConverter.parseDateTime(lexicalXSDDateTime);
-	}
-}
\ No newline at end of file
diff --git a/juneau-bean/juneau-bean-swagger/src/main/java/org/apache/juneau/dto/atom/doc-files/Example_HTML.png b/juneau-bean/juneau-bean-swagger/src/main/java/org/apache/juneau/dto/atom/doc-files/Example_HTML.png
deleted file mode 100644
index 18b3d52ba..000000000
Binary files a/juneau-bean/juneau-bean-swagger/src/main/java/org/apache/juneau/dto/atom/doc-files/Example_HTML.png and /dev/null differ
diff --git a/juneau-bean/juneau-bean-swagger/src/main/java/org/apache/juneau/dto/atom/package-info.java b/juneau-bean/juneau-bean-swagger/src/main/java/org/apache/juneau/dto/atom/package-info.java
deleted file mode 100644
index 5894d64f8..000000000
--- a/juneau-bean/juneau-bean-swagger/src/main/java/org/apache/juneau/dto/atom/package-info.java
+++ /dev/null
@@ -1,26 +0,0 @@
-// ***************************************************************************************************************************
-// * 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.                                              *
-// ***************************************************************************************************************************
-
-/**
- * TODO
- */
-@XmlSchema(
-	prefix="atom",
-	xmlNs={
-		@XmlNs(prefix="atom", namespaceURI="http://www.w3.org/2005/Atom/"),
-		@XmlNs(prefix="xml", namespaceURI="http://www.w3.org/XML/1998/namespace")
-	}
-)
-package org.apache.juneau.dto.atom;
-
-import org.apache.juneau.xml.annotation.*;
\ No newline at end of file
diff --git a/juneau-bean/juneau-bean-swagger/src/main/java/org/apache/juneau/dto/atom/package.html b/juneau-bean/juneau-bean-swagger/src/main/java/org/apache/juneau/dto/atom/package.html
deleted file mode 100644
index c287c18ac..000000000
--- a/juneau-bean/juneau-bean-swagger/src/main/java/org/apache/juneau/dto/atom/package.html
+++ /dev/null
@@ -1,536 +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>
-</head>
-<body>
-<p>ATOM Data Transfer Objects</p>
-
-<!-- ======================================================================================================== -->
-<a id="Overview"></a>
-<h2 class='topic'>1 - Overview</h2>
-<div class='topic'>
-	<p>
-		Juneau supports generation and consumption of ATOM feeds through the use of DTOs (Data Transfer Objects).
-		<br>It uses existing support for serializing and parsing POJOs to and from XML to define these ATOM objects. 
-	</p>
-	<p>
-		The examples shown here are pulled from the <code>AtomFeedResource</code> class in the 
-		<code>org.apache.juneau.sample.war</code> project.
-	</p>
-	
-	
-	<!-- ======================================================================================================== -->
-	<a id="Serialize"></a>
-	<h3 class='topic'>1.1 - Serializing ATOM feeds</h3>
-	<div class='topic'>
-		<p>
-			The Juneau ATOM feed DTOs are simply beans with fluent-style setters.
-			<br>The following code shows a feed being created programmatically using the 
-			{@link org.apache.juneau.dto.atom.AtomBuilder} class.
-		</p>
-		<p class='bjava'>
-		
-	<jk>import static</jk> org.apache.juneau.dto.atom.AtomBuilder.*;
-	
-	Feed <jv>feed</jv> = 
-		<jsm>feed</jsm>(<js>"tag:juneau.apache.org"</js>, <js>"Juneau ATOM specification"</js>, <js>"2016-01-02T03:04:05Z"</js>)
-		.subtitle(<jsm>text</jsm>(<js>"html"</js>).text(<js>"Describes &lt;em&gt;stuff&lt;/em&gt; about Juneau"</js>))
-		.links(
-			<jsm>link</jsm>(<js>"alternate"</js>, <js>"text/html"</js>, <js>"http://juneau.apache.org"</js>).hreflang(<js>"en"</js>),
-			<jsm>link</jsm>(<js>"self"</js>, <js>"application/atom+xml"</js>, <js>"http://juneau.apache.org/feed.atom"</js>)
-		)
-		.generator(
-			<jsm>generator</jsm>(<js>"Juneau"</js>).uri(<js>"http://juneau.apache.org"</js>).version(<js>"1.0"</js>)
-		)
-		.entries(
-			<jsm>entry</jsm>(<js>"tag:juneau.sample.com,2013:1.2345"</js>, <js>"Juneau ATOM specification snapshot"</js>, <js>"2016-01-02T03:04:05Z"</js>)
-			.links(
-				<jsm>link</jsm>(<js>"alternate"</js>, <js>"text/html"</js>, <js>"http://juneau.apache.org/juneau.atom"</js>),
-				<jsm>link</jsm>(<js>"enclosure"</js>, <js>"audio/mpeg"</js>, <js>"http://juneau.apache.org/audio/juneau_podcast.mp3"</js>).length(1337)
-			)
-			.published(<js>"2016-01-02T03:04:05Z"</js>)
-			.authors(
-				<jsm>person</jsm>(<js>"Jane Smith"</js>).uri(<js>"http://juneau.apache.org"</js>).email(<js>"janesmith@apache.org"</js>)
-			)
-			.contributors(
-				<jsm>person</jsm>(<js>"John Smith"</js>)
-			)
-			.content(
-				<jsm>content</jsm>(<js>"xhtml"</js>)
-				.lang(<js>"en"</js>)
-				.base(<js>"http://www.apache.org/"</js>)
-				.text(<js>"&lt;div&gt;&lt;p&gt;&lt;i&gt;[Update: Juneau supports ATOM.]&lt;/i&gt;&lt;/p&gt;&lt;/div&gt;"</js>)
-			)
-		);
-		</p>
-		<p>
-			To serialize this to ATOM, use the {@link org.apache.juneau.xml.XmlSerializer} class:
-		</p>
-		
-		<h5 class='figure'>Example with no namespaces</h5>
-		<p class='bjava'>
-	<jc>// Create a serializer with readable output, no namespaces yet.</jc>
-	XmlSerializer <jv>serializer</jv> = XmlSerializer.<jsm>create</jsm>().sq().ws().build();
-
-	<jc>// Serialize to ATOM/XML</jc>
-	String <jv>atomXml</jv> = <jv>serializer</jv>.serialize(<jv>feed</jv>);
-		</p>
-		
-		<h5 class='figure'>Results</h5>
-		<p class='bxml'>
-	<xt>&lt;feed&gt;</xt>
-		<xt>&lt;id&gt;</xt>
-			tag:juneau.apache.org
-		<xt>&lt;/id&gt;</xt>
-		<xt>&lt;link</xt> <xa>href</xa>=<xs>'http://juneau.apache.org/'</xs> <xa>rel</xa>=<xs>'alternate'</xs> <xa>type</xa>=<xs>'text/html'</xs> <xa>hreflang</xa>=<xs>'en'</xs>/<xt>&gt;</xt>
-		<xt>&lt;link</xt> <xa>href</xa>=<xs>'http://juneau.apache.org/feed.atom'</xs> <xa>rel</xa>=<xs>'self'</xs> <xa>type</xa>=<xs>'application/atom+xml'</xs>/<xt>&gt;</xt>
-		<xt>&lt;title</xt> <xa>type</xa>=<xs>'text'</xs>&gt;</xt>
-			Juneau ATOM specification
-		<xt>&lt;/title&gt;</xt>
-		<xt>&lt;updated&gt;</xt>2016-01-02T03:04:05Z<xt>&lt;/updated&gt;</xt>
-		<xt>&lt;generator</xt> <xa>uri</xa>=<xs>'http://juneau.apache.org/'</xs> <xa>version</xa>=<xs>'1.0'</xs><xt>&gt;</xt>
-			Juneau
-		<xt>&lt;/generator&gt;</xt>
-		<xt>&lt;subtitle</xt> <xa>type</xa>=<xs>'html'</xs><xt>&gt;</xt>
-			Describes &lt;em&gt;stuff&lt;/em&gt; about Juneau
-		<xt>&lt;/subtitle&gt;</xt>
-		<xt>&lt;entry&gt;</xt>
-			<xt>&lt;author&gt;</xt>
-				<xt>&lt;name&gt;</xt>Jane Smith<xt>&lt;/name&gt;</xt>
-				<xt>&lt;uri&gt;</xt>http://juneau.apache.org/<xt>&lt;/uri&gt;</xt>
-				<xt>&lt;email&gt;</xt>janesmith@apache.org<xt>&lt;/email&gt;</xt>
-			<xt>&lt;/author&gt;</xt>
-			<xt>&lt;contributor&gt;</xt>
-				<xt>&lt;name&gt;</xt>John Smith<xt>&lt;/name&gt;</xt>
-			<xt>&lt;/contributor&gt;</xt>
-			<xt>&lt;id&gt;</xt>
-				tag:juneau.apache.org
-			<xt>&lt;/id&gt;</xt>
-			<xt>&lt;link</xt> <xa>href</xa>=<xs>'http://juneau.apache.org/juneau.atom'</xs> <xa>rel</xa>=<xs>'alternate'</xs> <xa>type</xa>=<xs>'text/html'</xs>/<xt>&gt;</xt>
-			<xt>&lt;link</xt> <xa>href</xa>=<xs>'http://juneau.apache.org/audio/juneau_podcast.mp3'</xs> <xa>rel</xa>=<xs>'enclosure'</xs> <xa>type</xa>=<xs>'audio/mpeg'</xs> <xa>length</xa>=<xs>'12345'</xs>/<xt>&gt;</xt>
-			<xt>&lt;title&gt;</xt>
-				Juneau ATOM specification snapshot
-			<xt>&lt;/title&gt;</xt>
-			<xt>&lt;updated&gt;</xt>2016-01-02T03:04:05Z<xt>&lt;/updated&gt;</xt>
-			<xt>&lt;content</xt> <xa>base</xa>=<xs>'http://www.apache.org/'</xs> <xa>lang</xa>=<xs>'en'</xs> <xa>type</xa>=<xs>'xhtml'</xs><xt>&gt;</xt>
-				<xt>&lt;div</xt> <xa>xmlns</xa>=<xs>"http://www.w3.org/1999/xhtml"</xs><xt>&gt;&lt;p&gt;&lt;i&gt;</xt>[Update: Juneau supports ATOM.]<xt>&lt;/i&gt;&lt;/p&gt;&lt;/div&gt;</xt>
-			<xt>&lt;/content&gt;</xt>
-			<xt>&lt;published&gt;</xt>2016-01-02T03:04:05Z<xt>&lt;/published&gt;</xt>
-		<xt>&lt;/entry&gt;</xt>
-	<xt>&lt;/feed&gt;</xt>		
-		</p>
-		
-		<p>
-			The following is the same, except with XML namespaces enabled:
-		</p>
-	
-		<h5 class='figure'>Example with namespaces</h5>
-		<p class='bjava'>
-	<jc>// Create a serializer with readable output with namespaces.</jc>
-	XmlSerializer <jv>serializer</jv> = XmlSerializer.<jsm>create</jsm>().sq().ws().build();
-
-	<jc>// Serialize to ATOM/XML</jc>
-	String <jv>atomXml</jv> = <jv>serializer</jv>.serialize(<jv>feed</jv>);
-		</p>
-		
-		<h5 class='figure'>Results</h5>
-		<p class='bxml'>
-	<xt>&lt;atom:feed</xt> 
-			<xa>xmlns</xa>=<xs>'http://www.apache.org/2013/Juneau'</xs> 
-			<xa>xmlns:atom</xa>=<xs>'http://www.w3.org/2005/Atom/'</xs> 
-			<xa>xmlns:xml</xa>=<xs>'http://www.w3.org/XML/1998/namespace'</xs> 
-			<xa>xmlns:xsi</xa>=<xs>'http://www.w3.org/2001/XMLSchema-instance'</xs><xt>&gt;</xt>
-		<xt>&lt;atom:id&gt;</xt>
-			tag:juneau.apache.org
-		<xt>&lt;/atom:id&gt;</xt>
-		<xt>&lt;atom:link</xt> <xa>href</xa>=<xs>'http://juneau.apache.org/'</xs> <xa>rel</xa>=<xs>'alternate'</xs> <xa>type</xa>=<xs>'text/html'</xs> <xa>hreflang</xa>=<xs>'en'</xs><xt>/&gt;</xt>
-		<xt>&lt;atom:link</xt> <xa>href</xa>=<xs>'http://juneau.apache.org/feed.atom'</xs> <xa>rel</xa>=<xs>'self'</xs> <xa>type</xa>=<xs>'application/atom+xml'</xs><xt>/&gt;</xt>
-		<xt>&lt;atom:title</xt> <xa>type</xa>=<xs>'text'</xs><xt>&gt;</xt>
-			Juneau ATOM specification
-		<xt>&lt;/atom:title&gt;</xt>
-		<xt>&lt;atom:updated&gt;</xt>2016-01-02T03:04:05Z<xt>&lt;/atom:updated&gt;</xt>
-		<xt>&lt;atom:generator</xt> <xa>uri</xa>=<xs>'http://juneau.apache.org/'</xs> <xa>version</xa>=<xs>'1.0'</xs><xt>&gt;</xt>
-			Juneau
-		<xt>&lt;/atom:generator&gt;</xt>
-		<xt>&lt;atom:subtitle</xt> <xa>type</xa>=<xs>'html'</xs><xt>&gt;</xt>
-			Describes &lt;em&gt;stuff&lt;/em&gt; about Juneau
-		<xt>&lt;/atom:subtitle&gt;</xt>
-		<xt>&lt;atom:entry&gt;</xt>
-			<xt>&lt;atom:author&gt;</xt>
-				<xt>&lt;atom:name&gt;</xt>Jane Smith<xt>&lt;/atom:name&gt;</xt>
-				<xt>&lt;atom:uri&gt;</xt>http://juneau.apache.org/<xt>&lt;/atom:uri&gt;</xt>
-				<xt>&lt;atom:email&gt;</xt>janesmith@apache.org<xt>&lt;/atom:email&gt;</xt>
-			<xt>&lt;/atom:author&gt;</xt>
-			<xt>&lt;atom:contributor&gt;</xt>
-				<xt>&lt;atom:name&gt;</xt>John Smith<xt>&lt;/atom:name&gt;</xt>
-			<xt>&lt;/atom:contributor&gt;</xt>
-			<xt>&lt;atom:id&gt;</xt>
-				tag:juneau.apache.org
-			<xt>&lt;/atom:id&gt;</xt>
-			<xt>&lt;atom:link</xt> <xa>href</xa>=<xs>'http://juneau.apache.org/juneau.atom'</xs> <xa>rel</xa>=<xs>'alternate'</xs> <xa>type</xa>=<xs>'text/html'</xs><xt>/&gt;</xt>
-			<xt>&lt;atom:link</xt> <xa>href</xa>=<xs>'http://juneau.apache.org/audio/juneau_podcast.mp3'</xs> <xa>rel</xa>=<xs>'enclosure'</xs> <xa>type</xa>=<xs>'audio/mpeg'</xs> <xa>length</xa>=<xs>'12345'</xs><xt>/&gt;</xt>
-			<xt>&lt;atom:title&gt;</xt>
-				Juneau ATOM specification snapshot
-			<xt>&lt;/atom:title&gt;</xt>
-			<xt>&lt;atom:updated&gt;</xt>2016-01-02T03:04:05Z<xt>&lt;/atom:updated&gt;</xt>
-			<xt>&lt;atom:content</xt> <xa>xml:base</xa>=<xs>'http://www.apache.org/'</xs> <xa>xml:lang</xa>=<xs>'en'</xs> <xa>type</xa>=<xs>'xhtml'</xs><xt>&gt;</xt>
-				<xt>&lt;div</xt> <xa>xmlns</xa>=<xs>"http://www.w3.org/1999/xhtml"</xs><xt>&gt;</xt><xt>&lt;p&gt;</xt><xt>&lt;i&gt;</xt>[Update: Juneau supports ATOM.]<xt>&lt;/i&gt;</xt><xt>&lt;/p&gt;</xt><xt>&lt;/div&gt;</xt>
-			<xt>&lt;/atom:content&gt;</xt>
-			<xt>&lt;atom:published&gt;</xt>2016-01-02T03:04:05Z<xt>&lt;/atom:published&gt;</xt>
-		<xt>&lt;/atom:entry&gt;</xt>
-	<xt>&lt;/atom:feed&gt;</xt>
-		</p>
-	
-		<p>
-			The following is the same, except with XML namespaces enabled and the ATOM namespace as the default namespace:
-		</p>
-
-		<h5 class='figure'>Example with namespaces with ATOM as the default namespace</h5>
-		<p class='bjava'>
-	<jc>// Create a serializer with readable output with namespaces.</jc>
-	XmlSerializer <jv>serializer</jv> = XmlSerializer.<jsm>create</jsm>().sq().ws().defaultNamespaceUri(<js>"atom"</js>).build();
-
-	<jc>// Serialize to ATOM/XML</jc>
-	String <jv>atomXml</jv> = <jv>serializer</jv>.serialize(<jv>feed</jv>);
-		</p>
-		
-		<h5 class='figure'>Results</h5>
-		<p class='bxml'>
-	<xt>&lt;feed</xt> 
-			<xa>xmlns</xa>=<xs>'http://www.w3.org/2005/Atom/'</xs> 
-			<xa>xmlns:xml</xa>=<xs>'http://www.w3.org/XML/1998/namespace'</xs> 
-			<xa>xmlns:xsi</xa>=<xs>'http://www.w3.org/2001/XMLSchema-instance'</xs><xt>&gt;</xt>
-		<xt>&lt;id&gt;</xt>
-			tag:juneau.apache.org
-		<xt>&lt;/id&gt;</xt>
-		<xt>&lt;link</xt> <xa>href</xa>=<xs>'http://juneau.apache.org/'</xs> <xa>rel</xa>=<xs>'alternate'</xs> <xa>type</xa>=<xs>'text/html'</xs> <xa>hreflang</xa>=<xs>'en'</xs><xt>/&gt;</xt>
-		<xt>&lt;link</xt> <xa>href</xa>=<xs>'http://juneau.apache.org/feed.atom'</xs> <xa>rel</xa>=<xs>'self'</xs> <xa>type</xa>=<xs>'application/atom+xml'</xs><xt>/&gt;</xt>
-		<xt>&lt;title</xt> <xa>type</xa>=<xs>'text'</xs><xt>&gt;</xt>
-			Juneau ATOM specification
-		<xt>&lt;/title&gt;</xt>
-		<xt>&lt;updated&gt;</xt>2016-01-02T03:04:05Z<xt>&lt;/updated&gt;</xt>
-		<xt>&lt;generator</xt> <xa>uri</xa>=<xs>'http://juneau.apache.org/'</xs> <xa>version</xa>=<xs>'1.0'</xs><xt>&gt;</xt>
-			Juneau
-		<xt>&lt;/generator&gt;</xt>
-		<xt>&lt;subtitle</xt> <xa>type</xa>=<xs>'html'</xs><xt>&gt;</xt>
-			Describes &amp;lt;em&amp;stuff&amp;lt;/em&amp;gt; about Juneau
-		<xt>&lt;/subtitle&gt;</xt>
-		<xt>&lt;entry&gt;</xt>
-			<xt>&lt;author&gt;</xt>
-				<xt>&lt;name&gt;</xt>Jane Smith<xt>&lt;/name&gt;</xt>
-				<xt>&lt;uri&gt;</xt>http://juneau.apache.org/<xt>&lt;/uri&gt;</xt>
-				<xt>&lt;email&gt;</xt>janesmith@apache.org<xt>&lt;/email&gt;</xt>
-			<xt>&lt;/author&gt;</xt>
-			<xt>&lt;contributor&gt;</xt>
-				<xt>&lt;name&gt;</xt>John Smith<xt>&lt;/name&gt;</xt>
-			<xt>&lt;/contributor&gt;</xt>
-			<xt>&lt;id&gt;</xt>
-				tag:juneau.apache.org
-			<xt>&lt;/id&gt;</xt>
-			<xt>&lt;link</xt> <xa>href</xa>=<xs>'http://juneau.apache.org/juneau.atom'</xs> <xa>rel</xa>=<xs>'alternate'</xs> <xa>type</xa>=<xs>'text/html'</xs><xt>/&gt;</xt>
-			<xt>&lt;link</xt> <xa>href</xa>=<xs>'http://juneau.apache.org/audio/juneau_podcast.mp3'</xs> <xa>rel</xa>=<xs>'enclosure'</xs> <xa>type</xa>=<xs>'audio/mpeg'</xs> <xa>length</xa>=<xs>'12345'</xs><xt>/&gt;</xt>
-			<xt>&lt;title&gt;</xt>
-				Juneau ATOM specification snapshot
-			<xt>&lt;/title&gt;</xt>
-			<xt>&lt;updated&gt;</xt>2016-01-02T03:04:05Z<xt>&lt;/updated&gt;</xt>
-			<xt>&lt;content</xt> <xa>xml:base</xa>=<xs>'http://www.apache.org/'</xs> <xa>xml:lang</xa>=<xs>'en'</xs> <xa>type</xa>=<xs>'xhtml'</xs><xt>&gt;</xt>
-				<xt>&lt;div</xt> <xa>xmlns</xa>=<xs>"http://www.w3.org/1999/xhtml"</xs><xt>&gt;</xt><xt>&lt;p&gt;</xt><xt>&lt;i&gt;</xt>[Update: Juneau supports ATOM.]<xt>&lt;/i&gt;</xt><xt>&lt;/p&gt;</xt><xt>&lt;/div&gt;</xt>
-			<xt>&lt;/content&gt;</xt>
-			<xt>&lt;published&gt;</xt>2016-01-02T03:04:05Z<xt>&lt;/published&gt;</xt>
-		<xt>&lt;/entry&gt;</xt>
-	<xt>&lt;/feed&gt;</xt>
-		</p>		
-	
-	
-		<!-- ======================================================================================================== -->
-		<a id="AtomJson"></a>
-		<h4 class='topic'>1.1.1 - ATOM/JSON</h4>
-		<div class='topic'>
-			<p>
-				The {@link org.apache.juneau.json.JsonSerializer} class can also be used to produce ATOM in JSON format.
-			</p>
-
-			<h5 class='figure'>ATOM/JSON example</h5>
-			<p class='bjava'>
-	<jc>// Get JSON serializer with readable output.</jc>
-	Json5Serializer <jv>serializer</jv> = Json5Serializer.<jsf>DEFAULT_READABLE</jsf>;
-
-	<jc>// Serialize to ATOM/JSON</jc>
-	String <jv>atomXml</jv> = <jv>serializer</jv>.serialize(<jv>feed</jv>);
-			</p>
-		
-			<h5 class='figure'>Results</h5>
-			<p class='bjson'>
-	{
-		id: {
-			text: <js>'tag:juneau.apache.org'</js>
-		}, 
-		links: [
-			{
-				href: <js>'http://juneau.apache.org/'</js>, 
-				rel: <js>'alternate'</js>, 
-				type: <js>'text/html'</js>, 
-				hreflang: <js>'en'</js>
-			}, 
-			{
-				href: <js>'http://juneau.apache.org/juneau.atom'</js>, 
-				rel: <js>'self'</js>, 
-				type: <js>'application/atom+xml'</js>
-			}
-		], 
-		title: {
-			type: <js>'text'</js>, 
-			text: <js>'Juneau ATOM specification'</js>
-		}, 
-		updated: <js>'2016-01-02T03:04:05Z'</js>, 
-		generator: {
-			uri: <js>'http://juneau.apache.org/'</js>, 
-			version: <js>'1.0'</js>, 
-			text: <js>'Juneau'</js>
-		}, 
-		subtitle: {
-			type: <js>'html'</js>, 
-			text: <js>'Describes &lt;em&gt;stuff&lt;/em&gt; about Juneau'</js>
-		}, 
-		entries: [
-			{
-				authors: [
-					{
-						name: <js>'James Bognar'</js>, 
-						uri: <js>'http://juneau.apache.org/'</js>, 
-						email: <js>'jamesbognar@apache.org'</js>
-					}
-				], 
-				contributors: [
-					{
-						name: <js>'Barry M. Caceres'</js>
-					}
-				], 
-				id: {
-					text: <js>'tag:juneau.apache.org'</js>
-				}, 
-				links: [
-					{
-						href: <js>'http://juneau.apache.org/juneau.atom'</js>, 
-						rel: <js>'alternate'</js>, 
-						type: <js>'text/html'</js>
-					}, 
-					{
-						href: <js>'http://juneau.apache.org/audio/juneau_podcast.mp3'</js>, 
-						rel: <js>'enclosure'</js>, 
-						type: <js>'audio/mpeg'</js>, 
-						length: <jk>12345</jk>
-					}
-				], 
-				title: {
-					text: <js>'Juneau ATOM specification snapshot'</js>
-				}, 
-				updated: <js>'2016-01-02T03:04:05Z'</js>, 
-				content: {
-					base: <js>'http://www.apache.org/'</js>, 
-					lang: <js>'en'</js>, 
-					type: <js>'xhtml'</js>, 
-					text: <js>'&lt;div xmlns="http://www.w3.org/1999/xhtml"&gt;&lt;p&gt;&lt;i&gt;[Update: Juneau supports ATOM.]&lt;/i&gt;&lt;/p&gt;&lt;/div&gt;'</js>
-				}, 
-				published: <js>'2016-01-02T03:04:05Z'</js>
-			}
-		]
-	}
-			</p>
-		</div>	
-		
-
-		<!-- ======================================================================================================== -->
-		<a id="AtomRdfXml"></a>
-		<h4 class='topic'>1.1.2 - ATOM/RDF/XML</h4>
-		<div class='topic'>
-			<p>
-				The {@link org.apache.juneau.jena.RdfSerializer} class and subclasses can also be used to produce ATOM 
-				in various RDF formats.
-			</p>
-
-			<h5 class='figure'>ATOM/RDF/XML example</h5>
-			<p class='bjava'>
-	<jc>// Get RDF/XML serializer with readable output.</jc>
-	RdfSerializer <jv>serializer</jv> = RdfSerializer.<jsm>create</jsm>()
-		.xmlabbrev()
-		.ws()
-		.sq()
-		.rdfxml_tab(3)
-		.build();
-
-	<jc>// Serialize to ATOM/RDF/XML</jc>
-	String <jv>atomRdfXml</jv> = <jv>serializer</jv>.serialize(<jv>feed</jv>);
-			</p>
-			
-			<h5 class='figure'>Results</h5>
-			<p class='bxml'>
-	<xt>&lt;rdf:RDF</xt>
-			<xa>xmlns:rdf</xa>=<xs>'http://www.w3.org/1999/02/22-rdf-syntax-ns#'</xs>
-			<xa>xmlns:j</xa>=<xs>'http://www.apache.org/juneau/'</xs>
-			<xa>xmlns:jp</xa>=<xs>'http://www.apache.org/juneaubp/'</xs>
-			<xa>xmlns:atom</xa>=<xs>'http://www.w3.org/2005/Atom/'</xs>
-			<xa>xmlns:j.0</xa>=<xs>'http://www.w3.org/XML/1998/'</xs><xt>&gt;</xt>
-		<xt>&lt;rdf:Description&gt;</xt>
-			<xt>&lt;atom:id</xt> <xa>rdf:parseType</xa>=<xs>'Resource'</xs><xt>&gt;</xt>
-				<xt>&lt;atom:text&gt;</xt>tag:juneau.apache.org<xt>&lt;/atom:text&gt;</xt>
-			<xt>&lt;/atom:id&gt;</xt>
-			<xt>&lt;atom:links&gt;</xt>
-				<xt>&lt;rdf:Seq&gt;</xt>
-					<xt>&lt;rdf:li</xt> <xa>rdf:parseType</xa>=<xs>'Resource'</xs><xt>&gt;</xt>
-						<xt>&lt;atom:href&gt;</xt>http://juneau.apache.org/<xt>&lt;/atom:href&gt;</xt>
-						<xt>&lt;atom:rel&gt;</xt>alternate<xt>&lt;/atom:rel&gt;</xt>
-						<xt>&lt;atom:type&gt;</xt>text/html<xt>&lt;/atom:type&gt;</xt>
-						<xt>&lt;atom:hreflang&gt;</xt>en<xt>&lt;/atom:hreflang&gt;</xt>
-					<xt>&lt;/rdf:li&gt;</xt>
-					<xt>&lt;rdf:li</xt> <xa>rdf:parseType</xa>=<xs>'Resource'</xs><xt>&gt;</xt>
-						<xt>&lt;atom:href&gt;</xt>http://juneau.apache.org/feed.atom<xt>&lt;/atom:href&gt;</xt>
-						<xt>&lt;atom:rel&gt;</xt>self<xt>&lt;/atom:rel&gt;</xt>
-						<xt>&lt;atom:type&gt;</xt>application/atom+xml<xt>&lt;/atom:type&gt;</xt>
-					<xt>&lt;/rdf:li&gt;</xt>
-				<xt>&lt;/rdf:Seq&gt;</xt>
-			<xt>&lt;/atom:links&gt;</xt>
-			<xt>&lt;atom:title</xt> <xa>rdf:parseType</xa>=<xs>'Resource'</xs><xt>&gt;</xt>
-				<xt>&lt;atom:type&gt;</xt>text<xt>&lt;/atom:type&gt;</xt>
-				<xt>&lt;atom:text&gt;</xt>Juneau ATOM specification<xt>&lt;/atom:text&gt;</xt>
-			<xt>&lt;/atom:title&gt;</xt>
-			<xt>&lt;atom:updated&gt;</xt>2016-01-02T03:04:05Z<xt>&lt;/atom:updated&gt;</xt>
-			<xt>&lt;atom:generator</xt> <xa>rdf:parseType</xa>=<xs>'Resource'</xs><xt>&gt;</xt>
-				<xt>&lt;atom:uri</xt> <xa>rdf:resource</xa>=<xs>'http://juneau.apache.org/'</xs><xt>/&gt;</xt>
-				<xt>&lt;atom:version&gt;</xt>1.0<xt>&lt;/atom:version&gt;</xt>
-				<xt>&lt;atom:text&gt;</xt>Juneau<xt>&lt;/atom:text&gt;</xt>
-			<xt>&lt;/atom:generator&gt;</xt>
-			<xt>&lt;atom:subtitle</xt> <xa>rdf:parseType</xa>=<xs>'Resource'</xs><xt>&gt;</xt>
-				<xt>&lt;atom:type&gt;</xt>html<xt>&lt;/atom:type&gt;</xt>
-				<xt>&lt;atom:text&gt;</xt>A &amp;lt;em&amp;gt;lot&amp;lt;/em&amp;gt; of effort went into making this effortless<xt>&lt;/atom:text&gt;</xt>
-			<xt>&lt;/atom:subtitle&gt;</xt>
-			<xt>&lt;atom:entries&gt;</xt>
-				<xt>&lt;rdf:Seq&gt;</xt>
-					<xt>&lt;rdf:li</xt> <xa>rdf:parseType</xa>=<xs>'Resource'</xs><xt>&gt;</xt>
-						<xt>&lt;atom:authors&gt;</xt>
-							<xt>&lt;rdf:Seq&gt;</xt>
-								<xt>&lt;rdf:li</xt> <xa>rdf:parseType</xa>=<xs>'Resource'</xs><xt>&gt;</xt>
-									<xt>&lt;atom:name&gt;</xt>James Bognar<xt>&lt;/atom:name&gt;</xt>
-									<xt>&lt;atom:uri</xt> <xa>rdf:resource</xa>=<xs>'http://juneau.apache.org/'</xs><xt>/&gt;</xt>
-									<xt>&lt;atom:email&gt;</xt>james.bognar@salesforce.com<xt>&lt;/atom:email&gt;</xt>
-								<xt>&lt;/rdf:li&gt;</xt>
-							<xt>&lt;/rdf:Seq&gt;</xt>
-						<xt>&lt;/atom:authors&gt;</xt>
-						<xt>&lt;atom:contributors&gt;</xt>
-							<xt>&lt;rdf:Seq&gt;</xt>
-								<xt>&lt;rdf:li</xt> <xa>rdf:parseType</xa>=<xs>'Resource'</xs><xt>&gt;</xt>
-									<xt>&lt;atom:name&gt;</xt>Barry M. Caceres<xt>&lt;/atom:name&gt;</xt>
-								<xt>&lt;/rdf:li&gt;</xt>
-							<xt>&lt;/rdf:Seq&gt;</xt>
-						<xt>&lt;/atom:contributors&gt;</xt>
-						<xt>&lt;atom:id</xt> <xa>rdf:parseType</xa>=<xs>'Resource'</xs><xt>&gt;</xt>
-							<xt>&lt;atom:text&gt;</xt>tag:juneau.apache.org<xt>&lt;/atom:text&gt;</xt>
-						<xt>&lt;/atom:id&gt;</xt>
-						<xt>&lt;atom:links&gt;</xt>
-							<xt>&lt;rdf:Seq&gt;</xt>
-								<xt>&lt;rdf:li</xt> <xa>rdf:parseType</xa>=<xs>'Resource'</xs><xt>&gt;</xt>
-									<xt>&lt;atom:href&gt;</xt>http://juneau.apache.org/juneau.atom<xt>&lt;/atom:href&gt;</xt>
-									<xt>&lt;atom:rel&gt;</xt>alternate<xt>&lt;/atom:rel&gt;</xt>
-									<xt>&lt;atom:type&gt;</xt>text/html<xt>&lt;/atom:type&gt;</xt>
-								<xt>&lt;/rdf:li&gt;</xt>
-								<xt>&lt;rdf:li</xt> <xa>rdf:parseType</xa>=<xs>'Resource'</xs><xt>&gt;</xt>
-									<xt>&lt;atom:href&gt;</xt>http://juneau.apache.org/audio/juneau_podcast.mp3<xt>&lt;/atom:href&gt;</xt>
-									<xt>&lt;atom:rel&gt;</xt>enclosure<xt>&lt;/atom:rel&gt;</xt>
-									<xt>&lt;atom:type&gt;</xt>audio/mpeg<xt>&lt;/atom:type&gt;</xt>
-									<xt>&lt;atom:length&gt;</xt>12345<xt>&lt;/atom:length&gt;</xt>
-								<xt>&lt;/rdf:li&gt;</xt>
-							<xt>&lt;/rdf:Seq&gt;</xt>
-						<xt>&lt;/atom:links&gt;</xt>
-						<xt>&lt;atom:title</xt> <xa>rdf:parseType</xa>=<xs>'Resource'</xs><xt>&gt;</xt>
-							<xt>&lt;atom:text&gt;</xt>Juneau ATOM specification snapshot<xt>&lt;/atom:text&gt;</xt>
-						<xt>&lt;/atom:title&gt;</xt>
-						<xt>&lt;atom:updated&gt;</xt>2016-01-02T03:04:05Z<xt>&lt;/atom:updated&gt;</xt>
-						<xt>&lt;atom:content</xt> <xa>rdf:parseType</xa>=<xs>'Resource'</xs><xt>&gt;</xt>
-							<xt>&lt;j.0:namespacebase</xt> <xa>rdf:resource</xa>=<xs>'http://www.apache.org/'</xs><xt>/&gt;</xt>
-							<xt>&lt;j.0:namespacelang&gt;</xt>en<xt>&lt;/j.0:namespacelang&gt;</xt>
-							<xt>&lt;atom:type&gt;</xt>xhtml<xt>&lt;/atom:type&gt;</xt>
-							<xt>&lt;atom:text&gt;</xt>&amp;lt;div xmlns="http://www.w3.org/1999/xhtml"&amp;gt;&amp;lt;p&amp;gt;&amp;lt;i&amp;gt;[Update: Juneau supports ATOM.]&amp;lt;/i&amp;gt;&amp;lt;/p&amp;gt;&amp;lt;/div&amp;gt;<xt>&lt;/atom:text&gt;</xt>
-						<xt>&lt;/atom:content&gt;</xt>
-						<xt>&lt;atom:published&gt;</xt>2016-01-02T03:04:05Z<xt>&lt;/atom:published&gt;</xt>
-					<xt>&lt;/rdf:li&gt;</xt>
-				<xt>&lt;/rdf:Seq&gt;</xt>
-			<xt>&lt;/atom:entries&gt;</xt>
-		<xt>&lt;/rdf:Description&gt;</xt>
-	<xt>&lt;/rdf:RDF&gt;</xt>
-			</p>
-		</div>
-		
-		
-		<!-- ======================================================================================================== -->
-		<a id="AtomHtml"></a>
-		<h4 class='topic'>1.1.3 - ATOM/HTML</h4>
-		<div class='topic'>
-			<p>
-				The {@link org.apache.juneau.html.HtmlSerializer} class can be used to produce ATOM in HTML format.
-			</p>
-			<p>
-				The following is the output produced by the <code>AtomFeedResource</code> in the <code>org.apache.juneau.sample.war</code> project:
-			</p>
-			
-			<h5 class='figure'>Example ATOM/HTML results</h5>
-			<img class='bordered' src='doc-files/Example_HTML.png'>	
-		</div>
-	</div>
-	
-
-	<!-- ======================================================================================================== -->
-	<a id="Parse"></a>
-	<h3 class='topic'>1.2 - Parsing ATOM feeds</h3>
-	<div class='topic'>
-		<p>
-			Use the {@link org.apache.juneau.xml.XmlParser} to convert ATOM/XML feeds back into their original POJOs:
-		</p>
-		<p class='bjava'>
-	<jc>// Create a serializer with readable output with namespaces</jc>
-	XmlSerializer <jv>serializer</jv> = XmlSerializer.<jsf>DEFAULT_SQ_READABLE</jsf>;
-
-	<jc>// Serialize to ATOM/XML</jc>
-	String <jv>atomXml</jv> = <jv>serializer</jv>.serialize(<jv>feed</jv>);
-
-	<jc>// Get an XML parser to convert it back into a POJO</jc>
-	XmlParser <jv>parser</jv> = XmlParser.<jsf>DEFAULT</jsf>;
-	
-	<jc>// Convert the XML back into a POJO</jc>
-	Feed <jv>feed2</jv> = <jv>parser</jv>.parse(<jv>atomXml</jv>, Feed.<jk>class</jk>);
-		</p>
-		<p>
-			ATOM Feed objects can also be constructed from the other media types using the appropriate parsers.
-		</p>
-	</div>
-
-</div>
-<p align="center"><i><b>*** fín ***</b></i></p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/juneau-bean/juneau-bean-swagger/src/main/java/org/apache/juneau/dto/html5/A.java b/juneau-bean/juneau-bean-swagger/src/main/java/org/apache/juneau/dto/html5/A.java
deleted file mode 100644
index ef9bfafa8..000000000
--- a/juneau-bean/juneau-bean-swagger/src/main/java/org/apache/juneau/dto/html5/A.java
+++ /dev/null
@@ -1,535 +0,0 @@
-// ***************************************************************************************************************************
-// * 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.                                              *
-// ***************************************************************************************************************************
-package org.apache.juneau.dto.html5;
-
-import java.net.*;
-
-import org.apache.juneau.*;
-import org.apache.juneau.annotation.*;
-import org.apache.juneau.internal.*;
-
-/**
- * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/text-level-semantics.html#the-a-element">&lt;a&gt;</a>
- * element.
- *
- * <h5 class='section'>See Also:</h5><ul>
- * 	<li class='link'><a class="doclink" href="../../../../../index.html#jd.Html5">Overview &gt; juneau-dto &gt; HTML5</a>
- * </ul>
- */
-@Bean(typeName="a")
-@FluentSetters
-public class A extends HtmlElementMixed {
-
-	/**
-	 * Creates an empty {@link A} element.
-	 */
-	public A() {}
-
-	/**
-	 * Creates an {@link A} element with the specified {@link A#href(Object)} attribute and {@link A#children(Object[])}
-	 * nodes.
-	 *
-	 * @param href The {@link A#href(Object)} attribute.
-	 * @param children The {@link A#children(Object[])} nodes.
-	 */
-	public A(Object href, Object[] children) {
-		href(href).children(children);
-	}
-
-	/**
-	 * <a class="doclink" href="https://www.w3.org/TR/html5/links.html#attr-hyperlink-download">download</a> attribute.
-	 *
-	 * <p>
-	 * Whether to download the resource instead of navigating to it, and its file name if so.
-	 *
-	 * @param download
-	 * 	The new value for this attribute.
-	 * 	Typically a {@link Boolean} or {@link String}.
-	 * @return This object.
-	 */
-	public final A download(Object download) {
-		attr("download", download);
-		return this;
-	}
-
-	/**
-	 * <a class="doclink" href="https://www.w3.org/TR/html5/links.html#attr-hyperlink-href">href</a> attribute.
-	 *
-	 * <p>
-	 * Address of the hyperlink.
-	 *
-	 * <p>
-	 * The value can be of any of the following types: {@link URI}, {@link URL}, {@link String}.
-	 * Strings must be valid URIs.
-	 *
-	 * <p>
-	 * URIs defined by {@link UriResolver} can be used for values.
-	 *
-	 * @param href
-	 * 	The new value for this attribute.
-	 * 	Typically a {@link URL} or {@link String}.
-	 * @return This object.
-	 */
-	public final A href(Object href) {
-		attrUri("href", href);
-		return this;
-	}
-
-	/**
-	 * <a class="doclink" href="https://www.w3.org/TR/html5/links.html#attr-hyperlink-hreflang">hreflang</a> attribute.
-	 *
-	 * <p>
-	 * Language of the linked resource.
-	 *
-	 * @param hreflang The new value for this attribute.
-	 * @return This object.
-	 */
-	public final A hreflang(String hreflang) {
-		attr("hreflang", hreflang);
-		return this;
-	}
-
-	/**
-	 * <a class="doclink" href="https://www.w3.org/TR/html5/links.html#attr-hyperlink-rel">rel</a> attribute.
-	 *
-	 * <p>
-	 * Relationship between the document containing the hyperlink and the destination resource.
-	 *
-	 * @param rel The new value for this attribute.
-	 * @return This object.
-	 */
-	public final A rel(String rel) {
-		attr("rel", rel);
-		return this;
-	}
-
-	/**
-	 * <a class="doclink" href="https://www.w3.org/TR/html5/links.html#attr-hyperlink-target">target</a> attribute.
-	 *
-	 * <p>
-	 * Default browsing context for hyperlink navigation and form submission.
-	 *
-	 * @param target The new value for this attribute.
-	 * @return This object.
-	 */
-	public final A target(String target) {
-		attr("target", target);
-		return this;
-	}
-
-	/**
-	 * <a class="doclink" href="https://www.w3.org/TR/html5/links.html#attr-hyperlink-type">type</a> attribute.
-	 *
-	 * <p>
-	 * Hint for the type of the referenced resource.
-	 *
-	 * @param type The new value for this attribute.
-	 * @return This object.
-	 */
-	public final A type(String type) {
-		attr("type", type);
-		return this;
-	}
-
-	//-----------------------------------------------------------------------------------------------------------------
-	// Overridden methods
-	//-----------------------------------------------------------------------------------------------------------------
-
-	// <FluentSetters>
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public A _class(String _class) {  // NOSONAR - Intentional naming.
-		super._class(_class);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public A accesskey(String accesskey) {
-		super.accesskey(accesskey);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public A contenteditable(Object contenteditable) {
-		super.contenteditable(contenteditable);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public A dir(String dir) {
-		super.dir(dir);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public A hidden(Object hidden) {
-		super.hidden(hidden);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public A id(String id) {
-		super.id(id);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public A lang(String lang) {
-		super.lang(lang);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public A onabort(String onabort) {
-		super.onabort(onabort);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public A onblur(String onblur) {
-		super.onblur(onblur);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public A oncancel(String oncancel) {
-		super.oncancel(oncancel);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public A oncanplay(String oncanplay) {
-		super.oncanplay(oncanplay);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public A oncanplaythrough(String oncanplaythrough) {
-		super.oncanplaythrough(oncanplaythrough);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public A onchange(String onchange) {
-		super.onchange(onchange);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public A onclick(String onclick) {
-		super.onclick(onclick);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public A oncuechange(String oncuechange) {
-		super.oncuechange(oncuechange);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public A ondblclick(String ondblclick) {
-		super.ondblclick(ondblclick);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public A ondurationchange(String ondurationchange) {
-		super.ondurationchange(ondurationchange);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public A onemptied(String onemptied) {
-		super.onemptied(onemptied);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public A onended(String onended) {
-		super.onended(onended);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public A onerror(String onerror) {
-		super.onerror(onerror);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public A onfocus(String onfocus) {
-		super.onfocus(onfocus);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public A oninput(String oninput) {
-		super.oninput(oninput);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public A oninvalid(String oninvalid) {
-		super.oninvalid(oninvalid);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public A onkeydown(String onkeydown) {
-		super.onkeydown(onkeydown);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public A onkeypress(String onkeypress) {
-		super.onkeypress(onkeypress);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public A onkeyup(String onkeyup) {
-		super.onkeyup(onkeyup);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public A onload(String onload) {
-		super.onload(onload);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public A onloadeddata(String onloadeddata) {
-		super.onloadeddata(onloadeddata);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public A onloadedmetadata(String onloadedmetadata) {
-		super.onloadedmetadata(onloadedmetadata);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public A onloadstart(String onloadstart) {
-		super.onloadstart(onloadstart);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public A onmousedown(String onmousedown) {
-		super.onmousedown(onmousedown);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public A onmouseenter(String onmouseenter) {
-		super.onmouseenter(onmouseenter);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public A onmouseleave(String onmouseleave) {
-		super.onmouseleave(onmouseleave);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public A onmousemove(String onmousemove) {
-		super.onmousemove(onmousemove);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public A onmouseout(String onmouseout) {
-		super.onmouseout(onmouseout);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public A onmouseover(String onmouseover) {
-		super.onmouseover(onmouseover);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public A onmouseup(String onmouseup) {
-		super.onmouseup(onmouseup);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public A onmousewheel(String onmousewheel) {
-		super.onmousewheel(onmousewheel);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public A onpause(String onpause) {
-		super.onpause(onpause);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public A onplay(String onplay) {
-		super.onplay(onplay);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public A onplaying(String onplaying) {
-		super.onplaying(onplaying);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public A onprogress(String onprogress) {
-		super.onprogress(onprogress);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public A onratechange(String onratechange) {
-		super.onratechange(onratechange);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public A onreset(String onreset) {
-		super.onreset(onreset);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public A onresize(String onresize) {
-		super.onresize(onresize);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public A onscroll(String onscroll) {
-		super.onscroll(onscroll);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public A onseeked(String onseeked) {
-		super.onseeked(onseeked);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public A onseeking(String onseeking) {
-		super.onseeking(onseeking);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public A onselect(String onselect) {
-		super.onselect(onselect);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public A onshow(String onshow) {
-		super.onshow(onshow);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public A onstalled(String onstalled) {
-		super.onstalled(onstalled);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public A onsubmit(String onsubmit) {
-		super.onsubmit(onsubmit);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public A onsuspend(String onsuspend) {
-		super.onsuspend(onsuspend);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public A ontimeupdate(String ontimeupdate) {
-		super.ontimeupdate(ontimeupdate);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public A ontoggle(String ontoggle) {
-		super.ontoggle(ontoggle);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public A onvolumechange(String onvolumechange) {
-		super.onvolumechange(onvolumechange);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public A onwaiting(String onwaiting) {
-		super.onwaiting(onwaiting);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public A spellcheck(Object spellcheck) {
-		super.spellcheck(spellcheck);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public A style(String style) {
-		super.style(style);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public A tabindex(Object tabindex) {
-		super.tabindex(tabindex);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public A title(String title) {
-		super.title(title);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public A translate(Object translate) {
-		super.translate(translate);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElementMixed */
-	public A child(Object child) {
-		super.child(child);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElementMixed */
-	public A children(Object...children) {
-		super.children(children);
-		return this;
-	}
-
-	// </FluentSetters>
-}
\ No newline at end of file
diff --git a/juneau-bean/juneau-bean-swagger/src/main/java/org/apache/juneau/dto/html5/Abbr.java b/juneau-bean/juneau-bean-swagger/src/main/java/org/apache/juneau/dto/html5/Abbr.java
deleted file mode 100644
index 77ca04b40..000000000
--- a/juneau-bean/juneau-bean-swagger/src/main/java/org/apache/juneau/dto/html5/Abbr.java
+++ /dev/null
@@ -1,437 +0,0 @@
-// ***************************************************************************************************************************
-// * 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.                                              *
-// ***************************************************************************************************************************
-package org.apache.juneau.dto.html5;
-
-import org.apache.juneau.annotation.*;
-import org.apache.juneau.internal.*;
-
-/**
- * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/text-level-semantics.html#the-abbr-element">&lt;abbr&gt;</a>
- * element.
- *
- * <h5 class='section'>See Also:</h5><ul>
- * 	<li class='link'><a class="doclink" href="../../../../../index.html#jd.Html5">Overview &gt; juneau-dto &gt; HTML5</a>
- * </ul>
- */
-@Bean(typeName="abbr")
-@FluentSetters
-public class Abbr extends HtmlElementMixed {
-
-	/**
-	 * Creates an empty {@link Abbr} element.
-	 */
-	public Abbr() {}
-
-	/**
-	 * Creates an {@link Abbr} element with the specified {@link Abbr#title(String)} attribute and
-	 * {@link Abbr#children(Object[])} nodes.
-	 *
-	 * @param title The {@link Abbr#title(String)} attribute.
-	 * @param children The {@link Abbr#children(Object[])} nodes.
-	 */
-	public Abbr(String title, Object...children) {
-		title(title).children(children);
-	}
-
-	//-----------------------------------------------------------------------------------------------------------------
-	// Overridden methods
-	//-----------------------------------------------------------------------------------------------------------------
-
-	// <FluentSetters>
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Abbr _class(String _class) {  // NOSONAR - Intentional naming.
-		super._class(_class);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Abbr accesskey(String accesskey) {
-		super.accesskey(accesskey);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Abbr contenteditable(Object contenteditable) {
-		super.contenteditable(contenteditable);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Abbr dir(String dir) {
-		super.dir(dir);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Abbr hidden(Object hidden) {
-		super.hidden(hidden);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Abbr id(String id) {
-		super.id(id);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Abbr lang(String lang) {
-		super.lang(lang);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Abbr onabort(String onabort) {
-		super.onabort(onabort);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Abbr onblur(String onblur) {
-		super.onblur(onblur);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Abbr oncancel(String oncancel) {
-		super.oncancel(oncancel);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Abbr oncanplay(String oncanplay) {
-		super.oncanplay(oncanplay);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Abbr oncanplaythrough(String oncanplaythrough) {
-		super.oncanplaythrough(oncanplaythrough);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Abbr onchange(String onchange) {
-		super.onchange(onchange);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Abbr onclick(String onclick) {
-		super.onclick(onclick);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Abbr oncuechange(String oncuechange) {
-		super.oncuechange(oncuechange);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Abbr ondblclick(String ondblclick) {
-		super.ondblclick(ondblclick);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Abbr ondurationchange(String ondurationchange) {
-		super.ondurationchange(ondurationchange);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Abbr onemptied(String onemptied) {
-		super.onemptied(onemptied);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Abbr onended(String onended) {
-		super.onended(onended);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Abbr onerror(String onerror) {
-		super.onerror(onerror);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Abbr onfocus(String onfocus) {
-		super.onfocus(onfocus);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Abbr oninput(String oninput) {
-		super.oninput(oninput);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Abbr oninvalid(String oninvalid) {
-		super.oninvalid(oninvalid);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Abbr onkeydown(String onkeydown) {
-		super.onkeydown(onkeydown);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Abbr onkeypress(String onkeypress) {
-		super.onkeypress(onkeypress);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Abbr onkeyup(String onkeyup) {
-		super.onkeyup(onkeyup);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Abbr onload(String onload) {
-		super.onload(onload);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Abbr onloadeddata(String onloadeddata) {
-		super.onloadeddata(onloadeddata);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Abbr onloadedmetadata(String onloadedmetadata) {
-		super.onloadedmetadata(onloadedmetadata);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Abbr onloadstart(String onloadstart) {
-		super.onloadstart(onloadstart);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Abbr onmousedown(String onmousedown) {
-		super.onmousedown(onmousedown);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Abbr onmouseenter(String onmouseenter) {
-		super.onmouseenter(onmouseenter);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Abbr onmouseleave(String onmouseleave) {
-		super.onmouseleave(onmouseleave);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Abbr onmousemove(String onmousemove) {
-		super.onmousemove(onmousemove);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Abbr onmouseout(String onmouseout) {
-		super.onmouseout(onmouseout);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Abbr onmouseover(String onmouseover) {
-		super.onmouseover(onmouseover);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Abbr onmouseup(String onmouseup) {
-		super.onmouseup(onmouseup);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Abbr onmousewheel(String onmousewheel) {
-		super.onmousewheel(onmousewheel);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Abbr onpause(String onpause) {
-		super.onpause(onpause);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Abbr onplay(String onplay) {
-		super.onplay(onplay);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Abbr onplaying(String onplaying) {
-		super.onplaying(onplaying);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Abbr onprogress(String onprogress) {
-		super.onprogress(onprogress);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Abbr onratechange(String onratechange) {
-		super.onratechange(onratechange);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Abbr onreset(String onreset) {
-		super.onreset(onreset);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Abbr onresize(String onresize) {
-		super.onresize(onresize);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Abbr onscroll(String onscroll) {
-		super.onscroll(onscroll);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Abbr onseeked(String onseeked) {
-		super.onseeked(onseeked);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Abbr onseeking(String onseeking) {
-		super.onseeking(onseeking);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Abbr onselect(String onselect) {
-		super.onselect(onselect);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Abbr onshow(String onshow) {
-		super.onshow(onshow);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Abbr onstalled(String onstalled) {
-		super.onstalled(onstalled);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Abbr onsubmit(String onsubmit) {
-		super.onsubmit(onsubmit);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Abbr onsuspend(String onsuspend) {
-		super.onsuspend(onsuspend);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Abbr ontimeupdate(String ontimeupdate) {
-		super.ontimeupdate(ontimeupdate);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Abbr ontoggle(String ontoggle) {
-		super.ontoggle(ontoggle);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Abbr onvolumechange(String onvolumechange) {
-		super.onvolumechange(onvolumechange);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Abbr onwaiting(String onwaiting) {
-		super.onwaiting(onwaiting);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Abbr spellcheck(Object spellcheck) {
-		super.spellcheck(spellcheck);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Abbr style(String style) {
-		super.style(style);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Abbr tabindex(Object tabindex) {
-		super.tabindex(tabindex);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Abbr title(String title) {
-		super.title(title);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Abbr translate(Object translate) {
-		super.translate(translate);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElementMixed */
-	public Abbr child(Object child) {
-		super.child(child);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElementMixed */
-	public Abbr children(Object...children) {
-		super.children(children);
-		return this;
-	}
-
-	// </FluentSetters>
-}
\ No newline at end of file
diff --git a/juneau-bean/juneau-bean-swagger/src/main/java/org/apache/juneau/dto/html5/Address.java b/juneau-bean/juneau-bean-swagger/src/main/java/org/apache/juneau/dto/html5/Address.java
deleted file mode 100644
index 883882488..000000000
--- a/juneau-bean/juneau-bean-swagger/src/main/java/org/apache/juneau/dto/html5/Address.java
+++ /dev/null
@@ -1,435 +0,0 @@
-// ***************************************************************************************************************************
-// * 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.                                              *
-// ***************************************************************************************************************************
-package org.apache.juneau.dto.html5;
-
-import org.apache.juneau.annotation.*;
-import org.apache.juneau.internal.*;
-
-/**
- * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/sections.html#the-address-element">&lt;address&gt;</a>
- * element.
- *
- * <h5 class='section'>See Also:</h5><ul>
- * 	<li class='link'><a class="doclink" href="../../../../../index.html#jd.Html5">Overview &gt; juneau-dto &gt; HTML5</a>
- * </ul>
- */
-@Bean(typeName="address")
-@FluentSetters
-public class Address extends HtmlElementMixed {
-
-	/**
-	 * Creates an empty {@link Address} element.
-	 */
-	public Address() {}
-
-	/**
-	 * Creates an {@link Address} element with the specified child nodes.
-	 *
-	 * @param children The child nodes.
-	 */
-	public Address(Object...children) {
-		children(children);
-	}
-
-	//-----------------------------------------------------------------------------------------------------------------
-	// Overridden methods
-	//-----------------------------------------------------------------------------------------------------------------
-
-	// <FluentSetters>
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Address _class(String _class) {  // NOSONAR - Intentional naming.
-		super._class(_class);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Address accesskey(String accesskey) {
-		super.accesskey(accesskey);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Address contenteditable(Object contenteditable) {
-		super.contenteditable(contenteditable);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Address dir(String dir) {
-		super.dir(dir);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Address hidden(Object hidden) {
-		super.hidden(hidden);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Address id(String id) {
-		super.id(id);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Address lang(String lang) {
-		super.lang(lang);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Address onabort(String onabort) {
-		super.onabort(onabort);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Address onblur(String onblur) {
-		super.onblur(onblur);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Address oncancel(String oncancel) {
-		super.oncancel(oncancel);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Address oncanplay(String oncanplay) {
-		super.oncanplay(oncanplay);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Address oncanplaythrough(String oncanplaythrough) {
-		super.oncanplaythrough(oncanplaythrough);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Address onchange(String onchange) {
-		super.onchange(onchange);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Address onclick(String onclick) {
-		super.onclick(onclick);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Address oncuechange(String oncuechange) {
-		super.oncuechange(oncuechange);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Address ondblclick(String ondblclick) {
-		super.ondblclick(ondblclick);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Address ondurationchange(String ondurationchange) {
-		super.ondurationchange(ondurationchange);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Address onemptied(String onemptied) {
-		super.onemptied(onemptied);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Address onended(String onended) {
-		super.onended(onended);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Address onerror(String onerror) {
-		super.onerror(onerror);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Address onfocus(String onfocus) {
-		super.onfocus(onfocus);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Address oninput(String oninput) {
-		super.oninput(oninput);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Address oninvalid(String oninvalid) {
-		super.oninvalid(oninvalid);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Address onkeydown(String onkeydown) {
-		super.onkeydown(onkeydown);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Address onkeypress(String onkeypress) {
-		super.onkeypress(onkeypress);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Address onkeyup(String onkeyup) {
-		super.onkeyup(onkeyup);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Address onload(String onload) {
-		super.onload(onload);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Address onloadeddata(String onloadeddata) {
-		super.onloadeddata(onloadeddata);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Address onloadedmetadata(String onloadedmetadata) {
-		super.onloadedmetadata(onloadedmetadata);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Address onloadstart(String onloadstart) {
-		super.onloadstart(onloadstart);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Address onmousedown(String onmousedown) {
-		super.onmousedown(onmousedown);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Address onmouseenter(String onmouseenter) {
-		super.onmouseenter(onmouseenter);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Address onmouseleave(String onmouseleave) {
-		super.onmouseleave(onmouseleave);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Address onmousemove(String onmousemove) {
-		super.onmousemove(onmousemove);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Address onmouseout(String onmouseout) {
-		super.onmouseout(onmouseout);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Address onmouseover(String onmouseover) {
-		super.onmouseover(onmouseover);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Address onmouseup(String onmouseup) {
-		super.onmouseup(onmouseup);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Address onmousewheel(String onmousewheel) {
-		super.onmousewheel(onmousewheel);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Address onpause(String onpause) {
-		super.onpause(onpause);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Address onplay(String onplay) {
-		super.onplay(onplay);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Address onplaying(String onplaying) {
-		super.onplaying(onplaying);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Address onprogress(String onprogress) {
-		super.onprogress(onprogress);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Address onratechange(String onratechange) {
-		super.onratechange(onratechange);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Address onreset(String onreset) {
-		super.onreset(onreset);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Address onresize(String onresize) {
-		super.onresize(onresize);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Address onscroll(String onscroll) {
-		super.onscroll(onscroll);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Address onseeked(String onseeked) {
-		super.onseeked(onseeked);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Address onseeking(String onseeking) {
-		super.onseeking(onseeking);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Address onselect(String onselect) {
-		super.onselect(onselect);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Address onshow(String onshow) {
-		super.onshow(onshow);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Address onstalled(String onstalled) {
-		super.onstalled(onstalled);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Address onsubmit(String onsubmit) {
-		super.onsubmit(onsubmit);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Address onsuspend(String onsuspend) {
-		super.onsuspend(onsuspend);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Address ontimeupdate(String ontimeupdate) {
-		super.ontimeupdate(ontimeupdate);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Address ontoggle(String ontoggle) {
-		super.ontoggle(ontoggle);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Address onvolumechange(String onvolumechange) {
-		super.onvolumechange(onvolumechange);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Address onwaiting(String onwaiting) {
-		super.onwaiting(onwaiting);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Address spellcheck(Object spellcheck) {
-		super.spellcheck(spellcheck);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Address style(String style) {
-		super.style(style);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Address tabindex(Object tabindex) {
-		super.tabindex(tabindex);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Address title(String title) {
-		super.title(title);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Address translate(Object translate) {
-		super.translate(translate);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElementMixed */
-	public Address child(Object child) {
-		super.child(child);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElementMixed */
-	public Address children(Object...children) {
-		super.children(children);
-		return this;
-	}
-
-	// </FluentSetters>
-}
\ No newline at end of file
diff --git a/juneau-bean/juneau-bean-swagger/src/main/java/org/apache/juneau/dto/html5/Area.java b/juneau-bean/juneau-bean-swagger/src/main/java/org/apache/juneau/dto/html5/Area.java
deleted file mode 100644
index 330a8828a..000000000
--- a/juneau-bean/juneau-bean-swagger/src/main/java/org/apache/juneau/dto/html5/Area.java
+++ /dev/null
@@ -1,567 +0,0 @@
-// ***************************************************************************************************************************
-// * 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.                                              *
-// ***************************************************************************************************************************
-package org.apache.juneau.dto.html5;
-
-import java.net.*;
-
-import org.apache.juneau.*;
-import org.apache.juneau.annotation.*;
-import org.apache.juneau.internal.*;
-
-/**
- * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#the-area-element">&lt;area&gt;</a>
- * element.
- *
- * <h5 class='section'>See Also:</h5><ul>
- * 	<li class='link'><a class="doclink" href="../../../../../index.html#jd.Html5">Overview &gt; juneau-dto &gt; HTML5</a>
- * </ul>
- */
-@Bean(typeName="area")
-@FluentSetters
-public class Area extends HtmlElementVoid {
-
-	/**
-	 * Creates an empty {@link Area} element.
-	 */
-	public Area() {}
-
-	/**
-	 * Creates an {@link Area} element with the specified {@link Area#shape(String)}, {@link Area#coords(String)},
-	 * and {@link Area#href(Object)} attributes.
-	 *
-	 * @param shape The {@link Area#shape(String)} attribute.
-	 * @param coords The {@link Area#coords(String)} attribute.
-	 * @param href The {@link Area#href(Object)} attribute.
-	 */
-	public Area(String shape, String coords, Object href) {
-		shape(shape).coords(coords).href(href);
-	}
-
-	/**
-	 * <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#attr-area-alt">alt</a> attribute.
-	 *
-	 * <p>
-	 * Replacement text for use when images are not available.
-	 *
-	 * @param alt The new value for this attribute.
-	 * @return This object.
-	 */
-	public final Area alt(String alt) {
-		attr("alt", alt);
-		return this;
-	}
-
-	/**
-	 * <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#attr-area-coords">coords</a>
-	 * attribute.
-	 *
-	 * <p>
-	 * Coordinates for the shape to be created in an image map.
-	 *
-	 * @param coords The new value for this attribute.
-	 * @return This object.
-	 */
-	public final Area coords(String coords) {
-		attr("coords", coords);
-		return this;
-	}
-
-	/**
-	 * <a class="doclink" href="https://www.w3.org/TR/html5/links.html#attr-hyperlink-download">download</a> attribute.
-	 *
-	 * <p>
-	 * Whether to download the resource instead of navigating to it, and its file name if so.
-	 *
-	 * @param download
-	 * 	The new value for this attribute.
-	 * 	Typically a {@link Boolean} or {@link String}.
-	 * @return This object.
-	 */
-	public final Area download(Object download) {
-		attr("download", download);
-		return this;
-	}
-
-	/**
-	 * <a class="doclink" href="https://www.w3.org/TR/html5/links.html#attr-hyperlink-href">href</a> attribute.
-	 *
-	 * <p>
-	 * Address of the hyperlink.
-	 *
-	 * <p>
-	 * The value can be of any of the following types: {@link URI}, {@link URL}, {@link String}.
-	 * Strings must be valid URIs.
-	 *
-	 * <p>
-	 * URIs defined by {@link UriResolver} can be used for values.
-	 *
-	 * @param href
-	 * 	The new value for this attribute.
-	 * 	Typically a {@link URL} or {@link String}.
-	 * @return This object.
-	 */
-	public final Area href(Object href) {
-		attrUri("href", href);
-		return this;
-	}
-
-	/**
-	 * <a class="doclink" href="https://www.w3.org/TR/html5/links.html#attr-hyperlink-hreflang">hreflang</a> attribute.
-	 *
-	 * <p>
-	 * Language of the linked resource.
-	 *
-	 * @param hreflang The new value for this attribute.
-	 * @return This object.
-	 */
-	public final Area hreflang(String hreflang) {
-		attr("hreflang", hreflang);
-		return this;
-	}
-
-	/**
-	 * <a class="doclink" href="https://www.w3.org/TR/html5/links.html#attr-hyperlink-rel">rel</a> attribute.
-	 *
-	 * <p>
-	 * Relationship between the document containing the hyperlink and the destination resource.
-	 *
-	 * @param rel The new value for this attribute.
-	 * @return This object.
-	 */
-	public final Area rel(String rel) {
-		attr("rel", rel);
-		return this;
-	}
-
-	/**
-	 * <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#attr-area-shape">shape</a> attribute.
-	 *
-	 * <p>
-	 * The kind of shape to be created in an image map.
-	 *
-	 * @param shape The new value for this attribute.
-	 * @return This object.
-	 */
-	public final Area shape(String shape) {
-		attr("shape", shape);
-		return this;
-	}
-
-	/**
-	 * <a class="doclink" href="https://www.w3.org/TR/html5/links.html#attr-hyperlink-target">target</a> attribute.
-	 *
-	 * <p>
-	 * Browsing context for hyperlink navigation.
-	 *
-	 * @param target The new value for this attribute.
-	 * @return This object.
-	 */
-	public final Area target(String target) {
-		attr("target", target);
-		return this;
-	}
-
-	/**
-	 * <a class="doclink" href="https://www.w3.org/TR/html5/links.html#attr-hyperlink-type">type</a> attribute.
-	 *
-	 * <p>
-	 * Hint for the type of the referenced resource.
-	 *
-	 * @param type The new value for this attribute.
-	 * @return This object.
-	 */
-	public final Area type(String type) {
-		attr("type", type);
-		return this;
-	}
-
-	//-----------------------------------------------------------------------------------------------------------------
-	// Overridden methods
-	//-----------------------------------------------------------------------------------------------------------------
-
-	// <FluentSetters>
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Area _class(String _class) {  // NOSONAR - Intentional naming.
-		super._class(_class);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Area accesskey(String accesskey) {
-		super.accesskey(accesskey);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Area contenteditable(Object contenteditable) {
-		super.contenteditable(contenteditable);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Area dir(String dir) {
-		super.dir(dir);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Area hidden(Object hidden) {
-		super.hidden(hidden);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Area id(String id) {
-		super.id(id);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Area lang(String lang) {
-		super.lang(lang);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Area onabort(String onabort) {
-		super.onabort(onabort);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Area onblur(String onblur) {
-		super.onblur(onblur);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Area oncancel(String oncancel) {
-		super.oncancel(oncancel);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Area oncanplay(String oncanplay) {
-		super.oncanplay(oncanplay);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Area oncanplaythrough(String oncanplaythrough) {
-		super.oncanplaythrough(oncanplaythrough);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Area onchange(String onchange) {
-		super.onchange(onchange);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Area onclick(String onclick) {
-		super.onclick(onclick);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Area oncuechange(String oncuechange) {
-		super.oncuechange(oncuechange);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Area ondblclick(String ondblclick) {
-		super.ondblclick(ondblclick);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Area ondurationchange(String ondurationchange) {
-		super.ondurationchange(ondurationchange);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Area onemptied(String onemptied) {
-		super.onemptied(onemptied);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Area onended(String onended) {
-		super.onended(onended);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Area onerror(String onerror) {
-		super.onerror(onerror);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Area onfocus(String onfocus) {
-		super.onfocus(onfocus);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Area oninput(String oninput) {
-		super.oninput(oninput);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Area oninvalid(String oninvalid) {
-		super.oninvalid(oninvalid);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Area onkeydown(String onkeydown) {
-		super.onkeydown(onkeydown);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Area onkeypress(String onkeypress) {
-		super.onkeypress(onkeypress);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Area onkeyup(String onkeyup) {
-		super.onkeyup(onkeyup);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Area onload(String onload) {
-		super.onload(onload);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Area onloadeddata(String onloadeddata) {
-		super.onloadeddata(onloadeddata);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Area onloadedmetadata(String onloadedmetadata) {
-		super.onloadedmetadata(onloadedmetadata);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Area onloadstart(String onloadstart) {
-		super.onloadstart(onloadstart);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Area onmousedown(String onmousedown) {
-		super.onmousedown(onmousedown);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Area onmouseenter(String onmouseenter) {
-		super.onmouseenter(onmouseenter);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Area onmouseleave(String onmouseleave) {
-		super.onmouseleave(onmouseleave);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Area onmousemove(String onmousemove) {
-		super.onmousemove(onmousemove);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Area onmouseout(String onmouseout) {
-		super.onmouseout(onmouseout);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Area onmouseover(String onmouseover) {
-		super.onmouseover(onmouseover);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Area onmouseup(String onmouseup) {
-		super.onmouseup(onmouseup);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Area onmousewheel(String onmousewheel) {
-		super.onmousewheel(onmousewheel);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Area onpause(String onpause) {
-		super.onpause(onpause);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Area onplay(String onplay) {
-		super.onplay(onplay);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Area onplaying(String onplaying) {
-		super.onplaying(onplaying);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Area onprogress(String onprogress) {
-		super.onprogress(onprogress);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Area onratechange(String onratechange) {
-		super.onratechange(onratechange);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Area onreset(String onreset) {
-		super.onreset(onreset);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Area onresize(String onresize) {
-		super.onresize(onresize);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Area onscroll(String onscroll) {
-		super.onscroll(onscroll);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Area onseeked(String onseeked) {
-		super.onseeked(onseeked);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Area onseeking(String onseeking) {
-		super.onseeking(onseeking);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Area onselect(String onselect) {
-		super.onselect(onselect);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Area onshow(String onshow) {
-		super.onshow(onshow);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Area onstalled(String onstalled) {
-		super.onstalled(onstalled);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Area onsubmit(String onsubmit) {
-		super.onsubmit(onsubmit);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Area onsuspend(String onsuspend) {
-		super.onsuspend(onsuspend);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Area ontimeupdate(String ontimeupdate) {
-		super.ontimeupdate(ontimeupdate);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Area ontoggle(String ontoggle) {
-		super.ontoggle(ontoggle);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Area onvolumechange(String onvolumechange) {
-		super.onvolumechange(onvolumechange);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Area onwaiting(String onwaiting) {
-		super.onwaiting(onwaiting);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Area spellcheck(Object spellcheck) {
-		super.spellcheck(spellcheck);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Area style(String style) {
-		super.style(style);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Area tabindex(Object tabindex) {
-		super.tabindex(tabindex);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Area title(String title) {
-		super.title(title);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Area translate(Object translate) {
-		super.translate(translate);
-		return this;
-	}
-
-	// </FluentSetters>
-}
\ No newline at end of file
diff --git a/juneau-bean/juneau-bean-swagger/src/main/java/org/apache/juneau/dto/html5/Article.java b/juneau-bean/juneau-bean-swagger/src/main/java/org/apache/juneau/dto/html5/Article.java
deleted file mode 100644
index dbfa4ff56..000000000
--- a/juneau-bean/juneau-bean-swagger/src/main/java/org/apache/juneau/dto/html5/Article.java
+++ /dev/null
@@ -1,479 +0,0 @@
-// ***************************************************************************************************************************
-// * 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.                                              *
-// ***************************************************************************************************************************
-package org.apache.juneau.dto.html5;
-
-import org.apache.juneau.annotation.*;
-import org.apache.juneau.internal.*;
-
-/**
- * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/sections.html#the-article-element">&lt;article&gt;</a>
- * element.
- *
- * <h5 class='section'>See Also:</h5><ul>
- * 	<li class='link'><a class="doclink" href="../../../../../index.html#jd.Html5">Overview &gt; juneau-dto &gt; HTML5</a>
- * </ul>
- */
-@Bean(typeName="article")
-@FluentSetters
-public class Article extends HtmlElementMixed {
-
-	/**
-	 * Creates an empty {@link Article} element.
-	 */
-	public Article() {}
-
-	/**
-	 * Creates an {@link Article} element with the specified child nodes.
-	 *
-	 * @param children The child nodes.
-	 */
-	public Article(Object...children) {
-		children(children);
-	}
-
-	/**
-	 * Adds a header node to this element.
-	 *
-	 * @param children The children inside the header node.
-	 * @return This object.
-	 */
-	public Article header(Object...children) {
-		super.child(HtmlBuilder.header(children));
-		return this;
-	}
-
-	/**
-	 * Adds a footer node to this element.
-	 *
-	 * @param children The children inside the footer node.
-	 * @return This object.
-	 */
-	public Article footer(Object...children) {
-		super.child(HtmlBuilder.footer(children));
-		return this;
-	}
-
-	/**
-	 * Adds a link node to this element.
-	 *
-	 * @param link The link node to add to this article.
-	 * @return This object.
-	 */
-	public Article link(Link link) {
-		super.child(link);
-		return this;
-	}
-
-	/**
-	 * Adds a section node to this element.
-	 *
-	 * @param section The section node to add to this article.
-	 * @return This object.
-	 */
-	public Article section(Section section) {
-		super.child(section);
-		return this;
-	}
-
-	//-----------------------------------------------------------------------------------------------------------------
-	// Overridden methods
-	//-----------------------------------------------------------------------------------------------------------------
-
-	// <FluentSetters>
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Article _class(String _class) {  // NOSONAR - Intentional naming.
-		super._class(_class);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Article accesskey(String accesskey) {
-		super.accesskey(accesskey);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Article contenteditable(Object contenteditable) {
-		super.contenteditable(contenteditable);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Article dir(String dir) {
-		super.dir(dir);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Article hidden(Object hidden) {
-		super.hidden(hidden);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Article id(String id) {
-		super.id(id);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Article lang(String lang) {
-		super.lang(lang);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Article onabort(String onabort) {
-		super.onabort(onabort);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Article onblur(String onblur) {
-		super.onblur(onblur);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Article oncancel(String oncancel) {
-		super.oncancel(oncancel);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Article oncanplay(String oncanplay) {
-		super.oncanplay(oncanplay);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Article oncanplaythrough(String oncanplaythrough) {
-		super.oncanplaythrough(oncanplaythrough);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Article onchange(String onchange) {
-		super.onchange(onchange);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Article onclick(String onclick) {
-		super.onclick(onclick);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Article oncuechange(String oncuechange) {
-		super.oncuechange(oncuechange);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Article ondblclick(String ondblclick) {
-		super.ondblclick(ondblclick);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Article ondurationchange(String ondurationchange) {
-		super.ondurationchange(ondurationchange);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Article onemptied(String onemptied) {
-		super.onemptied(onemptied);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Article onended(String onended) {
-		super.onended(onended);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Article onerror(String onerror) {
-		super.onerror(onerror);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Article onfocus(String onfocus) {
-		super.onfocus(onfocus);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Article oninput(String oninput) {
-		super.oninput(oninput);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Article oninvalid(String oninvalid) {
-		super.oninvalid(oninvalid);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Article onkeydown(String onkeydown) {
-		super.onkeydown(onkeydown);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Article onkeypress(String onkeypress) {
-		super.onkeypress(onkeypress);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Article onkeyup(String onkeyup) {
-		super.onkeyup(onkeyup);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Article onload(String onload) {
-		super.onload(onload);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Article onloadeddata(String onloadeddata) {
-		super.onloadeddata(onloadeddata);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Article onloadedmetadata(String onloadedmetadata) {
-		super.onloadedmetadata(onloadedmetadata);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Article onloadstart(String onloadstart) {
-		super.onloadstart(onloadstart);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Article onmousedown(String onmousedown) {
-		super.onmousedown(onmousedown);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Article onmouseenter(String onmouseenter) {
-		super.onmouseenter(onmouseenter);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Article onmouseleave(String onmouseleave) {
-		super.onmouseleave(onmouseleave);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Article onmousemove(String onmousemove) {
-		super.onmousemove(onmousemove);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Article onmouseout(String onmouseout) {
-		super.onmouseout(onmouseout);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Article onmouseover(String onmouseover) {
-		super.onmouseover(onmouseover);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Article onmouseup(String onmouseup) {
-		super.onmouseup(onmouseup);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Article onmousewheel(String onmousewheel) {
-		super.onmousewheel(onmousewheel);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Article onpause(String onpause) {
-		super.onpause(onpause);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Article onplay(String onplay) {
-		super.onplay(onplay);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Article onplaying(String onplaying) {
-		super.onplaying(onplaying);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Article onprogress(String onprogress) {
-		super.onprogress(onprogress);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Article onratechange(String onratechange) {
-		super.onratechange(onratechange);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Article onreset(String onreset) {
-		super.onreset(onreset);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Article onresize(String onresize) {
-		super.onresize(onresize);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Article onscroll(String onscroll) {
-		super.onscroll(onscroll);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Article onseeked(String onseeked) {
-		super.onseeked(onseeked);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Article onseeking(String onseeking) {
-		super.onseeking(onseeking);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Article onselect(String onselect) {
-		super.onselect(onselect);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Article onshow(String onshow) {
-		super.onshow(onshow);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Article onstalled(String onstalled) {
-		super.onstalled(onstalled);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Article onsubmit(String onsubmit) {
-		super.onsubmit(onsubmit);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Article onsuspend(String onsuspend) {
-		super.onsuspend(onsuspend);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Article ontimeupdate(String ontimeupdate) {
-		super.ontimeupdate(ontimeupdate);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Article ontoggle(String ontoggle) {
-		super.ontoggle(ontoggle);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Article onvolumechange(String onvolumechange) {
-		super.onvolumechange(onvolumechange);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Article onwaiting(String onwaiting) {
-		super.onwaiting(onwaiting);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Article spellcheck(Object spellcheck) {
-		super.spellcheck(spellcheck);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Article style(String style) {
-		super.style(style);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Article tabindex(Object tabindex) {
-		super.tabindex(tabindex);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Article title(String title) {
-		super.title(title);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Article translate(Object translate) {
-		super.translate(translate);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElementMixed */
-	public Article child(Object child) {
-		super.child(child);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElementMixed */
-	public Article children(Object...children) {
-		super.children(children);
-		return this;
-	}
-
-	// </FluentSetters>
-}
\ No newline at end of file
diff --git a/juneau-bean/juneau-bean-swagger/src/main/java/org/apache/juneau/dto/html5/Aside.java b/juneau-bean/juneau-bean-swagger/src/main/java/org/apache/juneau/dto/html5/Aside.java
deleted file mode 100644
index dd0a18943..000000000
--- a/juneau-bean/juneau-bean-swagger/src/main/java/org/apache/juneau/dto/html5/Aside.java
+++ /dev/null
@@ -1,435 +0,0 @@
-// ***************************************************************************************************************************
-// * 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.                                              *
-// ***************************************************************************************************************************
-package org.apache.juneau.dto.html5;
-
-import org.apache.juneau.annotation.*;
-import org.apache.juneau.internal.*;
-
-/**
- * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/sections.html#the-aside-element">&lt;aside&gt;</a>
- * element.
- *
- * <h5 class='section'>See Also:</h5><ul>
- * 	<li class='link'><a class="doclink" href="../../../../../index.html#jd.Html5">Overview &gt; juneau-dto &gt; HTML5</a>
- * </ul>
- */
-@Bean(typeName="aside")
-@FluentSetters
-public class Aside extends HtmlElementMixed {
-
-	/**
-	 * Creates an empty {@link Aside} element.
-	 */
-	public Aside() {}
-
-	/**
-	 * Creates an {@link Aside} element with the specified child nodes.
-	 *
-	 * @param children The child nodes.
-	 */
-	public Aside(Object...children) {
-		children(children);
-	}
-
-	//-----------------------------------------------------------------------------------------------------------------
-	// Overridden methods
-	//-----------------------------------------------------------------------------------------------------------------
-
-	// <FluentSetters>
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Aside _class(String _class) {  // NOSONAR - Intentional naming.
-		super._class(_class);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Aside accesskey(String accesskey) {
-		super.accesskey(accesskey);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Aside contenteditable(Object contenteditable) {
-		super.contenteditable(contenteditable);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Aside dir(String dir) {
-		super.dir(dir);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Aside hidden(Object hidden) {
-		super.hidden(hidden);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Aside id(String id) {
-		super.id(id);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Aside lang(String lang) {
-		super.lang(lang);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Aside onabort(String onabort) {
-		super.onabort(onabort);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Aside onblur(String onblur) {
-		super.onblur(onblur);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Aside oncancel(String oncancel) {
-		super.oncancel(oncancel);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Aside oncanplay(String oncanplay) {
-		super.oncanplay(oncanplay);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Aside oncanplaythrough(String oncanplaythrough) {
-		super.oncanplaythrough(oncanplaythrough);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Aside onchange(String onchange) {
-		super.onchange(onchange);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Aside onclick(String onclick) {
-		super.onclick(onclick);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Aside oncuechange(String oncuechange) {
-		super.oncuechange(oncuechange);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Aside ondblclick(String ondblclick) {
-		super.ondblclick(ondblclick);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Aside ondurationchange(String ondurationchange) {
-		super.ondurationchange(ondurationchange);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Aside onemptied(String onemptied) {
-		super.onemptied(onemptied);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Aside onended(String onended) {
-		super.onended(onended);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Aside onerror(String onerror) {
-		super.onerror(onerror);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Aside onfocus(String onfocus) {
-		super.onfocus(onfocus);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Aside oninput(String oninput) {
-		super.oninput(oninput);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Aside oninvalid(String oninvalid) {
-		super.oninvalid(oninvalid);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Aside onkeydown(String onkeydown) {
-		super.onkeydown(onkeydown);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Aside onkeypress(String onkeypress) {
-		super.onkeypress(onkeypress);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Aside onkeyup(String onkeyup) {
-		super.onkeyup(onkeyup);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Aside onload(String onload) {
-		super.onload(onload);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Aside onloadeddata(String onloadeddata) {
-		super.onloadeddata(onloadeddata);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Aside onloadedmetadata(String onloadedmetadata) {
-		super.onloadedmetadata(onloadedmetadata);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Aside onloadstart(String onloadstart) {
-		super.onloadstart(onloadstart);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Aside onmousedown(String onmousedown) {
-		super.onmousedown(onmousedown);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Aside onmouseenter(String onmouseenter) {
-		super.onmouseenter(onmouseenter);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Aside onmouseleave(String onmouseleave) {
-		super.onmouseleave(onmouseleave);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Aside onmousemove(String onmousemove) {
-		super.onmousemove(onmousemove);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Aside onmouseout(String onmouseout) {
-		super.onmouseout(onmouseout);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Aside onmouseover(String onmouseover) {
-		super.onmouseover(onmouseover);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Aside onmouseup(String onmouseup) {
-		super.onmouseup(onmouseup);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Aside onmousewheel(String onmousewheel) {
-		super.onmousewheel(onmousewheel);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Aside onpause(String onpause) {
-		super.onpause(onpause);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Aside onplay(String onplay) {
-		super.onplay(onplay);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Aside onplaying(String onplaying) {
-		super.onplaying(onplaying);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Aside onprogress(String onprogress) {
-		super.onprogress(onprogress);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Aside onratechange(String onratechange) {
-		super.onratechange(onratechange);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Aside onreset(String onreset) {
-		super.onreset(onreset);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Aside onresize(String onresize) {
-		super.onresize(onresize);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Aside onscroll(String onscroll) {
-		super.onscroll(onscroll);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Aside onseeked(String onseeked) {
-		super.onseeked(onseeked);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Aside onseeking(String onseeking) {
-		super.onseeking(onseeking);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Aside onselect(String onselect) {
-		super.onselect(onselect);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Aside onshow(String onshow) {
-		super.onshow(onshow);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Aside onstalled(String onstalled) {
-		super.onstalled(onstalled);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Aside onsubmit(String onsubmit) {
-		super.onsubmit(onsubmit);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Aside onsuspend(String onsuspend) {
-		super.onsuspend(onsuspend);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Aside ontimeupdate(String ontimeupdate) {
-		super.ontimeupdate(ontimeupdate);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Aside ontoggle(String ontoggle) {
-		super.ontoggle(ontoggle);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Aside onvolumechange(String onvolumechange) {
-		super.onvolumechange(onvolumechange);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Aside onwaiting(String onwaiting) {
-		super.onwaiting(onwaiting);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Aside spellcheck(Object spellcheck) {
-		super.spellcheck(spellcheck);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Aside style(String style) {
-		super.style(style);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Aside tabindex(Object tabindex) {
-		super.tabindex(tabindex);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Aside title(String title) {
-		super.title(title);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Aside translate(Object translate) {
-		super.translate(translate);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElementMixed */
-	public Aside child(Object child) {
-		super.child(child);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElementMixed */
-	public Aside children(Object...children) {
-		super.children(children);
-		return this;
-	}
-
-	// </FluentSetters>
-}
\ No newline at end of file
diff --git a/juneau-bean/juneau-bean-swagger/src/main/java/org/apache/juneau/dto/html5/Audio.java b/juneau-bean/juneau-bean-swagger/src/main/java/org/apache/juneau/dto/html5/Audio.java
deleted file mode 100644
index 0c4114688..000000000
--- a/juneau-bean/juneau-bean-swagger/src/main/java/org/apache/juneau/dto/html5/Audio.java
+++ /dev/null
@@ -1,573 +0,0 @@
-// ***************************************************************************************************************************
-// * 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.                                              *
-// ***************************************************************************************************************************
-package org.apache.juneau.dto.html5;
-
-import java.net.*;
-
-import org.apache.juneau.*;
-import org.apache.juneau.annotation.*;
-import org.apache.juneau.internal.*;
-
-/**
- * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#the-audio-element">&lt;audio&gt;</a>
- * element.
- *
- * <h5 class='section'>See Also:</h5><ul>
- * 	<li class='link'><a class="doclink" href="../../../../../index.html#jd.Html5">Overview &gt; juneau-dto &gt; HTML5</a>
- * </ul>
- */
-@Bean(typeName="audio")
-@FluentSetters
-public class Audio extends HtmlElementContainer {
-
-	/**
-	 * Creates an empty {@link Audio} element.
-	 */
-	public Audio() {}
-
-	/**
-	 * Creates an {@link Audio} element with the specified {@link Audio#src(Object)} attribute.
-	 *
-	 * @param src The {@link Audio#src(Object)} attribute.
-	 */
-	public Audio(String src) {
-		src(src);
-	}
-
-	/**
-	 * <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#attr-media-autoplay">autoplay</a>
-	 * attribute.
-	 *
-	 * <p>
-	 * Hint that the media resource can be started automatically when the page is loaded.
-	 *
-	 * @param autoplay
-	 * 	The new value for this attribute.
-	 * 	Typically a {@link Boolean} or {@link String}.
-	 * @return This object.
-	 */
-	public final Audio autoplay(Object autoplay) {
-		attr("autoplay", deminimize(autoplay, "autoplay"));
-		return this;
-	}
-
-	/**
-	 * <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#attr-media-controls">controls</a>
-	 * attribute.
-	 *
-	 * <p>
-	 * Show user agent controls.
-	 *
-	 * @param controls
-	 * 	The new value for this attribute.
-	 * 	Typically a {@link Boolean} or {@link String}.
-	 * @return This object.
-	 */
-	public final Audio controls(Object controls) {
-		attr("controls", deminimize(controls, "controls"));
-		return this;
-	}
-
-	/**
-	 * <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#attr-media-crossorigin">crossorigin</a>
-	 * attribute.
-	 *
-	 * <p>
-	 * How the element handles cross-origin requests.
-	 *
-	 * @param crossorigin The new value for this attribute.
-	 * @return This object.
-	 */
-	public final Audio crossorigin(String crossorigin) {
-		attr("crossorigin", crossorigin);
-		return this;
-	}
-
-	/**
-	 * <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#attr-media-loop">loop</a> attribute.
-	 *
-	 * <p>
-	 * Whether to loop the media resource.
-	 *
-	 * @param loop
-	 * 	The new value for this attribute.
-	 * 	Typically a {@link Boolean} or {@link String}.
-	 * @return This object.
-	 */
-	public final Audio loop(Object loop) {
-		attr("loop", loop);
-		return this;
-	}
-
-	/**
-	 * <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#attr-media-mediagroup">mediagroup</a>
-	 * attribute.
-	 *
-	 * <p>
-	 * Groups media elements together with an implicit MediaController.
-	 *
-	 * @param mediagroup The new value for this attribute.
-	 * @return This object.
-	 */
-	public final Audio mediagroup(String mediagroup) {
-		attr("mediagroup", mediagroup);
-		return this;
-	}
-
-	/**
-	 * <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#attr-media-muted">muted</a>
-	 * attribute.
-	 *
-	 * <p>
-	 * Whether to mute the media resource by default.
-	 *
-	 * @param muted
-	 * 	The new value for this attribute.
-	 * 	Typically a {@link Boolean} or {@link String}.
-	 * @return This object.
-	 */
-	public final Audio muted(Object muted) {
-		attr("muted", muted);
-		return this;
-	}
-
-	/**
-	 * <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#attr-media-preload">preload</a>
-	 * attribute.
-	 *
-	 * <p>
-	 * Hints how much buffering the media resource will likely need.
-	 *
-	 * @param preload The new value for this attribute.
-	 * @return This object.
-	 */
-	public final Audio preload(Object preload) {
-		attr("preload", preload);
-		return this;
-	}
-
-	/**
-	 * <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#attr-media-src">src</a> attribute.
-	 *
-	 * <p>
-	 * Address of the resource.
-	 *
-	 * <p>
-	 * The value can be of any of the following types: {@link URI}, {@link URL}, {@link String}.
-	 * Strings must be valid URIs.
-	 *
-	 * <p>
-	 * URIs defined by {@link UriResolver} can be used for values.
-	 *
-	 * @param src
-	 * 	The new value for this attribute.
-	 * 	Typically a {@link URL} or {@link String}.
-	 * @return This object.
-	 */
-	public final Audio src(Object src) {
-		attrUri("src", src);
-		return this;
-	}
-
-	//-----------------------------------------------------------------------------------------------------------------
-	// Overridden methods
-	//-----------------------------------------------------------------------------------------------------------------
-
-	// <FluentSetters>
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Audio _class(String _class) {  // NOSONAR - Intentional naming.
-		super._class(_class);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Audio accesskey(String accesskey) {
-		super.accesskey(accesskey);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Audio contenteditable(Object contenteditable) {
-		super.contenteditable(contenteditable);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Audio dir(String dir) {
-		super.dir(dir);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Audio hidden(Object hidden) {
-		super.hidden(hidden);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Audio id(String id) {
-		super.id(id);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Audio lang(String lang) {
-		super.lang(lang);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Audio onabort(String onabort) {
-		super.onabort(onabort);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Audio onblur(String onblur) {
-		super.onblur(onblur);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Audio oncancel(String oncancel) {
-		super.oncancel(oncancel);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Audio oncanplay(String oncanplay) {
-		super.oncanplay(oncanplay);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Audio oncanplaythrough(String oncanplaythrough) {
-		super.oncanplaythrough(oncanplaythrough);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Audio onchange(String onchange) {
-		super.onchange(onchange);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Audio onclick(String onclick) {
-		super.onclick(onclick);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Audio oncuechange(String oncuechange) {
-		super.oncuechange(oncuechange);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Audio ondblclick(String ondblclick) {
-		super.ondblclick(ondblclick);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Audio ondurationchange(String ondurationchange) {
-		super.ondurationchange(ondurationchange);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Audio onemptied(String onemptied) {
-		super.onemptied(onemptied);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Audio onended(String onended) {
-		super.onended(onended);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Audio onerror(String onerror) {
-		super.onerror(onerror);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Audio onfocus(String onfocus) {
-		super.onfocus(onfocus);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Audio oninput(String oninput) {
-		super.oninput(oninput);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Audio oninvalid(String oninvalid) {
-		super.oninvalid(oninvalid);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Audio onkeydown(String onkeydown) {
-		super.onkeydown(onkeydown);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Audio onkeypress(String onkeypress) {
-		super.onkeypress(onkeypress);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Audio onkeyup(String onkeyup) {
-		super.onkeyup(onkeyup);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Audio onload(String onload) {
-		super.onload(onload);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Audio onloadeddata(String onloadeddata) {
-		super.onloadeddata(onloadeddata);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Audio onloadedmetadata(String onloadedmetadata) {
-		super.onloadedmetadata(onloadedmetadata);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Audio onloadstart(String onloadstart) {
-		super.onloadstart(onloadstart);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Audio onmousedown(String onmousedown) {
-		super.onmousedown(onmousedown);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Audio onmouseenter(String onmouseenter) {
-		super.onmouseenter(onmouseenter);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Audio onmouseleave(String onmouseleave) {
-		super.onmouseleave(onmouseleave);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Audio onmousemove(String onmousemove) {
-		super.onmousemove(onmousemove);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Audio onmouseout(String onmouseout) {
-		super.onmouseout(onmouseout);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Audio onmouseover(String onmouseover) {
-		super.onmouseover(onmouseover);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Audio onmouseup(String onmouseup) {
-		super.onmouseup(onmouseup);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Audio onmousewheel(String onmousewheel) {
-		super.onmousewheel(onmousewheel);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Audio onpause(String onpause) {
-		super.onpause(onpause);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Audio onplay(String onplay) {
-		super.onplay(onplay);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Audio onplaying(String onplaying) {
-		super.onplaying(onplaying);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Audio onprogress(String onprogress) {
-		super.onprogress(onprogress);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Audio onratechange(String onratechange) {
-		super.onratechange(onratechange);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Audio onreset(String onreset) {
-		super.onreset(onreset);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Audio onresize(String onresize) {
-		super.onresize(onresize);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Audio onscroll(String onscroll) {
-		super.onscroll(onscroll);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Audio onseeked(String onseeked) {
-		super.onseeked(onseeked);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Audio onseeking(String onseeking) {
-		super.onseeking(onseeking);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Audio onselect(String onselect) {
-		super.onselect(onselect);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Audio onshow(String onshow) {
-		super.onshow(onshow);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Audio onstalled(String onstalled) {
-		super.onstalled(onstalled);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Audio onsubmit(String onsubmit) {
-		super.onsubmit(onsubmit);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Audio onsuspend(String onsuspend) {
-		super.onsuspend(onsuspend);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Audio ontimeupdate(String ontimeupdate) {
-		super.ontimeupdate(ontimeupdate);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Audio ontoggle(String ontoggle) {
-		super.ontoggle(ontoggle);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Audio onvolumechange(String onvolumechange) {
-		super.onvolumechange(onvolumechange);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Audio onwaiting(String onwaiting) {
-		super.onwaiting(onwaiting);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Audio spellcheck(Object spellcheck) {
-		super.spellcheck(spellcheck);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Audio style(String style) {
-		super.style(style);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Audio tabindex(Object tabindex) {
-		super.tabindex(tabindex);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Audio title(String title) {
-		super.title(title);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Audio translate(Object translate) {
-		super.translate(translate);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElementContainer */
-	public Audio child(Object child) {
-		super.child(child);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElementContainer */
-	public Audio children(Object...children) {
-		super.children(children);
-		return this;
-	}
-
-	// </FluentSetters>
-}
\ No newline at end of file
diff --git a/juneau-bean/juneau-bean-swagger/src/main/java/org/apache/juneau/dto/html5/B.java b/juneau-bean/juneau-bean-swagger/src/main/java/org/apache/juneau/dto/html5/B.java
deleted file mode 100644
index 92e0c4b57..000000000
--- a/juneau-bean/juneau-bean-swagger/src/main/java/org/apache/juneau/dto/html5/B.java
+++ /dev/null
@@ -1,435 +0,0 @@
-// ***************************************************************************************************************************
-// * 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.                                              *
-// ***************************************************************************************************************************
-package org.apache.juneau.dto.html5;
-
-import org.apache.juneau.annotation.*;
-import org.apache.juneau.internal.*;
-
-/**
- * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/text-level-semantics.html#the-b-element">&lt;b&gt;</a>
- * element.
- *
- * <h5 class='section'>See Also:</h5><ul>
- * 	<li class='link'><a class="doclink" href="../../../../../index.html#jd.Html5">Overview &gt; juneau-dto &gt; HTML5</a>
- * </ul>
- */
-@Bean(typeName="b")
-@FluentSetters
-public class B extends HtmlElementMixed {
-
-	/**
-	 * Creates an empty {@link B} element.
-	 */
-	public B() {}
-
-	/**
-	 * Creates a {@link B} element with the specified child nodes.
-	 *
-	 * @param children The child nodes.
-	 */
-	public B(Object...children) {
-		children(children);
-	}
-
-	//-----------------------------------------------------------------------------------------------------------------
-	// Overridden methods
-	//-----------------------------------------------------------------------------------------------------------------
-
-	// <FluentSetters>
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public B _class(String _class) {  // NOSONAR - Intentional naming.
-		super._class(_class);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public B accesskey(String accesskey) {
-		super.accesskey(accesskey);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public B contenteditable(Object contenteditable) {
-		super.contenteditable(contenteditable);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public B dir(String dir) {
-		super.dir(dir);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public B hidden(Object hidden) {
-		super.hidden(hidden);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public B id(String id) {
-		super.id(id);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public B lang(String lang) {
-		super.lang(lang);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public B onabort(String onabort) {
-		super.onabort(onabort);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public B onblur(String onblur) {
-		super.onblur(onblur);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public B oncancel(String oncancel) {
-		super.oncancel(oncancel);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public B oncanplay(String oncanplay) {
-		super.oncanplay(oncanplay);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public B oncanplaythrough(String oncanplaythrough) {
-		super.oncanplaythrough(oncanplaythrough);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public B onchange(String onchange) {
-		super.onchange(onchange);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public B onclick(String onclick) {
-		super.onclick(onclick);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public B oncuechange(String oncuechange) {
-		super.oncuechange(oncuechange);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public B ondblclick(String ondblclick) {
-		super.ondblclick(ondblclick);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public B ondurationchange(String ondurationchange) {
-		super.ondurationchange(ondurationchange);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public B onemptied(String onemptied) {
-		super.onemptied(onemptied);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public B onended(String onended) {
-		super.onended(onended);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public B onerror(String onerror) {
-		super.onerror(onerror);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public B onfocus(String onfocus) {
-		super.onfocus(onfocus);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public B oninput(String oninput) {
-		super.oninput(oninput);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public B oninvalid(String oninvalid) {
-		super.oninvalid(oninvalid);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public B onkeydown(String onkeydown) {
-		super.onkeydown(onkeydown);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public B onkeypress(String onkeypress) {
-		super.onkeypress(onkeypress);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public B onkeyup(String onkeyup) {
-		super.onkeyup(onkeyup);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public B onload(String onload) {
-		super.onload(onload);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public B onloadeddata(String onloadeddata) {
-		super.onloadeddata(onloadeddata);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public B onloadedmetadata(String onloadedmetadata) {
-		super.onloadedmetadata(onloadedmetadata);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public B onloadstart(String onloadstart) {
-		super.onloadstart(onloadstart);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public B onmousedown(String onmousedown) {
-		super.onmousedown(onmousedown);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public B onmouseenter(String onmouseenter) {
-		super.onmouseenter(onmouseenter);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public B onmouseleave(String onmouseleave) {
-		super.onmouseleave(onmouseleave);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public B onmousemove(String onmousemove) {
-		super.onmousemove(onmousemove);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public B onmouseout(String onmouseout) {
-		super.onmouseout(onmouseout);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public B onmouseover(String onmouseover) {
-		super.onmouseover(onmouseover);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public B onmouseup(String onmouseup) {
-		super.onmouseup(onmouseup);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public B onmousewheel(String onmousewheel) {
-		super.onmousewheel(onmousewheel);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public B onpause(String onpause) {
-		super.onpause(onpause);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public B onplay(String onplay) {
-		super.onplay(onplay);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public B onplaying(String onplaying) {
-		super.onplaying(onplaying);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public B onprogress(String onprogress) {
-		super.onprogress(onprogress);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public B onratechange(String onratechange) {
-		super.onratechange(onratechange);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public B onreset(String onreset) {
-		super.onreset(onreset);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public B onresize(String onresize) {
-		super.onresize(onresize);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public B onscroll(String onscroll) {
-		super.onscroll(onscroll);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public B onseeked(String onseeked) {
-		super.onseeked(onseeked);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public B onseeking(String onseeking) {
-		super.onseeking(onseeking);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public B onselect(String onselect) {
-		super.onselect(onselect);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public B onshow(String onshow) {
-		super.onshow(onshow);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public B onstalled(String onstalled) {
-		super.onstalled(onstalled);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public B onsubmit(String onsubmit) {
-		super.onsubmit(onsubmit);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public B onsuspend(String onsuspend) {
-		super.onsuspend(onsuspend);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public B ontimeupdate(String ontimeupdate) {
-		super.ontimeupdate(ontimeupdate);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public B ontoggle(String ontoggle) {
-		super.ontoggle(ontoggle);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public B onvolumechange(String onvolumechange) {
-		super.onvolumechange(onvolumechange);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public B onwaiting(String onwaiting) {
-		super.onwaiting(onwaiting);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public B spellcheck(Object spellcheck) {
-		super.spellcheck(spellcheck);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public B style(String style) {
-		super.style(style);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public B tabindex(Object tabindex) {
-		super.tabindex(tabindex);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public B title(String title) {
-		super.title(title);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public B translate(Object translate) {
-		super.translate(translate);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElementMixed */
-	public B child(Object child) {
-		super.child(child);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElementMixed */
-	public B children(Object...children) {
-		super.children(children);
-		return this;
-	}
-
-	// </FluentSetters>
-}
\ No newline at end of file
diff --git a/juneau-bean/juneau-bean-swagger/src/main/java/org/apache/juneau/dto/html5/Base.java b/juneau-bean/juneau-bean-swagger/src/main/java/org/apache/juneau/dto/html5/Base.java
deleted file mode 100644
index 5c0317657..000000000
--- a/juneau-bean/juneau-bean-swagger/src/main/java/org/apache/juneau/dto/html5/Base.java
+++ /dev/null
@@ -1,464 +0,0 @@
-// ***************************************************************************************************************************
-// * 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.                                              *
-// ***************************************************************************************************************************
-package org.apache.juneau.dto.html5;
-
-import java.net.*;
-
-import org.apache.juneau.*;
-import org.apache.juneau.annotation.*;
-import org.apache.juneau.internal.*;
-
-/**
- * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/document-metadata.html#the-base-element">&lt;base&gt;</a>
- * element.
- *
- * <h5 class='section'>See Also:</h5><ul>
- * 	<li class='link'><a class="doclink" href="../../../../../index.html#jd.Html5">Overview &gt; juneau-dto &gt; HTML5</a>
- * </ul>
- */
-@Bean(typeName="base")
-@FluentSetters
-public class Base extends HtmlElementVoid {
-
-	/**
-	 * Creates an empty {@link Base} element.
-	 */
-	public Base() {}
-
-	/**
-	 * Creates a {@link Base} element with the specified {@link Base#href(Object)} attribute.
-	 *
-	 * @param href The {@link Base#href(Object)} attribute.
-	 */
-	public Base(Object href) {
-		href(href);
-	}
-
-	/**
-	 * <a class="doclink" href="https://www.w3.org/TR/html5/document-metadata.html#attr-base-href">href</a> attribute.
-	 *
-	 * <p>
-	 * Document base URL.
-	 *
-	 * <p>
-	 * The value can be of any of the following types: {@link URI}, {@link URL}, {@link String}.
-	 * Strings must be valid URIs.
-	 *
-	 * <p>
-	 * URIs defined by {@link UriResolver} can be used for values.
-	 *
-	 * @param href
-	 * 	The new value for this attribute.
-	 * 	Typically a {@link URL} or {@link String}.
-	 * @return This object.
-	 */
-	public final Base href(Object href) {
-		attrUri("href", href);
-		return this;
-	}
-
-	/**
-	 * <a class="doclink" href="https://www.w3.org/TR/html5/document-metadata.html#attr-base-target">target</a>
-	 * attribute.
-	 *
-	 * <p>
-	 * Default browsing context for hyperlink navigation and form submission.
-	 *
-	 * @param target The new value for this attribute.
-	 * @return This object.
-	 */
-	public final Base target(String target) {
-		attr("target", target);
-		return this;
-	}
-
-	//-----------------------------------------------------------------------------------------------------------------
-	// Overridden methods
-	//-----------------------------------------------------------------------------------------------------------------
-
-	// <FluentSetters>
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Base _class(String _class) {  // NOSONAR - Intentional naming.
-		super._class(_class);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Base accesskey(String accesskey) {
-		super.accesskey(accesskey);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Base contenteditable(Object contenteditable) {
-		super.contenteditable(contenteditable);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Base dir(String dir) {
-		super.dir(dir);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Base hidden(Object hidden) {
-		super.hidden(hidden);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Base id(String id) {
-		super.id(id);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Base lang(String lang) {
-		super.lang(lang);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Base onabort(String onabort) {
-		super.onabort(onabort);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Base onblur(String onblur) {
-		super.onblur(onblur);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Base oncancel(String oncancel) {
-		super.oncancel(oncancel);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Base oncanplay(String oncanplay) {
-		super.oncanplay(oncanplay);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Base oncanplaythrough(String oncanplaythrough) {
-		super.oncanplaythrough(oncanplaythrough);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Base onchange(String onchange) {
-		super.onchange(onchange);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Base onclick(String onclick) {
-		super.onclick(onclick);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Base oncuechange(String oncuechange) {
-		super.oncuechange(oncuechange);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Base ondblclick(String ondblclick) {
-		super.ondblclick(ondblclick);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Base ondurationchange(String ondurationchange) {
-		super.ondurationchange(ondurationchange);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Base onemptied(String onemptied) {
-		super.onemptied(onemptied);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Base onended(String onended) {
-		super.onended(onended);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Base onerror(String onerror) {
-		super.onerror(onerror);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Base onfocus(String onfocus) {
-		super.onfocus(onfocus);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Base oninput(String oninput) {
-		super.oninput(oninput);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Base oninvalid(String oninvalid) {
-		super.oninvalid(oninvalid);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Base onkeydown(String onkeydown) {
-		super.onkeydown(onkeydown);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Base onkeypress(String onkeypress) {
-		super.onkeypress(onkeypress);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Base onkeyup(String onkeyup) {
-		super.onkeyup(onkeyup);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Base onload(String onload) {
-		super.onload(onload);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Base onloadeddata(String onloadeddata) {
-		super.onloadeddata(onloadeddata);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Base onloadedmetadata(String onloadedmetadata) {
-		super.onloadedmetadata(onloadedmetadata);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Base onloadstart(String onloadstart) {
-		super.onloadstart(onloadstart);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Base onmousedown(String onmousedown) {
-		super.onmousedown(onmousedown);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Base onmouseenter(String onmouseenter) {
-		super.onmouseenter(onmouseenter);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Base onmouseleave(String onmouseleave) {
-		super.onmouseleave(onmouseleave);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Base onmousemove(String onmousemove) {
-		super.onmousemove(onmousemove);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Base onmouseout(String onmouseout) {
-		super.onmouseout(onmouseout);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Base onmouseover(String onmouseover) {
-		super.onmouseover(onmouseover);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Base onmouseup(String onmouseup) {
-		super.onmouseup(onmouseup);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Base onmousewheel(String onmousewheel) {
-		super.onmousewheel(onmousewheel);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Base onpause(String onpause) {
-		super.onpause(onpause);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Base onplay(String onplay) {
-		super.onplay(onplay);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Base onplaying(String onplaying) {
-		super.onplaying(onplaying);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Base onprogress(String onprogress) {
-		super.onprogress(onprogress);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Base onratechange(String onratechange) {
-		super.onratechange(onratechange);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Base onreset(String onreset) {
-		super.onreset(onreset);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Base onresize(String onresize) {
-		super.onresize(onresize);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Base onscroll(String onscroll) {
-		super.onscroll(onscroll);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Base onseeked(String onseeked) {
-		super.onseeked(onseeked);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Base onseeking(String onseeking) {
-		super.onseeking(onseeking);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Base onselect(String onselect) {
-		super.onselect(onselect);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Base onshow(String onshow) {
-		super.onshow(onshow);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Base onstalled(String onstalled) {
-		super.onstalled(onstalled);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Base onsubmit(String onsubmit) {
-		super.onsubmit(onsubmit);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Base onsuspend(String onsuspend) {
-		super.onsuspend(onsuspend);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Base ontimeupdate(String ontimeupdate) {
-		super.ontimeupdate(ontimeupdate);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Base ontoggle(String ontoggle) {
-		super.ontoggle(ontoggle);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Base onvolumechange(String onvolumechange) {
-		super.onvolumechange(onvolumechange);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Base onwaiting(String onwaiting) {
-		super.onwaiting(onwaiting);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Base spellcheck(Object spellcheck) {
-		super.spellcheck(spellcheck);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Base style(String style) {
-		super.style(style);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Base tabindex(Object tabindex) {
-		super.tabindex(tabindex);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Base title(String title) {
-		super.title(title);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Base translate(Object translate) {
-		super.translate(translate);
-		return this;
-	}
-
-	// </FluentSetters>
-}
\ No newline at end of file
diff --git a/juneau-bean/juneau-bean-swagger/src/main/java/org/apache/juneau/dto/html5/Bdi.java b/juneau-bean/juneau-bean-swagger/src/main/java/org/apache/juneau/dto/html5/Bdi.java
deleted file mode 100644
index 15c7b5bcf..000000000
--- a/juneau-bean/juneau-bean-swagger/src/main/java/org/apache/juneau/dto/html5/Bdi.java
+++ /dev/null
@@ -1,429 +0,0 @@
-// ***************************************************************************************************************************
-// * 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.                                              *
-// ***************************************************************************************************************************
-package org.apache.juneau.dto.html5;
-
-import org.apache.juneau.annotation.*;
-import org.apache.juneau.internal.*;
-
-/**
- * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/text-level-semantics.html#the-bdi-element">&lt;bdi&gt;</a>
- * element.
- *
- * <h5 class='section'>See Also:</h5><ul>
- * 	<li class='link'><a class="doclink" href="../../../../../index.html#jd.Html5">Overview &gt; juneau-dto &gt; HTML5</a>
- * </ul>
- */
-@Bean(typeName="bdi")
-@FluentSetters
-public class Bdi extends HtmlElementText {
-
-	/**
-	 * Creates an empty {@link Bdi} element.
-	 */
-	public Bdi() {}
-
-	/**
-	 * Creates a {@link Bdi} element with the specified {@link Bdi#text(Object)} node.
-	 *
-	 * @param text The {@link Bdi#text(Object)} node.
-	 */
-	public Bdi(Object text) {
-		text(text);
-	}
-
-	//-----------------------------------------------------------------------------------------------------------------
-	// Overridden methods
-	//-----------------------------------------------------------------------------------------------------------------
-
-	// <FluentSetters>
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Bdi _class(String _class) {  // NOSONAR - Intentional naming.
-		super._class(_class);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Bdi accesskey(String accesskey) {
-		super.accesskey(accesskey);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Bdi contenteditable(Object contenteditable) {
-		super.contenteditable(contenteditable);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Bdi dir(String dir) {
-		super.dir(dir);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Bdi hidden(Object hidden) {
-		super.hidden(hidden);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Bdi id(String id) {
-		super.id(id);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Bdi lang(String lang) {
-		super.lang(lang);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Bdi onabort(String onabort) {
-		super.onabort(onabort);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Bdi onblur(String onblur) {
-		super.onblur(onblur);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Bdi oncancel(String oncancel) {
-		super.oncancel(oncancel);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Bdi oncanplay(String oncanplay) {
-		super.oncanplay(oncanplay);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Bdi oncanplaythrough(String oncanplaythrough) {
-		super.oncanplaythrough(oncanplaythrough);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Bdi onchange(String onchange) {
-		super.onchange(onchange);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Bdi onclick(String onclick) {
-		super.onclick(onclick);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Bdi oncuechange(String oncuechange) {
-		super.oncuechange(oncuechange);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Bdi ondblclick(String ondblclick) {
-		super.ondblclick(ondblclick);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Bdi ondurationchange(String ondurationchange) {
-		super.ondurationchange(ondurationchange);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Bdi onemptied(String onemptied) {
-		super.onemptied(onemptied);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Bdi onended(String onended) {
-		super.onended(onended);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Bdi onerror(String onerror) {
-		super.onerror(onerror);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Bdi onfocus(String onfocus) {
-		super.onfocus(onfocus);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Bdi oninput(String oninput) {
-		super.oninput(oninput);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Bdi oninvalid(String oninvalid) {
-		super.oninvalid(oninvalid);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Bdi onkeydown(String onkeydown) {
-		super.onkeydown(onkeydown);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Bdi onkeypress(String onkeypress) {
-		super.onkeypress(onkeypress);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Bdi onkeyup(String onkeyup) {
-		super.onkeyup(onkeyup);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Bdi onload(String onload) {
-		super.onload(onload);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Bdi onloadeddata(String onloadeddata) {
-		super.onloadeddata(onloadeddata);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Bdi onloadedmetadata(String onloadedmetadata) {
-		super.onloadedmetadata(onloadedmetadata);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Bdi onloadstart(String onloadstart) {
-		super.onloadstart(onloadstart);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Bdi onmousedown(String onmousedown) {
-		super.onmousedown(onmousedown);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Bdi onmouseenter(String onmouseenter) {
-		super.onmouseenter(onmouseenter);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Bdi onmouseleave(String onmouseleave) {
-		super.onmouseleave(onmouseleave);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Bdi onmousemove(String onmousemove) {
-		super.onmousemove(onmousemove);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Bdi onmouseout(String onmouseout) {
-		super.onmouseout(onmouseout);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Bdi onmouseover(String onmouseover) {
-		super.onmouseover(onmouseover);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Bdi onmouseup(String onmouseup) {
-		super.onmouseup(onmouseup);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Bdi onmousewheel(String onmousewheel) {
-		super.onmousewheel(onmousewheel);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Bdi onpause(String onpause) {
-		super.onpause(onpause);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Bdi onplay(String onplay) {
-		super.onplay(onplay);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Bdi onplaying(String onplaying) {
-		super.onplaying(onplaying);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Bdi onprogress(String onprogress) {
-		super.onprogress(onprogress);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Bdi onratechange(String onratechange) {
-		super.onratechange(onratechange);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Bdi onreset(String onreset) {
-		super.onreset(onreset);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Bdi onresize(String onresize) {
-		super.onresize(onresize);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Bdi onscroll(String onscroll) {
-		super.onscroll(onscroll);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Bdi onseeked(String onseeked) {
-		super.onseeked(onseeked);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Bdi onseeking(String onseeking) {
-		super.onseeking(onseeking);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Bdi onselect(String onselect) {
-		super.onselect(onselect);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Bdi onshow(String onshow) {
-		super.onshow(onshow);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Bdi onstalled(String onstalled) {
-		super.onstalled(onstalled);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Bdi onsubmit(String onsubmit) {
-		super.onsubmit(onsubmit);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Bdi onsuspend(String onsuspend) {
-		super.onsuspend(onsuspend);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Bdi ontimeupdate(String ontimeupdate) {
-		super.ontimeupdate(ontimeupdate);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Bdi ontoggle(String ontoggle) {
-		super.ontoggle(ontoggle);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Bdi onvolumechange(String onvolumechange) {
-		super.onvolumechange(onvolumechange);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Bdi onwaiting(String onwaiting) {
-		super.onwaiting(onwaiting);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Bdi spellcheck(Object spellcheck) {
-		super.spellcheck(spellcheck);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Bdi style(String style) {
-		super.style(style);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Bdi tabindex(Object tabindex) {
-		super.tabindex(tabindex);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Bdi title(String title) {
-		super.title(title);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Bdi translate(Object translate) {
-		super.translate(translate);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElementText */
-	public Bdi text(Object text) {
-		super.text(text);
-		return this;
-	}
-
-	// </FluentSetters>
-}
\ No newline at end of file
diff --git a/juneau-bean/juneau-bean-swagger/src/main/java/org/apache/juneau/dto/html5/Bdo.java b/juneau-bean/juneau-bean-swagger/src/main/java/org/apache/juneau/dto/html5/Bdo.java
deleted file mode 100644
index 02313987f..000000000
--- a/juneau-bean/juneau-bean-swagger/src/main/java/org/apache/juneau/dto/html5/Bdo.java
+++ /dev/null
@@ -1,436 +0,0 @@
-// ***************************************************************************************************************************
-// * 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.                                              *
-// ***************************************************************************************************************************
-package org.apache.juneau.dto.html5;
-
-import org.apache.juneau.annotation.*;
-import org.apache.juneau.internal.*;
-
-/**
- * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/text-level-semantics.html#the-bdo-element">&lt;bdo&gt;</a>
- * element.
- *
- * <h5 class='section'>See Also:</h5><ul>
- * 	<li class='link'><a class="doclink" href="../../../../../index.html#jd.Html5">Overview &gt; juneau-dto &gt; HTML5</a>
- * </ul>
- */
-@Bean(typeName="bdo")
-@FluentSetters
-public class Bdo extends HtmlElementMixed {
-
-	/**
-	 * Creates an empty {@link Bdo} element.
-	 */
-	public Bdo() {}
-
-	/**
-	 * Creates a {@link Bdo} element with the specified {@link Bdo#dir(String)} attribute and child nodes.
-	 *
-	 * @param dir The {@link Bdo#dir(String)} attribute.
-	 * @param children The child nodes.
-	 */
-	public Bdo(String dir, Object...children) {
-		dir(dir).children(children);
-	}
-
-	//-----------------------------------------------------------------------------------------------------------------
-	// Overridden methods
-	//-----------------------------------------------------------------------------------------------------------------
-
-	// <FluentSetters>
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Bdo _class(String _class) {  // NOSONAR - Intentional naming.
-		super._class(_class);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Bdo accesskey(String accesskey) {
-		super.accesskey(accesskey);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Bdo contenteditable(Object contenteditable) {
-		super.contenteditable(contenteditable);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Bdo dir(String dir) {
-		super.dir(dir);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Bdo hidden(Object hidden) {
-		super.hidden(hidden);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Bdo id(String id) {
-		super.id(id);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Bdo lang(String lang) {
-		super.lang(lang);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Bdo onabort(String onabort) {
-		super.onabort(onabort);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Bdo onblur(String onblur) {
-		super.onblur(onblur);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Bdo oncancel(String oncancel) {
-		super.oncancel(oncancel);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Bdo oncanplay(String oncanplay) {
-		super.oncanplay(oncanplay);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Bdo oncanplaythrough(String oncanplaythrough) {
-		super.oncanplaythrough(oncanplaythrough);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Bdo onchange(String onchange) {
-		super.onchange(onchange);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Bdo onclick(String onclick) {
-		super.onclick(onclick);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Bdo oncuechange(String oncuechange) {
-		super.oncuechange(oncuechange);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Bdo ondblclick(String ondblclick) {
-		super.ondblclick(ondblclick);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Bdo ondurationchange(String ondurationchange) {
-		super.ondurationchange(ondurationchange);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Bdo onemptied(String onemptied) {
-		super.onemptied(onemptied);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Bdo onended(String onended) {
-		super.onended(onended);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Bdo onerror(String onerror) {
-		super.onerror(onerror);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Bdo onfocus(String onfocus) {
-		super.onfocus(onfocus);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Bdo oninput(String oninput) {
-		super.oninput(oninput);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Bdo oninvalid(String oninvalid) {
-		super.oninvalid(oninvalid);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Bdo onkeydown(String onkeydown) {
-		super.onkeydown(onkeydown);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Bdo onkeypress(String onkeypress) {
-		super.onkeypress(onkeypress);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Bdo onkeyup(String onkeyup) {
-		super.onkeyup(onkeyup);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Bdo onload(String onload) {
-		super.onload(onload);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Bdo onloadeddata(String onloadeddata) {
-		super.onloadeddata(onloadeddata);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Bdo onloadedmetadata(String onloadedmetadata) {
-		super.onloadedmetadata(onloadedmetadata);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Bdo onloadstart(String onloadstart) {
-		super.onloadstart(onloadstart);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Bdo onmousedown(String onmousedown) {
-		super.onmousedown(onmousedown);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Bdo onmouseenter(String onmouseenter) {
-		super.onmouseenter(onmouseenter);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Bdo onmouseleave(String onmouseleave) {
-		super.onmouseleave(onmouseleave);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Bdo onmousemove(String onmousemove) {
-		super.onmousemove(onmousemove);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Bdo onmouseout(String onmouseout) {
-		super.onmouseout(onmouseout);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Bdo onmouseover(String onmouseover) {
-		super.onmouseover(onmouseover);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Bdo onmouseup(String onmouseup) {
-		super.onmouseup(onmouseup);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Bdo onmousewheel(String onmousewheel) {
-		super.onmousewheel(onmousewheel);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Bdo onpause(String onpause) {
-		super.onpause(onpause);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Bdo onplay(String onplay) {
-		super.onplay(onplay);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Bdo onplaying(String onplaying) {
-		super.onplaying(onplaying);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Bdo onprogress(String onprogress) {
-		super.onprogress(onprogress);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Bdo onratechange(String onratechange) {
-		super.onratechange(onratechange);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Bdo onreset(String onreset) {
-		super.onreset(onreset);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Bdo onresize(String onresize) {
-		super.onresize(onresize);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Bdo onscroll(String onscroll) {
-		super.onscroll(onscroll);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Bdo onseeked(String onseeked) {
-		super.onseeked(onseeked);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Bdo onseeking(String onseeking) {
-		super.onseeking(onseeking);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Bdo onselect(String onselect) {
-		super.onselect(onselect);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Bdo onshow(String onshow) {
-		super.onshow(onshow);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Bdo onstalled(String onstalled) {
-		super.onstalled(onstalled);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Bdo onsubmit(String onsubmit) {
-		super.onsubmit(onsubmit);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Bdo onsuspend(String onsuspend) {
-		super.onsuspend(onsuspend);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Bdo ontimeupdate(String ontimeupdate) {
-		super.ontimeupdate(ontimeupdate);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Bdo ontoggle(String ontoggle) {
-		super.ontoggle(ontoggle);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Bdo onvolumechange(String onvolumechange) {
-		super.onvolumechange(onvolumechange);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Bdo onwaiting(String onwaiting) {
-		super.onwaiting(onwaiting);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Bdo spellcheck(Object spellcheck) {
-		super.spellcheck(spellcheck);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Bdo style(String style) {
-		super.style(style);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Bdo tabindex(Object tabindex) {
-		super.tabindex(tabindex);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Bdo title(String title) {
-		super.title(title);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Bdo translate(Object translate) {
-		super.translate(translate);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElementMixed */
-	public Bdo child(Object child) {
-		super.child(child);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElementMixed */
-	public Bdo children(Object...children) {
-		super.children(children);
-		return this;
-	}
-
-	// </FluentSetters>
-}
\ No newline at end of file
diff --git a/juneau-bean/juneau-bean-swagger/src/main/java/org/apache/juneau/dto/html5/Blockquote.java b/juneau-bean/juneau-bean-swagger/src/main/java/org/apache/juneau/dto/html5/Blockquote.java
deleted file mode 100644
index f436ef8aa..000000000
--- a/juneau-bean/juneau-bean-swagger/src/main/java/org/apache/juneau/dto/html5/Blockquote.java
+++ /dev/null
@@ -1,450 +0,0 @@
-// ***************************************************************************************************************************
-// * 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.                                              *
-// ***************************************************************************************************************************
-package org.apache.juneau.dto.html5;
-
-import org.apache.juneau.annotation.*;
-import org.apache.juneau.internal.*;
-
-/**
- * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/grouping-content.html#the-blockquote-element">&lt;blockquote&gt;</a>
- * element.
- *
- * <h5 class='section'>See Also:</h5><ul>
- * 	<li class='link'><a class="doclink" href="../../../../../index.html#jd.Html5">Overview &gt; juneau-dto &gt; HTML5</a>
- * </ul>
- */
-@Bean(typeName="blockquote")
-@FluentSetters
-public class Blockquote extends HtmlElementMixed {
-
-	/**
-	 * Creates an empty {@link Blockquote} element.
-	 */
-	public Blockquote() {}
-
-	/**
-	 * Creates a {@link Blockquote} element with the specified child nodes.
-	 *
-	 * @param children The child nodes.
-	 */
-	public Blockquote(Object...children) {
-		children(children);
-	}
-
-	/**
-	 * <a class="doclink" href="https://www.w3.org/TR/html5/grouping-content.html#attr-blockquote-cite">cite</a>
-	 * attribute.
-	 *
-	 * <p>
-	 * Link to the source of the quotation.
-	 *
-	 * @param cite The new value for this attribute.
-	 * @return This object.
-	 */
-	public final Blockquote cite(String cite) {
-		attr("cite", cite);
-		return this;
-	}
-
-	//-----------------------------------------------------------------------------------------------------------------
-	// Overridden methods
-	//-----------------------------------------------------------------------------------------------------------------
-
-	// <FluentSetters>
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Blockquote _class(String _class) {  // NOSONAR - Intentional naming.
-		super._class(_class);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Blockquote accesskey(String accesskey) {
-		super.accesskey(accesskey);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Blockquote contenteditable(Object contenteditable) {
-		super.contenteditable(contenteditable);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Blockquote dir(String dir) {
-		super.dir(dir);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Blockquote hidden(Object hidden) {
-		super.hidden(hidden);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Blockquote id(String id) {
-		super.id(id);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Blockquote lang(String lang) {
-		super.lang(lang);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Blockquote onabort(String onabort) {
-		super.onabort(onabort);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Blockquote onblur(String onblur) {
-		super.onblur(onblur);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
-	public Blockquote oncancel(String oncancel) {
-		super.oncancel(oncancel);
-		return this;
-	}
-
-	@Override /* GENERATED - org.apache.juneau.dto.html5.HtmlElement */
... 72147 lines suppressed ...