juneau-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jamesbog...@apache.org
Subject [juneau] branch master updated: Update Javadocs.
Date Fri, 02 Feb 2018 01:40:06 GMT
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 c4fdbf9  Update Javadocs.
c4fdbf9 is described below

commit c4fdbf9bb3dcb95c26977887953fda37cc94e9ab
Author: JamesBognar <jamesbognar@apache.org>
AuthorDate: Thu Feb 1 20:40:03 2018 -0500

    Update Javadocs.
---
 .../main/java/org/apache/juneau/ini/package.html   |   2 +-
 .../java/org/apache/juneau/dto}/package-info.java  |  27 +---
 .../main/java/org/apache/juneau/dto/package.html   |  41 ------
 .../juneau/jena/annotation}/package-info.java      |  27 +---
 .../org/apache/juneau/jena/annotation/package.html |  41 ------
 .../main/java/org/apache/juneau/jena/package.html  |   2 +-
 .../apache/juneau/annotation}/package-info.java    |  27 +---
 .../java/org/apache/juneau/annotation/package.html |  41 ------
 .../main/java/org/apache/juneau/csv/package.html   |   2 +-
 .../org/apache/juneau/doc-files/AddressBook.html   | 114 ----------------
 .../org/apache/juneau/encoders}/package-info.java  |  27 +---
 .../java/org/apache/juneau/encoders/package.html   |  60 --------
 .../juneau/html/annotation}/package-info.java      |  27 +---
 .../org/apache/juneau/html/annotation/package.html |  41 ------
 .../main/java/org/apache/juneau/html/package.html  |   2 +-
 .../java/org/apache/juneau/http}/package-info.java |  27 +---
 .../main/java/org/apache/juneau/http/package.html  |  41 ------
 .../org/apache/juneau/httppart}/package-info.java  |  27 +---
 .../java/org/apache/juneau/httppart/package.html   |  41 ------
 .../org/apache/juneau/internal}/package-info.java  |  27 +---
 .../java/org/apache/juneau/internal/package.html   |  42 ------
 .../main/java/org/apache/juneau/jso/package.html   |   2 +-
 .../juneau/json/annotation}/package-info.java      |  27 +---
 .../org/apache/juneau/json/annotation/package.html |  41 ------
 .../main/java/org/apache/juneau/json/package.html  |   2 +-
 .../java/org/apache/juneau/msgpack/package.html    |   2 +-
 .../main/java/org/apache/juneau}/package-info.java |  27 +---
 .../src/main/java/org/apache/juneau/package.html   |  60 --------
 .../org/apache/juneau/parser}/package-info.java    |  27 +---
 .../java/org/apache/juneau/parser/package.html     | 147 --------------------
 .../java/org/apache/juneau/plaintext/package.html  |   2 +-
 .../apache/juneau/remoteable}/package-info.java    |  27 +---
 .../java/org/apache/juneau/remoteable/package.html |  72 ----------
 .../apache/juneau/serializer}/package-info.java    |  27 +---
 .../java/org/apache/juneau/serializer/package.html | 152 ---------------------
 .../main/java/org/apache/juneau/soap/package.html  |   2 +-
 .../apache/juneau/transform/doc-files/classes.png  | Bin 15527 -> 0 bytes
 .../org/apache/juneau/transform}/package-info.java |  27 +---
 .../java/org/apache/juneau/transform/package.html  |  60 --------
 .../apache/juneau/transforms}/package-info.java    |  27 +---
 .../java/org/apache/juneau/transforms/package.html |  67 ---------
 .../main/java/org/apache/juneau/uon/package.html   |   2 +-
 .../urlencoding/annotation}/package-info.java      |  27 +---
 .../juneau/urlencoding/annotation/package.html     |  41 ------
 .../org/apache/juneau/urlencoding/package.html     |   2 +-
 .../org/apache/juneau/utils}/package-info.java     |  27 +---
 .../main/java/org/apache/juneau/utils/package.html |  60 --------
 .../juneau/xml/annotation}/package-info.java       |  27 +---
 .../org/apache/juneau/xml/annotation/package.html  |  41 ------
 .../main/java/org/apache/juneau/xml/package.html   |   2 +-
 .../yaml/proto/annotation}/package-info.java       |  27 +---
 .../juneau/yaml/proto/annotation/package.html      |  41 ------
 .../java/org/apache/juneau/yaml/proto/package.html |   2 +-
 .../org/apache/juneau/svl/vars}/package-info.java  |  27 +---
 .../java/org/apache/juneau/svl/vars/package.html   |  41 ------
 .../juneau/examples/addressbook/package-info.java  |   4 +
 .../juneau/examples/addressbook/package.html       |  42 ------
 .../juneau/microservice/console}/package-info.java |  27 +---
 .../juneau/microservice/console/package.html       |  41 ------
 .../org/apache/juneau/microservice/package.html    |   2 +-
 .../microservice/resources}/package-info.java      |  27 +---
 .../juneau/microservice/sample}/package-info.java  |  27 +---
 .../org/apache/juneau/rest/client/package.html     |   2 +-
 .../java/org/apache/juneau/rest/jaxrs/package.html |   2 +-
 .../juneau/rest/annotation/package-info.java       |  49 +++----
 .../org/apache/juneau/rest/annotation/package.html |  41 ------
 .../package.html => converters/package-info.java}  |  52 +++----
 .../org/apache/juneau/rest/converters/package.html |  41 ------
 .../apache/juneau/rest/doc-files/AddressBook.png   | Bin 44553 -> 0 bytes
 .../juneau/rest/doc-files/AddressBookJson.png      | Bin 30639 -> 0 bytes
 .../juneau/rest/doc-files/AddressBookOptions.png   | Bin 224346 -> 0 bytes
 .../rest/doc-files/AddressBook_juneaustyle.png     | Bin 52768 -> 0 bytes
 .../juneau/rest/doc-files/HelloWorldResource1.png  | Bin 14206 -> 0 bytes
 .../juneau/rest/doc-files/HelloWorldResource2.png  | Bin 30721 -> 0 bytes
 .../juneau/rest/doc-files/HelloWorldResource3.png  | Bin 11040 -> 0 bytes
 .../juneau/rest/doc-files/HelloWorldResource4.png  | Bin 16188 -> 0 bytes
 .../rest/doc-files/HelloWorldResourceOptions.png   | Bin 172104 -> 0 bytes
 .../doc-files/HelloWorldResourceOptionsJson.png    | Bin 167174 -> 0 bytes
 .../org/apache/juneau/rest/doc-files/Options2.png  | Bin 9809 -> 0 bytes
 .../apache/juneau/rest/doc-files/OptionsPage.png   | Bin 56895 -> 0 bytes
 .../rest/doc-files/Samples_RootResources.png       | Bin 62372 -> 0 bytes
 .../juneau/rest/doc-files/UrlEncodedForm.png       | Bin 21379 -> 0 bytes
 .../package.html => labels/package-info.java}      |  57 +++-----
 .../org/apache/juneau/rest/labels/package.html     |  41 ------
 .../apache/juneau/rest/matchers/package-info.java  |  57 +++-----
 .../java/org/apache/juneau/rest/package-info.java  |  49 +++----
 .../main/java/org/apache/juneau/rest/package.html  |  63 ---------
 .../apache/juneau/rest/response/package-info.java  |  49 +++----
 .../org/apache/juneau/rest/response/package.html   |  41 ------
 .../org/apache/juneau/rest/vars/package-info.java  |  49 +++----
 .../java/org/apache/juneau/rest/vars/package.html  |  41 ------
 .../apache/juneau/rest/widget/package-info.java    |  49 +++----
 92 files changed, 279 insertions(+), 2425 deletions(-)

diff --git a/juneau-core/juneau-config/src/main/java/org/apache/juneau/ini/package.html b/juneau-core/juneau-config/src/main/java/org/apache/juneau/ini/package.html
index fab7c27..678ae14 100644
--- a/juneau-core/juneau-config/src/main/java/org/apache/juneau/ini/package.html
+++ b/juneau-core/juneau-config/src/main/java/org/apache/juneau/ini/package.html
@@ -36,7 +36,7 @@
 	</script>
 </head>
 <body>
-<p>INI file support</p>
+<p>INI File Support</p>
 
 <script>
 	function toggle(x) {
diff --git a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/addressbook/package-info.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/package-info.java
similarity index 64%
copy from juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/addressbook/package-info.java
copy to juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/package-info.java
index 5d597ca..b187e5b 100755
--- a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/addressbook/package-info.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/package-info.java
@@ -10,26 +10,9 @@
 // * "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.                                              *
 // ***************************************************************************************************************************
-// XML namespaces used in this package
-@XmlSchema(
-	prefix="ab",
-	xmlNs={
-		@XmlNs(prefix="ab", namespaceURI="http://www.apache.org/addressBook/"),
-		@XmlNs(prefix="per", namespaceURI="http://www.apache.org/person/"),
-		@XmlNs(prefix="addr", namespaceURI="http://www.apache.org/address/"),
-		@XmlNs(prefix="mail", namespaceURI="http://www.apache.org/mail/")
-	}
-)
-@RdfSchema(
-	prefix="ab",
-	rdfNs={
-		@RdfNs(prefix="ab", namespaceURI="http://www.apache.org/addressBook/"),
-		@RdfNs(prefix="per", namespaceURI="http://www.apache.org/person/"),
-		@RdfNs(prefix="addr", namespaceURI="http://www.apache.org/address/"),
-		@RdfNs(prefix="mail", namespaceURI="http://www.apache.org/mail/")
-	}
-)
-package org.apache.juneau.examples.addressbook;
-import org.apache.juneau.jena.annotation.*;
-import org.apache.juneau.xml.annotation.*;
+
+/**
+ * Data Transfer Objects
+ */
+package org.apache.juneau.dto;
 
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/package.html b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/package.html
deleted file mode 100644
index 4574810..0000000
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/package.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE HTML>
-<!--
-/***************************************************************************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *  
- *  http://www.apache.org/licenses/LICENSE-2.0
- *  
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations under the License.
- *
- ***************************************************************************************************************************/
- -->
-<html>
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-	<style type="text/css">
-		/* For viewing in Page Designer */
-		@IMPORT url("../../../../../../javadoc.css");
-
-		/* For viewing in REST interface */
-		@IMPORT url("../htdocs/javadoc.css");
-		body { 
-			margin: 20px; 
-		}	
-	</style>
-	<script>
-		/* Replace all @code and @link tags. */	
-		window.onload = function() {
-			document.body.innerHTML = document.body.innerHTML.replace(/\{\@code ([^\}]+)\}/g, '<code>$1</code>');
-			document.body.innerHTML = document.body.innerHTML.replace(/\{\@link (([^\}]+)\.)?([^\.\}]+)\}/g, '<code>$3</code>');
-		}
-	</script>
-</head>
-<body>
-<p>Data transfer objects</p>
-</body>
-</html>
\ No newline at end of file
diff --git a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/addressbook/package-info.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/annotation/package-info.java
similarity index 64%
copy from juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/addressbook/package-info.java
copy to juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/annotation/package-info.java
index 5d597ca..c7c10c9 100755
--- a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/addressbook/package-info.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/annotation/package-info.java
@@ -10,26 +10,9 @@
 // * "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.                                              *
 // ***************************************************************************************************************************
-// XML namespaces used in this package
-@XmlSchema(
-	prefix="ab",
-	xmlNs={
-		@XmlNs(prefix="ab", namespaceURI="http://www.apache.org/addressBook/"),
-		@XmlNs(prefix="per", namespaceURI="http://www.apache.org/person/"),
-		@XmlNs(prefix="addr", namespaceURI="http://www.apache.org/address/"),
-		@XmlNs(prefix="mail", namespaceURI="http://www.apache.org/mail/")
-	}
-)
-@RdfSchema(
-	prefix="ab",
-	rdfNs={
-		@RdfNs(prefix="ab", namespaceURI="http://www.apache.org/addressBook/"),
-		@RdfNs(prefix="per", namespaceURI="http://www.apache.org/person/"),
-		@RdfNs(prefix="addr", namespaceURI="http://www.apache.org/address/"),
-		@RdfNs(prefix="mail", namespaceURI="http://www.apache.org/mail/")
-	}
-)
-package org.apache.juneau.examples.addressbook;
-import org.apache.juneau.jena.annotation.*;
-import org.apache.juneau.xml.annotation.*;
+
+/**
+ * RDF Marshalling Annotations
+ */
+package org.apache.juneau.jena.annotation;
 
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/annotation/package.html b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/annotation/package.html
deleted file mode 100644
index c72c12e..0000000
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/annotation/package.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE HTML>
-<!--
-/***************************************************************************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *  
- *  http://www.apache.org/licenses/LICENSE-2.0
- *  
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations under the License.
- *
- ***************************************************************************************************************************/
- -->
-<html>
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-	<style type="text/css">
-		/* For viewing in Page Designer */
-		@IMPORT url("../../../../../../../javadoc.css");
-
-		/* For viewing in REST interface */
-		@IMPORT url("../htdocs/javadoc.css");
-		body { 
-			margin: 20px; 
-		}	
-	</style>
-	<script>
-		/* Replace all @code and @link tags. */	
-		window.onload = function() {
-			document.body.innerHTML = document.body.innerHTML.replace(/\{\@code ([^\}]+)\}/g, '<code>$1</code>');
-			document.body.innerHTML = document.body.innerHTML.replace(/\{\@link (([^\}]+)\.)?([^\.\}]+)\}/g, '<code>$3</code>');
-		}
-	</script>
-</head>
-<body>
-<p>RDF annotations</p>
-</body>
-</html>
\ No newline at end of file
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/package.html b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/package.html
index 2c0718e..e8f7ea6 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/package.html
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/package.html
@@ -36,7 +36,7 @@
 	</script>
 </head>
 <body>
