HTML5 DTOs

Project: http://git-wip-us.apache.org/repos/asf/incubator-juneau/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-juneau/commit/d408947b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-juneau/tree/d408947b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-juneau/diff/d408947b

Branch: refs/heads/master
Commit: d408947b1949bf87da337a96db1ffb82f1fce35a
Parents: fcb4195
Author: jamesbognar <[email protected]>
Authored: Sun Sep 4 22:23:38 2016 -0400
Committer: jamesbognar <[email protected]>
Committed: Sun Sep 4 22:23:38 2016 -0400

----------------------------------------------------------------------
 .../main/java/org/apache/juneau/html/dto/A.java |  7 +++---
 .../java/org/apache/juneau/html/dto/Abbr.java   |  8 +++----
 .../org/apache/juneau/html/dto/Address.java     |  8 +++----
 .../java/org/apache/juneau/html/dto/Area.java   |  8 +++----
 .../org/apache/juneau/html/dto/Article.java     |  8 +++----
 .../java/org/apache/juneau/html/dto/Aside.java  |  8 +++----
 .../java/org/apache/juneau/html/dto/Audio.java  |  8 +++----
 .../main/java/org/apache/juneau/html/dto/B.java |  8 +++----
 .../java/org/apache/juneau/html/dto/Base.java   |  8 +++----
 .../java/org/apache/juneau/html/dto/Bdi.java    |  8 +++----
 .../java/org/apache/juneau/html/dto/Bdo.java    |  8 +++----
 .../org/apache/juneau/html/dto/Blockquote.java  |  8 +++----
 .../java/org/apache/juneau/html/dto/Body.java   |  8 +++----
 .../java/org/apache/juneau/html/dto/Br.java     |  8 +++----
 .../java/org/apache/juneau/html/dto/Button.java |  8 +++----
 .../java/org/apache/juneau/html/dto/Canvas.java |  8 +++----
 .../org/apache/juneau/html/dto/Caption.java     |  8 +++----
 .../java/org/apache/juneau/html/dto/Cite.java   |  8 +++----
 .../java/org/apache/juneau/html/dto/Code.java   |  8 +++----
 .../java/org/apache/juneau/html/dto/Col.java    |  8 +++----
 .../org/apache/juneau/html/dto/Colgroup.java    |  8 +++----
 .../org/apache/juneau/html/dto/Command.java     |  8 +++----
 .../java/org/apache/juneau/html/dto/Data.java   | 25 ++++++++++++++++++++
 .../org/apache/juneau/html/dto/Datalist.java    |  8 +++----
 .../java/org/apache/juneau/html/dto/Dd.java     |  8 +++----
 .../java/org/apache/juneau/html/dto/Del.java    |  8 +++----
 .../org/apache/juneau/html/dto/Details.java     |  8 +++----
 .../java/org/apache/juneau/html/dto/Dfn.java    |  8 +++----
 .../java/org/apache/juneau/html/dto/Div.java    |  8 +++----
 .../java/org/apache/juneau/html/dto/Dl.java     |  8 +++----
 .../java/org/apache/juneau/html/dto/Dt.java     |  8 +++----
 .../java/org/apache/juneau/html/dto/Em.java     |  8 +++----
 .../java/org/apache/juneau/html/dto/Embed.java  |  8 +++----
 .../org/apache/juneau/html/dto/Fieldset.java    |  8 +++----
 .../org/apache/juneau/html/dto/Figcaption.java  |  8 +++----
 .../java/org/apache/juneau/html/dto/Figure.java |  8 +++----
 .../java/org/apache/juneau/html/dto/Footer.java |  8 +++----
 .../java/org/apache/juneau/html/dto/Form.java   |  8 +++----
 .../java/org/apache/juneau/html/dto/H1.java     |  8 +++----
 .../java/org/apache/juneau/html/dto/H2.java     |  8 +++----
 .../java/org/apache/juneau/html/dto/H3.java     |  8 +++----
 .../java/org/apache/juneau/html/dto/H4.java     |  8 +++----
 .../java/org/apache/juneau/html/dto/H5.java     |  8 +++----
 .../java/org/apache/juneau/html/dto/H6.java     |  8 +++----
 .../java/org/apache/juneau/html/dto/Head.java   |  8 +++----
 .../java/org/apache/juneau/html/dto/Header.java |  8 +++----
 .../java/org/apache/juneau/html/dto/Hgroup.java |  8 +++----
 .../java/org/apache/juneau/html/dto/Hr.java     |  8 +++----
 .../java/org/apache/juneau/html/dto/Html.java   |  8 +++----
 .../main/java/org/apache/juneau/html/dto/I.java |  8 +++----
 .../java/org/apache/juneau/html/dto/IFrame.java |  8 +++----
 .../java/org/apache/juneau/html/dto/Img.java    |  7 +++---
 .../java/org/apache/juneau/html/dto/Input.java  |  8 +++----
 .../java/org/apache/juneau/html/dto/Ins.java    |  8 +++----
 .../java/org/apache/juneau/html/dto/Kbd.java    |  8 +++----
 .../java/org/apache/juneau/html/dto/Keygen.java |  8 +++----
 .../java/org/apache/juneau/html/dto/Label.java  |  8 +++----
 .../java/org/apache/juneau/html/dto/Legend.java |  8 +++----
 .../java/org/apache/juneau/html/dto/Li.java     |  8 +++----
 .../java/org/apache/juneau/html/dto/Link.java   |  8 +++----
 .../java/org/apache/juneau/html/dto/Main.java   | 25 ++++++++++++++++++++
 .../java/org/apache/juneau/html/dto/Map.java    |  8 +++----
 .../java/org/apache/juneau/html/dto/Mark.java   |  8 +++----
 .../java/org/apache/juneau/html/dto/Menu.java   |  8 +++----
 .../java/org/apache/juneau/html/dto/Meta.java   |  8 +++----
 .../java/org/apache/juneau/html/dto/Meter.java  |  8 +++----
 .../java/org/apache/juneau/html/dto/Nav.java    |  8 +++----
 .../org/apache/juneau/html/dto/Noscript.java    |  8 +++----
 .../java/org/apache/juneau/html/dto/Object.java |  8 +++----
 .../java/org/apache/juneau/html/dto/Ol.java     |  8 +++----
 .../org/apache/juneau/html/dto/Optgroup.java    |  8 +++----
 .../java/org/apache/juneau/html/dto/Option.java |  8 +++----
 .../java/org/apache/juneau/html/dto/Output.java |  8 +++----
 .../main/java/org/apache/juneau/html/dto/P.java |  8 +++----
 .../java/org/apache/juneau/html/dto/Param.java  |  8 +++----
 .../java/org/apache/juneau/html/dto/Pre.java    |  8 +++----
 .../org/apache/juneau/html/dto/Progress.java    |  8 +++----
 .../main/java/org/apache/juneau/html/dto/Q.java |  8 +++----
 .../java/org/apache/juneau/html/dto/Rb.java     | 25 ++++++++++++++++++++
 .../java/org/apache/juneau/html/dto/Rp.java     |  8 +++----
 .../java/org/apache/juneau/html/dto/Rt.java     |  8 +++----
 .../java/org/apache/juneau/html/dto/Rtc.java    | 25 ++++++++++++++++++++
 .../java/org/apache/juneau/html/dto/Ruby.java   |  8 +++----
 .../main/java/org/apache/juneau/html/dto/S.java |  8 +++----
 .../java/org/apache/juneau/html/dto/Samp.java   |  8 +++----
 .../java/org/apache/juneau/html/dto/Script.java |  8 +++----
 .../org/apache/juneau/html/dto/Section.java     |  8 +++----
 .../java/org/apache/juneau/html/dto/Select.java |  8 +++----
 .../java/org/apache/juneau/html/dto/Small.java  |  8 +++----
 .../java/org/apache/juneau/html/dto/Source.java |  8 +++----
 .../java/org/apache/juneau/html/dto/Span.java   |  8 +++----
 .../java/org/apache/juneau/html/dto/Strong.java |  8 +++----
 .../java/org/apache/juneau/html/dto/Style.java  |  8 +++----
 .../java/org/apache/juneau/html/dto/Sub.java    |  8 +++----
 .../org/apache/juneau/html/dto/Summary.java     |  8 +++----
 .../java/org/apache/juneau/html/dto/Sup.java    |  8 +++----
 .../java/org/apache/juneau/html/dto/Table.java  |  8 +++----
 .../java/org/apache/juneau/html/dto/Tbody.java  |  8 +++----
 .../java/org/apache/juneau/html/dto/Td.java     |  8 +++----
 .../org/apache/juneau/html/dto/Template.java    | 25 ++++++++++++++++++++
 .../org/apache/juneau/html/dto/Textarea.java    |  8 +++----
 .../java/org/apache/juneau/html/dto/Tfoot.java  |  8 +++----
 .../java/org/apache/juneau/html/dto/Th.java     |  8 +++----
 .../java/org/apache/juneau/html/dto/Thead.java  |  8 +++----
 .../java/org/apache/juneau/html/dto/Time.java   |  8 +++----
 .../java/org/apache/juneau/html/dto/Title.java  |  8 +++----
 .../java/org/apache/juneau/html/dto/Tr.java     |  8 +++----
 .../java/org/apache/juneau/html/dto/Track.java  |  8 +++----
 .../main/java/org/apache/juneau/html/dto/U.java |  8 +++----
 .../java/org/apache/juneau/html/dto/Ul.java     |  8 +++----
 .../java/org/apache/juneau/html/dto/Var.java    |  8 +++----
 .../java/org/apache/juneau/html/dto/Video.java  |  8 +++----
 .../java/org/apache/juneau/html/dto/Wbr.java    |  8 +++----
 .../main/java/org/apache/juneau/html/dto/X.java | 25 --------------------
 114 files changed, 557 insertions(+), 455 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d408947b/juneau-core/src/main/java/org/apache/juneau/html/dto/A.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/A.java 