-<p>Jena-based RDF serialization and parsing support</p>
+<p>RDF Marshalling Support</p>
 <script>
 	function toggle(x) {
 		var div = x.nextSibling;
diff --git a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/addressbook/package-info.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/package-info.java
similarity index 64%
copy from juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/addressbook/package-info.java
copy to juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/package-info.java
index 5d597ca..d0f77b4 100755
--- a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/addressbook/package-info.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/package-info.java
@@ -10,26 +10,9 @@
 // * "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.                                              *
 // ***************************************************************************************************************************
-// XML namespaces used in this package
-@XmlSchema(
-	prefix="ab",
-	xmlNs={
-		@XmlNs(prefix="ab", namespaceURI="http://www.apache.org/addressBook/"),
-		@XmlNs(prefix="per", namespaceURI="http://www.apache.org/person/"),
-		@XmlNs(prefix="addr", namespaceURI="http://www.apache.org/address/"),
-		@XmlNs(prefix="mail", namespaceURI="http://www.apache.org/mail/")
-	}
-)
-@RdfSchema(
-	prefix="ab",
-	rdfNs={
-		@RdfNs(prefix="ab", namespaceURI="http://www.apache.org/addressBook/"),
-		@RdfNs(prefix="per", namespaceURI="http://www.apache.org/person/"),
-		@RdfNs(prefix="addr", namespaceURI="http://www.apache.org/address/"),
-		@RdfNs(prefix="mail", namespaceURI="http://www.apache.org/mail/")
-	}
-)
-package org.apache.juneau.examples.addressbook;
-import org.apache.juneau.jena.annotation.*;
-import org.apache.juneau.xml.annotation.*;
+
+/**
+ * Bean and POJO Annotations
+ */
+package org.apache.juneau.annotation;
 
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/package.html b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/package.html
deleted file mode 100644
index 5e0089b..0000000
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/package.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE HTML>
-<!--
-/***************************************************************************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *  
- *  http://www.apache.org/licenses/LICENSE-2.0
- *  
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations under the License.
- *
- ***************************************************************************************************************************/
- -->
-<html>
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-	<style type="text/css">
-		/* For viewing in Page Designer */
-		@IMPORT url("../../../../../../javadoc.css");
-
-		/* For viewing in REST interface */
-		@IMPORT url("../htdocs/javadoc.css");
-		body { 
-			margin: 20px; 
-		}	
-	</style>
-	<script>
-		/* Replace all @code and @link tags. */	
-		window.onload = function() {
-			document.body.innerHTML = document.body.innerHTML.replace(/\{\@code ([^\}]+)\}/g, '<code>$1</code>');
-			document.body.innerHTML = document.body.innerHTML.replace(/\{\@link (([^\}]+)\.)?([^\.\}]+)\}/g, '<code>$3</code>');
-		}
-	</script>
-</head>
-<body>
-<p>General bean annotations</p>
-</body>
-</html>
\ No newline at end of file
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/package.html b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/package.html
index 249baca..dbf972c 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/package.html
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/package.html
@@ -36,7 +36,7 @@
 	</script>
 </head>
 <body>
-<p>CSV serialization and parsing support</p>
+<p>CSV Marshalling Support</p>
 
 <script>
 	function toggle(x) {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/doc-files/AddressBook.html b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/doc-files/AddressBook.html
deleted file mode 100644
index b892477..0000000
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/doc-files/AddressBook.html
+++ /dev/null
@@ -1,114 +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">@IMPORT url("../../../../../../javadoc.css");</style>
-</head>
-<body style='margin:0 20'>
-	<p></p>
-	<!-- ======================================================================================================== -->
-	<a id="AddressBookSampleSource"></a>
-	<h2 class='topic'>AddressBook sample source</h2>
-	<p>
-		Sample code use in various examples throughout the Javadocs.  Represents a simple POJO model consisting
-		of a collection (<code>LinkedList</code>), beans (<code>Address</code>, <code>Person</code>), and a type 4a transformed type (<code>Calendar</code>).
-	</p>
-	<p>
-		Public fields are used for bean properties in-leu of getters and setters to reduce the size of the example.  
-		Bean properties defined using getters and setters would work identically.
-	</p>
-	<a id="AddressBook"></a>
-	<h6 class='figure'>AddressBook.java</h6>
-	<p class='bcode'>
-	<jc>// A collection of people</jc>
-	<jk>public class</jk> AddressBook <jk>extends</jk> LinkedList&lt;Person&gt; {
-		
-		<jc>// Extra method for adding a person to this address book.
-		// Used in PojoIntrospector usage examples.</jc>
-		<jk>public void</jk> addPerson(String name, <jk>String</jk> birthDate, List&lt;Address&gt; addresses) {
-			add(<jk>new</jk> Person(name, birthdate, addresses));
-		}  
-	}
-	</p>
-	<a id="Address"></a>
-	<h6 class='figure'>Address.java</h6>
-	<p class='bcode'>
-	<jk>public class</jk> Address {
-
-		<jc>// Bean properties</jc>
-		<jk>public</jk> String <jf>street</jf>, <jf>city</jf>, <jf>state</jf>;
-		<jk>public int</jk> <jf>zip</jf>;
-		<jk>public boolean</jk> <jf>isCurrent</jf>;
-		
-		<jc>// Bean constructor</jc>
-		<jk>public</jk> Address() {}
-		
-		<jc>// Other constructor</jc>
-		<jk>public</jk> Address(String street, String city, String state, <jk>int</jk> zip, <jk>boolean</jk> isCurrent) {
-			<jk>this</jk>.<jf>street</jf> = street;
-			<jk>this</jk>.<jf>city</jf> = city;
-			<jk>this</jk>.<jf>state</jf> = state;
-			<jk>this</jk>.<jf>zip</jf> = zip;
-			<jk>this</jk>.<jf>isCurrent</jf> = isCurrent;
-		}
-	}
-	</p>
-	<a id="Person"></a>
-	<h6 class='figure'>Person.java</h6>
-	<p class='bcode'>
-	<jk>public class</jk> Person {
-
-		<jc>// Bean properties</jc>
-		<jk>public</jk> String <jf>name</jf>;
-		<jk>public int</jk> <jf>age</jf>;
-		<jk>public</jk> Calendar <jf>birthDate</jf>;
-
-		<jk>public</jk> LinkedList&lt;Address&gt; <jf>addresses</jf> = <jk>new</jk> LinkedList&lt;Address&gt;();
-	
-		<jc>// Bean constructor</jc>
-		<jk>public</jk> Person() {}
-	
-		<jc>// Other constructor</jc>
-		<jk>public</jk> Person(String name, String birthDate, Address...addresses) {
-			<jk>this</jk>.<jf>name</jf> = name;
-			<jk>this</jk>.<jf>birthDate</jf> = <jsm>getBirthDate</jsm>(birthDate);
-			<jk>this</jk>.<jf>age</jf> = <jsm>calcAge</jsm>(birthDate);
-			<jk>this</jk>.<jf>addresses</jf>.addAll(Arrays.<jsm>asList</jsm>(addresses));
-		}
-	
-		<jc>// Other method</jc>
-		<jc>// Calculates a persons age based on the birthdate</jc>
-		<jk>public static int</jk> calcAge(String birthDate) {
-			<jk>return new</jk> GregorianCalendar().get(Calendar.<jsf>YEAR</jsf>) - getBirthDate(birthDate).get(Calendar.<jsf>YEAR</jsf>);
-		}
-	
-		<jc>// Utility method</jc>
-		<jc>// Converts a birthdate string to a Calendar</jc>
-		<jk>private static</jk> Calendar getBirthDate(String birthDate) {
-			<jk>try</jk> {
-				Calendar c = <jk>new</jk> GregorianCalendar();
-				c.setTime(DateFormat.<jsm>getDateInstance</jsm>(DateFormat.<jsf>MEDIUM</jsf>).parse(birthDate));
-				<jk>return</jk> c;
-			} <jk>catch</jk> (ParseException e) {
-				<jk>throw new</jk> RuntimeException(e);
-			}
-		}
-	}
-	</p>
-
-</body>
\ No newline at end of file
diff --git a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/addressbook/package-info.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/encoders/package-info.java
similarity index 64%
copy from juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/addressbook/package-info.java
copy to juneau-core/juneau-marshall/src/main/java/org/apache/juneau/encoders/package-info.java
index 5d597ca..e7e066a 100755
--- a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/addressbook/package-info.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/encoders/package-info.java
@@ -10,26 +10,9 @@
 // * "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.                                              *
 // ***************************************************************************************************************************
-// XML namespaces used in this package
-@XmlSchema(
-	prefix="ab",
-	xmlNs={
-		@XmlNs(prefix="ab", namespaceURI="http://www.apache.org/addressBook/"),
-		@XmlNs(prefix="per", namespaceURI="http://www.apache.org/person/"),
-		@XmlNs(prefix="addr", namespaceURI="http://www.apache.org/address/"),
-		@XmlNs(prefix="mail", namespaceURI="http://www.apache.org/mail/")
-	}
-)
-@RdfSchema(
-	prefix="ab",
-	rdfNs={
-		@RdfNs(prefix="ab", namespaceURI="http://www.apache.org/addressBook/"),
-		@RdfNs(prefix="per", namespaceURI="http://www.apache.org/person/"),
-		@RdfNs(prefix="addr", namespaceURI="http://www.apache.org/address/"),
-		@RdfNs(prefix="mail", namespaceURI="http://www.apache.org/mail/")
-	}
-)
-package org.apache.juneau.examples.addressbook;
-import org.apache.juneau.jena.annotation.*;
-import org.apache.juneau.xml.annotation.*;
+
+/**
+ * Encoders
+ */
+package org.apache.juneau.encoders;
 
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/encoders/package.html b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/encoders/package.html
deleted file mode 100644
index 41c1ab1..0000000
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/encoders/package.html
+++ /dev/null
@@ -1,60 +0,0 @@
-<!DOCTYPE HTML>
-<!--
-/***************************************************************************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *  
- *  http://www.apache.org/licenses/LICENSE-2.0
- *  
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations under the License.
- *
- ***************************************************************************************************************************/
- -->
-<html>
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-	<style type="text/css">
-		/* For viewing in Page Designer */
-		@IMPORT url("../../../../../../javadoc.css");
-
-		/* For viewing in REST interface */
-		@IMPORT url("../htdocs/javadoc.css");
-		body { 
-			margin: 20px; 
-		}	
-	</style>
-	<script>
-		/* Replace all @code and @link tags. */	
-		window.onload = function() {
-			document.body.innerHTML = document.body.innerHTML.replace(/\{\@code ([^\}]+)\}/g, '<code>$1</code>');
-			document.body.innerHTML = document.body.innerHTML.replace(/\{\@link (([^\}]+)\.)?([^\.\}]+)\}/g, '<code>$3</code>');
-		}
-	</script>
-</head>
-<body>
-<p>Encoder API</p>
-
-<script>
-	function toggle(x) {
-		var div = x.nextSibling;
-		while (div != null && div.nodeType != 1)
-			div = div.nextSibling;
-		if (div != null) {
-			var d = div.style.display;
-			if (d == 'block' || d == '') {
-				div.style.display = 'none';
-				x.className += " closed";
-			} else {
-				div.style.display = 'block';
-				x.className = x.className.replace(/(?:^|\s)closed(?!\S)/g , '' );
-			}
-		}
-	}
-</script>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/addressbook/package-info.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/package-info.java
similarity index 64%
copy from juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/addressbook/package-info.java
copy to juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/package-info.java
index 5d597ca..80ac9de 100755
--- a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/addressbook/package-info.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/package-info.java
@@ -10,26 +10,9 @@
 // * "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.                                              *
 // ***************************************************************************************************************************
-// XML namespaces used in this package
-@XmlSchema(
-	prefix="ab",
-	xmlNs={
-		@XmlNs(prefix="ab", namespaceURI="http://www.apache.org/addressBook/"),
-		@XmlNs(prefix="per", namespaceURI="http://www.apache.org/person/"),
-		@XmlNs(prefix="addr", namespaceURI="http://www.apache.org/address/"),
-		@XmlNs(prefix="mail", namespaceURI="http://www.apache.org/mail/")
-	}
-)
-@RdfSchema(
-	prefix="ab",
-	rdfNs={
-		@RdfNs(prefix="ab", namespaceURI="http://www.apache.org/addressBook/"),
-		@RdfNs(prefix="per", namespaceURI="http://www.apache.org/person/"),
-		@RdfNs(prefix="addr", namespaceURI="http://www.apache.org/address/"),
-		@RdfNs(prefix="mail", namespaceURI="http://www.apache.org/mail/")
-	}
-)
-package org.apache.juneau.examples.addressbook;
-import org.apache.juneau.jena.annotation.*;
-import org.apache.juneau.xml.annotation.*;
+
+/**
+ * HTML Marshalling Annotations
+ */
+package org.apache.juneau.html.annotation;
 
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/package.html b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/package.html
deleted file mode 100644
index a71e2b3..0000000
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/package.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE HTML>
-<!--
-/***************************************************************************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *  
- *  http://www.apache.org/licenses/LICENSE-2.0
- *  
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations under the License.
- *
- ***************************************************************************************************************************/
- -->
-<html>
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-	<style type="text/css">
-		/* For viewing in Page Designer */
-		@IMPORT url("../../../../../../../javadoc.css");
-
-		/* For viewing in REST interface */
-		@IMPORT url("../htdocs/javadoc.css");
-		body { 
-			margin: 20px; 
-		}	
-	</style>
-	<script>
-		/* Replace all @code and @link tags. */	
-		window.onload = function() {
-			document.body.innerHTML = document.body.innerHTML.replace(/\{\@code ([^\}]+)\}/g, '<code>$1</code>');
-			document.body.innerHTML = document.body.innerHTML.replace(/\{\@link (([^\}]+)\.)?([^\.\}]+)\}/g, '<code>$3</code>');
-		}
-	</script>
-</head>
-<body>
-<p>HTML annotations</p>
-</body>
-</html>
\ No newline at end of file
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/package.html b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/package.html
index 7d36182..e365a06 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/package.html
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/package.html
@@ -36,7 +36,7 @@
 	</script>
 </head>
 <body>
-<p>HTML serialization and parsing support</p>
+<p>HTML Marshalling Support</p>
 <script>
 	function toggle(x) {
 		var div = x.nextSibling;
diff --git a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/addressbook/package-info.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/package-info.java
similarity index 64%
copy from juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/addressbook/package-info.java
copy to juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/package-info.java
index 5d597ca..6732e2a 100755
--- a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/addressbook/package-info.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/package-info.java
@@ -10,26 +10,9 @@
 // * "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.                                              *
 // ***************************************************************************************************************************
-// XML namespaces used in this package
-@XmlSchema(
-	prefix="ab",
-	xmlNs={
-		@XmlNs(prefix="ab", namespaceURI="http://www.apache.org/addressBook/"),
-		@XmlNs(prefix="per", namespaceURI="http://www.apache.org/person/"),
-		@XmlNs(prefix="addr", namespaceURI="http://www.apache.org/address/"),
-		@XmlNs(prefix="mail", namespaceURI="http://www.apache.org/mail/")
-	}
-)
-@RdfSchema(
-	prefix="ab",
-	rdfNs={
-		@RdfNs(prefix="ab", namespaceURI="http://www.apache.org/addressBook/"),
-		@RdfNs(prefix="per", namespaceURI="http://www.apache.org/person/"),
-		@RdfNs(prefix="addr", namespaceURI="http://www.apache.org/address/"),
-		@RdfNs(prefix="mail", namespaceURI="http://www.apache.org/mail/")
-	}
-)
-package org.apache.juneau.examples.addressbook;
-import org.apache.juneau.jena.annotation.*;
-import org.apache.juneau.xml.annotation.*;
+
+/**
+ * RFC2616 HTTP Headers
+ */
+package org.apache.juneau.http;
 
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/package.html b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/package.html
deleted file mode 100644
index 23f63da..0000000
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/package.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE HTML>
-<!--
-/***************************************************************************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *  
- *  http://www.apache.org/licenses/LICENSE-2.0
- *  
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations under the License.
- *
- ***************************************************************************************************************************/
- -->
-<html>
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-	<style type="text/css">
-		/* For viewing in Page Designer */
-		@IMPORT url("../../../../../../javadoc.css");
-
-		/* For viewing in REST interface */
-		@IMPORT url("../htdocs/javadoc.css");
-		body { 
-			margin: 20px; 
-		}	
-	</style>
-	<script>
-		/* Replace all @code and @link tags. */	
-		window.onload = function() {
-			document.body.innerHTML = document.body.innerHTML.replace(/\{\@code ([^\}]+)\}/g, '<code>$1</code>');
-			document.body.innerHTML = document.body.innerHTML.replace(/\{\@link (([^\}]+)\.)?([^\.\}]+)\}/g, '<code>$3</code>');
-		}
-	</script>
-</head>
-<body>
-<p>RFC2616 HTTP Headers</p>
-</body>
-</html>
\ No newline at end of file
diff --git a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/addressbook/package-info.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/package-info.java
similarity index 64%
copy from juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/addressbook/package-info.java
copy to juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/package-info.java
index 5d597ca..8788fd4 100755
--- a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/addressbook/package-info.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/package-info.java
@@ -10,26 +10,9 @@
 // * "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.                                              *
 // ***************************************************************************************************************************
-// XML namespaces used in this package
-@XmlSchema(
-	prefix="ab",
-	xmlNs={
-		@XmlNs(prefix="ab", namespaceURI="http://www.apache.org/addressBook/"),
-		@XmlNs(prefix="per", namespaceURI="http://www.apache.org/person/"),
-		@XmlNs(prefix="addr", namespaceURI="http://www.apache.org/address/"),
-		@XmlNs(prefix="mail", namespaceURI="http://www.apache.org/mail/")
-	}
-)
-@RdfSchema(
-	prefix="ab",
-	rdfNs={
-		@RdfNs(prefix="ab", namespaceURI="http://www.apache.org/addressBook/"),
-		@RdfNs(prefix="per", namespaceURI="http://www.apache.org/person/"),
-		@RdfNs(prefix="addr", namespaceURI="http://www.apache.org/address/"),
-		@RdfNs(prefix="mail", namespaceURI="http://www.apache.org/mail/")
-	}
-)
-package org.apache.juneau.examples.addressbook;
-import org.apache.juneau.jena.annotation.*;
-import org.apache.juneau.xml.annotation.*;
+
+/**
+ * HTTP Part Marshalling Support
+ */
+package org.apache.juneau.httppart;
 
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/package.html b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/package.html
deleted file mode 100644
index 85ada84..0000000
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/package.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE HTML>
-<!--
-/***************************************************************************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *  
- *  http://www.apache.org/licenses/LICENSE-2.0
- *  
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations under the License.
- *
- ***************************************************************************************************************************/
- -->
-<html>
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-	<style type="text/css">
-		/* For viewing in Page Designer */
-		@IMPORT url("../../../../../../javadoc.css");
-
-		/* For viewing in REST interface */
-		@IMPORT url("../htdocs/javadoc.css");
-		body { 
-			margin: 20px; 
-		}	
-	</style>
-	<script>
-		/* Replace all @code and @link tags. */	
-		window.onload = function() {
-			document.body.innerHTML = document.body.innerHTML.replace(/\{\@code ([^\}]+)\}/g, '<code>$1</code>');
-			document.body.innerHTML = document.body.innerHTML.replace(/\{\@link (([^\}]+)\.)?([^\.\}]+)\}/g, '<code>$3</code>');
-		}
-	</script>
-</head>
-<body>
-<p>Microservice console support</p>
-</body>
-</html>
\ No newline at end of file
diff --git a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/addressbook/package-info.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/package-info.java
similarity index 64%
copy from juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/addressbook/package-info.java
copy to juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/package-info.java
index 5d597ca..44a0823 100755
--- a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/addressbook/package-info.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/package-info.java
@@ -10,26 +10,9 @@
 // * "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.                                              *
 // ***************************************************************************************************************************
-// XML namespaces used in this package
-@XmlSchema(
-	prefix="ab",
-	xmlNs={
-		@XmlNs(prefix="ab", namespaceURI="http://www.apache.org/addressBook/"),
-		@XmlNs(prefix="per", namespaceURI="http://www.apache.org/person/"),
-		@XmlNs(prefix="addr", namespaceURI="http://www.apache.org/address/"),
-		@XmlNs(prefix="mail", namespaceURI="http://www.apache.org/mail/")
-	}
-)
-@RdfSchema(
-	prefix="ab",
-	rdfNs={
-		@RdfNs(prefix="ab", namespaceURI="http://www.apache.org/addressBook/"),
-		@RdfNs(prefix="per", namespaceURI="http://www.apache.org/person/"),
-		@RdfNs(prefix="addr", namespaceURI="http://www.apache.org/address/"),
-		@RdfNs(prefix="mail", namespaceURI="http://www.apache.org/mail/")
-	}
-)
-package org.apache.juneau.examples.addressbook;
-import org.apache.juneau.jena.annotation.*;
-import org.apache.juneau.xml.annotation.*;
+
+/**
+ * Internal Utilities
+ */
+package org.apache.juneau.internal;
 
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/package.html b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/package.html
deleted file mode 100644
index 181414a..0000000
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/package.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<!DOCTYPE HTML>
-<!--
-/***************************************************************************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *  
- *  http://www.apache.org/licenses/LICENSE-2.0
- *  
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations under the License.
- *
- ***************************************************************************************************************************/
- -->
-<html>
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-	<style type="text/css">
-		/* For viewing in Page Designer */
-		@IMPORT url("../../../../../../javadoc.css");
-
-		/* For viewing in REST interface */
-		@IMPORT url("../htdocs/javadoc.css");
-		body { 
-			margin: 20px; 
-		}	
-	</style>
-	<script>
-		/* Replace all @code and @link tags. */	
-		window.onload = function() {
-			document.body.innerHTML = document.body.innerHTML.replace(/\{\@code ([^\}]+)\}/g, '<code>$1</code>');
-			document.body.innerHTML = document.body.innerHTML.replace(/\{\@link (([^\}]+)\.)?([^\.\}]+)\}/g, '<code>$3</code>');
-		}
-	</script>
-</head>
-<body>
-<p>Internal classes not meant for external use</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jso/package.html b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jso/package.html
index 176f869..576ec72 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jso/package.html
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jso/package.html
@@ -36,6 +36,6 @@
 	</script>
 </head>
 <body>
-<p>Java-serialized-object support</p>
+<p>Java-Serialized-Object Marshalling Support</p>
 </body>
 </html>
\ No newline at end of file
diff --git a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/addressbook/package-info.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/annotation/package-info.java
similarity index 64%
copy from juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/addressbook/package-info.java
copy to juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/annotation/package-info.java
index 5d597ca..f6da843 100755
--- a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/addressbook/package-info.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/annotation/package-info.java
@@ -10,26 +10,9 @@
 // * "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.                                              *
 // ***************************************************************************************************************************
-// XML namespaces used in this package
-@XmlSchema(
-	prefix="ab",
-	xmlNs={
-		@XmlNs(prefix="ab", namespaceURI="http://www.apache.org/addressBook/"),
-		@XmlNs(prefix="per", namespaceURI="http://www.apache.org/person/"),
-		@XmlNs(prefix="addr", namespaceURI="http://www.apache.org/address/"),
-		@XmlNs(prefix="mail", namespaceURI="http://www.apache.org/mail/")
-	}
-)
-@RdfSchema(
-	prefix="ab",
-	rdfNs={
-		@RdfNs(prefix="ab", namespaceURI="http://www.apache.org/addressBook/"),
-		@RdfNs(prefix="per", namespaceURI="http://www.apache.org/person/"),
-		@RdfNs(prefix="addr", namespaceURI="http://www.apache.org/address/"),
-		@RdfNs(prefix="mail", namespaceURI="http://www.apache.org/mail/")
-	}
-)
-package org.apache.juneau.examples.addressbook;
-import org.apache.juneau.jena.annotation.*;
-import org.apache.juneau.xml.annotation.*;
+
+/**
+ * JSON Marshalling Annotations
+ */
+package org.apache.juneau.json.annotation;
 
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/annotation/package.html b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/annotation/package.html
deleted file mode 100644
index df41b35..0000000
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/annotation/package.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE HTML>
-<!--
-/***************************************************************************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *  
- *  http://www.apache.org/licenses/LICENSE-2.0
- *  
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations under the License.
- *
- ***************************************************************************************************************************/
- -->
-<html>
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-	<style type="text/css">
-		/* For viewing in Page Designer */
-		@IMPORT url("../../../../../../../javadoc.css");
-
-		/* For viewing in REST interface */
-		@IMPORT url("../htdocs/javadoc.css");
-		body { 
-			margin: 20px; 
-		}	
-	</style>
-	<script>
-		/* Replace all @code and @link tags. */	
-		window.onload = function() {
-			document.body.innerHTML = document.body.innerHTML.replace(/\{\@code ([^\}]+)\}/g, '<code>$1</code>');
-			document.body.innerHTML = document.body.innerHTML.replace(/\{\@link (([^\}]+)\.)?([^\.\}]+)\}/g, '<code>$3</code>');
-		}
-	</script>
-</head>
-<body>
-<p>JSON annotations</p>
-</body>
-</html>
\ No newline at end of file
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/package.html b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/package.html
index b1abe28..9826e47 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/package.html
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/package.html
@@ -36,7 +36,7 @@
 	</script>
 </head>
 <body>
-<p>JSON serialization and parsing support</p>
+<p>JSON Marshalling Support</p>
 <script>
 	function toggle(x) {
 		var div = x.nextSibling;
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/package.html b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/package.html
index d37c0ac..cdd9531 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/package.html
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/package.html
@@ -36,7 +36,7 @@
 	</script>
 </head>
 <body>
-<p>JSON serialization and parsing support</p>
+<p>MessagePack Marshalling Support</p>
 <script>
 	function toggle(x) {
 		var div = x.nextSibling;
diff --git a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/addressbook/package-info.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/package-info.java
similarity index 64%
copy from juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/addressbook/package-info.java
copy to juneau-core/juneau-marshall/src/main/java/org/apache/juneau/package-info.java
index 5d597ca..21190e6 100755
--- a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/addressbook/package-info.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/package-info.java
@@ -10,26 +10,9 @@
 // * "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.                                              *
 // ***************************************************************************************************************************
-// XML namespaces used in this package
-@XmlSchema(
-	prefix="ab",
-	xmlNs={
-		@XmlNs(prefix="ab", namespaceURI="http://www.apache.org/addressBook/"),
-		@XmlNs(prefix="per", namespaceURI="http://www.apache.org/person/"),
-		@XmlNs(prefix="addr", namespaceURI="http://www.apache.org/address/"),
-		@XmlNs(prefix="mail", namespaceURI="http://www.apache.org/mail/")
-	}
-)
-@RdfSchema(
-	prefix="ab",
-	rdfNs={
-		@RdfNs(prefix="ab", namespaceURI="http://www.apache.org/addressBook/"),
-		@RdfNs(prefix="per", namespaceURI="http://www.apache.org/person/"),
-		@RdfNs(prefix="addr", namespaceURI="http://www.apache.org/address/"),
-		@RdfNs(prefix="mail", namespaceURI="http://www.apache.org/mail/")
-	}
-)
-package org.apache.juneau.examples.addressbook;
-import org.apache.juneau.jena.annotation.*;
-import org.apache.juneau.xml.annotation.*;
+
+/**
+ * Marshalling API
+ */
+package org.apache.juneau;
 
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/package.html b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/package.html
deleted file mode 100644
index 6375f33..0000000
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/package.html
+++ /dev/null
@@ -1,60 +0,0 @@
-<!DOCTYPE HTML>
-<!--
-/***************************************************************************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *  
- *  http://www.apache.org/licenses/LICENSE-2.0
- *  
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations under the License.
- *
- ***************************************************************************************************************************/
- -->
-<html>
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-	<style type="text/css">
-		/* For viewing in Page Designer */
-		@IMPORT url("../../../../../javadoc.css");
-
-		/* For viewing in REST interface */
-		@IMPORT url("../htdocs/javadoc.css");
-		body { 
-			margin: 20px; 
-		}	
-	</style>
-	<script>
-		/* Replace all @code and @link tags. */	
-		window.onload = function() {
-			document.body.innerHTML = document.body.innerHTML.replace(/\{\@code ([^\}]+)\}/g, '<code>$1</code>');
-			document.body.innerHTML = document.body.innerHTML.replace(/\{\@link (([^\}]+)\.)?([^\.\}]+)\}/g, '<code>$3</code>');
-		}
-	</script>
-</head>
-<body>
-<p>Base toolkit for serializers, parsers, and bean contexts</p>
-
-<script>
-	function toggle(x) {
-		var div = x.nextSibling;
-		while (div != null && div.nodeType != 1)
-			div = div.nextSibling;
-		if (div != null) {
-			var d = div.style.display;
-			if (d == 'block' || d == '') {
-				div.style.display = 'none';
-				x.className += " closed";
-			} else {
-				div.style.display = 'block';
-				x.className = x.className.replace(/(?:^|\s)closed(?!\S)/g , '' );
-			}
-		}
-	}
-</script>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/addressbook/package-info.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/package-info.java
similarity index 64%
copy from juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/addressbook/package-info.java
copy to juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/package-info.java
index 5d597ca..00074ec 100755
--- a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/addressbook/package-info.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/package-info.java
@@ -10,26 +10,9 @@
 // * "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.                                              *
 // ***************************************************************************************************************************