b/juneau-core/src/main/java/org/apache/juneau/html/dto/A.java
index 3a48664..5e3ffc1 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/A.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/A.java
@@ -2,7 +2,7 @@
 // * 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                
                                              * 
+// * with the License.  You may obtain a copy of the License at                
                                              *
 // *                                                                           
                                              *
 // *  http://www.apache.org/licenses/LICENSE-2.0                               
                                              *
 // *                                                                           
                                              *
@@ -14,15 +14,16 @@ package org.apache.juneau.html.dto;
 
 import static org.apache.juneau.xml.annotation.XmlFormat.*;
 
+import org.apache.juneau.annotation.*;
 import org.apache.juneau.xml.annotation.*;
 
 /**
- * TODO
+ * DTO for an HTML <a 
href='https://www.w3.org/TR/html5/text-level-semantics.html#the-a-element'>&lt;a&gt;</a>
 element.
  * <p>
  *
  * @author James Bognar ([email protected])
  */
-@Xml(name="a")
+@Bean(name="a")
 @SuppressWarnings("javadoc")
 public class A extends HtmlElement {
 

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d408947b/juneau-core/src/main/java/org/apache/juneau/html/dto/Abbr.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Abbr.java 
b/juneau-core/src/main/java/org/apache/juneau/html/dto/Abbr.java
index a268c7b..5a3b6c5 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Abbr.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Abbr.java
@@ -2,7 +2,7 @@
 // * 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                
                                              * 
+// * with the License.  You may obtain a copy of the License at                
                                              *
 // *                                                                           
                                              *
 // *  http://www.apache.org/licenses/LICENSE-2.0                               
                                              *
 // *                                                                           
                                              *
@@ -12,14 +12,14 @@
 // 
***************************************************************************************************************************
 package org.apache.juneau.html.dto;
 
-import org.apache.juneau.xml.annotation.*;
+import org.apache.juneau.annotation.*;
 
 /**
- * TODO
+ * DTO for an HTML <a 
href='https://www.w3.org/TR/html5/text-level-semantics.html#the-abbr-element'>&lt;abbr&gt;</a>
 element.
  * <p>
  *
  * @author James Bognar ([email protected])
  */
-@Xml(name="x")
+@Bean(name="abbr")
 public class Abbr extends HtmlElement {
 }

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d408947b/juneau-core/src/main/java/org/apache/juneau/html/dto/Address.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Address.java 
b/juneau-core/src/main/java/org/apache/juneau/html/dto/Address.java
index 9fd8fce..db14434 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Address.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Address.java
@@ -2,7 +2,7 @@
 // * 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                
                                              * 
+// * with the License.  You may obtain a copy of the License at                
                                              *
 // *                                                                           
                                              *
 // *  http://www.apache.org/licenses/LICENSE-2.0                               
                                              *
 // *                                                                           
                                              *
@@ -12,14 +12,14 @@
 // 
***************************************************************************************************************************
 package org.apache.juneau.html.dto;
 
-import org.apache.juneau.xml.annotation.*;
+import org.apache.juneau.annotation.*;
 
 /**
- * TODO
+ * DTO for an HTML <a 
href='https://www.w3.org/TR/html5/sections.html#the-address-element'>&lt;address&gt;</a>
 element.
  * <p>
  *
  * @author James Bognar ([email protected])
  */
-@Xml(name="x")
+@Bean(name="address")
 public class Address extends HtmlElement {
 }

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d408947b/juneau-core/src/main/java/org/apache/juneau/html/dto/Area.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Area.java 
b/juneau-core/src/main/java/org/apache/juneau/html/dto/Area.java
index c0e7873..a139618 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Area.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Area.java
@@ -2,7 +2,7 @@
 // * 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                
                                              * 
+// * with the License.  You may obtain a copy of the License at                
                                              *
 // *                                                                           
                                              *
 // *  http://www.apache.org/licenses/LICENSE-2.0                               
                                              *
 // *                                                                           
                                              *
@@ -12,14 +12,14 @@
 // 
***************************************************************************************************************************
 package org.apache.juneau.html.dto;
 
-import org.apache.juneau.xml.annotation.*;
+import org.apache.juneau.annotation.*;
 
 /**
- * TODO
+ * DTO for an HTML <a 
href='https://www.w3.org/TR/html5/embedded-content-0.html#the-area-element'>&lt;area&gt;</a>
 element.
  * <p>
  *
  * @author James Bognar ([email protected])
  */
-@Xml(name="x")
+@Bean(name="area")
 public class Area extends HtmlElement {
 }

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d408947b/juneau-core/src/main/java/org/apache/juneau/html/dto/Article.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Article.java 
b/juneau-core/src/main/java/org/apache/juneau/html/dto/Article.java
index 0ce197e..6b56e46 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Article.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Article.java
@@ -2,7 +2,7 @@
 // * 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                
                                              * 
+// * with the License.  You may obtain a copy of the License at                
                                              *
 // *                                                                           
                                              *
 // *  http://www.apache.org/licenses/LICENSE-2.0                               
                                              *
 // *                                                                           
                                              *
@@ -12,14 +12,14 @@
 // 
***************************************************************************************************************************
 package org.apache.juneau.html.dto;
 
-import org.apache.juneau.xml.annotation.*;
+import org.apache.juneau.annotation.*;
 
 /**
- * TODO
+ * DTO for an HTML <a 
href='https://www.w3.org/TR/html5/sections.html#the-article-element'>&lt;article&gt;</a>
 element.
  * <p>
  *
  * @author James Bognar ([email protected])
  */
-@Xml(name="x")
+@Bean(name="article")
 public class Article extends HtmlElement {
 }

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d408947b/juneau-core/src/main/java/org/apache/juneau/html/dto/Aside.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Aside.java 
b/juneau-core/src/main/java/org/apache/juneau/html/dto/Aside.java
index ed7fe2f..7105b99 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Aside.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Aside.java
@@ -2,7 +2,7 @@
 // * 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                
                                              * 
+// * with the License.  You may obtain a copy of the License at                
                                              *
 // *                                                                           
                                              *
 // *  http://www.apache.org/licenses/LICENSE-2.0                               
                                              *
 // *                                                                           
                                              *
@@ -12,14 +12,14 @@
 // 
***************************************************************************************************************************
 package org.apache.juneau.html.dto;
 
-import org.apache.juneau.xml.annotation.*;
+import org.apache.juneau.annotation.*;
 
 /**
- * TODO
+ * DTO for an HTML <a 
href='https://www.w3.org/TR/html5/sections.html#the-aside-element'>&lt;aside&gt;</a>
 element.
  * <p>
  *
  * @author James Bognar ([email protected])
  */
-@Xml(name="x")
+@Bean(name="aside")
 public class Aside extends HtmlElement {
 }

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d408947b/juneau-core/src/main/java/org/apache/juneau/html/dto/Audio.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Audio.java 
b/juneau-core/src/main/java/org/apache/juneau/html/dto/Audio.java
index a956c2a..0172838 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Audio.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Audio.java
@@ -2,7 +2,7 @@
 // * 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                
                                              * 
+// * with the License.  You may obtain a copy of the License at                
                                              *
 // *                                                                           
                                              *
 // *  http://www.apache.org/licenses/LICENSE-2.0                               
                                              *
 // *                                                                           
                                              *
@@ -12,14 +12,14 @@
 // 
***************************************************************************************************************************
 package org.apache.juneau.html.dto;
 
-import org.apache.juneau.xml.annotation.*;
+import org.apache.juneau.annotation.*;
 
 /**
- * TODO
+ * DTO for an HTML <a 
href='https://www.w3.org/TR/html5/embedded-content-0.html#the-audio-element'>&lt;audio&gt;</a>
 element.
  * <p>
  *
  * @author James Bognar ([email protected])
  */
-@Xml(name="x")
+@Bean(name="audio")
 public class Audio extends HtmlElement {
 }

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d408947b/juneau-core/src/main/java/org/apache/juneau/html/dto/B.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/B.java 
b/juneau-core/src/main/java/org/apache/juneau/html/dto/B.java
index a86b8b2..de10358 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/B.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/B.java
@@ -2,7 +2,7 @@
 // * 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                
                                              * 
+// * with the License.  You may obtain a copy of the License at                
                                              *
 // *                                                                           
                                              *
 // *  http://www.apache.org/licenses/LICENSE-2.0                               
                                              *
 // *                                                                           
                                              *
@@ -12,14 +12,14 @@
 // 
***************************************************************************************************************************
 package org.apache.juneau.html.dto;
 
-import org.apache.juneau.xml.annotation.*;
+import org.apache.juneau.annotation.*;
 
 /**
- * TODO
+ * DTO for an HTML <a 
href='https://www.w3.org/TR/html5/text-level-semantics.html#the-b-element'>&lt;b&gt;</a>
 element.
  * <p>
  *
  * @author James Bognar ([email protected])
  */
-@Xml(name="x")
+@Bean(name="b")
 public class B extends HtmlElement {
 }

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d408947b/juneau-core/src/main/java/org/apache/juneau/html/dto/Base.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Base.java 
b/juneau-core/src/main/java/org/apache/juneau/html/dto/Base.java
index b9ce07f..d31fda0 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Base.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Base.java
@@ -2,7 +2,7 @@
 // * 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                
                                              * 
+// * with the License.  You may obtain a copy of the License at                
                                              *
 // *                                                                           
                                              *
 // *  http://www.apache.org/licenses/LICENSE-2.0                               
                                              *
 // *                                                                           
                                              *
@@ -12,14 +12,14 @@
 // 
***************************************************************************************************************************
 package org.apache.juneau.html.dto;
 
-import org.apache.juneau.xml.annotation.*;
+import org.apache.juneau.annotation.*;
 
 /**
- * TODO
+ * DTO for an HTML <a 
href='https://www.w3.org/TR/html5/document-metadata.html#the-base-element'>&lt;base&gt;</a>
 element.
  * <p>
  *
  * @author James Bognar ([email protected])
  */
-@Xml(name="x")
+@Bean(name="base")
 public class Base extends HtmlElement {
 }

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d408947b/juneau-core/src/main/java/org/apache/juneau/html/dto/Bdi.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Bdi.java 
b/juneau-core/src/main/java/org/apache/juneau/html/dto/Bdi.java
index 7874c9f..c76c47a 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Bdi.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Bdi.java
@@ -2,7 +2,7 @@
 // * 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                
                                              * 
+// * with the License.  You may obtain a copy of the License at                
                                              *
 // *                                                                           
                                              *
 // *  http://www.apache.org/licenses/LICENSE-2.0                               
                                              *
 // *                                                                           
                                              *
@@ -12,14 +12,14 @@
 // 
***************************************************************************************************************************
 package org.apache.juneau.html.dto;
 
-import org.apache.juneau.xml.annotation.*;
+import org.apache.juneau.annotation.*;
 
 /**
- * TODO
+ * DTO for an HTML <a 
href='https://www.w3.org/TR/html5/text-level-semantics.html#the-bdi-element'>&lt;bdi&gt;</a>
 element.
  * <p>
  *
  * @author James Bognar ([email protected])
  */
-@Xml(name="x")
+@Bean(name="bdi")
 public class Bdi extends HtmlElement {
 }

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d408947b/juneau-core/src/main/java/org/apache/juneau/html/dto/Bdo.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Bdo.java 
b/juneau-core/src/main/java/org/apache/juneau/html/dto/Bdo.java
index 583efc6..4415f76 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Bdo.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Bdo.java
@@ -2,7 +2,7 @@
 // * 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                
                                              * 
+// * with the License.  You may obtain a copy of the License at                
                                              *
 // *                                                                           
                                              *
 // *  http://www.apache.org/licenses/LICENSE-2.0                               
                                              *
 // *                                                                           
                                              *
@@ -12,14 +12,14 @@
 // 
***************************************************************************************************************************
 package org.apache.juneau.html.dto;
 
-import org.apache.juneau.xml.annotation.*;
+import org.apache.juneau.annotation.*;
 
 /**
- * TODO
+ * DTO for an HTML <a 
href='https://www.w3.org/TR/html5/text-level-semantics.html#the-bdo-element'>&lt;bdo&gt;</a>
 element.
  * <p>
  *
  * @author James Bognar ([email protected])
  */
-@Xml(name="x")
+@Bean(name="bdo")
 public class Bdo extends HtmlElement {
 }

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d408947b/juneau-core/src/main/java/org/apache/juneau/html/dto/Blockquote.java
----------------------------------------------------------------------
diff --git 
a/juneau-core/src/main/java/org/apache/juneau/html/dto/Blockquote.java 
b/juneau-core/src/main/java/org/apache/juneau/html/dto/Blockquote.java
index ad95861..6f7b554 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Blockquote.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Blockquote.java
@@ -2,7 +2,7 @@
 // * 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                
                                              * 
+// * with the License.  You may obtain a copy of the License at                
                                              *
 // *                                                                           
                                              *
 // *  http://www.apache.org/licenses/LICENSE-2.0                               
                                              *
 // *                                                                           
                                              *
@@ -12,14 +12,14 @@
 // 
***************************************************************************************************************************
 package org.apache.juneau.html.dto;
 
-import org.apache.juneau.xml.annotation.*;
+import org.apache.juneau.annotation.*;
 
 /**
- * TODO
+ * DTO for an HTML <a 
href='https://www.w3.org/TR/html5/grouping-content.html#the-blockquote-element'>&lt;blockquote&gt;</a>
 element.
  * <p>
  *
  * @author James Bognar ([email protected])
  */
-@Xml(name="x")
+@Bean(name="blockquote")
 public class Blockquote extends HtmlElement {
 }

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d408947b/juneau-core/src/main/java/org/apache/juneau/html/dto/Body.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Body.java 
b/juneau-core/src/main/java/org/apache/juneau/html/dto/Body.java
index eae9786..f91e742 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Body.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Body.java
@@ -2,7 +2,7 @@
 // * 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                
                                              * 
+// * with the License.  You may obtain a copy of the License at                
                                              *
 // *                                                                           
                                              *
 // *  http://www.apache.org/licenses/LICENSE-2.0                               
                                              *
 // *                                                                           
                                              *
@@ -12,14 +12,14 @@
 // 
***************************************************************************************************************************
 package org.apache.juneau.html.dto;
 
-import org.apache.juneau.xml.annotation.*;
+import org.apache.juneau.annotation.*;
 
 /**
- * TODO
+ * DTO for an HTML <a 
href='https://www.w3.org/TR/html5/sections.html#the-body-element'>&lt;body&gt;</a>
 element.
  * <p>
  *
  * @author James Bognar ([email protected])
  */
-@Xml(name="x")
+@Bean(name="body")
 public class Body extends HtmlElement {
 }

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d408947b/juneau-core/src/main/java/org/apache/juneau/html/dto/Br.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Br.java 
b/juneau-core/src/main/java/org/apache/juneau/html/dto/Br.java
index 2389ff3..3104a35 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Br.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Br.java
@@ -2,7 +2,7 @@
 // * 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                
                                              * 
+// * with the License.  You may obtain a copy of the License at                
                                              *
 // *                                                                           
                                              *
 // *  http://www.apache.org/licenses/LICENSE-2.0                               
                                              *
 // *                                                                           
                                              *
@@ -12,14 +12,14 @@
 // 
***************************************************************************************************************************
 package org.apache.juneau.html.dto;
 
-import org.apache.juneau.xml.annotation.*;
+import org.apache.juneau.annotation.*;
 
 /**
- * TODO
+ * DTO for an HTML <a 
href='https://www.w3.org/TR/html5/text-level-semantics.html#the-br-element'>&lt;br&gt;</a>
 element.
  * <p>
  *
  * @author James Bognar ([email protected])
  */
-@Xml(name="x")
+@Bean(name="br")
 public class Br extends HtmlElement {
 }

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d408947b/juneau-core/src/main/java/org/apache/juneau/html/dto/Button.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Button.java 
b/juneau-core/src/main/java/org/apache/juneau/html/dto/Button.java
index 9ede226..babcf56 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Button.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Button.java
@@ -2,7 +2,7 @@
 // * 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                
                                              * 
+// * with the License.  You may obtain a copy of the License at                
                                              *
 // *                                                                           
                                              *
 // *  http://www.apache.org/licenses/LICENSE-2.0                               
                                              *
 // *                                                                           
                                              *
@@ -12,14 +12,14 @@
 // 
***************************************************************************************************************************
 package org.apache.juneau.html.dto;
 
-import org.apache.juneau.xml.annotation.*;
+import org.apache.juneau.annotation.*;
 
 /**
- * TODO
+ * DTO for an HTML <a 
href='https://www.w3.org/TR/html5/forms.html#the-button-element'>&lt;button&gt;</a>
 element.
  * <p>
  *
  * @author James Bognar ([email protected])
  */
-@Xml(name="x")
+@Bean(name="button")
 public class Button extends HtmlElement {
 }

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d408947b/juneau-core/src/main/java/org/apache/juneau/html/dto/Canvas.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Canvas.java 
b/juneau-core/src/main/java/org/apache/juneau/html/dto/Canvas.java
index d9ae8eb..81e5af8 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Canvas.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Canvas.java
@@ -2,7 +2,7 @@
 // * 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                
                                              * 
+// * with the License.  You may obtain a copy of the License at                
                                              *
 // *                                                                           
                                              *
 // *  http://www.apache.org/licenses/LICENSE-2.0                               
                                              *
 // *                                                                           
                                              *
@@ -12,14 +12,14 @@
 // 
***************************************************************************************************************************
 package org.apache.juneau.html.dto;
 
-import org.apache.juneau.xml.annotation.*;
+import org.apache.juneau.annotation.*;
 
 /**
- * TODO
+ * DTO for an HTML <a 
href='https://www.w3.org/TR/html5/scripting-1.html#the-canvas-element'>&lt;canvas&gt;</a>
 element.
  * <p>
  *
  * @author James Bognar ([email protected])
  */
-@Xml(name="x")
+@Bean(name="canvas")
 public class Canvas extends HtmlElement {
 }

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d408947b/juneau-core/src/main/java/org/apache/juneau/html/dto/Caption.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Caption.java 
b/juneau-core/src/main/java/org/apache/juneau/html/dto/Caption.java
index ecc3599..1c2b149 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Caption.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Caption.java
@@ -2,7 +2,7 @@
 // * 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                
                                              * 
+// * with the License.  You may obtain a copy of the License at                
                                              *
 // *                                                                           
                                              *
 // *  http://www.apache.org/licenses/LICENSE-2.0                               
                                              *
 // *                                                                           
                                              *
@@ -12,14 +12,14 @@
 // 
***************************************************************************************************************************
 package org.apache.juneau.html.dto;
 
-import org.apache.juneau.xml.annotation.*;
+import org.apache.juneau.annotation.*;
 
 /**
- * TODO
+ * DTO for an HTML <a 
href='https://www.w3.org/TR/html5/tabular-data.html#the-caption-element'>&lt;caption&gt;</a>
 element.
  * <p>
  *
  * @author James Bognar ([email protected])
  */
-@Xml(name="x")
+@Bean(name="caption")
 public class Caption extends HtmlElement {
 }

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d408947b/juneau-core/src/main/java/org/apache/juneau/html/dto/Cite.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Cite.java 
b/juneau-core/src/main/java/org/apache/juneau/html/dto/Cite.java
index c8116d0..9bfa180 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Cite.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Cite.java
@@ -2,7 +2,7 @@
 // * 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                
                                              * 
+// * with the License.  You may obtain a copy of the License at                
                                              *
 // *                                                                           
                                              *
 // *  http://www.apache.org/licenses/LICENSE-2.0                               
                                              *
 // *                                                                           
                                              *
@@ -12,14 +12,14 @@
 // 
***************************************************************************************************************************
 package org.apache.juneau.html.dto;
 
-import org.apache.juneau.xml.annotation.*;
+import org.apache.juneau.annotation.*;
 
 /**
- * TODO
+ * DTO for an HTML <a 
href='https://www.w3.org/TR/html5/text-level-semantics.html#the-cite-element'>&lt;cite&gt;</a>
 element.
  * <p>
  *
  * @author James Bognar ([email protected])
  */
-@Xml(name="x")
+@Bean(name="cite")
 public class Cite extends HtmlElement {
 }

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d408947b/juneau-core/src/main/java/org/apache/juneau/html/dto/Code.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Code.java 
b/juneau-core/src/main/java/org/apache/juneau/html/dto/Code.java
index 76f8a73..1383a7a 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Code.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Code.java
@@ -2,7 +2,7 @@
 // * 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                
                                              * 
+// * with the License.  You may obtain a copy of the License at                
                                              *
 // *                                                                           
                                              *
 // *  http://www.apache.org/licenses/LICENSE-2.0                               
                                              *
 // *                                                                           
                                              *
@@ -12,14 +12,14 @@
 // 
***************************************************************************************************************************
 package org.apache.juneau.html.dto;
 
-import org.apache.juneau.xml.annotation.*;
+import org.apache.juneau.annotation.*;
 
 /**
- * TODO
+ * DTO for an HTML <a 
href='https://www.w3.org/TR/html5/text-level-semantics.html#the-code-element'>&lt;code&gt;</a>
 element.
  * <p>
  *
  * @author James Bognar ([email protected])
  */
-@Xml(name="x")
+@Bean(name="code")
 public class Code extends HtmlElement {
 }

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d408947b/juneau-core/src/main/java/org/apache/juneau/html/dto/Col.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Col.java 
b/juneau-core/src/main/java/org/apache/juneau/html/dto/Col.java
index 29ec459..80510b2 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Col.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Col.java
@@ -2,7 +2,7 @@
 // * 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                
                                              * 
+// * with the License.  You may obtain a copy of the License at                
                                              *
 // *                                                                           
                                              *
 // *  http://www.apache.org/licenses/LICENSE-2.0                               
                                              *
 // *                                                                           
                                              *
@@ -12,14 +12,14 @@
 // 
***************************************************************************************************************************
 package org.apache.juneau.html.dto;
 
-import org.apache.juneau.xml.annotation.*;
+import org.apache.juneau.annotation.*;
 
 /**
- * TODO
+ * DTO for an HTML <a 
href='https://www.w3.org/TR/html5/tabular-data.html#the-col-element'>&lt;col&gt;</a>
 element.
  * <p>
  *
  * @author James Bognar ([email protected])
  */
-@Xml(name="x")
+@Bean(name="col")
 public class Col extends HtmlElement {
 }

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d408947b/juneau-core/src/main/java/org/apache/juneau/html/dto/Colgroup.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Colgroup.java 
b/juneau-core/src/main/java/org/apache/juneau/html/dto/Colgroup.java
index c7ff54e..0fa0ae3 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Colgroup.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Colgroup.java
@@ -2,7 +2,7 @@
 // * 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                
                                              * 
+// * with the License.  You may obtain a copy of the License at                
                                              *
 // *                                                                           
                                              *
 // *  http://www.apache.org/licenses/LICENSE-2.0                               
                                              *
 // *                                                                           
                                              *
@@ -12,14 +12,14 @@
 // 
***************************************************************************************************************************
 package org.apache.juneau.html.dto;
 
-import org.apache.juneau.xml.annotation.*;
+import org.apache.juneau.annotation.*;
 
 /**
- * TODO
+ * DTO for an HTML <a 
href='https://www.w3.org/TR/html5/tabular-data.html#the-colgroup-element'>&lt;colgroup&gt;</a>
 element.
  * <p>
  *
  * @author James Bognar ([email protected])
  */
-@Xml(name="x")
+@Bean(name="colgroup")
 public class Colgroup extends HtmlElement {
 }

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d408947b/juneau-core/src/main/java/org/apache/juneau/html/dto/Command.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Command.java 
b/juneau-core/src/main/java/org/apache/juneau/html/dto/Command.java
index f665e3a..d880f14 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Command.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Command.java
@@ -2,7 +2,7 @@
 // * 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                
                                              * 
+// * with the License.  You may obtain a copy of the License at                
                                              *
 // *                                                                           
                                              *
 // *  http://www.apache.org/licenses/LICENSE-2.0                               
                                              *
 // *                                                                           
                                              *
@@ -12,14 +12,14 @@
 // 
***************************************************************************************************************************
 package org.apache.juneau.html.dto;
 
-import org.apache.juneau.xml.annotation.*;
+import org.apache.juneau.annotation.*;
 
 /**
- * TODO
+ * DTO for an HTML <a href=''>&lt;command&gt;</a> element.
  * <p>
  *
  * @author James Bognar ([email protected])
  */
-@Xml(name="x")
+@Bean(name="command")
 public class Command extends HtmlElement {
 }

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d408947b/juneau-core/src/main/java/org/apache/juneau/html/dto/Data.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Data.java 
b/juneau-core/src/main/java/org/apache/juneau/html/dto/Data.java
new file mode 100644
index 0000000..7e241a9
--- /dev/null
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Data.java
@@ -0,0 +1,25 @@
+// 
***************************************************************************************************************************
+// * 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.html.dto;
+
+import org.apache.juneau.annotation.*;
+
+/**
+ * DTO for an HTML <a 
href='https://www.w3.org/TR/html5/text-level-semantics.html#the-data-element'>&lt;data&gt;</a>
 element.
+ * <p>
+ *
+ * @author James Bognar ([email protected])
+ */
+@Bean(name="data")
+public class Data extends HtmlElement {
+}

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d408947b/juneau-core/src/main/java/org/apache/juneau/html/dto/Datalist.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Datalist.java 
b/juneau-core/src/main/java/org/apache/juneau/html/dto/Datalist.java
index 25d9a83..de6b668 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Datalist.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Datalist.java
@@ -2,7 +2,7 @@
 // * 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                
                                              * 
+// * with the License.  You may obtain a copy of the License at                
                                              *
 // *                                                                           
                                              *
 // *  http://www.apache.org/licenses/LICENSE-2.0                               
                                              *
 // *                                                                           
                                              *
@@ -12,14 +12,14 @@
 // 
***************************************************************************************************************************
 package org.apache.juneau.html.dto;
 
-import org.apache.juneau.xml.annotation.*;
+import org.apache.juneau.annotation.*;
 
 /**
- * TODO
+ * DTO for an HTML <a 
href='https://www.w3.org/TR/html5/forms.html#the-datalist-element'>&lt;datalist&gt;</a>
 element.
  * <p>
  *
  * @author James Bognar ([email protected])
  */
-@Xml(name="x")
+@Bean(name="datalist")
 public class Datalist extends HtmlElement {
 }

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d408947b/juneau-core/src/main/java/org/apache/juneau/html/dto/Dd.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Dd.java 
b/juneau-core/src/main/java/org/apache/juneau/html/dto/Dd.java
index 23ee48a..74307a7 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Dd.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Dd.java
@@ -2,7 +2,7 @@
 // * 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                
                                              * 
+// * with the License.  You may obtain a copy of the License at                
                                              *
 // *                                                                           
                                              *
 // *  http://www.apache.org/licenses/LICENSE-2.0                               
                                              *
 // *                                                                           
                                              *
@@ -12,14 +12,14 @@
 // 
***************************************************************************************************************************
 package org.apache.juneau.html.dto;
 
-import org.apache.juneau.xml.annotation.*;
+import org.apache.juneau.annotation.*;
 
 /**
- * TODO
+ * DTO for an HTML <a 
href='https://www.w3.org/TR/html5/grouping-content.html#the-dd-element'>&lt;dd&gt;</a>
 element.
  * <p>
  *
  * @author James Bognar ([email protected])
  */
-@Xml(name="x")
+@Bean(name="dd")
 public class Dd extends HtmlElement {
 }

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d408947b/juneau-core/src/main/java/org/apache/juneau/html/dto/Del.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Del.java 
b/juneau-core/src/main/java/org/apache/juneau/html/dto/Del.java
index cea41ce..691b748 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Del.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Del.java
@@ -2,7 +2,7 @@
 // * 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                
                                              * 
+// * with the License.  You may obtain a copy of the License at                
                                              *
 // *                                                                           
                                              *
 // *  http://www.apache.org/licenses/LICENSE-2.0                               
                                              *
 // *                                                                           
                                              *
@@ -12,14 +12,14 @@
 // 
***************************************************************************************************************************
 package org.apache.juneau.html.dto;
 
-import org.apache.juneau.xml.annotation.*;
+import org.apache.juneau.annotation.*;
 
 /**
- * TODO
+ * DTO for an HTML <a 
href='https://www.w3.org/TR/html5/edits.html#the-del-element'>&lt;del&gt;</a> 
element.
  * <p>
  *
  * @author James Bognar ([email protected])
  */
-@Xml(name="x")
+@Bean(name="del")
 public class Del extends HtmlElement {
 }

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d408947b/juneau-core/src/main/java/org/apache/juneau/html/dto/Details.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Details.java 
b/juneau-core/src/main/java/org/apache/juneau/html/dto/Details.java
index 0af89e5..e0b7229 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Details.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Details.java
@@ -2,7 +2,7 @@
 // * 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                
                                              * 
+// * with the License.  You may obtain a copy of the License at                
                                              *
 // *                                                                           
                                              *
 // *  http://www.apache.org/licenses/LICENSE-2.0                               
                                              *
 // *                                                                           
                                              *
@@ -12,14 +12,14 @@
 // 
***************************************************************************************************************************
 package org.apache.juneau.html.dto;
 
-import org.apache.juneau.xml.annotation.*;
+import org.apache.juneau.annotation.*;
 
 /**
- * TODO
+ * DTO for an HTML <a href=''>&lt;details&gt;</a> element.
  * <p>
  *
  * @author James Bognar ([email protected])
  */
-@Xml(name="x")
+@Bean(name="details")
 public class Details extends HtmlElement {
 }

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d408947b/juneau-core/src/main/java/org/apache/juneau/html/dto/Dfn.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Dfn.java 
b/juneau-core/src/main/java/org/apache/juneau/html/dto/Dfn.java
index 6bd660a..9eb6014 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Dfn.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Dfn.java
@@ -2,7 +2,7 @@
 // * 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                
                                              * 
+// * with the License.  You may obtain a copy of the License at                
                                              *
 // *                                                                           
                                              *
 // *  http://www.apache.org/licenses/LICENSE-2.0                               
                                              *
 // *                                                                           
                                              *
@@ -12,14 +12,14 @@
 // 
***************************************************************************************************************************
 package org.apache.juneau.html.dto;
 
-import org.apache.juneau.xml.annotation.*;
+import org.apache.juneau.annotation.*;
 
 /**
- * TODO
+ * DTO for an HTML <a 
href='https://www.w3.org/TR/html5/text-level-semantics.html#the-dfn-element'>&lt;dfn&gt;</a>
 element.
  * <p>
  *
  * @author James Bognar ([email protected])
  */
-@Xml(name="x")
+@Bean(name="dfn")
 public class Dfn extends HtmlElement {
 }

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d408947b/juneau-core/src/main/java/org/apache/juneau/html/dto/Div.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Div.java 
b/juneau-core/src/main/java/org/apache/juneau/html/dto/Div.java
index 4450c48..cad1884 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Div.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Div.java
@@ -2,7 +2,7 @@
 // * 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                
                                              * 
+// * with the License.  You may obtain a copy of the License at                
                                              *
 // *                                                                           
                                              *
 // *  http://www.apache.org/licenses/LICENSE-2.0                               
                                              *
 // *                                                                           
                                              *
@@ -12,14 +12,14 @@
 // 
***************************************************************************************************************************
 package org.apache.juneau.html.dto;
 
-import org.apache.juneau.xml.annotation.*;
+import org.apache.juneau.annotation.*;
 
 /**
- * TODO
+ * DTO for an HTML <a 
href='https://www.w3.org/TR/html5/grouping-content.html#the-div-element'>&lt;div&gt;</a>
 element.
  * <p>
  *
  * @author James Bognar ([email protected])
  */
-@Xml(name="x")
+@Bean(name="div")
 public class Div extends HtmlElement {
 }

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d408947b/juneau-core/src/main/java/org/apache/juneau/html/dto/Dl.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Dl.java 
b/juneau-core/src/main/java/org/apache/juneau/html/dto/Dl.java
index 52acbaf..f08c916 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Dl.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Dl.java
@@ -2,7 +2,7 @@
 // * 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                
                                              * 
+// * with the License.  You may obtain a copy of the License at                
                                              *
 // *                                                                           
                                              *
 // *  http://www.apache.org/licenses/LICENSE-2.0                               
                                              *
 // *                                                                           
                                              *
@@ -12,14 +12,14 @@
 // 
***************************************************************************************************************************
 package org.apache.juneau.html.dto;
 
-import org.apache.juneau.xml.annotation.*;
+import org.apache.juneau.annotation.*;
 
 /**
- * TODO
+ * DTO for an HTML <a 
href='https://www.w3.org/TR/html5/grouping-content.html#the-dl-element'>&lt;dl&gt;</a>
 element.
  * <p>
  *
  * @author James Bognar ([email protected])
  */
-@Xml(name="x")
+@Bean(name="dl")
 public class Dl extends HtmlElement {
 }

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d408947b/juneau-core/src/main/java/org/apache/juneau/html/dto/Dt.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Dt.java 
b/juneau-core/src/main/java/org/apache/juneau/html/dto/Dt.java
index 98d9309..9832121 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Dt.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Dt.java
@@ -2,7 +2,7 @@
 // * 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                
                                              * 
+// * with the License.  You may obtain a copy of the License at                
                                              *
 // *                                                                           
                                              *
 // *  http://www.apache.org/licenses/LICENSE-2.0                               
                                              *
 // *                                                                           
                                              *
@@ -12,14 +12,14 @@
 // 
***************************************************************************************************************************
 package org.apache.juneau.html.dto;
 
-import org.apache.juneau.xml.annotation.*;
+import org.apache.juneau.annotation.*;
 
 /**
- * TODO
+ * DTO for an HTML <a 
href='https://www.w3.org/TR/html5/grouping-content.html#the-dt-element'>&lt;dt&gt;</a>
 element.
  * <p>
  *
  * @author James Bognar ([email protected])
  */
-@Xml(name="x")
+@Bean(name="dt")
 public class Dt extends HtmlElement {
 }

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d408947b/juneau-core/src/main/java/org/apache/juneau/html/dto/Em.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Em.java 
b/juneau-core/src/main/java/org/apache/juneau/html/dto/Em.java
index 66bb8e8..730f265 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Em.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Em.java
@@ -2,7 +2,7 @@
 // * 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                
                                              * 
+// * with the License.  You may obtain a copy of the License at                
                                              *
 // *                                                                           
                                              *
 // *  http://www.apache.org/licenses/LICENSE-2.0                               
                                              *
 // *                                                                           
                                              *
@@ -12,14 +12,14 @@
 // 
***************************************************************************************************************************
 package org.apache.juneau.html.dto;
 
-import org.apache.juneau.xml.annotation.*;
+import org.apache.juneau.annotation.*;
 
 /**
- * TODO
+ * DTO for an HTML <a 
href='https://www.w3.org/TR/html5/text-level-semantics.html#the-em-element'>&lt;em&gt;</a>
 element.
  * <p>
  *
  * @author James Bognar ([email protected])
  */
-@Xml(name="x")
+@Bean(name="em")
 public class Em extends HtmlElement {
 }

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d408947b/juneau-core/src/main/java/org/apache/juneau/html/dto/Embed.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Embed.java 
b/juneau-core/src/main/java/org/apache/juneau/html/dto/Embed.java
index d38f902..ca68607 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Embed.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Embed.java
@@ -2,7 +2,7 @@
 // * 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                
                                              * 
+// * with the License.  You may obtain a copy of the License at                
                                              *
 // *                                                                           
                                              *
 // *  http://www.apache.org/licenses/LICENSE-2.0                               
                                              *
 // *                                                                           
                                              *
@@ -12,14 +12,14 @@
 // 
***************************************************************************************************************************
 package org.apache.juneau.html.dto;
 
-import org.apache.juneau.xml.annotation.*;
+import org.apache.juneau.annotation.*;
 
 /**
- * TODO
+ * DTO for an HTML <a 
href='https://www.w3.org/TR/html5/embedded-content-0.html#the-embed-element'>&lt;embed&gt;</a>
 element.
  * <p>
  *
  * @author James Bognar ([email protected])
  */
-@Xml(name="x")
+@Bean(name="embed")
 public class Embed extends HtmlElement {
 }

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d408947b/juneau-core/src/main/java/org/apache/juneau/html/dto/Fieldset.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Fieldset.java 
b/juneau-core/src/main/java/org/apache/juneau/html/dto/Fieldset.java
index 14fbd30..ee1d66e 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Fieldset.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Fieldset.java
@@ -2,7 +2,7 @@
 // * 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                
                                              * 
+// * with the License.  You may obtain a copy of the License at                
                                              *
 // *                                                                           
                                              *
 // *  http://www.apache.org/licenses/LICENSE-2.0                               
                                              *
 // *                                                                           
                                              *
@@ -12,14 +12,14 @@
 // 
***************************************************************************************************************************
 package org.apache.juneau.html.dto;
 
-import org.apache.juneau.xml.annotation.*;
+import org.apache.juneau.annotation.*;
 
 /**
- * TODO
+ * DTO for an HTML <a 
href='https://www.w3.org/TR/html5/forms.html#the-fieldset-element'>&lt;fieldset&gt;</a>
 element.
  * <p>
  *
  * @author James Bognar ([email protected])
  */
-@Xml(name="x")
+@Bean(name="fieldset")
 public class Fieldset extends HtmlElement {
 }

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d408947b/juneau-core/src/main/java/org/apache/juneau/html/dto/Figcaption.java
----------------------------------------------------------------------
diff --git 
a/juneau-core/src/main/java/org/apache/juneau/html/dto/Figcaption.java 
b/juneau-core/src/main/java/org/apache/juneau/html/dto/Figcaption.java
index 17496d3..6c182f4 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Figcaption.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Figcaption.java
@@ -2,7 +2,7 @@
 // * 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                
                                              * 
+// * with the License.  You may obtain a copy of the License at                
                                              *
 // *                                                                           
                                              *
 // *  http://www.apache.org/licenses/LICENSE-2.0                               
                                              *
 // *                                                                           
                                              *
@@ -12,14 +12,14 @@
 // 
***************************************************************************************************************************
 package org.apache.juneau.html.dto;
 
-import org.apache.juneau.xml.annotation.*;
+import org.apache.juneau.annotation.*;
 
 /**
- * TODO
+ * DTO for an HTML <a 
href='https://www.w3.org/TR/html5/grouping-content.html#the-figcaption-element'>&lt;figcaption&gt;</a>
 element.
  * <p>
  *
  * @author James Bognar ([email protected])
  */
-@Xml(name="x")
+@Bean(name="figcaption")
 public class Figcaption extends HtmlElement {
 }

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d408947b/juneau-core/src/main/java/org/apache/juneau/html/dto/Figure.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Figure.java 
b/juneau-core/src/main/java/org/apache/juneau/html/dto/Figure.java
index 138b7fa..3258a1b 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Figure.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Figure.java
@@ -2,7 +2,7 @@
 // * 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                
                                              * 
+// * with the License.  You may obtain a copy of the License at                
                                              *
 // *                                                                           
                                              *
 // *  http://www.apache.org/licenses/LICENSE-2.0                               
                                              *
 // *                                                                           
                                              *
@@ -12,14 +12,14 @@
 // 
***************************************************************************************************************************
 package org.apache.juneau.html.dto;
 
-import org.apache.juneau.xml.annotation.*;
+import org.apache.juneau.annotation.*;
 
 /**
- * TODO
+ * DTO for an HTML <a 
href='https://www.w3.org/TR/html5/grouping-content.html#the-figure-element'>&lt;figure&gt;</a>
 element.
  * <p>
  *
  * @author James Bognar ([email protected])
  */
-@Xml(name="x")
+@Bean(name="figure")
 public class Figure extends HtmlElement {
 }

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d408947b/juneau-core/src/main/java/org/apache/juneau/html/dto/Footer.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Footer.java 
b/juneau-core/src/main/java/org/apache/juneau/html/dto/Footer.java
index 4819a21..4df1c37 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Footer.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Footer.java
@@ -2,7 +2,7 @@
 // * 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                
                                              * 
+// * with the License.  You may obtain a copy of the License at                
                                              *
 // *                                                                           
                                              *
 // *  http://www.apache.org/licenses/LICENSE-2.0                               
                                              *
 // *                                                                           
                                              *
@@ -12,14 +12,14 @@
 // 
***************************************************************************************************************************
 package org.apache.juneau.html.dto;
 
-import org.apache.juneau.xml.annotation.*;
+import org.apache.juneau.annotation.*;
 
 /**
- * TODO
+ * DTO for an HTML <a 
href='https://www.w3.org/TR/html5/sections.html#the-footer-element'>&lt;footer&gt;</a>
 element.
  * <p>
  *
  * @author James Bognar ([email protected])
  */
-@Xml(name="x")
+@Bean(name="footer")
 public class Footer extends HtmlElement {
 }

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d408947b/juneau-core/src/main/java/org/apache/juneau/html/dto/Form.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Form.java 
b/juneau-core/src/main/java/org/apache/juneau/html/dto/Form.java
index 6bcbf9e..5e45754 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Form.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Form.java
@@ -2,7 +2,7 @@
 // * 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                
                                              * 
+// * with the License.  You may obtain a copy of the License at                
                                              *
 // *                                                                           
                                              *
 // *  http://www.apache.org/licenses/LICENSE-2.0                               
                                              *
 // *                                                                           
                                              *
@@ -12,14 +12,14 @@
 // 
***************************************************************************************************************************
 package org.apache.juneau.html.dto;
 
-import org.apache.juneau.xml.annotation.*;
+import org.apache.juneau.annotation.*;
 
 /**
- * TODO
+ * DTO for an HTML <a 
href='https://www.w3.org/TR/html5/forms.html#the-form-element'>&lt;form&gt;</a> 
element.
  * <p>
  *
  * @author James Bognar ([email protected])
  */
-@Xml(name="x")
+@Bean(name="form")
 public class Form extends HtmlElement {
 }


Reply via email to