-// XML namespaces used in this package
-@XmlSchema(
-	prefix="ab",
-	xmlNs={
-		@XmlNs(prefix="ab", namespaceURI="http://www.apache.org/addressBook/"),
-		@XmlNs(prefix="per", namespaceURI="http://www.apache.org/person/"),
-		@XmlNs(prefix="addr", namespaceURI="http://www.apache.org/address/"),
-		@XmlNs(prefix="mail", namespaceURI="http://www.apache.org/mail/")
-	}
-)
-@RdfSchema(
-	prefix="ab",
-	rdfNs={
-		@RdfNs(prefix="ab", namespaceURI="http://www.apache.org/addressBook/"),
-		@RdfNs(prefix="per", namespaceURI="http://www.apache.org/person/"),
-		@RdfNs(prefix="addr", namespaceURI="http://www.apache.org/address/"),
-		@RdfNs(prefix="mail", namespaceURI="http://www.apache.org/mail/")
-	}
-)
-package org.apache.juneau.examples.addressbook;
-import org.apache.juneau.jena.annotation.*;
-import org.apache.juneau.xml.annotation.*;
+
+/**
+ * Parser API
+ */
+package org.apache.juneau.parser;
 
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/package.html b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/package.html
deleted file mode 100644
index b1f9722..0000000
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/package.html
+++ /dev/null
@@ -1,147 +0,0 @@
-<!DOCTYPE HTML>
-<!--
-/***************************************************************************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *  
- *  http://www.apache.org/licenses/LICENSE-2.0
- *  
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations under the License.
- *
- ***************************************************************************************************************************/
- -->
-<html>
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-	<style type="text/css">
-		/* For viewing in Page Designer */
-		@IMPORT url("../../../../../../javadoc.css");
-
-		/* For viewing in REST interface */
-		@IMPORT url("../htdocs/javadoc.css");
-		body { 
-			margin: 20px; 
-		}	
-	</style>
-	<script>
-		/* Replace all @code and @link tags. */	
-		window.onload = function() {
-			document.body.innerHTML = document.body.innerHTML.replace(/\{\@code ([^\}]+)\}/g, '<code>$1</code>');
-			document.body.innerHTML = document.body.innerHTML.replace(/\{\@link (([^\}]+)\.)?([^\.\}]+)\}/g, '<code>$3</code>');
-		}
-	</script>
-</head>
-<body>
-<p>Parser API</p>
-
-<script>
-	function toggle(x) {
-		var div = x.nextSibling;
-		while (div != null && div.nodeType != 1)
-			div = div.nextSibling;
-		if (div != null) {
-			var d = div.style.display;
-			if (d == 'block' || d == '') {
-				div.style.display = 'none';
-				x.className += " closed";
-			} else {
-				div.style.display = 'block';
-				x.className = x.className.replace(/(?:^|\s)closed(?!\S)/g , '' );
-			}
-		}
-	}
-</script>
-
-<a id='TOC'></a><h5 class='toc'>Table of Contents</h5>
-<ol class='toc'>
-	<li><p><a class='doclink' href='#Parser'>Parser API</a></p>
-	<ol>
-		<li><p><a class='doclink' href='#ParserGroup'>The ParserGroup class</a></p>
-	</ol>
-	<li><p><a class='doclink' href='#DefiningParser'>Defining a new Parser</a></p>
-</ol>
-
-<!-- ======================================================================================================== -->
-<a id="Parser"></a>
-<h2 class='topic' onclick='toggle(this)'>1 - Parser API</h2>
-<div class='topic'>
-	<p>
-		The parser API is designed to be easily extensible by developers. 
-		<br>If you are writing your own parser, you will typically subclass directly from either 
-		{@link org.apache.juneau.parser.ReaderParser} or {@link org.apache.juneau.parser.InputStreamParser}.
-	</p>
-
-	<!-- ======================================================================================================== -->
-	<a id="ParserGroup"></a>
-	<h3 class='topic' onclick='toggle(this)'>1.1 - The ParserGroup class</h3>
-	<div class='topic'>
-		<p>
-			The {@link org.apache.juneau.parser.ParserGroup} class represents a group of parser registered with the 
-			media types they handle.
-		</p>
-		
-		<h6 class='topic'>Features</h6>		
-		<p>
-			The <code>ParserGroup</code> class provides the following features:
-		<ul class='spaced-list'>
-			<li>
-				Finds parsers based on HTTP <code>Content-Type</code> header values.
-			<li>
-				Sets common properties on all parsers in a single method call.
-			<li>
-				Locks all parsers in a single method call.
-			<li>
-				Clones existing groups and all parsers within the group in a single method call.
-		</ul>
-		
-		<p>
-			Refer to {@link org.apache.juneau.parser.ParserGroup} for additional information.
-		</p>
-	</div> 
-</div>
-
-
-<!-- ======================================================================================================== -->
-<a id="DefiningParser"></a>
-<h2 class='topic' onclick='toggle(this)'>2 - Defining a new Parser</h2>
-<div class='topic'>
-	<p>
-		Defining a new parser is quite simple if you subclass directly from {@link org.apache.juneau.parser.ReaderParser} 
-		or {@link org.apache.juneau.parser.InputStreamParser}.  
-		In each case, you simply need to implement a single method .
-	</p>
-	<p>
-		The following example shows a simple parser that converts input streams to images using standard JRE classes.
-	</p>
-	<p class='bcode'>
-	<jd>/** Parser for converting byte streams to images */</jd>
-	<jk>public class</jk> ImageParser <jk>extends</jk> InputStreamParser {
-
-		<jd>/**
-		 * Constructor.
-		 * <ja>@param</ja> propertyStore The property store containing all the settings for this object.
-		 */</jd>
-		<jk>public</jk> ImageParser(PropertyStore propertyStore) {
-			<jk>super</jk>(propertyStore, <js>"image/png"</js>, <js>"image/jpeg"</js>);
-		}
-
-		<ja>@Override</ja> <jc>/* Parser */</jc>
-		<jk>protected</jk> &lt;T&gt; T doParse(ParserSession session, ClassMeta&lt;T&gt; type) <jk>throws</jk> Exception {
-			<jk>return</jk> (T)ImageIO.<jsm>read</jsm>(session.getInputStream());
-		}
-	}
-	</p>
-	<p>
-		Parsers that take advantage of the entire {@link org.apache.juneau.BeanContext} interface to be able to parse 
-		arbitrary beans and POJOs is considerably more complex and outside the scope of this document.  
-		If developing such a parser, the best course of action would be to replicate what occurs in the 
-		{@link org.apache.juneau.json.JsonParser} class.
-	</p>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/package.html b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/package.html
index e53f25a..eaf08c4 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/package.html
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/package.html
@@ -36,6 +36,6 @@
 	</script>
 </head>
 <body>
-<p>Plain-text serialization and parsing support</p>
+<p>Plaintext Marshalling Support</p>
 </body>
 </html>
\ No newline at end of file
diff --git a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/addressbook/package-info.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/remoteable/package-info.java
similarity index 64%
copy from juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/addressbook/package-info.java
copy to juneau-core/juneau-marshall/src/main/java/org/apache/juneau/remoteable/package-info.java
index 5d597ca..0ec1c48 100755
--- a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/addressbook/package-info.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/remoteable/package-info.java
@@ -10,26 +10,9 @@
 // * "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.                                              *
 // ***************************************************************************************************************************
-// XML namespaces used in this package
-@XmlSchema(
-	prefix="ab",
-	xmlNs={
-		@XmlNs(prefix="ab", namespaceURI="http://www.apache.org/addressBook/"),
-		@XmlNs(prefix="per", namespaceURI="http://www.apache.org/person/"),
-		@XmlNs(prefix="addr", namespaceURI="http://www.apache.org/address/"),
-		@XmlNs(prefix="mail", namespaceURI="http://www.apache.org/mail/")
-	}
-)
-@RdfSchema(
-	prefix="ab",
-	rdfNs={
-		@RdfNs(prefix="ab", namespaceURI="http://www.apache.org/addressBook/"),
-		@RdfNs(prefix="per", namespaceURI="http://www.apache.org/person/"),
-		@RdfNs(prefix="addr", namespaceURI="http://www.apache.org/address/"),
-		@RdfNs(prefix="mail", namespaceURI="http://www.apache.org/mail/")
-	}
-)
-package org.apache.juneau.examples.addressbook;
-import org.apache.juneau.jena.annotation.*;
-import org.apache.juneau.xml.annotation.*;
+
+/**
+ * Remoteable API
+ */
+package org.apache.juneau.remoteable;
 
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/remoteable/package.html b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/remoteable/package.html
deleted file mode 100644
index 45bc0e9..0000000
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/remoteable/package.html
+++ /dev/null
@@ -1,72 +0,0 @@
-<!DOCTYPE HTML>
-<!--
-/***************************************************************************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *  
- *  http://www.apache.org/licenses/LICENSE-2.0
- *  
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations under the License.
- *
- ***************************************************************************************************************************/
- -->
-<html>
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-	<style type="text/css">
-		/* For viewing in Page Designer */
-		@IMPORT url("../../../../../../javadoc.css");
-
-		/* For viewing in REST interface */
-		@IMPORT url("../htdocs/javadoc.css");
-		body { 
-			margin: 20px; 
-		}	
-	</style>
-	<script>
-		/* Replace all @code and @link tags. */	
-		window.onload = function() {
-			document.body.innerHTML = document.body.innerHTML.replace(/\{\@code ([^\}]+)\}/g, '<code>$1</code>');
-			document.body.innerHTML = document.body.innerHTML.replace(/\{\@link (([^\}]+)\.)?([^\.\}]+)\}/g, '<code>$3</code>');
-		}
-	</script>
-</head>
-<body>
-<p>Remoteable interface proxies</p>
-<script>
-	function toggle(x) {
-		var div = x.nextSibling;
-		while (div != null && div.nodeType != 1)
-			div = div.nextSibling;
-		if (div != null) {
-			var d = div.style.display;
-			if (d == 'block' || d == '') {
-				div.style.display = 'none';
-				x.className += " closed";
-			} else {
-				div.style.display = 'block';
-				x.className = x.className.replace(/(?:^|\s)closed(?!\S)/g , '' );
-			}
-		}
-	}
-</script>
-
-<a id='TOC'></a><h5 class='toc'>Table of Contents</h5>
-<ol class='toc'>
-	<li><p><a class='doclink' href='#Overview'>Remoteable support overview</a></p> 
-</ol>
-
-<!-- ======================================================================================================== -->
-<a id="Overview"></a>
-<h2 class='topic' onclick='toggle(this)'>1 - Remoteable support overview</h2>
-<div class='topic'>
-	TODO <i>(sorry)</i>
-</div>
-<p align="center"><i><b>*** fín ***</b></i></p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/addressbook/package-info.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/package-info.java
similarity index 64%
copy from juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/addressbook/package-info.java
copy to juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/package-info.java
index 5d597ca..a121c9e 100755
--- a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/addressbook/package-info.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/package-info.java
@@ -10,26 +10,9 @@
 // * "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.                                              *
 // ***************************************************************************************************************************
-// XML namespaces used in this package
-@XmlSchema(
-	prefix="ab",
-	xmlNs={
-		@XmlNs(prefix="ab", namespaceURI="http://www.apache.org/addressBook/"),
-		@XmlNs(prefix="per", namespaceURI="http://www.apache.org/person/"),
-		@XmlNs(prefix="addr", namespaceURI="http://www.apache.org/address/"),
-		@XmlNs(prefix="mail", namespaceURI="http://www.apache.org/mail/")
-	}
-)
-@RdfSchema(
-	prefix="ab",
-	rdfNs={
-		@RdfNs(prefix="ab", namespaceURI="http://www.apache.org/addressBook/"),
-		@RdfNs(prefix="per", namespaceURI="http://www.apache.org/person/"),
-		@RdfNs(prefix="addr", namespaceURI="http://www.apache.org/address/"),
-		@RdfNs(prefix="mail", namespaceURI="http://www.apache.org/mail/")
-	}
-)
-package org.apache.juneau.examples.addressbook;
-import org.apache.juneau.jena.annotation.*;
-import org.apache.juneau.xml.annotation.*;
+
+/**
+ * Serializer API
+ */
+package org.apache.juneau.serializer;
 
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/package.html b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/package.html
deleted file mode 100644
index ba42daf..0000000
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/package.html
+++ /dev/null
@@ -1,152 +0,0 @@
-<!DOCTYPE HTML>
-<!--
-/***************************************************************************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *  
- *  http://www.apache.org/licenses/LICENSE-2.0
- *  
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations under the License.
- *
- ***************************************************************************************************************************/
- -->
-<html>
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-	<style type="text/css">
-		/* For viewing in Page Designer */
-		@IMPORT url("../../../../../../javadoc.css");
-
-		/* For viewing in REST interface */
-		@IMPORT url("../htdocs/javadoc.css");
-		body { 
-			margin: 20px; 
-		}	
-	</style>
-	<script>
-		/* Replace all @code and @link tags. */	
-		window.onload = function() {
-			document.body.innerHTML = document.body.innerHTML.replace(/\{\@code ([^\}]+)\}/g, '<code>$1</code>');
-			document.body.innerHTML = document.body.innerHTML.replace(/\{\@link (([^\}]+)\.)?([^\.\}]+)\}/g, '<code>$3</code>');
-		}
-	</script>
-</head>
-<body>
-<p>Serializer API</p>
-
-<script>
-	function toggle(x) {
-		var div = x.nextSibling;
-		while (div != null && div.nodeType != 1)
-			div = div.nextSibling;
-		if (div != null) {
-			var d = div.style.display;
-			if (d == 'block' || d == '') {
-				div.style.display = 'none';
-				x.className += " closed";
-			} else {
-				div.style.display = 'block';
-				x.className = x.className.replace(/(?:^|\s)closed(?!\S)/g , '' );
-			}
-		}
-	}
-</script>
-
-<a id='TOC'></a><h5 class='toc'>Table of Contents</h5>
-<ol class='toc'>
-	<li><p><a class='doclink' href='#Serializer'>Serializer API</a></p>
-	<ol>
-		<li><p><a class='doclink' href='#SerializerGroup'>The SerializerGroup class</a></p>
-	</ol>
-	<li><p><a class='doclink' href='#DefiningSerializer'>Defining a new Serializer</a></p>
-</ol>
-
-<!-- ======================================================================================================== -->
-<a id="Serializer"></a>
-<h2 class='topic' onclick='toggle(this)'>1 - Serializer API</h2>
-<div class='topic'>
-	<p>
-		The serialization API is designed to be easily extensible by developers.
-		<br>If you are writing your own serializer, you will typically subclass directly from either 
-		{@link org.apache.juneau.serializer.WriterSerializer} or 
-		{@link org.apache.juneau.serializer.OutputStreamSerializer}.
-	</p>
-
-	<!-- ======================================================================================================== -->
-	<a id="SerializerGroup"></a>
-	<h3 class='topic' onclick='toggle(this)'>1.1 - The SerializerGroup class</h3>
-	<div class='topic'>
-		<p>
-			The {@link org.apache.juneau.serializer.SerializerGroup} class represents a group of serializers registered 
-			with the media types they handle.
-		</p>
-		
-		<h6 class='topic'>Features</h6>		
-		<p>
-			The <code>SerializerGroup</code> class provides the following features:
-		</p>
-		<ul class='spaced-list'>
-			<li>
-				Finds serializers based on HTTP <code>Accept</code> header values.
-			<li>
-				Sets common properties on all serializers in a single method call.
-		 	<li>
-		 		Locks all serializers in a single method call.
-			<li>
-				Clones existing groups and all serializers within the group in a single method call.
-		</ul>
-		
-		<p>
-			Refer to {@link org.apache.juneau.serializer.SerializerGroup} for additional information.
-		</p>
-	</div> 
-</div>
-
-
-<!-- ======================================================================================================== -->
-<a id="DefiningSerializer"></a>
-<h2 class='topic' onclick='toggle(this)'>2 - Defining a new Serializer</h2>
-<div class='topic'>
-	<p>
-		Defining a new serializer is quite simple if you subclass directly from 
-		{@link org.apache.juneau.serializer.WriterSerializer}  or {@link org.apache.juneau.serializer.OutputStreamSerializer}.
-		<br>In each case, you simply need to implement a single method .
-	</p>
-	<p>
-		The following example shows a simple serializer that converts images to output streams using standard JRE 
-		classes.
-	</p>
-	<p class='bcode'>
-	<jd>/** Serializer for converting images to byte streams */</jd>
-	<jk>public class</jk> ImageSerializer <jk>extends</jk> OutputStreamSerializer {
-
-		<jd>/**
-		 * Constructor.
-		 * <ja>@param</ja> propertyStore The property store containing all the settings for this object.
-		 */</jd>
-		<jk>public</jk> ImageSerializer(PropertyStore propertyStore) {
-			<jk>super</jk>(propertyStore, <jk>null</jk>, <js>"image/png"</js>, <js>"image/jpeg"</js>);
-		}
-
-		<ja>@Override</ja> <jc>/* Serializer */</jc>
-		<jk>protected void</jk> doSerialize(SerializerSession session, Object o) <jk>throws</jk> Exception {
-			RenderedImage image = (RenderedImage)o;
-			String mediaType = session.getProperty(<js>"mediaType"</js>);
-			ImageIO.<jsm>write</jsm>(image, mediaType.substring(mediaType.indexOf(<js>'/'</js>)+1), session.getOutputStream());
-		}
-	}
-	</p>
-	<p>
-		Serializer that take advantage of the entire {@link org.apache.juneau.BeanContext} interface to be able to 
-		serialize arbitrary beans and POJOs is considerably more complex and outside the scope of this document.
-		<br>If developing such a serializer, the best course of action would be to replicate what occurs in the 
-		{@link org.apache.juneau.json.JsonSerializer} class.
-	</p>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/package.html b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/package.html
index 89463d6..c848b1f 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/package.html
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/package.html
@@ -36,6 +36,6 @@
 	</script>
 </head>
 <body>
-<p>SOAP/XML serialization and parsing support</p>
+<p>SOAP/XML Marshalling Support</p>
 </body>
 </html>
\ No newline at end of file
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/transform/doc-files/classes.png b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/transform/doc-files/classes.png
deleted file mode 100644
index 0a2ef0d..0000000
Binary files a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/transform/doc-files/classes.png and /dev/null differ
diff --git a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/addressbook/package-info.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/transform/package-info.java
similarity index 64%
copy from juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/addressbook/package-info.java
copy to juneau-core/juneau-marshall/src/main/java/org/apache/juneau/transform/package-info.java
index 5d597ca..187b5c5 100755
--- a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/addressbook/package-info.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/transform/package-info.java
@@ -10,26 +10,9 @@
 // * "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.                                              *
 // ***************************************************************************************************************************
-// XML namespaces used in this package
-@XmlSchema(
-	prefix="ab",
-	xmlNs={
-		@XmlNs(prefix="ab", namespaceURI="http://www.apache.org/addressBook/"),
-		@XmlNs(prefix="per", namespaceURI="http://www.apache.org/person/"),
-		@XmlNs(prefix="addr", namespaceURI="http://www.apache.org/address/"),
-		@XmlNs(prefix="mail", namespaceURI="http://www.apache.org/mail/")
-	}
-)
-@RdfSchema(
-	prefix="ab",
-	rdfNs={
-		@RdfNs(prefix="ab", namespaceURI="http://www.apache.org/addressBook/"),
-		@RdfNs(prefix="per", namespaceURI="http://www.apache.org/person/"),
-		@RdfNs(prefix="addr", namespaceURI="http://www.apache.org/address/"),
-		@RdfNs(prefix="mail", namespaceURI="http://www.apache.org/mail/")
-	}
-)
-package org.apache.juneau.examples.addressbook;
-import org.apache.juneau.jena.annotation.*;
-import org.apache.juneau.xml.annotation.*;
+
+/**
+ * Transform API
+ */
+package org.apache.juneau.transform;
 
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/transform/package.html b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/transform/package.html
deleted file mode 100644
index faf5634..0000000
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/transform/package.html
+++ /dev/null
@@ -1,60 +0,0 @@
-<!DOCTYPE HTML>
-<!--
-/***************************************************************************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *  
- *  http://www.apache.org/licenses/LICENSE-2.0
- *  
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations under the License.
- *
- ***************************************************************************************************************************/
- -->
-<html>
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-	<style type="text/css">
-		/* For viewing in Page Designer */
-		@IMPORT url("../../../../../../javadoc.css");
-
-		/* For viewing in REST interface */
-		@IMPORT url("../htdocs/javadoc.css");
-		body { 
-			margin: 20px; 
-		}	
-	</style>
-	<script>
-		/* Replace all @code and @link tags. */	
-		window.onload = function() {
-			document.body.innerHTML = document.body.innerHTML.replace(/\{\@code ([^\}]+)\}/g, '<code>$1</code>');
-			document.body.innerHTML = document.body.innerHTML.replace(/\{\@link (([^\}]+)\.)?([^\.\}]+)\}/g, '<code>$3</code>');
-		}
-	</script>
-</head>
-<body>
-<p>Transform API</p>
-
-<script>
-	function toggle(x) {
-		var div = x.nextSibling;
-		while (div != null && div.nodeType != 1)
-			div = div.nextSibling;
-		if (div != null) {
-			var d = div.style.display;
-			if (d == 'block' || d == '') {
-				div.style.display = 'none';
-				x.className += " closed";
-			} else {
-				div.style.display = 'block';
-				x.className = x.className.replace(/(?:^|\s)closed(?!\S)/g , '' );
-			}
-		}
-	}
-</script>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/addressbook/package-info.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/transforms/package-info.java
similarity index 64%
copy from juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/addressbook/package-info.java
copy to juneau-core/juneau-marshall/src/main/java/org/apache/juneau/transforms/package-info.java
index 5d597ca..9650342 100755
--- a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/addressbook/package-info.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/transforms/package-info.java
@@ -10,26 +10,9 @@
 // * "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.                                              *
 // ***************************************************************************************************************************
-// XML namespaces used in this package
-@XmlSchema(
-	prefix="ab",
-	xmlNs={
-		@XmlNs(prefix="ab", namespaceURI="http://www.apache.org/addressBook/"),
-		@XmlNs(prefix="per", namespaceURI="http://www.apache.org/person/"),
-		@XmlNs(prefix="addr", namespaceURI="http://www.apache.org/address/"),
-		@XmlNs(prefix="mail", namespaceURI="http://www.apache.org/mail/")
-	}
-)
-@RdfSchema(
-	prefix="ab",
-	rdfNs={
-		@RdfNs(prefix="ab", namespaceURI="http://www.apache.org/addressBook/"),
-		@RdfNs(prefix="per", namespaceURI="http://www.apache.org/person/"),
-		@RdfNs(prefix="addr", namespaceURI="http://www.apache.org/address/"),
-		@RdfNs(prefix="mail", namespaceURI="http://www.apache.org/mail/")
-	}
-)
-package org.apache.juneau.examples.addressbook;
-import org.apache.juneau.jena.annotation.*;
-import org.apache.juneau.xml.annotation.*;
+
+/**
+ * Predefined Transforms
+ */
+package org.apache.juneau.transforms;
 
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/transforms/package.html b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/transforms/package.html
deleted file mode 100644
index 5853f5e..0000000
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/transforms/package.html
+++ /dev/null
@@ -1,67 +0,0 @@
-<!DOCTYPE HTML>
-<!--
-/***************************************************************************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *  
- *  http://www.apache.org/licenses/LICENSE-2.0
- *  
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations under the License.
- *
- ***************************************************************************************************************************/
- -->
-<html>
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-	<style type="text/css">
-		/* For viewing in Page Designer */
-		@IMPORT url("../../../../../../javadoc.css");
-
-		/* For viewing in REST interface */
-		@IMPORT url("../htdocs/javadoc.css");
-		body { 
-			margin: 20px; 
-		}	
-	</style>
-	<script>
-		/* Replace all @code and @link tags. */	
-		window.onload = function() {
-			document.body.innerHTML = document.body.innerHTML.replace(/\{\@code ([^\}]+)\}/g, '<code>$1</code>');
-			document.body.innerHTML = document.body.innerHTML.replace(/\{\@link (([^\}]+)\.)?([^\.\}]+)\}/g, '<code>$3</code>');
-		}
-	</script>
-</head>
-<body>
-<p>Predefined Transform implementations</p>
-<script>
-	function toggle(x) {
-		var div = x.nextSibling;
-		while (div != null && div.nodeType != 1)
-			div = div.nextSibling;
-		if (div != null) {
-			var d = div.style.display;
-			if (d == 'block' || d == '') {
-				div.style.display = 'none';
-				x.className += " closed";
-			} else {
-				div.style.display = 'block';
-				x.className = x.className.replace(/(?:^|\s)closed(?!\S)/g , '' );
-			}
-		}
-	}
-</script>
-
-<!-- ======================================================================================================== -->
-<a id="PredefinedTransforms"></a><h2 class='topic'>1 - Predefined transform support</h2>
-<p>
-	This package contains various predefined instances of transforms for commonly-serialized/parsed class types.
-</p>
-<p>
-	See <a class='doclink' href='../transform/package-summary.html#TOC'>org.apache.juneau.transform</a> for more 
-	information about transforms.
-</p>
-</body>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/package.html b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/package.html
index 6935f9a..6785c5f 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/package.html
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/package.html
@@ -36,7 +36,7 @@
 	</script>
 </head>
 <body>
-<p>UON notation serialization and parsing support</p>
+<p>UON Marshalling Support</p>
 <script>
 	function toggle(x) {
 		var div = x.nextSibling;
diff --git a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/addressbook/package-info.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/annotation/package-info.java
similarity index 64%
copy from juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/addressbook/package-info.java
copy to juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/annotation/package-info.java
index 5d597ca..07ad947 100755
--- a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/addressbook/package-info.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/annotation/package-info.java
@@ -10,26 +10,9 @@
 // * "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.                                              *
 // ***************************************************************************************************************************
-// XML namespaces used in this package
-@XmlSchema(
-	prefix="ab",
-	xmlNs={
-		@XmlNs(prefix="ab", namespaceURI="http://www.apache.org/addressBook/"),
-		@XmlNs(prefix="per", namespaceURI="http://www.apache.org/person/"),
-		@XmlNs(prefix="addr", namespaceURI="http://www.apache.org/address/"),
-		@XmlNs(prefix="mail", namespaceURI="http://www.apache.org/mail/")
-	}
-)
-@RdfSchema(
-	prefix="ab",
-	rdfNs={
-		@RdfNs(prefix="ab", namespaceURI="http://www.apache.org/addressBook/"),
-		@RdfNs(prefix="per", namespaceURI="http://www.apache.org/person/"),
-		@RdfNs(prefix="addr", namespaceURI="http://www.apache.org/address/"),
-		@RdfNs(prefix="mail", namespaceURI="http://www.apache.org/mail/")
-	}
-)
-package org.apache.juneau.examples.addressbook;
-import org.apache.juneau.jena.annotation.*;
-import org.apache.juneau.xml.annotation.*;
+
+/**
+ * URL-Encoding Marshalling Annotations
+ */
+package org.apache.juneau.urlencoding.annotation;
 
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/annotation/package.html b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/annotation/package.html
deleted file mode 100644
index 6391eae..0000000
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/annotation/package.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE HTML>
-<!--
-/***************************************************************************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *  
- *  http://www.apache.org/licenses/LICENSE-2.0
- *  
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations under the License.
- *
- ***************************************************************************************************************************/
- -->
-<html>
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-	<style type="text/css">
-		/* For viewing in Page Designer */
-		@IMPORT url("../../../../../../../javadoc.css");
-
-		/* For viewing in REST interface */
-		@IMPORT url("../htdocs/javadoc.css");
-		body { 
-			margin: 20px; 
-		}	
-	</style>
-	<script>
-		/* Replace all @code and @link tags. */	
-		window.onload = function() {
-			document.body.innerHTML = document.body.innerHTML.replace(/\{\@code ([^\}]+)\}/g, '<code>$1</code>');
-			document.body.innerHTML = document.body.innerHTML.replace(/\{\@link (([^\}]+)\.)?([^\.\}]+)\}/g, '<code>$3</code>');
-		}
-	</script>
-</head>
-<body>
-<p>URL-Encoding annotations</p>
-</body>
-</html>
\ No newline at end of file
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/package.html b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/package.html
index 1e99063..8a5fc73 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/package.html
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/package.html
@@ -36,7 +36,7 @@
 	</script>
 </head>
 <body>
-<p>URL encoding serialization and parsing support</p>
+<p>URL-Encoding Marshalling Support</p>
 <script>
 	function toggle(x) {
 		var div = x.nextSibling;
diff --git a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/addressbook/package-info.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/package-info.java
similarity index 64%
copy from juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/addressbook/package-info.java
copy to juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/package-info.java
index 5d597ca..8ccef97 100755
--- a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/addressbook/package-info.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/package-info.java
@@ -10,26 +10,9 @@
 // * "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.                                              *
 // ***************************************************************************************************************************
-// XML namespaces used in this package
-@XmlSchema(
-	prefix="ab",
-	xmlNs={
-		@XmlNs(prefix="ab", namespaceURI="http://www.apache.org/addressBook/"),
-		@XmlNs(prefix="per", namespaceURI="http://www.apache.org/person/"),
-		@XmlNs(prefix="addr", namespaceURI="http://www.apache.org/address/"),
-		@XmlNs(prefix="mail", namespaceURI="http://www.apache.org/mail/")
-	}
-)
-@RdfSchema(
-	prefix="ab",
-	rdfNs={
-		@RdfNs(prefix="ab", namespaceURI="http://www.apache.org/addressBook/"),
-		@RdfNs(prefix="per", namespaceURI="http://www.apache.org/person/"),
-		@RdfNs(prefix="addr", namespaceURI="http://www.apache.org/address/"),
-		@RdfNs(prefix="mail", namespaceURI="http://www.apache.org/mail/")
-	}
-)
-package org.apache.juneau.examples.addressbook;
-import org.apache.juneau.jena.annotation.*;
-import org.apache.juneau.xml.annotation.*;
+
+/**
+ * URL-Encoding Annotations
+ */
+package org.apache.juneau.utils;
 
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/package.html b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/package.html
deleted file mode 100644
index c3d6a65..0000000
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/package.html
+++ /dev/null
@@ -1,60 +0,0 @@
-<!DOCTYPE HTML>
-<!--
-/***************************************************************************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *  
- *  http://www.apache.org/licenses/LICENSE-2.0
- *  
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations under the License.
- *
- ***************************************************************************************************************************/
- -->
-<html>
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-	<style type="text/css">
-		/* For viewing in Page Designer */
-		@IMPORT url("../../../../../../javadoc.css");
-
-		/* For viewing in REST interface */
-		@IMPORT url("../htdocs/javadoc.css");
-		body { 
-			margin: 20px; 
-		}	
-	</style>
-	<script>
-		/* Replace all @code and @link tags. */	
-		window.onload = function() {
-			document.body.innerHTML = document.body.innerHTML.replace(/\{\@code ([^\}]+)\}/g, '<code>$1</code>');
-			document.body.innerHTML = document.body.innerHTML.replace(/\{\@link (([^\}]+)\.)?([^\.\}]+)\}/g, '<code>$3</code>');
-		}
-	</script>
-</head>
-<body>
-<p>Utility classes</p>
-
-<script>
-	function toggle(x) {
-		var div = x.nextSibling;
-		while (div != null && div.nodeType != 1)
-			div = div.nextSibling;
-		if (div != null) {
-			var d = div.style.display;
-			if (d == 'block' || d == '') {
-				div.style.display = 'none';
-				x.className += " closed";
-			} else {
-				div.style.display = 'block';
-				x.className = x.className.replace(/(?:^|\s)closed(?!\S)/g , '' );
-			}
-		}
-	}
-</script>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/addressbook/package-info.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/annotation/package-info.java
similarity index 64%
copy from juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/addressbook/package-info.java
copy to juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/annotation/package-info.java
index 5d597ca..9a80bbf 100755
--- a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/addressbook/package-info.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/annotation/package-info.java
@@ -10,26 +10,9 @@
 // * "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.                                              *
 // ***************************************************************************************************************************
-// XML namespaces used in this package
-@XmlSchema(
-	prefix="ab",
-	xmlNs={
-		@XmlNs(prefix="ab", namespaceURI="http://www.apache.org/addressBook/"),
-		@XmlNs(prefix="per", namespaceURI="http://www.apache.org/person/"),
-		@XmlNs(prefix="addr", namespaceURI="http://www.apache.org/address/"),
-		@XmlNs(prefix="mail", namespaceURI="http://www.apache.org/mail/")
-	}
-)
-@RdfSchema(
-	prefix="ab",
-	rdfNs={
-		@RdfNs(prefix="ab", namespaceURI="http://www.apache.org/addressBook/"),
-		@RdfNs(prefix="per", namespaceURI="http://www.apache.org/person/"),
-		@RdfNs(prefix="addr", namespaceURI="http://www.apache.org/address/"),
-		@RdfNs(prefix="mail", namespaceURI="http://www.apache.org/mail/")
-	}
-)
-package org.apache.juneau.examples.addressbook;
-import org.apache.juneau.jena.annotation.*;
-import org.apache.juneau.xml.annotation.*;
+
+/**
+ * XML Marshalling Annotations
+ */
+package org.apache.juneau.xml.annotation;
 
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/annotation/package.html b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/annotation/package.html
deleted file mode 100644
index 662281a..0000000
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/annotation/package.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE HTML>
-<!--
-/***************************************************************************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *  
- *  http://www.apache.org/licenses/LICENSE-2.0
- *  
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations under the License.
- *
- ***************************************************************************************************************************/
- -->
-<html>
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-	<style type="text/css">
-		/* For viewing in Page Designer */
-		@IMPORT url("../../../../../../../javadoc.css");
-
-		/* For viewing in REST interface */
-		@IMPORT url("../htdocs/javadoc.css");
-		body { 
-			margin: 20px; 
-		}	
-	</style>
-	<script>
-		/* Replace all @code and @link tags. */	
-		window.onload = function() {
-			document.body.innerHTML = document.body.innerHTML.replace(/\{\@code ([^\}]+)\}/g, '<code>$1</code>');
-			document.body.innerHTML = document.body.innerHTML.replace(/\{\@link (([^\}]+)\.)?([^\.\}]+)\}/g, '<code>$3</code>');
-		}
-	</script>
-</head>
-<body>
-<p>XML annotations</p>
-</body>
-</html>
\ No newline at end of file
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/package.html b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/package.html
index 422b16f..60244c4 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/package.html
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/package.html
@@ -36,7 +36,7 @@
 	</script>
 </head>
 <body>
-<p>XML serialization and parsing support</p>
+<p>XML Marshalling Support</p>
 <script>
 	function toggle(x) {
 		var div = x.nextSibling;
diff --git a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/addressbook/package-info.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/yaml/proto/annotation/package-info.java
similarity index 64%
copy from juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/addressbook/package-info.java
copy to juneau-core/juneau-marshall/src/main/java/org/apache/juneau/yaml/proto/annotation/package-info.java
index 5d597ca..36a600b 100755
--- a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/addressbook/package-info.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/yaml/proto/annotation/package-info.java
@@ -10,26 +10,9 @@
 // * "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.                                              *
 // ***************************************************************************************************************************
-// XML namespaces used in this package
-@XmlSchema(
-	prefix="ab",
-	xmlNs={
-		@XmlNs(prefix="ab", namespaceURI="http://www.apache.org/addressBook/"),
-		@XmlNs(prefix="per", namespaceURI="http://www.apache.org/person/"),
-		@XmlNs(prefix="addr", namespaceURI="http://www.apache.org/address/"),
-		@XmlNs(prefix="mail", namespaceURI="http://www.apache.org/mail/")
-	}
-)
-@RdfSchema(
-	prefix="ab",
-	rdfNs={
-		@RdfNs(prefix="ab", namespaceURI="http://www.apache.org/addressBook/"),
-		@RdfNs(prefix="per", namespaceURI="http://www.apache.org/person/"),
-		@RdfNs(prefix="addr", namespaceURI="http://www.apache.org/address/"),
-		@RdfNs(prefix="mail", namespaceURI="http://www.apache.org/mail/")
-	}
-)
-package org.apache.juneau.examples.addressbook;
-import org.apache.juneau.jena.annotation.*;
-import org.apache.juneau.xml.annotation.*;
+
+/**
+ * YAML Marshalling Annotations
+ */
+package org.apache.juneau.yaml.proto.annotation;
 
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/yaml/proto/annotation/package.html b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/yaml/proto/annotation/package.html
deleted file mode 100644
index df41b35..0000000
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/yaml/proto/annotation/package.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE HTML>
-<!--
-/***************************************************************************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *  
- *  http://www.apache.org/licenses/LICENSE-2.0
- *  
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations under the License.
- *
- ***************************************************************************************************************************/
- -->
-<html>
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-	<style type="text/css">
-		/* For viewing in Page Designer */
-		@IMPORT url("../../../../../../../javadoc.css");
-
-		/* For viewing in REST interface */
-		@IMPORT url("../htdocs/javadoc.css");
-		body { 
-			margin: 20px; 
-		}	
-	</style>
-	<script>
-		/* Replace all @code and @link tags. */	
-		window.onload = function() {
-			document.body.innerHTML = document.body.innerHTML.replace(/\{\@code ([^\}]+)\}/g, '<code>$1</code>');
-			document.body.innerHTML = document.body.innerHTML.replace(/\{\@link (([^\}]+)\.)?([^\.\}]+)\}/g, '<code>$3</code>');
-		}
-	</script>
-</head>
-<body>
-<p>JSON annotations</p>
-</body>
-</html>
\ No newline at end of file
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/yaml/proto/package.html b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/yaml/proto/package.html
index 0049b28..a9c0b56 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/yaml/proto/package.html
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/yaml/proto/package.html
@@ -36,7 +36,7 @@
 	</script>
 </head>
 <body>
-<p>JSON serialization and parsing support</p>
+<p>YAML Marshalling Support</p>
 <script>
 	function toggle(x) {
 		var div = x.nextSibling;
diff --git a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/addressbook/package-info.java b/juneau-core/juneau-svl/src/main/java/org/apache/juneau/svl/vars/package-info.java
similarity index 64%
copy from juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/addressbook/package-info.java
copy to juneau-core/juneau-svl/src/main/java/org/apache/juneau/svl/vars/package-info.java
index 5d597ca..c1af9f3 100755
--- a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/addressbook/package-info.java
+++ b/juneau-core/juneau-svl/src/main/java/org/apache/juneau/svl/vars/package-info.java
@@ -10,26 +10,9 @@
 // * "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.                                              *
 // ***************************************************************************************************************************
-// XML namespaces used in this package
-@XmlSchema(
-	prefix="ab",
-	xmlNs={
-		@XmlNs(prefix="ab", namespaceURI="http://www.apache.org/addressBook/"),
-		@XmlNs(prefix="per", namespaceURI="http://www.apache.org/person/"),
-		@XmlNs(prefix="addr", namespaceURI="http://www.apache.org/address/"),
-		@XmlNs(prefix="mail", namespaceURI="http://www.apache.org/mail/")
-	}
-)
-@RdfSchema(
-	prefix="ab",
-	rdfNs={
-		@RdfNs(prefix="ab", namespaceURI="http://www.apache.org/addressBook/"),
-		@RdfNs(prefix="per", namespaceURI="http://www.apache.org/person/"),
-		@RdfNs(prefix="addr", namespaceURI="http://www.apache.org/address/"),
-		@RdfNs(prefix="mail", namespaceURI="http://www.apache.org/mail/")
-	}
-)
-package org.apache.juneau.examples.addressbook;
-import org.apache.juneau.jena.annotation.*;
-import org.apache.juneau.xml.annotation.*;
+
+/**
+ * Predefined SVL Variables
+ */
+package org.apache.juneau.svl.vars;
 
diff --git a/juneau-core/juneau-svl/src/main/java/org/apache/juneau/svl/vars/package.html b/juneau-core/juneau-svl/src/main/java/org/apache/juneau/svl/vars/package.html
deleted file mode 100644
index 5344cc6..0000000
--- a/juneau-core/juneau-svl/src/main/java/org/apache/juneau/svl/vars/package.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE HTML>
-<!--
-/***************************************************************************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *  
- *  http://www.apache.org/licenses/LICENSE-2.0
- *  
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations under the License.
- *
- ***************************************************************************************************************************/
- -->
-<html>
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-	<style type="text/css">
-		/* For viewing in Page Designer */
-		@IMPORT url("../../../../../../../javadoc.css");
-
-		/* For viewing in REST interface */
-		@IMPORT url("../htdocs/javadoc.css");
-		body { 
-			margin: 20px; 
-		}	
-	</style>
-	<script>
-		/* Replace all @code and @link tags. */	
-		window.onload = function() {
-			document.body.innerHTML = document.body.innerHTML.replace(/\{\@code ([^\}]+)\}/g, '<code>$1</code>');
-			document.body.innerHTML = document.body.innerHTML.replace(/\{\@link (([^\}]+)\.)?([^\.\}]+)\}/g, '<code>$3</code>');
-		}
-	</script>
-</head>
-<body>
-<p>Simple Variable Language - Predefined variables</p>
-</body>
-</html>
\ No newline at end of file
diff --git a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/addressbook/package-info.java b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/addressbook/package-info.java
index 5d597ca..8b712a4 100755
--- a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/addressbook/package-info.java
+++ b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/addressbook/package-info.java
@@ -11,6 +11,10 @@
 // * specific language governing permissions and limitations under the License.                                              *
 // ***************************************************************************************************************************
 // XML namespaces used in this package
+
+/**
+ * AddressBookResource Example
+ */
 @XmlSchema(
 	prefix="ab",
 	xmlNs={
diff --git a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/addressbook/package.html b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/addressbook/package.html
deleted file mode 100755
index 21caee9..0000000
--- a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/addressbook/package.html
+++ /dev/null
@@ -1,42 +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.
- *
- ***************************************************************************************************************************/
- -->
-<html>
-<head>
-	<style type="text/css">
-		/* For viewing in Page Designer */
-		@IMPORT url("../../../../../../org.apache.juneau/javadoc.css");
-
-		/* For viewing in REST interface */
-		@IMPORT url("../htdocs/javadoc.css");
-		body { 
-			margin: 20px; 
-		}	
-	</style>
-	<script>
-		/* Replace all @code and @link tags. */	
-		window.onload = function() {
-			document.body.innerHTML = document.body.innerHTML.replace(/\{\@code ([^\}]+)\}/g, '<code>$1</code>');
-			document.body.innerHTML = document.body.innerHTML.replace(/\{\@link (([^\}]+)\.)?([^\.\}]+)\}/g, '<code>$3</code>');
-		}
-	</script>
-</head>
-<body>
-<p>Javadocs for Address Book Resource Example</p>
-<p>
-	Pretend there is documentation here.
-</p>
-</body>
-</html>
\ No newline at end of file
diff --git a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/addressbook/package-info.java b/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/console/package-info.java
similarity index 64%
copy from juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/addressbook/package-info.java
copy to juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/console/package-info.java
index 5d597ca..dff80d7 100755
--- a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/addressbook/package-info.java
+++ b/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/console/package-info.java
@@ -10,26 +10,9 @@
 // * "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.                                              *
 // ***************************************************************************************************************************
-// XML namespaces used in this package
-@XmlSchema(
-	prefix="ab",
-	xmlNs={
-		@XmlNs(prefix="ab", namespaceURI="http://www.apache.org/addressBook/"),
-		@XmlNs(prefix="per", namespaceURI="http://www.apache.org/person/"),
-		@XmlNs(prefix="addr", namespaceURI="http://www.apache.org/address/"),
-		@XmlNs(prefix="mail", namespaceURI="http://www.apache.org/mail/")
-	}
-)
-@RdfSchema(
-	prefix="ab",
-	rdfNs={
-		@RdfNs(prefix="ab", namespaceURI="http://www.apache.org/addressBook/"),
-		@RdfNs(prefix="per", namespaceURI="http://www.apache.org/person/"),
-		@RdfNs(prefix="addr", namespaceURI="http://www.apache.org/address/"),
-		@RdfNs(prefix="mail", namespaceURI="http://www.apache.org/mail/")
-	}
-)
-package org.apache.juneau.examples.addressbook;
-import org.apache.juneau.jena.annotation.*;
-import org.apache.juneau.xml.annotation.*;
+
+/**
+ * Microservice Console
+ */
+package org.apache.juneau.microservice.console;
 
diff --git a/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/console/package.html b/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/console/package.html
deleted file mode 100644
index 668f514..0000000
--- a/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/console/package.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE HTML>
-<!--
-/***************************************************************************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *  
- *  http://www.apache.org/licenses/LICENSE-2.0
- *  
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations under the License.
- *
- ***************************************************************************************************************************/
- -->
-<html>
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-	<style type="text/css">
-		/* For viewing in Page Designer */
-		@IMPORT url("../../../../../../javadoc.css");
-
-		/* For viewing in REST interface */
-		@IMPORT url("../htdocs/javadoc.css");
-		body { 
-			margin: 20px; 
-		}	
-	</style>
-	<script>
-		/* Replace all @code and @link tags. */	
-		window.onload = function() {
-			document.body.innerHTML = document.body.innerHTML.replace(/\{\@code ([^\}]+)\}/g, '<code>$1</code>');
-			document.body.innerHTML = document.body.innerHTML.replace(/\{\@link (([^\}]+)\.)?([^\.\}]+)\}/g, '<code>$3</code>');
-		}
-	</script>
-</head>
-<body>
-<p>HTTP-Part marshalling support</p>
-</body>
-</html>
\ No newline at end of file
diff --git a/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/package.html b/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/package.html
index d5416c1..95b4762 100755
--- a/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/package.html
+++ b/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/package.html
@@ -36,7 +36,7 @@
 	</script>
 </head>
 <body>
-<p>Juneau Cloud Microservice API</p>
+<p>Microservice API</p>
 
 <script>
 	function toggle(x) {
diff --git a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/addressbook/package-info.java b/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/resources/package-info.java
similarity index 64%
copy from juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/addressbook/package-info.java
copy to juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/resources/package-info.java
index 5d597ca..c6c736f 100755
--- a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/addressbook/package-info.java
+++ b/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/resources/package-info.java
@@ -10,26 +10,9 @@
 // * "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.                                              *
 // ***************************************************************************************************************************
-// XML namespaces used in this package
-@XmlSchema(
-	prefix="ab",
-	xmlNs={
-		@XmlNs(prefix="ab", namespaceURI="http://www.apache.org/addressBook/"),
-		@XmlNs(prefix="per", namespaceURI="http://www.apache.org/person/"),
-		@XmlNs(prefix="addr", namespaceURI="http://www.apache.org/address/"),
-		@XmlNs(prefix="mail", namespaceURI="http://www.apache.org/mail/")
-	}
-)
-@RdfSchema(
-	prefix="ab",
-	rdfNs={
-		@RdfNs(prefix="ab", namespaceURI="http://www.apache.org/addressBook/"),
-		@RdfNs(prefix="per", namespaceURI="http://www.apache.org/person/"),
-		@RdfNs(prefix="addr", namespaceURI="http://www.apache.org/address/"),
-		@RdfNs(prefix="mail", namespaceURI="http://www.apache.org/mail/")
-	}
-)
-package org.apache.juneau.examples.addressbook;
-import org.apache.juneau.jena.annotation.*;
-import org.apache.juneau.xml.annotation.*;
+
+/**
+ * Predefined Microservice Resources
+ */
+package org.apache.juneau.microservice.resources;
 
diff --git a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/addressbook/package-info.java b/juneau-microservice/juneau-microservice-template/src/main/java/org/apache/juneau/microservice/sample/package-info.java
similarity index 64%
copy from juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/addressbook/package-info.java
copy to juneau-microservice/juneau-microservice-template/src/main/java/org/apache/juneau/microservice/sample/package-info.java
index 5d597ca..c9eff9b 100755
--- a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/addressbook/package-info.java
+++ b/juneau-microservice/juneau-microservice-template/src/main/java/org/apache/juneau/microservice/sample/package-info.java
@@ -10,26 +10,9 @@
 // * "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.                                              *
 // ***************************************************************************************************************************
-// XML namespaces used in this package
-@XmlSchema(
-	prefix="ab",
-	xmlNs={
-		@XmlNs(prefix="ab", namespaceURI="http://www.apache.org/addressBook/"),
-		@XmlNs(prefix="per", namespaceURI="http://www.apache.org/person/"),
-		@XmlNs(prefix="addr", namespaceURI="http://www.apache.org/address/"),
-		@XmlNs(prefix="mail", namespaceURI="http://www.apache.org/mail/")
-	}
-)
-@RdfSchema(
-	prefix="ab",
-	rdfNs={
-		@RdfNs(prefix="ab", namespaceURI="http://www.apache.org/addressBook/"),
-		@RdfNs(prefix="per", namespaceURI="http://www.apache.org/person/"),
-		@RdfNs(prefix="addr", namespaceURI="http://www.apache.org/address/"),
-		@RdfNs(prefix="mail", namespaceURI="http://www.apache.org/mail/")
-	}
-)
-package org.apache.juneau.examples.addressbook;
-import org.apache.juneau.jena.annotation.*;
-import org.apache.juneau.xml.annotation.*;
+
+/**
+ * Microservice Samples
+ */
+package org.apache.juneau.microservice.sample;
 
diff --git a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/package.html b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/package.html
index 993dcac..d38e798 100644
--- a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/package.html
+++ b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/package.html
@@ -36,7 +36,7 @@
 	</script>
 </head>
 <body>
-<p>REST client API</p>
+<p>REST Client API</p>
 
 <script>
 	function toggle(x) {
diff --git a/juneau-rest/juneau-rest-server-jaxrs/src/main/java/org/apache/juneau/rest/jaxrs/package.html b/juneau-rest/juneau-rest-server-jaxrs/src/main/java/org/apache/juneau/rest/jaxrs/package.html
index 13a3494..a69ee15 100644
--- a/juneau-rest/juneau-rest-server-jaxrs/src/main/java/org/apache/juneau/rest/jaxrs/package.html
+++ b/juneau-rest/juneau-rest-server-jaxrs/src/main/java/org/apache/juneau/rest/jaxrs/package.html
@@ -36,7 +36,7 @@
 	</script>
 </head>
 <body>
-<p>JAX-RS integration components</p>
+<p>JAX-RS Integration</p>
 
 <script>
 	function toggle(x) {
diff --git a/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/resources/package.html b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/package-info.java
old mode 100755
new mode 100644
similarity index 74%
copy from juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/resources/package.html
copy to juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/package-info.java
index 422f5d2..282863d
--- a/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/resources/package.html
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/package-info.java
@@ -1,31 +1,18 @@
-<!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");
-		body { 
-			margin: 20px; 
-		}	
-	</style>
-</head>
-<body>
-<p>Predefined Microservice Resources</p>
-</body>
-</html>
\ No newline at end of file
+/***************************************************************************************************************************
+ * 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.
+ *
+ ***************************************************************************************************************************/
+
+/**
+ * REST Annotations
+ */
+package org.apache.juneau.rest.annotation;
\ No newline at end of file
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/package.html b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/package.html
deleted file mode 100644
index c0c0d41..0000000
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/package.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE HTML>
-<!--
-/***************************************************************************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations under the License.
- *
- ***************************************************************************************************************************/
- -->
-<html>
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-	<style type="text/css">
-		/* For viewing in Page Designer */
-		@IMPORT url("../../../../javadoc.css");
-
-		/* For viewing in REST interface */
-		@IMPORT url("../htdocs/javadoc.css");
-		body { 
-			margin: 20px; 
-		}	
-	</style>
-	<script>
-		/* Replace all @code and @link tags. */	
-		window.onload = function() {
-			document.body.innerHTML = document.body.innerHTML.replace(/\{\@code ([^\}]+)\}/g, '<code>$1</code>');
-			document.body.innerHTML = document.body.innerHTML.replace(/\{\@link (([^\}]+)\.)?([^\.\}]+)\}/g, '<code>$3</code>');
-		}
-	</script>
-</head>
-<body>
-<p>REST servlet annotations</p>
-</body>
-</html>
\ No newline at end of file
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/matchers/package.html b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/converters/package-info.java
similarity index 70%
rename from juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/matchers/package.html
rename to juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/converters/package-info.java
index 7eacf3a..e326d75 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/matchers/package.html
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/converters/package-info.java
@@ -1,34 +1,18 @@
-<!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>Predefined Matchers</p>
-</body>
-</html>
\ No newline at end of file
+/***************************************************************************************************************************
+ * 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.
+ *
+ ***************************************************************************************************************************/
+
+/**
+ * REST Response Converters
+ */
+package org.apache.juneau.rest.converters;
\ No newline at end of file
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/converters/package.html b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/converters/package.html
deleted file mode 100644
index 2599329..0000000
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/converters/package.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE HTML>
-<!--
-/***************************************************************************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations under the License.
- *
- ***************************************************************************************************************************/
- -->
-<html>
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-	<style type="text/css">
-		/* For viewing in Page Designer */
-		@IMPORT url("../../../../javadoc.css");
-
-		/* For viewing in REST interface */
-		@IMPORT url("../htdocs/javadoc.css");
-		body { 
-			margin: 20px; 
-		}	
-	</style>
-	<script>
-		/* Replace all @code and @link tags. */	
-		window.onload = function() {
-			document.body.innerHTML = document.body.innerHTML.replace(/\{\@code ([^\}]+)\}/g, '<code>$1</code>');
-			document.body.innerHTML = document.body.innerHTML.replace(/\{\@link (([^\}]+)\.)?([^\.\}]+)\}/g, '<code>$3</code>');
-		}
-	</script>
-</head>
-<body>
-<p>Predefined REST response converters</p>
-</body>
-</html>
\ No newline at end of file
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/doc-files/AddressBook.png b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/doc-files/AddressBook.png
deleted file mode 100644
index 96426b7..0000000
Binary files a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/doc-files/AddressBook.png and /dev/null differ
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/doc-files/AddressBookJson.png b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/doc-files/AddressBookJson.png
deleted file mode 100644
index 68c0ec8..0000000
Binary files a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/doc-files/AddressBookJson.png and /dev/null differ
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/doc-files/AddressBookOptions.png b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/doc-files/AddressBookOptions.png
deleted file mode 100644
index 36c3e42..0000000
Binary files a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/doc-files/AddressBookOptions.png and /dev/null differ
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/doc-files/AddressBook_juneaustyle.png b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/doc-files/AddressBook_juneaustyle.png
deleted file mode 100644
index 94327eb..0000000
Binary files a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/doc-files/AddressBook_juneaustyle.png and /dev/null differ
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/doc-files/HelloWorldResource1.png b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/doc-files/HelloWorldResource1.png
deleted file mode 100644
index 3b54341..0000000
Binary files a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/doc-files/HelloWorldResource1.png and /dev/null differ
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/doc-files/HelloWorldResource2.png b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/doc-files/HelloWorldResource2.png
deleted file mode 100644
index 7a4c816..0000000
Binary files a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/doc-files/HelloWorldResource2.png and /dev/null differ
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/doc-files/HelloWorldResource3.png b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/doc-files/HelloWorldResource3.png
deleted file mode 100644
index dd088bd..0000000
Binary files a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/doc-files/HelloWorldResource3.png and /dev/null differ
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/doc-files/HelloWorldResource4.png b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/doc-files/HelloWorldResource4.png
deleted file mode 100644
index 17bdbf6..0000000
Binary files a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/doc-files/HelloWorldResource4.png and /dev/null differ
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/doc-files/HelloWorldResourceOptions.png b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/doc-files/HelloWorldResourceOptions.png
deleted file mode 100644
index 8e64467..0000000
Binary files a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/doc-files/HelloWorldResourceOptions.png and /dev/null differ
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/doc-files/HelloWorldResourceOptionsJson.png b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/doc-files/HelloWorldResourceOptionsJson.png
deleted file mode 100644
index b87a317..0000000
Binary files a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/doc-files/HelloWorldResourceOptionsJson.png and /dev/null differ
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/doc-files/Options2.png b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/doc-files/Options2.png
deleted file mode 100644
index 52b9ad1..0000000
Binary files a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/doc-files/Options2.png and /dev/null differ
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/doc-files/OptionsPage.png b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/doc-files/OptionsPage.png
deleted file mode 100644
index c524ede..0000000
Binary files a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/doc-files/OptionsPage.png and /dev/null differ
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/doc-files/Samples_RootResources.png b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/doc-files/Samples_RootResources.png
deleted file mode 100644
index 62408e2..0000000
Binary files a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/doc-files/Samples_RootResources.png and /dev/null differ
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/doc-files/UrlEncodedForm.png b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/doc-files/UrlEncodedForm.png
deleted file mode 100644
index 2cd173f..0000000
Binary files a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/doc-files/UrlEncodedForm.png and /dev/null differ
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/widget/package.html b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/labels/package-info.java
old mode 100755
new mode 100644
similarity index 59%
rename from juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/widget/package.html
rename to juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/labels/package-info.java
index 536e05a..3ea441b
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/widget/package.html
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/labels/package-info.java
@@ -1,39 +1,18 @@
-<!--
-/***************************************************************************************************************************
- * 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>
-	<style type="text/css">
-		/* For viewing in Page Designer */
-		@IMPORT url("../../../../../../org.apache.juneau/javadoc.css");
-
-		/* For viewing in REST interface */
-		@IMPORT url("../htdocs/javadoc.css");
-		body { 
-			margin: 20px; 
-		}	
-	</style>
-	<script>
-		/* Replace all @code and @link tags. */	
-		window.onload = function() {
-			document.body.innerHTML = document.body.innerHTML.replace(/\{\@code ([^\}]+)\}/g, '<code>$1</code>');
-			document.body.innerHTML = document.body.innerHTML.replace(/\{\@link (([^\}]+)\.)?([^\.\}]+)\}/g, '<code>$3</code>');
-		}
-	</script>
-</head>
-<body>
-<p>HTML widget API</p>
-</body>
-</html>
\ No newline at end of file
+/***************************************************************************************************************************
+ * 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.
+ *
+ ***************************************************************************************************************************/
+
+/**
+ * REST Interface Label Classes
+ */
+package org.apache.juneau.rest.labels;
\ No newline at end of file
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/labels/package.html b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/labels/package.html
deleted file mode 100644
index 4e03390..0000000
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/labels/package.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE HTML>
-<!--
-/***************************************************************************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations under the License.
- *
- ***************************************************************************************************************************/
- -->
-<html>
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-	<style type="text/css">
-		/* For viewing in Page Designer */
-		@IMPORT url("../../../../javadoc.css");
-
-		/* For viewing in REST interface */
-		@IMPORT url("../htdocs/javadoc.css");
-		body { 
-			margin: 20px; 
-		}	
-	</style>
-	<script>
-		/* Replace all @code and @link tags. */	
-		window.onload = function() {
-			document.body.innerHTML = document.body.innerHTML.replace(/\{\@code ([^\}]+)\}/g, '<code>$1</code>');
-			document.body.innerHTML = document.body.innerHTML.replace(/\{\@link (([^\}]+)\.)?([^\.\}]+)\}/g, '<code>$3</code>');
-		}
-	</script>
-</head>
-<body>
-<p>Various REST interface label classes</p>
-</body>
-</html>
\ No newline at end of file
diff --git a/juneau-microservice/juneau-microservice-template/src/main/java/org/apache/juneau/microservice/sample/package.html b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/matchers/package-info.java
old mode 100755
new mode 100644
similarity index 58%
rename from juneau-microservice/juneau-microservice-template/src/main/java/org/apache/juneau/microservice/sample/package.html
rename to juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/matchers/package-info.java
index 8677acb..0f91a75
--- a/juneau-microservice/juneau-microservice-template/src/main/java/org/apache/juneau/microservice/sample/package.html
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/matchers/package-info.java
@@ -1,39 +1,18 @@
-<!--
-/***************************************************************************************************************************
- * 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>
-	<style type="text/css">
-		/* For viewing in Page Designer */
-		@IMPORT url("../../../../../../org.apache.juneau/javadoc.css");
-
-		/* For viewing in REST interface */
-		@IMPORT url("../htdocs/javadoc.css");
-		body { 
-			margin: 20px; 
-		}	
-	</style>
-	<script>
-		/* Replace all @code and @link tags. */	
-		window.onload = function() {
-			document.body.innerHTML = document.body.innerHTML.replace(/\{\@code ([^\}]+)\}/g, '<code>$1</code>');
-			document.body.innerHTML = document.body.innerHTML.replace(/\{\@link (([^\}]+)\.)?([^\.\}]+)\}/g, '<code>$3</code>');
-		}
-	</script>
-</head>
-<body>
-<p>Sample microservice resources that ship as part of the template</p>
-</body>
-</html>
\ No newline at end of file
+/***************************************************************************************************************************
+ * 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.
+ *
+ ***************************************************************************************************************************/
+
+/**
+ * Predefined Matchers
+ */
+package org.apache.juneau.rest.matchers;
\ No newline at end of file
diff --git a/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/resources/package.html b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/package-info.java
old mode 100755
new mode 100644
similarity index 74%
copy from juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/resources/package.html
copy to juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/package-info.java
index 422f5d2..dafbb3f
--- a/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/resources/package.html
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/package-info.java
@@ -1,31 +1,18 @@
-<!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");
-		body { 
-			margin: 20px; 
-		}	
-	</style>
-</head>
-<body>
-<p>Predefined Microservice Resources</p>
-</body>
-</html>
\ No newline at end of file
+/***************************************************************************************************************************
+ * 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.
+ *
+ ***************************************************************************************************************************/
+
+/**
+ * REST Server API
+ */
+package org.apache.juneau.rest;
\ No newline at end of file
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/package.html b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/package.html
deleted file mode 100644
index f2f991d..0000000
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/package.html
+++ /dev/null
@@ -1,63 +0,0 @@
-<!DOCTYPE HTML>
-<!--
-/***************************************************************************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations under the License.
- *
- ***************************************************************************************************************************/
- -->
-<html>
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-	<style type="text/css">
-		/* For viewing in Page Designer */
-		@IMPORT url("../../../../../javadoc.css");
-
-		/* For viewing in REST interface */
-		@IMPORT url("../htdocs/javadoc.css");
-		body { 
-			margin: 20px; 
-		}	
-	</style>
-	<script>
-		/* Replace all @code and @link tags. */	
-		window.onload = function() {
-			document.body.innerHTML = document.body.innerHTML.replace(/\{\@code ([^\}]+)\}/g, '<code>$1</code>');
-			document.body.innerHTML = document.body.innerHTML.replace(/\{\@link (([^\}]+)\.)?([^\.\}]+)\}/g, '<code>$3</code>');
-		}
-	</script>
-</head>
-<body>
-<p>REST Servlet API</p>
-
-<script>
-	function toggle(x) {
-		var div = x.nextSibling;
-		while (div != null && div.nodeType != 1)
-			div = div.nextSibling;
-		if (div != null) {
-			var d = div.style.display;
-			if (d == 'block' || d == '') {
-				div.style.display = 'none';
-				x.className += " closed";
-			} else {
-				div.style.display = 'block';
-				x.className = x.className.replace(/(?:^|\s)closed(?!\S)/g , '' );
-			}
-		}
-	}
-</script>
-
-<p>
-	Defines an API for defining REST resources as servlets.
-</p>
-</body>
-</html>
\ No newline at end of file
diff --git a/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/resources/package.html b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/package-info.java
old mode 100755
new mode 100644
similarity index 74%
copy from juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/resources/package.html
copy to juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/package-info.java
index 422f5d2..d8d8b9c
--- a/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/resources/package.html
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/package-info.java
@@ -1,31 +1,18 @@
-<!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");
-		body { 
-			margin: 20px; 
-		}	
-	</style>
-</head>
-<body>
-<p>Predefined Microservice Resources</p>
-</body>
-</html>
\ No newline at end of file
+/***************************************************************************************************************************
+ * 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.
+ *
+ ***************************************************************************************************************************/
+
+/**
+ * HTTP Response Handlers
+ */
+package org.apache.juneau.rest.response;
\ No newline at end of file
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/package.html b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/package.html
deleted file mode 100644
index 6e89506..0000000
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/package.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE HTML>
-<!--
-/***************************************************************************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations under the License.
- *
- ***************************************************************************************************************************/
- -->
-<html>
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-	<style type="text/css">
-		/* For viewing in Page Designer */
-		@IMPORT url("../../../../javadoc.css");
-
-		/* For viewing in REST interface */
-		@IMPORT url("../htdocs/javadoc.css");
-		body { 
-			margin: 20px; 
-		}	
-	</style>
-	<script>
-		/* Replace all @code and @link tags. */	
-		window.onload = function() {
-			document.body.innerHTML = document.body.innerHTML.replace(/\{\@code ([^\}]+)\}/g, '<code>$1</code>');
-			document.body.innerHTML = document.body.innerHTML.replace(/\{\@link (([^\}]+)\.)?([^\.\}]+)\}/g, '<code>$3</code>');
-		}
-	</script>
-</head>
-<body>
-<p>HTTP Response handlers</p>
-</body>
-</html>
\ No newline at end of file
diff --git a/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/resources/package.html b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/vars/package-info.java
old mode 100755
new mode 100644
similarity index 74%
copy from juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/resources/package.html
copy to juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/vars/package-info.java
index 422f5d2..c6d3141
--- a/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/resources/package.html
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/vars/package-info.java
@@ -1,31 +1,18 @@
-<!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");
-		body { 
-			margin: 20px; 
-		}	
-	</style>
-</head>
-<body>
-<p>Predefined Microservice Resources</p>
-</body>
-</html>
\ No newline at end of file
+/***************************************************************************************************************************
+ * 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.
+ *
+ ***************************************************************************************************************************/
+
+/**
+ * Predefined SVL Variables
+ */
+package org.apache.juneau.rest.vars;
\ No newline at end of file
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/vars/package.html b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/vars/package.html
deleted file mode 100644
index ac4588d..0000000
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/vars/package.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE HTML>
-<!--
-/***************************************************************************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations under the License.
- *
- ***************************************************************************************************************************/
- -->
-<html>
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-	<style type="text/css">
-		/* For viewing in Page Designer */
-		@IMPORT url("../../../../javadoc.css");
-
-		/* For viewing in REST interface */
-		@IMPORT url("../htdocs/javadoc.css");
-		body { 
-			margin: 20px; 
-		}	
-	</style>
-	<script>
-		/* Replace all @code and @link tags. */	
-		window.onload = function() {
-			document.body.innerHTML = document.body.innerHTML.replace(/\{\@code ([^\}]+)\}/g, '<code>$1</code>');
-			document.body.innerHTML = document.body.innerHTML.replace(/\{\@link (([^\}]+)\.)?([^\.\}]+)\}/g, '<code>$3</code>');
-		}
-	</script>
-</head>
-<body>
-<p>Predefined SVL variables</p>
-</body>
-</html>
\ No newline at end of file
diff --git a/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/resources/package.html b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/widget/package-info.java
old mode 100755
new mode 100644
similarity index 74%
rename from juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/resources/package.html
rename to juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/widget/package-info.java
index 422f5d2..5d56666
--- a/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/resources/package.html
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/widget/package-info.java
@@ -1,31 +1,18 @@
-<!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");
-		body { 
-			margin: 20px; 
-		}	
-	</style>
-</head>
-<body>
-<p>Predefined Microservice Resources</p>
-</body>
-</html>
\ No newline at end of file
+/***************************************************************************************************************************
+ * 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 Widget API
+ */
+package org.apache.juneau.rest.widget;
\ No newline at end of file

-- 
To stop receiving notification emails like this one, please contact
jamesbognar@apache.org.

Mime
View raw message