You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juneau.apache.org by ja...@apache.org on 2017/10/25 22:08:47 UTC

[1/4] juneau-website git commit: Update for 7.0.0

Repository: juneau-website
Updated Branches:
  refs/heads/asf-site f02bb7c4b -> b1ebfeda5


http://git-wip-us.apache.org/repos/asf/juneau-website/blob/b1ebfeda/content/svl.html
----------------------------------------------------------------------
diff --git a/content/svl.html b/content/svl.html
index 1a5e714..cf03c6c 100644
--- a/content/svl.html
+++ b/content/svl.html
@@ -18,18 +18,18 @@
 	<xt>&lt;dependency&gt;</xt>
 		<xt>&lt;groupId&gt;</xt>org.apache.juneau<xt>&lt;/groupId&gt;</xt>
 		<xt>&lt;artifactId&gt;</xt>juneau-svl<xt>&lt;/artifactId&gt;</xt>
-		<xt>&lt;version&gt;</xt>6.4.0-incubating<xt>&lt;/version&gt;</xt>
+		<xt>&lt;version&gt;</xt>7.0.0<xt>&lt;/version&gt;</xt>
 	<xt>&lt;/dependency&gt;</xt>
 		</p>	
 	
 		<h6 class='figure'>Java Library</h6>
 		<p class='bcode' style='width:500px;'>
-	juneau-svl-6.4.0-incubating.jar 
+	juneau-svl-7.0.0.jar 
 		</p>	
 	
 		<h6 class='figure'>OSGi Module</h6>
 		<p class='bcode' style='width:500px;'>
-	org.apache.juneau.svl_6.4.0-incubating.jar 
+	org.apache.juneau.svl_7.0.0.jar 
 		</p>	
 	
 		<p>
@@ -82,7 +82,7 @@
 		</p>
 		
 		<ul class='doctree'>
-			<li class='link'>See <a class='doclink' href='http://juneau.incubator.apache.org/site/apidocs/overview-summary.html#juneau-svl'>juneau-svl</a> for more information.
+			<li class='link'>See <a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-svl'>juneau-svl</a> for more information.
 		</ul>
 	</div>
 </body>


[2/4] juneau-website git commit: Update for 7.0.0

Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/juneau-website/blob/b1ebfeda/content/7.0.0/styles/juneau-doc.css
----------------------------------------------------------------------
diff --git a/content/7.0.0/styles/juneau-doc.css b/content/7.0.0/styles/juneau-doc.css
deleted file mode 100755
index cb4b144..0000000
--- a/content/7.0.0/styles/juneau-doc.css
+++ /dev/null
@@ -1,297 +0,0 @@
-/**********************************************************************************
- * Juneau-specific javadoc styles.
- * 
- * These are styles available in Javadocs in addition to the general Oracle 
- * javadoc tags.
- * 
- * Available classes:
- *	fixedWidth - Force block to be 800 px wide.
- *	table.styled - A table with alternating row colors.
- *	h2/h3/h4/h5/h6.topic - Topic headers.
- * 	bordered - Put border around a block (e.g. an image).
- *	padded - Put padding around a block (e.g. an image).
- *	ol/ul.toc - Table of contents.
- *	ol/ul.notes - Notes.
- *	code.snippet - A code snippet.
- *	ol/ul.spaced-list - A spaced list.
- *	ol/ul.javahierarchy - A Java class hierarchy list.
- *		li.c - Java class.
- *		li.i - Java interface.
- *		li.a - Java abstract class.
- *		li.n - Java annotation.
- *		li.p - Java package.
- *		li.m - Java method.
- *		li.f - Java field.
- *	p.severe - A severe block.
- *	p.warn - A warning block.
- *	p.info - An info block.
- *	p.todo - A TODO block.
- *	a.doclink - A link to another document.
- *
- * Available tags:
- * 	<l> - A literal.
- *	<property> - A property.
- **********************************************************************************/
-
-body { font-family: sans-serif; font-size: small; }
-
-property {
-	font-size: 9pt;
-	white-space: pre;
-	font-family: monospace;
-	font-weight: bold;
-}
-
-.fixedWidth {
-	max-width: 800px;
-}
-
-/*--- Override formatting on <table class='styled'> ---*/
-table.styled,.contentContainer .description table.styled,.contentContainer ul li table.styled,ul.blockList ul.blockList li.blockList table.styled
-	{
-	padding: 0px;
-	position: relative;
-	width: auto;
-	border: 1px solid #9eadc0;
-	margin-left: 20px;
-	margin-right: 20px;
-	border-collapse: collapse;
-}
-
-table.styled th { background-color: #dee3e9; border: 1px solid #9eadc0; padding: 3px 10px 3px 10px; }
-table.styled td { padding: 3px; }
-table.styled ul { padding: 0px 10px; }
-table.styled tr:nth-child(1) { background-color: #dee3e9; }
-table.styled tr:nth-child(2n+2) { background-color: #eeeeef; }
-table.styled tr:nth-child(2n+3) { background-color: white; }
-
-/* Same as r1 except with a border on the bottom */
-table.styled tr.bb { border-bottom: 1px solid #9eadc0 }
-table.styled tr.light { background-color: white !important;}
-table.styled tr.dark { background-color: #eeeeef !important; }
-
-/*--- Juneau topic headers ---*/
-h2.topic,
-h3.topic,
-h4.topic {
-	margin-bottom: 20px;
-	margin-top: 25px;
-	padding-top: 3px;
-	padding-left: 25px;
-	color: #2c4557;
-	border-top: 2px groove #9eadc0;
-	background-image: url('data:image/gif;base64,R0lGODlhEAAQAIQfACZJcSdKcjFTejVWfT5fhUFih0ZnjEhojUxskFFwk1Z0l1d1mFp4ml98nmaComiEpGuHpnKNq3SOrHiRroGZtYeeuJGmv5erwp+yx6O1yqm6zrDA0sTQ3s3X4+Dn7v///yH+EUNyZWF0ZWQgd2l0aCBHSU1QACH5BAEAAB8ALAAAAAAQABAAAAVk4CeOZGmWgmEQG/k0MHw4UY0gY1PvfG3kvaBhUqk4IMgkcuGrdJ7QaCfDiBgunKx2m1VYP5KNeEze0H4VjHrNVh9+HodlTq9bEr9PhMLv+ykOAyIaNEE8ACMFiouMigEnkJGQIQA7');
-	background-repeat: no-repeat;
-	background-position: left center;
-}
-h2.topic { font-size: 14pt; }
-h3.topic { font-size: 13pt; }
-h4.topic { font-size: 12pt; }
-
-h2.closed,
-h3.closed,
-h4.closed {
-	background-image: url('data:image/gif;base64,R0lGODlhEAAQAIQYADNVfDhagUNkiUZnjEhojUxskE9vklFwlFd1mF17nWJ/oGaCo2+KqXKNq3aQrX2WsoGZtYObtoeeuJKowJ2wxqm6zrbF1sTQ3v///////////////////////////////yH+EUNyZWF0ZWQgd2l0aCBHSU1QACH5BAEAAB8ALAAAAAAQABAAAAVi4CeOZGmST6EGpLK8cNHMi6GI8qzvcyEikqBwGByIIJekcpmEiByWqHQadYgYlax2m2WIFpSweBxeiBKTtHqdTvwi8LgcjhAdHPi8Hn8QERiAgYKABCIAAoiJiogAJ46PjiEAOw==') !important;
-}
-
-div.topic { margin-left: 10px; }
-
-h6.figure {
-	color: #2c4557;
-	margin-left: 30px;
-	margin-right: 30px;
-	margin-top: 10px;
-	margin-bottom: 0px;
-	font-style: italic;
-}
-
-/*--- Override how Javadoc handles unordered lists inside .footer ---*/
-ul.normal {
-	margin-top: 0px;
-}
-
-ul.normal li {
-	font-size: 100%;
-	list-style: disc;
-}
-
-/*--- Bordered images ---*/
-.bordered {
-	border: 1px solid #cccccc;
-	margin: 0px 20px;
-	border-radius: 10px;
-	box-shadow: 1px 1px 1px 0px rgba(0, 0, 0, 0.5);
-}
-
-.padded {
-	padding-left: 20px;
-	padding-right: 20px;
-}
-
-/*--- Rows with bottom borders ---*/
-tr.borderbottom td {
-	border-bottom: 1px solid #9eadc0
-}
-
-.nomargin {
-	margin: 0px;
-}
-
-ol.toc, ol.notes,
-ul.toc, ul.notes,
-.toc ol, .notes ol,
-.toc ul, .notes ul {
-	background: #dee3e9;
-	margin: 0px;
-	padding: 0px;
-}
-
-ul.toc, ul.notes,
-.toc ul, .notes ul {
-	list-style: disc;
-}
-
-ol.toc p, ol.notes p,
-ul.toc p, ul.notes p,
-.toc ol p, .notes ol p,
-.toc ul p, .notes ul p,
-ol.toc div, ol.notes div,
-ul.toc div, ul.notes div,
-.toc ol div, .notes ol div,
-.toc ul div, .notes ul div {
-	color: #353833;
-	font: normal 1em Arial, Helvetica, sans-serif;
-	font-size: 1em;
-	padding-bottom: 5px;
-	margin: 0px;
-}
-
-.toc li {
-	background: #FFFFFF;
-	margin-left: 30px;
-	padding-left: 5px;
-}
-
-.notes li {
-	background: #FFFFFF;
-	margin-left: 30px;
-	padding-left: 5px;
-	padding-top: 10px;
-}
-
-/* Linear gradients */
-
-/* Light-colored background headers */
-h5.toc,h6.toc, 
-h5.notes,h6.notes, 
-h5.topic,h6.topic, 
-h2.title {
-	background: linear-gradient(to bottom, #F5F5F5, #DEE3E9) repeat scroll 0% 0% transparent;
-	background: -moz-linear-gradient(to bottom, #F5F5F5, #DEE3E9) repeat scroll 0% 0% transparent;
-	background: -webkit-gradient(linear, left top, left bottom, from(#F5F5F5), to(#DEE3E9) );
-}
-
-/* Header styles */
-
-h5.toc, h5.notes,
-h6.toc, h6.notes {
-	color: #2C4557;
-	margin-bottom: 0px;
-	padding: 5px 30px;
-	border-radius: 15px 15px 15px 0px;
-	text-decoration: none;
-	box-shadow: 1px 1px 1px 0px rgba(0, 0, 0, 0.5);
-}
-
-h5.toc, h5.notes { font-size: 1.2em; }
-h6.toc, h6.notes { font-size: 1.1em; }
-
-h5.topic, h6.topic {
-	color: #2C4557;
-	padding: 5px 20px;
-	margin: 30px 10px 20px 0px;
-	text-decoration: none;
-}
-
-code.snippet {
-	border: 1px solid #cccccc;
-	margin: 2px;
-	padding: 0px 5px;
-	border-radius: 5px;
-	background-color: #f8f8f8;
-}
-
-l {
-	color: DarkBlue;
-	font-weight: bold;
-	font-style: italic;
-	font-family: monospace;
-	font-size: 1.2em;
-}
-
-.spaced-list li { padding:5px; }
-.footer .spaced-list ul { margin:0 }
-
-/* Documentation Tree */
-.doctree li {}
-.doctree li.link {
-    list-style-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABEElEQVQ4T2M0T3iVLyHKWvnvH4M4AwmAiYnh5adP/7oYvQrevmBmZiJJM8wekCGMvsXv/5NgMYrS33/+M1BkwOOX/ygzYM/pX8QZwMfN+L8lnZOhf+VPhvtP/zKC/HHh1h+Gx6+IdAEHG8P/WRVcDP///2con/aDYcfx34wgzSCAEgatGez/1WSZwDbgAm8//v8v7fcJrgbFAE1Fpv86iowMv/8gzPj7j4Hh7cd/DOkBrAzsrAwM9XN/MvQs/YUwQNb3zX9OdkxLP339z/Dtx3+GT9/+M/BwMv6/sZyTYdKa3wxdS36jKGZkMH9FdjoAh8GwMOD1AwYGBnky88NDRgbTNwkMTP8byDDkIcM/xgYA0dJ4nW6TgR4AAAAASUVORK5CYII=');
-}
-.doctree li.sublink {
-    list-style-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABXElEQVQ4T2M0T3iVLyHKWvnvH4M4AwmAiYnh5adP/7oYvQrevmBmZiJJM8wekCGMvsXv/8MErPVY/ytKMzMs2f6DkRjH/P7znwHFgLxwzv/G6qwM8U2fiDLg8ct/qAZkB3P8N1BjYUht/0KUAXtO/0I1ICuIHWxAWsdXFAP4uBn/9+RxMcza8JPhzPU/YLkLt/4wPH6F5oLMQLb/+qrMDBld31EM4GBj+D+rgouBlYWBoWvpT4b5m38ygjSDAEoYZASy/Xc2Ycbr/K8//v/Xi/7C8PTNP7A6FAPkJJj+G6kxoUTA338MDO8+/WPIDGQFu2DWht8MBRMRscQo6/vmPyc7pqWfvv5n+PbjP8Onb/8ZeDgZ/99excmwau8fhvwJv1AUMzKYv4KnA3xxb6PH9P/IJYizkQHRBuAyfFAY8PoBAwODPDFpH4uah4wMpm8SGJj+N5BhyEOGf4wNAOjWjp1FyKtJAAAAAElFTkSuQmCC');
-}
-.doctree li.extlink {
-    list-style-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABcklEQVQ4T52SvUtCYRTGn/Nq3VtBDRFmGGHg4FZQuPQXSLb0B+TiUAYFQeBWS9kHDRXNLg5Wa5s1uEVD0tCQQYVRaUogCeX9OHEvZWik3c76nuf3nPc5h3zB/FxvT0tE1+GAhRICuVJJXyf/fPHJZhOWxF8+BoQCCy9swbimVVEZTQHBcZkDYxI0DWixA5l7DYs7r2SQsjm9OcDlEOx2Ckz5ZXR3ET0WdJ7ZKJuA5FmlOcBojIbb2eMSuLjWoGiMldgbpa9UZPN/mGAtLPNgn8BG/B0jXhu6OwmTkTIZYqMaZhCdkUzx7qGCVFqlDhl886Dh9FIzv9AQsDrdym4nYftARSKpUDanoVj6uTDqDxS4TaoCTWp8WWLvAGF2q4LYkVL7WLdzgi9fg03tSTzkEQhFK0gcf4/6263UADZn7RyasJvi/RO9oXM1g/oJhj3E5xn+k9gMsR5g9awJvudbAANWhZ/9d4TRQhCCl/4BuYNOSx/YeJed6RTWWAAAAABJRU5ErkJggg==');
-}
-.doctree li.info {
-    list-style-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABTklEQVQ4T2M0T3iVLyHKWvnvH4M4AwmAiYnh5adP/7oYvQrevmBmZiJJM8wekCGMvsXv/5NgMYrS33/+M1BkwOOX//AbUJ/M9V9Flokhv/8rw7uP/xnRXbrn9C/8BpTGcPxXl2NmKJv6DcOAC7f+MDx+hccFPtYs/y11WBk+fv3HMGnVT4YfvxjgLoBpBrkIZxhEuLL8D7JnZfj3n4GhePIPhqev/jO+/fif4crdPwyfviHCHW8gtqaz/1eQZGCIqv/BcPzyH8a3nzAjjFHW981/TnaM8GH49PU/w7oO9v/aiswMxgnfGO48/YepCOQFBvNXONPB4ekc/7UVGRnMkn+SZ8DBqWz/9VSYGSxSfjDcfIwZjeBAxOeCA1PY/qvJMjDYZv5muPuMDAOISeKMDOavHzAwMMgToxiLmoeMDKZvEhiY/jeQYchDhn+MDQDaPZad/sBJ8AAAAABJRU5ErkJggg==');
-}
-.doctree li.warn {
-    list-style-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABdklEQVQ4T5WSv0tCcRTFz1WhNBtqSLIhGoKWgoYIbAmiraHFWvsPooigQXAQAsGpoqW9xSGpQEIqGyyXIKIiCEzw5Q9Synz+eM/njacQhV9D7/o993PPOXwpE5pbNZptW0DNho7GkIaa91I67EyRwdjhcuMSw5CmZHiZOzr8S8w1FZQ4FwPI2MUDU15oSh7vty4SHakWJVA81BowOLMPrfKBdHRdCJCTl6DY2ZIwgu7A7tiDpuaRumkGlHL3UGUJ9BL8D7BTj5CKbvxxUMw2lvWh59PWgCGHD6yVIUUagGolh1L2CZr69VMJPR6LAbrCPu3haimDRGSTKgUJ1XKuqUu6Phhjg8nc9KBbH5ndZaUgIXa1JiyxHiHk6xWWaOru5wnnBVhT8RBYgCKnhBAKeq1CgHVgkscXA6hpCu788yh/xsSAk20xQLdn6RvlivwGTZFbRzjytAa088XJ77a8AjTcjrhZw3E6dPWsgNlN1BmEmeMgcn8DcOyppYtyHnIAAAAASUVORK5CYII=');
-}
-.doctree li.severe {
-    list-style-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABZ0lEQVQ4T5XSu0/CUBQG8O8UjRg0hqjogiQuTm4mLG5uRjcn44Cr8TWZGIKig884GDccTPwLXE3cnNwcdNDEKBRKRRAKxQeFe01rMBIuDXS95/udnnMvPU75V9o9g+tgbACtfJL0yrT8AT3PTarU5mgtXG0kSa8UDUzzVhrX1JYNkDwvBqjDyT3hY1QKGtI7ayRqYigyKG4D9B+dgWlZpIMLQqB4fQVK2AC9+6dgBQ3vocU64Pv+FuWkDFJsAPdexAJyG0s1QDVsjkVJG6B7+wT4+kR+c9kCKtkMSg934Hr+byWkNgDMClfwkLM3FfrWKpUVGSyXqdslyX4vJ2dn3YHZpWs3wivJOPSQeInWCLEhCN8Buft4z8UNmFGCPjsBllKEN0FyA8AxOsZd55fgRgnFmXGw2JMYSDQAzN+Thkc4VxPgH7ow/HsLPvEIzT5vE3ghwNds4H8dB6KU8iLAJYRbRawwQ/gH7UigfGJInWUAAAAASUVORK5CYII=');
-}
-.doctree li.jc {
-    list-style-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACaElEQVQ4T42TXUhTYRjH/8/Z2cxNDZzZRXaVixKCaRc2P9KQGPallnolESJBF6FCUN3UsojKTNHCkiIvhCANLbsoiTEZYkRGRSZ+kIvKKDaZ07np9DyxkzsdR0bvxYHnOe//93+e931eQtTKrcvNTorbWCGQYGHm1PBvIpqQWBp0z/3ocJ5zDqglFAmYWXu4peyixNLpaGgk1pDGz4yW7urOs5GcDAiLj7SW25d5OWctsTovChrnoxOdu+Xqwp+SttIr0c75pjwuTy9Dwrp4hKQlDE8N47r9hlKxQMLV7uNdZyitPi3TZNz+Uu1g3bqXqzIrQSBMTruQqE+EL+hDbe8pBSCSxj/i/lBAObfzm4x6Y3UEECPG8K0DzbLzNWcDXn8bUkTR7X2fnWok0Rbr2JyQkmcymqDXxsKSsourM0/i488R1Dkv/VU8Hwpg3DOOL76v/SRe1nsJWB+mx+vicTB1P7dab+KFy476Vw0ywBPwyOaBUADugAfBpaAcM8NLYr3BS/QbEF7FWw5xu/Uueiae4Fhf1ZrlrwBmSGw2OAjIiwB2Jmfws3298CxMY9uDHf8GAP2kuxNnA3BefUA9BV2ck5xFY7Pj3DZ6D4WbrMhOtqDIXooh9xs19AJp7xvMkMihbiMMe77nKWckpiubR31jfHSwEp/mJleGDzMhYcksB9oOQw2BGqOvKSvJwht0SXDNf8Y77/tV7TC4NlThb1KSuodxPQAV/c8oA/x4sXyuWBllZYi6DTUMwRbdzp8HhxmCZFso8TetekxqV22fwUzLmmJizmcis+zC/JaJHItYbEdh0KXe/wv8BudlhAxYAQAAAABJRU5ErkJggg==');
-}
-.doctree li.jac {
-    list-style-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACQUlEQVQ4T41TX0hTURj/ffdutj+6TE2o2MhaC6KHQYUspxY9BBGlPvQQ0VvP6VP11KKXjEAhgnqL6H1FbxUxs2U1CYMZtZYz1LKa6Ebu3t3t3i/unbv7U1Ln7fvO+f37zjmEupWMd3eJtrYz0CgAaN7StpCEwBOqnL7v3TserYZQuWBm68yngavE6oV60nJNEFYButmxO3yp0gOgg1OJgWeAGlwPXKNK4niHL9yj9wwHnxP916DVKjubDvOm1lMQRBeYC5BzcfxcvGE6hiAO7/SFL9L0uz2dtg3eV9UKja6j3LL5nMGv5FMQLS3Q1Cy+zQ2aBHocKZ84Qh/iB0etlrbzZibBxlvctyCKLqS/D0Nanayo1uVTlK8j9HaCItYGd6/N5oMgOmB3Bri1fQiy9B7pxdBfwZqagywnUFDmxmjyJa0QaKNxWWITXM0neKvnDn5ln2Dpx3WDoFhIG9qaJqFYTIM1ueSFeaWGQO+5mvt52/Z7yC6HsfDl7Lr2DTw4Q7EoRQjUW45nd+xnj/cxVHUJyeld/yIYo1hU0INerp6Pe8cjtju7qaAkeDl9G42uY7A7gphPHYeUqwyVgSv0Jgo/MUWwNocykcf7lG32faYDJf+RF2ZPo6DMrPU4YxHZbxSxFxgEhJH6V+ho7GJRbIeipJCXpuriaEMHghg1m6+f0wMiOvk/T5mZH3b2cJ/5lMsg3QlrFAKVrvWPxZwhgUO6cs1nqj6oz4SLQh+ID4HhN/YIU2CKaA3a3UAAs9XnfwMcseP32xAmPAAAAABJRU5ErkJggg==');
-}
-.doctree li.jic {
-    list-style-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACLklEQVQ4T42TXUhTYRjH/8/ZdGgfc+ywi2l2YXSRXuyikOzDoKCLoHQlFH1ZoBh9bF6YRuQ+ImkFbWaUVGSBEHaz6sarYjakLruWBWKRsQ7znNWUdNsT5+DWdrbA5+Lwfvz/v/d53uc9BF1c2uPfZRbXnyKinZzlLeo2CRRj5o+K9Hv8QXRwutBCuQkzV3icwzczafTrobm5YKCUQBjxhV3XcmsaQDX7nA/fZ9KZ3f8zF64bjYaoJ3xxr5ad+vG1j97mdLbk5KN9B1isrcFL/ySSiVQ+W81oFAKecM8AdW8baq5rsH4qd/L5e21sq7fgqTsM6ZtcBBAMhtTcTHw/9bcMhzZY17nKAc7cOcS2zRY8c79FYj5ZBFD1C/PJIDlxNSJuqmm1bxVhqq4s4pwMHGSx3owXvZOQf/zKA/4sLuP7jATpqzxFHbguE8isOqs2mlBtNqGyqkIDuV51sK3BgmD7BKQ5hZaXVpCUFrGylNb2GZDpOLxqcRpAH4PTZ7m2UcSN7WOIxxIlJTCg0GncigBoLQcYiJ7guiYR/h3jiMcWSgAApqgTAS8ATzlA34djbG+0Yqh5Aj9jxV1Y1fuoE0GHAdkIVu+hEOR6d5jtTRbcbQlD+qLvAisZCA4trW7cdwMUXMsr/Kfh3se4EsrX1YNHrwk4shYIA29GcaEt/5Rzpst44mbAm2urHsZghQDvCLpCRT9TodCNMQcAlb4PgDpW4zMAtVvPQzg3W6j/C6P8uEsqsSt1AAAAAElFTkSuQmCC');
-}
-.doctree li.ja {
-    list-style-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACoklEQVQ4T42TXUiTYRTH/+fdtJx96JzMwj7EsAzTdRGRZRpLBKk00UDwtkhTN0WxUdpSzAzTlUnUhRgkXZRfXSRdlDMrtZk2+qBETDNakbmtnN/bE3vtndM+6Nyd/3PO7znnPOchLLGowuLdspUr0oiwy+Fgm5zHHEcDjKFz9Mf4zY6SoifuKSQ4jDGPpIpLJXMOR8FSqOCLOM5GRNVNeSqNoPEAPrmy+uEcc+z5W7K7LuZEHU25WXudGg84rLty/l83/wkq5rjyJnXmSdqqKdwZLA/ocg8K8pcxlTIGgVJfXh6z2dDca8S9l69dLYuIbP2fTUqKLKvQ+Xl7qwRAZHAQy9m/D5aJCTT0GjFrt+NQxDYE+vpQY5+R1Xf3uCAmq6WKcCxbv07qGx0i94fE0xM1R5IYEcEw/AHKzSH4PjWJ0vsPkBEViQ1SKbLvNOOj2Uz9X75iZMzcTkjPtYCw2llB2Bo568zNhE7/GObJSaQowhG+NgDtA4Ooe/YctakpUNZcQ/fQyK8qmIWQme8CJEeEsRupyUirv41z8bHw8vDgO2sbGER52yMY1BmIu16Hp++H5wEMVoJaowcQ7fQ3Sn2YUZ2OrJZWVB6Iw5DZAqnEi4+1Tk1BJpEgtKIa4zOzwhzaCXmntQDOCEN8ozrOGIDLnQYc3bEdw2YLlonFWC4W48TdVrwb/eYaIoCzhHytAhycVfBzSAwNYbUJ8bBOT+OqoQ8zdjtSw0Kx3mcVDtY3oOeTSQBYQVDMO5piNYiqhCrC5f6sKjYGW2R+fKOmcRsudvXg1qu3C7czloOyIt2CUFjaDFDC/6wywFpQcirRtcquJG25GoAWIL6d341Z+XNtgW7RZ1oUWHpBAYcoEQwxIKaYfy56AYIedq4O2pwh9/if
 1/D1lK2FX8oAAAAASUVORK5CYII=');
-}
-.doctree li.jm {
-    list-style-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACq0lEQVQ4T42Ta0jTYRTGn7OLNu+hGGji8rJCoQYFVjo1MyEpnYYfDEkcXaHSWGSWlWWIQulilWHgjIzQEbM+6IcoFfMCftDAyobIItASI2eZl+ZO/KdbUwr8fzvPOc/vfc7L+yes+lT7b8QHBfvkEdEuu52jhLZIRCPM3Ds58bOxq+1qt7uFnAUzS7ML7pTbFlG8GuqsxSKaIYLe1FBY4tQcAIdZU/vaZuOE/5nddYlE1GUynEoUNAcgS1NXabPZXSdrT6bwr9nfqH3U5einxCtYtTMS12+3uRJLJKIqU/3xixSTUBEXGRnc536CvlzN3l4e0GibHYbSolRWxobgzOUWjE9MOzSxWDRjNn/ZS7vV93SBAd6FTsA6TwnXVanhJfNA5f1ODA1/xd2bBxHgJ4Pe0IPOPosrxfiEtYaw8UpHWIhfkiIiCF4yKbbGbODS0yoQgdp7Lfyq24Ly88nCrtTaPsKG5kES1jOPTuLz2HQnIbx8CoC/kMDPxwPaY3F84UQcZuds+G6dQ//bcWSmRcNuZ/QNjOGAxkiz87blwDxFkFe6AIL6sGIf52ZswWPTexzJjsXEtxlYfyxgft6GwPUyRO2pd60AwEqQV3eAkOS8gx7jIZaH+iIx14R+Uw6kUhHVPhni8FBfpCWEYYfaiJFP1iUIo5MQoS8D0TWh9vGS8rvWbExNL2Bbhon6n2WyYpM/UvPboE4Nx9n8WBy91IWm1tFlAF8nyOuUELOQwj8owJM/tGXiZc8YDmvf0K3i7ZyeFIqY9BeUFh/CTToVHjw1o6R6gMCwYtGuXCJFGYpAqFnLK3TNMM5hpED390IUjS0gZK4JwngOc57a9ZRdps3GIoDLhHX+CRJig8rwMUe34mdaMRxtUkIMgZ4MQLncGwTQ
 AaABw1kW9/k/Y0T5zKW4eEsAAAAASUVORK5CYII=');
-}
-.doctree li.jf {
-    list-style-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACN0lEQVQ4T42SXUiTcRTGn/NuRh+mQeJFFA3nJgnBpEDM6RYRFRRpZIyQQNkCr9y8SQlruhp2kVtISFJzF4ZgH6ur7sShMROL2IXkGhYkZaLhok2quRPv6/b2tlr4vzsfz++c5/AnZL2aE93VRcX5jURUlUpxqVgWBIoyc2hp8dvQ+LMrz5USygTMnHem6ZYruYZL2dBMrBIoToS+gL+1I5OTAJK4uX80mWRjLrEyr1YL44HBlloxJwHqmwd6ksmUPPlwtY7PnqwQybJOEAj3H09jYmpO0qjVwo2A72I7lRvdlVpt8aRyQsuFKj5aq6d44genUpweA/iGpxCcXAeoVEI8Elk4Qofqbnt37tjWqgTYzh/k42Y9uryjCM8syHfKtvdpMeYh7O4c27OrwKQvKcLWLXlSj9VSwcdMWgq9nOfPy3GoBAGhV/N4+25ZgiVWfyIyt4QPH78GCXtdKwAKxUJB/iYUbt+M7rYatpzap5zM7v5J+EfCtPQlgdXvyfQyvELQ9MiAzIreTjPbLPvRdi2IO8PhnBYAxAia3jEQTEp/nstGtlnKYXdN4O7ITG4AI0go6XOC6KoS0NtRydZzZXBcf4F7D2f/A+AugmbAABWLW0h3EN/N9gNsbdDB4Z6G71H03wBGDGspw3qxdNAOgmcjv1DuYTgQbfL+puuHnoBwekMQxlNEGuvkryyLyh7YAXYq7fwBFNcGOTHb4M3k//anCxiggkg3AzCkG18DGAPgx5v690roL9X0xswRYjlfAAAAAElFTkSuQmCC');
-}
-.doctree li.jp {
-    list-style-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACSklEQVQ4T42TTWgTQRTH/29305RmTRoSxSK1glLUeIgnMVYrflA8WYMIQtu7iNhatXoyWkRT0QQqHrwo1oN6MAoi+IGkRlEv0qOGitK01dK03XxW080+ydas21ihcxiYee//+8+8N0OoGJ/6t2+zLnO3gWgrWFunh0kYBvO7X5nk3fXHYm/NEiovmNkycsffy6z2VEKNNYk5Iupv6IicLe/pgJI4MeB/BVab/is2BUiQYvXtkR364UrT2MCBy4y/zs6mk2xxNYIECVohi7lkHMqH68Zp54VScFV75Awlwhu3iO61783OzpZrLNWuIS2fZKG6FhAkUqeHeebFaQNCJObUyfhuGr/pCws213EzwLGnj0VHA5SnR6DNTpNj3w0WbW6knp9AMT1qQLT09xCNBBAV7fXNkqsRgqVG59h2BVmwr0bu2VEdIO8NMcl1yL3shpYZI20uD3UqjmI6MUijF6AQ4NDvVWWHUO2A7H/I4nIPihNDEOQ6kG0lacpXztxvoWI+CaizuhEzFPrRCwV/AOVryG1vmFZsJir1p1iANvER+Scd4Oz4gkICSNHkRUQBNJtrYD0cY8G9CT9veRYTmVMHaeoSAgScM+9Kh14zXB6o93zAzOdKVyOVgfOU7YNX1RAt10GPHowynBuABz4g9WVRAAMpK8OrB7NBdIIQWsorNNl3yT0IG/T8FTwiwv6lQJjxuOYUWo2nXBYVrqITjABovq3/DEYKhEBVN8ILPpM5kUPwakArM3YS4NX7DQwRISoAt6kL38z5vwEadtq3UJGa2gAAAABJRU5ErkJggg==');
-}
-
-.doctree ul { 
-	padding: 0px 0px 0px 20px; 
-}
-
-ul.doctree {
-	padding: 0px 0px 0px 20px; 
-	margin-left: 5px;
-}
-
-.topic a {
-	border-bottom: 1px dotted #4c6b87;
-}
-
-/* Article links */
-a.doclink {
-	font-weight: bold;
-	border-bottom: 1px dotted #4c6b87;
-	text-decoration: none;
-	color: #2c4557;
-}
-

http://git-wip-us.apache.org/repos/asf/juneau-website/blob/b1ebfeda/content/7.0.0/svl.html
----------------------------------------------------------------------
diff --git a/content/7.0.0/svl.html b/content/7.0.0/svl.html
deleted file mode 100644
index cf03c6c..0000000
--- a/content/7.0.0/svl.html
+++ /dev/null
@@ -1,89 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<style>
-	@import url("styles/juneau-code.css");
-	@import url("styles/juneau-doc.css");
-</style>
-</head>
-<body>
-	<!-- ======================================================================================================= -->
-	<!-- === JUNEAU-SVL ======================================================================================== -->
-	<!-- ======================================================================================================= -->
-	
-	<h5 class='toc' id='juneau-svl'>juneau-svl</h5>
-	<div>
-		<h6 class='figure'>Maven Dependency</h6>
-		<p class='bcode' style='width:500px;'>
-	<xt>&lt;dependency&gt;</xt>
-		<xt>&lt;groupId&gt;</xt>org.apache.juneau<xt>&lt;/groupId&gt;</xt>
-		<xt>&lt;artifactId&gt;</xt>juneau-svl<xt>&lt;/artifactId&gt;</xt>
-		<xt>&lt;version&gt;</xt>7.0.0<xt>&lt;/version&gt;</xt>
-	<xt>&lt;/dependency&gt;</xt>
-		</p>	
-	
-		<h6 class='figure'>Java Library</h6>
-		<p class='bcode' style='width:500px;'>
-	juneau-svl-7.0.0.jar 
-		</p>	
-	
-		<h6 class='figure'>OSGi Module</h6>
-		<p class='bcode' style='width:500px;'>
-	org.apache.juneau.svl_7.0.0.jar 
-		</p>	
-	
-		<p>
-			The <code>juneau-svl</code> module defines an API for a language called "Simple Variable Language".
-			In a nutshell, Simple Variable Language (or SVL) is text that contains variables of the form
-			<js>"$varName{varKey}"</js>.
-		</p>
-		<p>
-			Variables can be recursively nested within the varKey (e.g. <js>"$FOO{$BAR{xxx},$BAZ{xxx}}"</js>).
-			Variables can also return values that themselves contain more variables.
-		</p>
-		<p class='bcode'>
-	<jc>// Use the default variable resolver to resolve a string that contains $S (system property) variables</jc>
-	String myProperty = VarResolver.<jsf>DEFAULT</jsf>.resolve(<js>"The Java home directory is $S{java.home}"</js>);
-		</p>
-		<p>
-			The following shows how variables can be arbitrarily nested...
-		</p>
-		<p class='bcode'>
-	<jc>// Look up a property in the following order:
-	// 1) MYPROPERTY environment variable.
-	// 2) 'my.property' system property if environment variable not found.
-	// 3) 'not found' string if system property not found.</jc>
-	String myproperty = VarResolver.<jsf>DEFAULT</jsf>.resolve(<js>"$E{MYPROPERTY,$S{my.property,not found}}"</js>);
-	 	</p>
-		<p>
-			SVL is a large topic on it's own. 
-			It is used extensively in the ConfigFile, REST and Microservice APIs.
-		</p>
-		<p>
-			The following is the default list of supported variables:
-		</p>
-		<ul>
-			<li><code>$ARG{keyOrIndex[,defaultValue]}</code> - Command-line argument.
-			<li><code>$C{key[,defaultValue]}</code> - Config file entry.
-			<li><code>$E{envVar[,defaultValue]}</code> - Environment variable.
-			<li><code>$F{path[,defaultValue]}</code> - File resource.
-			<li><code>$I{name[,defaultValue]}</code> - Servlet init parameter.
-			<li><code>$L{key[,args...]}</code> - Localized message.
-			<li><code>$MF{key[,defaultValue]}</code> - Manifest file entry.
-			<li><code>$R{key[,args...]}</code> - Request variable.
-			<li><code>$S{systemProperty[,defaultValue]}</code> - System property.
-			<li><code>$SA{contentType,key[,defaultValue]}</code> - Serialized request attribute.
-			<li><code>$U{uri}</code> - URI resolver.
-			<li><code>$UE{uriPart}</code> - URL-Encoder.
-			<li><code>$W{widgetName}</code> - HTML widget variable.
-		</ul>
-		<p>
-			Plugging in your own variables is also easy.
-		</p>
-		
-		<ul class='doctree'>
-			<li class='link'>See <a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-svl'>juneau-svl</a> for more information.
-		</ul>
-	</div>
-</body>
-</html>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/juneau-website/blob/b1ebfeda/content/7.0.0/twitter.html
----------------------------------------------------------------------
diff --git a/content/7.0.0/twitter.html b/content/7.0.0/twitter.html
deleted file mode 100644
index 4e02c1e..0000000
--- a/content/7.0.0/twitter.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<!DOCTYPE html>
-<html>
-<body>
-	<a class="twitter-timeline" data-width="600" href="https://twitter.com/ApacheJuneau">Loading...</a> <script src="http://platform.twitter.com/widgets.js" charset="utf-8"></script>
-</body>
-</html>

http://git-wip-us.apache.org/repos/asf/juneau-website/blob/b1ebfeda/content/community.html
----------------------------------------------------------------------
diff --git a/content/community.html b/content/community.html
index d1f11f2..1f01881 100644
--- a/content/community.html
+++ b/content/community.html
@@ -21,16 +21,13 @@
 		<li><a class='doclink' href='https://lists.apache.org/list.html?dev@juneau.apache.org' target='_top'>Pony Mail</a> - Mailing list archive.
 		<li><a class='doclink' href='https://cwiki.apache.org/confluence/display/JUNEAU' target='_top'>Confluence workspace</a> - Design documents and information for developers.
 		<li><a class='doclink' href='https://cwiki.apache.org/confluence/pages/viewrecentblogposts.action?key=JUNEAU' target='_top'>Confluence blog</a> - Updates on new features and changes.
-		<li><a class='doclink' href='http://incubator.apache.org/projects/juneau.html' target='_top'>Incubation status page</a> - Current incubation status of this page.
 		<li><a class='doclink' href='https://twitter.com/ApacheJuneau' target='_top'>Twitter</a> - Announcements.
 		<li><a class='doclink' href='https://the-asf.slack.com/messages/C4RHGMTC2' target='_top'>Slack</a> - Intra-team communication.
-		<li><a class='doclink' href='https://whimsy.apache.org/roster/ppmc/juneau' target='_top'>Whimsy</a> - Juneau PPMC roster.
 	</ul>
 	
 	<h5 class='toc'>Becoming a contributor</h5>
 	<p>
-		Juneau is currently in "Incubation" status within the Apache Foundation.  
-		This means we are actively looking for contributors to join and take an active role in the project!  
+		We are actively looking for contributors to join and take an active role in the project!  
 	</p>
 	<p>
 		To become a contributor, we recommend joining and contributing code changes through the mailing list.
@@ -47,7 +44,7 @@
 		<li>More information for new committers can be found in the <a class='doclink' href='http://www.apache.org/dev/committers.html' target='_top'>Committers information</a> doc.
 	</ul>
 	<p>
-		The Juneau project does not currently have distinct roles for Committers and PPMC (Podling Project Management Committee).
+		The Juneau project does not currently have distinct roles for Committers and PMC (Project Management Committee).
 		All Committers are also voting members.  
 	</p>
 
@@ -65,15 +62,15 @@
 	<br>
 	<table class='styled' style='width:95%'>
 		<tr><th>Name</th><th>Role</th><th>User ID</th></tr>
-		<tr class='light'><td>John D. Ament</td><td>Mentor</td><td>johnadament</td><tr>
-		<tr class='dark'><td>Steve Blackmon</td><td>Mentor</td><td>sblackmon</td><tr>
-		<tr class='light'><td>Craig L Russell</td><td>Mentor</td><td>clr</td><tr>
-		<tr class='dark'><td>Stian Soiland-Reyes</td><td>Mentor</td><td>stain</td><tr>
-		<tr class='light'><td>Jochen Wiedmann</td><td>Mentor</td><td>jochen</td><tr>
-		<tr class='dark'><td>James Bognar</td><td>Committer</td><td>jamesbognar</td><tr>
-		<tr class='light'><td>David M Goddard</td><td>Committer</td><td>dmg</td><tr>
-		<tr class='dark'><td>Peter Haumer</td><td>Committer</td><td>phaumer</td><tr>
-		<tr class='light bb'><td>Raphi D Lee</td><td>Committer</td><td>yidonguk</td><tr>
+		<tr class='light'><td>John D. Ament</td><td>PMC / Committer</td><td>johnadament</td><tr>
+		<tr class='dark'><td>Steve Blackmon</td><td>PMC / Committer</td><td>sblackmon</td><tr>
+		<tr class='light'><td>James Bognar</td><td>PMC Chair / Committer</td><td>jamesbognar</td><tr>
+		<tr class='dark'><td>David M Goddard</td><td>PMC / Committer</td><td>dmg</td><tr>
+		<tr class='light'><td>Peter Haumer</td><td>PMC / Committer</td><td>phaumer</td><tr>
+		<tr class='dark'><td>Raphi D Lee</td><td>PMC / Committer</td><td>yidonguk</td><tr>
+		<tr class='light'><td>Craig L Russell</td><td>PMC / Committer</td><td>clr</td><tr>
+		<tr class='dark'><td>Stian Soiland-Reyes</td><td>PMC / Committer</td><td>stain</td><tr>
+		<tr class='light bb'><td>Jochen Wiedmann</td><td>PMC / Committer</td><td>jochen</td><tr>
 	</table>
 </body>
 </html>

http://git-wip-us.apache.org/repos/asf/juneau-website/blob/b1ebfeda/content/components.html
----------------------------------------------------------------------
diff --git a/content/components.html b/content/components.html
index e1681ee..aea608d 100644
--- a/content/components.html
+++ b/content/components.html
@@ -43,7 +43,7 @@
 				</td>
 				<td>
 					<ul style='margin:0px 10px;'>
-						<li>Java 6
+						<li>Java 7
 					</ul>
 				</td>
 			</tr>
@@ -61,7 +61,7 @@
 				</td>
 				<td>
 					<ul style='margin:0px 10px;'>
-						<li>Java 6
+						<li>Java 7
 						<li>Apache Jena 2.7.1
 					</ul>
 				</td>
@@ -78,21 +78,21 @@
 						<li>Swagger 2.0
 					</ul>				
 				</td>
-				<td><ul style='margin:0px 10px;'><li>Java 6</li></ul></td>
+				<td><ul style='margin:0px 10px;'><li>Java 7</li></ul></td>
 			</tr>
 			<tr class='dark bb'>
 				<td class='code'>juneau-svl</td>
 				<td>
 					Simple Variable Language API
 				</td>
-				<td><ul style='margin:0px 10px;'><li>Java 6</li></ul></td>
+				<td><ul style='margin:0px 10px;'><li>Java 7</li></ul></td>
 			</tr>
 			<tr class='dark bb'>
 				<td class='code'>juneau-config</td>
 				<td>
 					Configuration file API
 				</td>
-				<td><ul style='margin:0px 10px;'><li>Java 6</li></ul></td>
+				<td><ul style='margin:0px 10px;'><li>Java 7</li></ul></td>
 			</tr>
 			<tr class='light bb'>
 				<td rowspan="3" style='text-align:center;font-weight:bold;padding:20px;' class='code'>juneau-rest</td>
@@ -102,7 +102,7 @@
 				</td>
 				<td>
 					<ul style='margin:0px 10px;'>
-						<li>Java 6
+						<li>Java 7
 						<li>Servlet 3.1
 					</ul>
 				</td>
@@ -114,7 +114,7 @@
 				</td>
 				<td>
 					<ul style='margin:0px 10px;'>
-						<li>Java 6
+						<li>Java 7
 						<li>JAX-RS 2.0
 					</ul>
 				</td>
@@ -126,7 +126,7 @@
 				</td>
 				<td>
 					<ul style='margin:0px 10px;'>
-						<li>Java 6
+						<li>Java 7
 						<li>Apache HttpClient 4.5.3
 					</ul>
 				</td>
@@ -187,7 +187,7 @@
 				</td>
 				<td>
 					<ul style='margin:0px 10px;'>
-						<li>Java 6
+						<li>Java 7
 						<li>Servlet 3.1
 						<li>Apache HttpClient 4.5.3
 					</ul>
@@ -196,18 +196,18 @@
 		</table>
 		
 		<p>
-			The current version of Juneau is <code>6.4.0-incubating</code>.
+			The current version of Juneau is <code>7.0.0</code>.
 			The easiest way to pull in the library is through the following maven dependency:
 		</p>
 		<p class='bcode' style='width:500px;'>
 	<xt>&lt;dependency&gt;</xt>
 		<xt>&lt;groupId&gt;</xt>org.apache.juneau<xt>&lt;/groupId&gt;</xt>
 		<xt>&lt;artifactId&gt;</xt>juneau-all<xt>&lt;/artifactId&gt;</xt>
-		<xt>&lt;version&gt;</xt>6.4.0-incubating<xt>&lt;/version&gt;</xt>
+		<xt>&lt;version&gt;</xt>7.0.0<xt>&lt;/version&gt;</xt>
 	<xt>&lt;/dependency&gt;</xt>
 		</p>	
 		<p>
-			If you would like to work with the bleeding-edge code, you can access the <code>6.4.1-incubating-SNAPSHOT</code>
+			If you would like to work with the bleeding-edge code, you can access the <code>7.0.1-SNAPSHOT</code>
 			version through the following repository:
 		</p>
 		<p class='bcode' style='width:500px;'>

http://git-wip-us.apache.org/repos/asf/juneau-website/blob/b1ebfeda/content/config.html
----------------------------------------------------------------------
diff --git a/content/config.html b/content/config.html
index c72943b..10bde25 100644
--- a/content/config.html
+++ b/content/config.html
@@ -18,18 +18,18 @@
 	<xt>&lt;dependency&gt;</xt>
 		<xt>&lt;groupId&gt;</xt>org.apache.juneau<xt>&lt;/groupId&gt;</xt>
 		<xt>&lt;artifactId&gt;</xt>juneau-config<xt>&lt;/artifactId&gt;</xt>
-		<xt>&lt;version&gt;</xt>6.4.0-incubating<xt>&lt;/version&gt;</xt>
+		<xt>&lt;version&gt;</xt>7.0.0<xt>&lt;/version&gt;</xt>
 	<xt>&lt;/dependency&gt;</xt>
 		</p>	
 	
 		<h6 class='figure'>Java Library</h6>
 		<p class='bcode' style='width:500px;'>
-	juneau-config-6.4.0-incubating.jar 
+	juneau-config-7.0.0.jar 
 		</p>	
 	
 		<h6 class='figure'>OSGi Module</h6>
 		<p class='bcode' style='width:500px;'>
-	org.apache.juneau.config_6.4.0-incubating.jar 
+	org.apache.juneau.config_7.0.0.jar 
 		</p>	
 
 		<p>
@@ -133,7 +133,7 @@
 		</ul>
 		
 		<ul class='doctree'>
-			<li class='link'>See <a class='doclink' href='http://juneau.incubator.apache.org/site/apidocs/overview-summary.html#juneau-config'>juneau-config</a> for more information.
+			<li class='link'>See <a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-config'>juneau-config</a> for more information.
 		</ul>
 	</div>	
 </body>

http://git-wip-us.apache.org/repos/asf/juneau-website/blob/b1ebfeda/content/documentation.html
----------------------------------------------------------------------
diff --git a/content/documentation.html b/content/documentation.html
index 671be6a..e4ae7d6 100644
--- a/content/documentation.html
+++ b/content/documentation.html
@@ -5,7 +5,7 @@
 	@import url("styles/juneau-code.css");
 	@import url("styles/juneau-doc.css");
 </style>
-<base href='http://juneau.incubator.apache.org/site/apidocs/overview-summary.html'>
+<base href='http://juneau.apache.org/site/apidocs/overview-summary.html'>
 </head>
 <body>
 	<h5 class='toc'>Documentation</h5>
@@ -17,107 +17,107 @@
 		The package-level documents that link from the overview provide in-depth information on subtopics.
 	</p>
 	<ul class='spaced-list'>
-		<li><a class='doclink' href='http://juneau.incubator.apache.org/site/apidocs/index.html' target="_top">Javadocs</a>
-		<li><a class='doclink' href='http://juneau.incubator.apache.org/site/apidocs/overview-summary.html#overview.description' target="_top">Overview</a>
+		<li><a class='doclink' href='http://juneau.apache.org/site/apidocs/index.html' target="_top">Javadocs</a>
+		<li><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#overview.description' target="_top">Overview</a>
 	</ul>
 	
 	<a id='TOC'></a><h5 class='toc'>Table of Contents</h5>
 	<ol class='toc'>
-		<li><p><a class='doclink' href='http://juneau.incubator.apache.org/site/apidocs/overview-summary.html#Intro'>Introduction</a></p>
+		<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#Intro'>Introduction</a></p>
 		<ol>
-			<li><p><a class='doclink' href='http://juneau.incubator.apache.org/site/apidocs/overview-summary.html#Intro.Features'>Features</a></p>
-			<li><p><a class='doclink' href='http://juneau.incubator.apache.org/site/apidocs/overview-summary.html#Intro.Components'>Components</a></p>
+			<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#Intro.Features'>Features</a></p>
+			<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#Intro.Components'>Components</a></p>
 		</ol>
-		<li><p><a class='doclink' href='http://juneau.incubator.apache.org/site/apidocs/overview-summary.html#juneau-core'><i>juneau-core</i></a></p>
+		<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-core'><i>juneau-core</i></a></p>
 		<ol>
-			<li><p><a class='doclink' href='http://juneau.incubator.apache.org/site/apidocs/overview-summary.html#juneau-marshall'><i>juneau-marshall</i></a></p>
+			<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-marshall'><i>juneau-marshall</i></a></p>
 			<ol>
-				<li><p><a class='doclink' href='http://juneau.incubator.apache.org/site/apidocs/overview-summary.html#juneau-marshall.Serializers'>Serializers</a></p>
-				<li><p><a class='doclink' href='http://juneau.incubator.apache.org/site/apidocs/overview-summary.html#juneau-marshall.Parsers'>Parsers</a></p>
-				<li><p><a class='doclink' href='http://juneau.incubator.apache.org/site/apidocs/overview-summary.html#juneau-marshall.SerializerAndParserGroups'>SerializerGroups and ParserGroups</a></p>
-				<li><p><a class='doclink' href='http://juneau.incubator.apache.org/site/apidocs/overview-summary.html#juneau-marshall.ObjectMap'>ObjectMap and ObjectList</a></p>
-				<li><p><a class='doclink' href='http://juneau.incubator.apache.org/site/apidocs/overview-summary.html#juneau-marshall.ConfigurableProperties'>Configurable Properties</a></p>
-				<li><p><a class='doclink' href='http://juneau.incubator.apache.org/site/apidocs/overview-summary.html#juneau-marshall.Transforms'>Transforms</a></p>
+				<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-marshall.Serializers'>Serializers</a></p>
+				<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-marshall.Parsers'>Parsers</a></p>
+				<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-marshall.SerializerAndParserGroups'>SerializerGroups and ParserGroups</a></p>
+				<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-marshall.ObjectMap'>ObjectMap and ObjectList</a></p>
+				<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-marshall.ConfigurableProperties'>Configurable Properties</a></p>
+				<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-marshall.Transforms'>Transforms</a></p>
 				<ol>
-					<li><p><a class='doclink' href='http://juneau.incubator.apache.org/site/apidocs/overview-summary.html#juneau-marshall.PojoSwaps'>PojoSwaps</a></p>
-					<li><p><a class='doclink' href='http://juneau.incubator.apache.org/site/apidocs/overview-summary.html#juneau-marshall.SwapAnnotation'>@Swap annotation</a></p>
-					<li><p><a class='doclink' href='http://juneau.incubator.apache.org/site/apidocs/overview-summary.html#juneau-marshall.SwapMethods'>Swap methods</a></p>
-					<li><p><a class='doclink' href='http://juneau.incubator.apache.org/site/apidocs/overview-summary.html#juneau-marshall.BeanFilters'>BeanFilters and @Bean annotations</a></p>
-					<li><p><a class='doclink' href='http://juneau.incubator.apache.org/site/apidocs/overview-summary.html#juneau-marshall.SerializingReadersAndInputStreams'>Serializing Readers and InputStreams</a></p>
+					<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-marshall.PojoSwaps'>PojoSwaps</a></p>
+					<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-marshall.SwapAnnotation'>@Swap annotation</a></p>
+					<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-marshall.SwapMethods'>Swap methods</a></p>
+					<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-marshall.BeanFilters'>BeanFilters and @Bean annotations</a></p>
+					<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-marshall.SerializingReadersAndInputStreams'>Serializing Readers and InputStreams</a></p>
 				</ol>
-				<li><p><a class='doclink' href='http://juneau.incubator.apache.org/site/apidocs/overview-summary.html#juneau-marshall.BeanDictionaries'>Bean Name and Dictionaries</a></p>
+				<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-marshall.BeanDictionaries'>Bean Name and Dictionaries</a></p>
 				<ol>
-					<li><p><a class='doclink' href='http://juneau.incubator.apache.org/site/apidocs/overview-summary.html#juneau-marshall.BeanSubTypes'>Bean Subtypes</a></p>
+					<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-marshall.BeanSubTypes'>Bean Subtypes</a></p>
 				</ol>
-				<li><p><a class='doclink' href='http://juneau.incubator.apache.org/site/apidocs/overview-summary.html#juneau-marshall.VirtualBeans'>Virtual Beans</a></p>
-				<li><p><a class='doclink' href='http://juneau.incubator.apache.org/site/apidocs/overview-summary.html#juneau-marshall.JacksonComparison'>Comparison with Jackson</a></p>
-				<li><p><a class='doclink' href='http://juneau.incubator.apache.org/site/apidocs/overview-summary.html#juneau-marshall.PojoCategories'>POJO Categories</a></p>
-				<li><p><a class='doclink' href='http://juneau.incubator.apache.org/site/apidocs/overview-summary.html#juneau-marshall.BestPractices'>Best Practices</a></p>
-				<li><p><a class='doclink' href='http://juneau.incubator.apache.org/site/apidocs/overview-summary.html#juneau-marshall.AdditionalInfo'>Additional Information</a></p>
+				<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-marshall.VirtualBeans'>Virtual Beans</a></p>
+				<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-marshall.JacksonComparison'>Comparison with Jackson</a></p>
+				<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-marshall.PojoCategories'>POJO Categories</a></p>
+				<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-marshall.BestPractices'>Best Practices</a></p>
+				<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-marshall.AdditionalInfo'>Additional Information</a></p>
 			</ol>
-			<li><p><a class='doclink' href='http://juneau.incubator.apache.org/site/apidocs/overview-summary.html#juneau-marshall-rdf'><i>juneau-marshall-rdf</i></a></p>
-			<li><p><a class='doclink' href='http://juneau.incubator.apache.org/site/apidocs/overview-summary.html#juneau-dto'><i>juneau-dto</i></a></p>
+			<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-marshall-rdf'><i>juneau-marshall-rdf</i></a></p>
+			<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-dto'><i>juneau-dto</i></a></p>
 			<ol>
-				<li><p><a class='doclink' href='http://juneau.incubator.apache.org/site/apidocs/overview-summary.html#juneau-dto.HTML5'>HTML5</a></p>
-				<li><p><a class='doclink' href='http://juneau.incubator.apache.org/site/apidocs/overview-summary.html#juneau-dto.Atom'>Atom</a></p>
-				<li><p><a class='doclink' href='http://juneau.incubator.apache.org/site/apidocs/overview-summary.html#juneau-dto.Swagger'>Swagger</a></p>
-				<li><p><a class='doclink' href='http://juneau.incubator.apache.org/site/apidocs/overview-summary.html#juneau-dto.JsonSchema'>JSON-Schema</a></p>
+				<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-dto.HTML5'>HTML5</a></p>
+				<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-dto.Atom'>Atom</a></p>
+				<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-dto.Swagger'>Swagger</a></p>
+				<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-dto.JsonSchema'>JSON-Schema</a></p>
 			</ol>
-			<li><p><a class='doclink' href='http://juneau.incubator.apache.org/site/apidocs/overview-summary.html#juneau-svl'><i>juneau-svl</i></a></p>
-			<li><p><a class='doclink' href='http://juneau.incubator.apache.org/site/apidocs/overview-summary.html#juneau-config'><i>juneau-config</i></a></p>
+			<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-svl'><i>juneau-svl</i></a></p>
+			<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-config'><i>juneau-config</i></a></p>
 		</ol>
-		<li><p><a class='doclink' href='http://juneau.incubator.apache.org/site/apidocs/overview-summary.html#juneau-rest'><i>juneau-rest</i></a></p>
+		<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-rest'><i>juneau-rest</i></a></p>
 		<ol>
-			<li><p><a class='doclink' href='http://juneau.incubator.apache.org/site/apidocs/overview-summary.html#juneau-rest-server'><i>juneau-rest-server</i></a></p>
+			<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-rest-server'><i>juneau-rest-server</i></a></p>
 			<ol>
-				<li><p><a class='doclink' href='http://juneau.incubator.apache.org/site/apidocs/overview-summary.html#juneau-rest-server.Remoteable'>Remoteable Proxies</a></p>
-				<li><p><a class='doclink' href='http://juneau.incubator.apache.org/site/apidocs/overview-summary.html#juneau-rest-server.Injection'>Using with Spring or other Injection frameworks</a></p>
-				<li><p><a class='doclink' href='http://juneau.incubator.apache.org/site/apidocs/overview-summary.html#juneau-rest-server.HTTP2'>Using HTTP/2 features</a></p>
+				<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-rest-server.Remoteable'>Remoteable Proxies</a></p>
+				<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-rest-server.Injection'>Using with Spring or other Injection frameworks</a></p>
+				<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-rest-server.HTTP2'>Using HTTP/2 features</a></p>
 			</ol>
-			<li><p><a class='doclink' href='http://juneau.incubator.apache.org/site/apidocs/overview-summary.html#juneau-rest-server-jaxrs'><i>juneau-rest-server-jaxrs</i></a></p>
-			<li><p><a class='doclink' href='http://juneau.incubator.apache.org/site/apidocs/overview-summary.html#juneau-rest-client'><i>juneau-rest-client</i></a></p>
+			<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-rest-server-jaxrs'><i>juneau-rest-server-jaxrs</i></a></p>
+			<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-rest-client'><i>juneau-rest-client</i></a></p>
 			<ol>
-				<li><p><a class='doclink' href='http://juneau.incubator.apache.org/site/apidocs/overview-summary.html#juneau-rest-client.3rdPartyProxies'>Interface proxies against 3rd-party REST interfaces</a></p>
+				<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-rest-client.3rdPartyProxies'>Interface proxies against 3rd-party REST interfaces</a></p>
 			</ol>
 		</ol>
-		<li><p><a class='doclink' href='http://juneau.incubator.apache.org/site/apidocs/overview-summary.html#juneau-microservice'><i>juneau-microservice</i></a></p>
+		<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-microservice'><i>juneau-microservice</i></a></p>
 		<ol>
-			<li><p><a class='doclink' href='http://juneau.incubator.apache.org/site/apidocs/overview-summary.html#juneau-microservice-server'><i>juneau-microservice-server</i></a></p>
-			<li><p><a class='doclink' href='http://juneau.incubator.apache.org/site/apidocs/overview-summary.html#juneau-microservice-template'><i>juneau-microservice-template</i></a></p>
+			<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-microservice-server'><i>juneau-microservice-server</i></a></p>
+			<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-microservice-template'><i>juneau-microservice-template</i></a></p>
 		</ol>
-		<li><p><a class='doclink' href='http://juneau.incubator.apache.org/site/apidocs/overview-summary.html#juneau-examples'><i>juneau-examples</i></a></p>
+		<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-examples'><i>juneau-examples</i></a></p>
 		<ol>
-			<li><p><a class='doclink' href='http://juneau.incubator.apache.org/site/apidocs/overview-summary.html#juneau-examples-core'><i>juneau-examples-core</i></a></p>
-			<li><p><a class='doclink' href='http://juneau.incubator.apache.org/site/apidocs/overview-summary.html#juneau-examples-rest'><i>juneau-examples-rest</i></a></p>
+			<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-examples-core'><i>juneau-examples-core</i></a></p>
+			<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-examples-rest'><i>juneau-examples-rest</i></a></p>
 			<ol>
-				<li><p><a class='doclink' href='http://juneau.incubator.apache.org/site/apidocs/overview-summary.html#juneau-examples-rest.RootResources'>RootResources</a></p>
-				<li><p><a class='doclink' href='http://juneau.incubator.apache.org/site/apidocs/overview-summary.html#juneau-examples-rest.HelloWorldResource'>HelloWorldResource</a></p>
-				<li><p><a class='doclink' href='http://juneau.incubator.apache.org/site/apidocs/overview-summary.html#juneau-examples-rest.MethodExampleResource'>MethodExampleResource</a></p>
-				<li><p><a class='doclink' href='http://juneau.incubator.apache.org/site/apidocs/overview-summary.html#juneau-examples-rest.UrlEncodedFormResource'>UrlEncodedFormResource</a></p>
-				<li><p><a class='doclink' href='http://juneau.incubator.apache.org/site/apidocs/overview-summary.html#juneau-examples-rest.RequestEchoResource'>RequestEchoResource</a></p>
-				<li><p><a class='doclink' href='http://juneau.incubator.apache.org/site/apidocs/overview-summary.html#juneau-examples-rest.AddressBookResource'>AddressBookResource</a></p>
+				<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-examples-rest.RootResources'>RootResources</a></p>
+				<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-examples-rest.HelloWorldResource'>HelloWorldResource</a></p>
+				<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-examples-rest.MethodExampleResource'>MethodExampleResource</a></p>
+				<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-examples-rest.UrlEncodedFormResource'>UrlEncodedFormResource</a></p>
+				<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-examples-rest.RequestEchoResource'>RequestEchoResource</a></p>
+				<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-examples-rest.AddressBookResource'>AddressBookResource</a></p>
 				<ol>
-					<li><p><a class='doclink' href='http://juneau.incubator.apache.org/site/apidocs/overview-summary.html#juneau-examples-rest.AddressBookResource.Classes'>Classes</a></p>
-					<li><p><a class='doclink' href='http://juneau.incubator.apache.org/site/apidocs/overview-summary.html#juneau-examples-rest.AddressBookResource.Demo'>Demo</a></p>
-					<li><p><a class='doclink' href='http://juneau.incubator.apache.org/site/apidocs/overview-summary.html#juneau-examples-rest.AddressBookResource.Traversable'>Traversable</a></p>
-					<li><p><a class='doclink' href='http://juneau.incubator.apache.org/site/apidocs/overview-summary.html#juneau-examples-rest.AddressBookResource.Queryable'>Queryable</a></p>
-					<li><p><a class='doclink' href='http://juneau.incubator.apache.org/site/apidocs/overview-summary.html#juneau-examples-rest.AddressBookResource.Introspectable'>Introspectable</a></p>
-					<li><p><a class='doclink' href='http://juneau.incubator.apache.org/site/apidocs/overview-summary.html#juneau-examples-rest.AddressBookResource.RestClient'>ClientTest</a></p>
-					<li><p><a class='doclink' href='http://juneau.incubator.apache.org/site/apidocs/overview-summary.html#juneau-examples-rest.AddressBookResource.Browser'>Browser Tips</a></p>
+					<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-examples-rest.AddressBookResource.Classes'>Classes</a></p>
+					<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-examples-rest.AddressBookResource.Demo'>Demo</a></p>
+					<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-examples-rest.AddressBookResource.Traversable'>Traversable</a></p>
+					<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-examples-rest.AddressBookResource.Queryable'>Queryable</a></p>
+					<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-examples-rest.AddressBookResource.Introspectable'>Introspectable</a></p>
+					<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-examples-rest.AddressBookResource.RestClient'>ClientTest</a></p>
+					<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-examples-rest.AddressBookResource.Browser'>Browser Tips</a></p>
 				</ol>
-				<li><p><a class='doclink' href='http://juneau.incubator.apache.org/site/apidocs/overview-summary.html#juneau-examples-rest.SampleRemoteableServlet'>SampleRemoteableServlet</a></p>
-				<li><p><a class='doclink' href='http://juneau.incubator.apache.org/site/apidocs/overview-summary.html#juneau-examples-rest.TempDirResource'>TempDirResource</a></p>
-				<li><p><a class='doclink' href='http://juneau.incubator.apache.org/site/apidocs/overview-summary.html#juneau-examples-rest.AtomFeedResource'>AtomFeedResource</a></p>
-				<li><p><a class='doclink' href='http://juneau.incubator.apache.org/site/apidocs/overview-summary.html#juneau-examples-rest.DockerRegistryResource'>DockerRegistryResource</a></p>
-				<li><p><a class='doclink' href='http://juneau.incubator.apache.org/site/apidocs/overview-summary.html#juneau-examples-rest.TumblrParserResource'>TumblrParserResource</a></p>
-				<li><p><a class='doclink' href='http://juneau.incubator.apache.org/site/apidocs/overview-summary.html#juneau-examples-rest.PhotosResource'>PhotosResource</a></p>
-				<li><p><a class='doclink' href='http://juneau.incubator.apache.org/site/apidocs/overview-summary.html#juneau-examples-rest.JsonSchemaResource'>JsonSchemaResource</a></p>
-				<li><p><a class='doclink' href='http://juneau.incubator.apache.org/site/apidocs/overview-summary.html#juneau-examples-rest.SqlQueryResource'>SqlQueryResource</a></p>
-				<li><p><a class='doclink' href='http://juneau.incubator.apache.org/site/apidocs/overview-summary.html#juneau-examples-rest.ConfigResource'>ConfigResource</a></p>
-				<li><p><a class='doclink' href='http://juneau.incubator.apache.org/site/apidocs/overview-summary.html#juneau-examples-rest.LogsResource'>LogsResource</a></p>
+				<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-examples-rest.SampleRemoteableServlet'>SampleRemoteableServlet</a></p>
+				<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-examples-rest.TempDirResource'>TempDirResource</a></p>
+				<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-examples-rest.AtomFeedResource'>AtomFeedResource</a></p>
+				<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-examples-rest.DockerRegistryResource'>DockerRegistryResource</a></p>
+				<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-examples-rest.TumblrParserResource'>TumblrParserResource</a></p>
+				<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-examples-rest.PhotosResource'>PhotosResource</a></p>
+				<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-examples-rest.JsonSchemaResource'>JsonSchemaResource</a></p>
+				<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-examples-rest.SqlQueryResource'>SqlQueryResource</a></p>
+				<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-examples-rest.ConfigResource'>ConfigResource</a></p>
+				<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-examples-rest.LogsResource'>LogsResource</a></p>
 			</ol>
 		</ol>
-		<li><p><a class='doclink' href='http://juneau.incubator.apache.org/site/apidocs/overview-summary.html#ReleaseNotes'>Release Notes</a></p>
+		<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#ReleaseNotes'>Release Notes</a></p>
 	</ol>
 	
 </body>

http://git-wip-us.apache.org/repos/asf/juneau-website/blob/b1ebfeda/content/downloads.html
----------------------------------------------------------------------
diff --git a/content/downloads.html b/content/downloads.html
index d63967c..31fe0b8 100644
--- a/content/downloads.html
+++ b/content/downloads.html
@@ -20,16 +20,16 @@
 
 	<h5 class='toc'>Current release</h5>
 	<p class='download'>
-		6.4.0 (Oct 4, 2017) 
-		- <a href='http://juneau.incubator.apache.org/site/apidocs/overview-summary.html#6.4.0'>Release Notes</a>
-		- <a href='https://www.apache.org/dyn/closer.cgi/juneau/binaries/juneau-6.4.0-incubating/apache-juneau-6.4.0-incubating-bin.zip'>Binaries</a> 
-		(<a href='https://www.apache.org/dist/juneau/binaries/juneau-6.4.0-incubating/apache-juneau-6.4.0-incubating-bin.zip.asc'>ASC</a>,
-		<a href='https://www.apache.org/dist/juneau/binaries/juneau-6.4.0-incubating/apache-juneau-6.4.0-incubating-bin.zip.md5'>MD5</a>,
-		<a href='https://www.apache.org/dist/juneau/binaries/juneau-6.4.0-incubating/apache-juneau-6.4.0-incubating-bin.zip.sha1'>SHA1</a>)
-		- <a href='https://www.apache.org/dyn/closer.cgi/juneau/source/juneau-6.4.0-incubating/apache-juneau-6.4.0-incubating-src.zip'>Source</a>
-		(<a href='https://www.apache.org/dist/juneau/source/juneau-6.4.0-incubating/apache-juneau-6.4.0-incubating-src.zip.asc'>ASC</a>,
-		<a href='https://www.apache.org/dist/juneau/source/juneau-6.4.0-incubating/apache-juneau-6.4.0-incubating-src.zip.md5'>MD5</a>,
-		<a href='https://www.apache.org/dist/juneau/source/juneau-6.4.0-incubating/apache-juneau-6.4.0-incubating-src.zip.sha1'>SHA1</a>)
+		7.0.0 (Oct 25, 2017) 
+		- <a href='http://juneau.apache.org/site/apidocs/overview-summary.html#7.0.0'>Release Notes</a>
+		- <a href='https://www.apache.org/dyn/closer.cgi/juneau/binaries/juneau-7.0.0/apache-juneau-7.0.0-bin.zip'>Binaries</a> 
+		(<a href='https://www.apache.org/dist/juneau/binaries/juneau-7.0.0/apache-juneau-7.0.0-bin.zip.asc'>ASC</a>,
+		<a href='https://www.apache.org/dist/juneau/binaries/juneau-7.0.0/apache-juneau-7.0.0-bin.zip.md5'>MD5</a>,
+		<a href='https://www.apache.org/dist/juneau/binaries/juneau-7.0.0/apache-juneau-7.0.0-bin.zip.sha1'>SHA1</a>)
+		- <a href='https://www.apache.org/dyn/closer.cgi/juneau/source/juneau-7.0.0/apache-juneau-7.0.0-src.zip'>Source</a>
+		(<a href='https://www.apache.org/dist/juneau/source/juneau-7.0.0/apache-juneau-7.0.0-src.zip.asc'>ASC</a>,
+		<a href='https://www.apache.org/dist/juneau/source/juneau-7.0.0/apache-juneau-7.0.0-src.zip.md5'>MD5</a>,
+		<a href='https://www.apache.org/dist/juneau/source/juneau-7.0.0/apache-juneau-7.0.0-src.zip.sha1'>SHA1</a>)
 	</p>
 	<ul>
 		<li><b>Binaries</b>
@@ -72,7 +72,7 @@
 		<xt>&lt;dependency&gt;</xt>
 			<xt>&lt;groupId&gt;</xt>org.apache.juneau<xt>&lt;/groupId&gt;</xt>
 			<xt>&lt;artifactId&gt;</xt>juneau-XXX<xt>&lt;/artifactId&gt;</xt>
-			<xt>&lt;version&gt;</xt>6.4.0-incubating<xt>&lt;/version&gt;</xt>
+			<xt>&lt;version&gt;</xt>7.0.0<xt>&lt;/version&gt;</xt>
 		<xt>&lt;/dependency&gt;</xt>
 
 		<xc>&lt;!--  ...where the artifactId can be any of the following... --&gt;</xc>
@@ -95,28 +95,28 @@
 	</p>
 	<p>
 		The PGP signatures can be verified using PGP or GPG. 
-		<br>First download the <a class='doclink' href='https://www.apache.org/dist/juneau/KEYS'>KEYS</a> as well 
+		<br>First download the <a class='doclink' href='https://www.apache.org/dist/incubator/juneau/KEYS'>KEYS</a> as well 
 		as the asc signature file for the relevant distribution. 
-		<br>Make sure you get these files from the <a class='doclink' href='http://www.apache.org/dist/juneau'>main distribution directory</a> rather than from a mirror. 
+		<br>Make sure you get these files from the <a class='doclink' href='http://www.apache.org/dist/incubator/juneau'>main distribution directory</a> rather than from a mirror. 
 		<br>Then verify the signatures using:
 	</p>
 	<p class='bcode' style='max-width:800px;'>
 	pgpk -a KEYS
-	pgpv apache-juneau-6.4.0-incubating-bin.zip.asc 
+	pgpv apache-juneau-7.0.0-bin.zip.asc 
 	</p>
 	<p>
 		... or ... 
 	</p>
 	<p class='bcode' style='max-width:800px;'>
 	pgp -ka KEYS
-	apache-juneau-6.4.0-incubating-bin.zip.asc 
+	apache-juneau-7.0.0-bin.zip.asc 
 	</p>
 	<p>
 		... or ... 
 	</p>
 	<p class='bcode' style='max-width:800px;'>
 	gpg --import KEYS
-	gpg --verify apache-juneau-6.4.0-incubating-bin.zip.asc apache-juneau-6.4.0-incubating-bin.zip
+	gpg --verify apache-juneau-7.0.0-bin.zip.asc apache-juneau-7.0.0-bin.zip
 	</p>
 	<p>	
 		Alternatively, you can verify the MD5 signature on the files. 
@@ -136,8 +136,20 @@
 	
 	<h5 class='toc'>Older releases</h5>
 	<p class='download'>
+		6.4.0 (Oct 04, 2017) 
+		- <a href='http://juneau.apache.org/site/apidocs/overview-summary.html#6.4.0'>Release Notes</a>
+		- <a href='http://archive.apache.org/dist/incubator/juneau/binaries/juneau-6.4.0-incubating/apache-juneau-6.4.0-incubating-bin.zip'>Binaries</a> 
+		(<a href='https://archive.apache.org/dist/incubator/juneau/binaries/juneau-6.4.0-incubating/apache-juneau-6.4.0-incubating-bin.zip.asc'>ASC</a>,
+		<a href='https://archive.apache.org/dist/incubator/juneau/binaries/juneau-6.4.0-incubating/apache-juneau-6.4.0-incubating-bin.zip.md5'>MD5</a>,
+		<a href='https://archive.apache.org/dist/incubator/juneau/binaries/juneau-6.4.0-incubating/apache-juneau-6.4.0-incubating-bin.zip.sha1'>SHA1</a>)
+		- <a href='http://archive.apache.org/dist/incubator/juneau/source/juneau-6.4.0-incubating/apache-juneau-6.4.0-incubating-src.zip'>Source</a>
+		(<a href='https://archive.apache.org/dist/incubator/juneau/source/juneau-6.4.0-incubating/apache-juneau-6.4.0-incubating-src.zip.asc'>ASC</a>,
+		<a href='https://archive.apache.org/dist/incubator/juneau/source/juneau-6.4.0-incubating/apache-juneau-6.4.0-incubating-src.zip.md5'>MD5</a>,
+		<a href='https://archive.apache.org/dist/incubator/juneau/source/juneau-6.4.0-incubating/apache-juneau-6.4.0-incubating-src.zip.sha1'>SHA1</a>)
+	</p>
+	<p class='download'>
 		6.3.1 (Aug 02, 2017) 
-		- <a href='http://juneau.incubator.apache.org/site/apidocs/overview-summary.html#6.3.1'>Release Notes</a>
+		- <a href='http://juneau.apache.org/site/apidocs/overview-summary.html#6.3.1'>Release Notes</a>
 		- <a href='http://archive.apache.org/dist/incubator/juneau/binaries/juneau-6.3.1-incubating/apache-juneau-6.3.1-incubating-bin.zip'>Binaries</a> 
 		(<a href='https://archive.apache.org/dist/incubator/juneau/binaries/juneau-6.3.1-incubating/apache-juneau-6.3.1-incubating-bin.zip.asc'>ASC</a>,
 		<a href='https://archive.apache.org/dist/incubator/juneau/binaries/juneau-6.3.1-incubating/apache-juneau-6.3.1-incubating-bin.zip.md5'>MD5</a>,
@@ -149,7 +161,7 @@
 	</p>
 	<p class='download'>
 		6.3.0 (Jun 28, 2017) 
-		- <a href='http://juneau.incubator.apache.org/site/apidocs/overview-summary.html#6.3.0'>Release Notes</a>
+		- <a href='http://juneau.apache.org/site/apidocs/overview-summary.html#6.3.0'>Release Notes</a>
 		- <a href='http://archive.apache.org/dist/incubator/juneau/binaries/juneau-6.3.0-incubating/apache-juneau-6.3.0-incubating-bin.zip'>Binaries</a> 
 		(<a href='https://archive.apache.org/dist/incubator/juneau/binaries/juneau-6.3.0-incubating/apache-juneau-6.3.0-incubating-bin.zip.asc'>ASC</a>,
 		<a href='https://archive.apache.org/dist/incubator/juneau/binaries/juneau-6.3.0-incubating/apache-juneau-6.3.0-incubating-bin.zip.md5'>MD5</a>,
@@ -161,7 +173,7 @@
 	</p>
 	<p class='download'>
 		6.2.0 (Apr 28, 2017) 
-		- <a href='http://juneau.incubator.apache.org/site/apidocs/overview-summary.html#6.2.0'>Release Notes</a>
+		- <a href='http://juneau.apache.org/site/apidocs/overview-summary.html#6.2.0'>Release Notes</a>
 		- <a href='http://archive.apache.org/dist/incubator/juneau/binaries/juneau-6.2.0-incubating/apache-juneau-6.2.0-incubating-bin.zip'>Binaries</a> 
 		(<a href='https://archive.apache.org/dist/incubator/juneau/binaries/juneau-6.2.0-incubating/apache-juneau-6.2.0-incubating-bin.zip.asc'>ASC</a>,
 		<a href='https://archive.apache.org/dist/incubator/juneau/binaries/juneau-6.2.0-incubating/apache-juneau-6.2.0-incubating-bin.zip.md5'>MD5</a>,
@@ -173,7 +185,7 @@
 	</p>
 	<p class='download'>
 		6.1.0 (Feb 25, 2017) 
-		- <a href='http://juneau.incubator.apache.org/site/apidocs/overview-summary.html#6.1.0'>Release Notes</a>
+		- <a href='http://juneau.apache.org/site/apidocs/overview-summary.html#6.1.0'>Release Notes</a>
 		- <a href='http://archive.apache.org/dist/incubator/juneau/binaries/juneau-6.1.0-incubating/apache-juneau-6.1.0-incubating-bin.zip'>Binaries</a> 
 		(<a href='https://archive.apache.org/dist/incubator/juneau/binaries/juneau-6.1.0-incubating/apache-juneau-6.1.0-incubating-bin.zip.asc'>ASC</a>,
 		<a href='https://archive.apache.org/dist/incubator/juneau/binaries/juneau-6.1.0-incubating/apache-juneau-6.1.0-incubating-bin.zip.md5'>MD5</a>,
@@ -185,7 +197,7 @@
 	</p>
 	<p class='download'>
 		6.0.1 (Jan 03, 2017) 
-		- <a href='http://juneau.incubator.apache.org/site/apidocs/overview-summary.html#6.0.1'>Release Notes</a>
+		- <a href='http://juneau.apache.org/site/apidocs/overview-summary.html#6.0.1'>Release Notes</a>
 		- <a href='http://archive.apache.org/dist/incubator/juneau/binaries/juneau-6.0.1-incubating/apache-juneau-6.0.1-incubating-bin.zip'>Binaries</a> 
 		(<a href='https://archive.apache.org/dist/incubator/juneau/binaries/juneau-6.0.1-incubating/apache-juneau-6.0.1-incubating-bin.zip.asc'>ASC</a>,
 		<a href='https://archive.apache.org/dist/incubator/juneau/binaries/juneau-6.0.1-incubating/apache-juneau-6.0.1-incubating-bin.zip.md5'>MD5</a>,
@@ -197,7 +209,7 @@
 	</p>
 	<p class='download'>
 		6.0.0 (Oct 25, 2016) 
-		- <a href='http://juneau.incubator.apache.org/site/apidocs/overview-summary.html#6.0.0'>Release Notes</a>
+		- <a href='http://juneau.apache.org/site/apidocs/overview-summary.html#6.0.0'>Release Notes</a>
 		- <a href='http://archive.apache.org/dist/incubator/juneau/binaries/juneau-6.0.0-incubating/apache-juneau-6.0.0-incubating-bin.zip'>Binaries</a> 
 		(<a href='https://archive.apache.org/dist/incubator/juneau/binaries/juneau-6.0.0-incubating/apache-juneau-6.0.0-incubating-bin.zip.asc'>ASC</a>,
 		<a href='https://archive.apache.org/dist/incubator/juneau/binaries/juneau-6.0.0-incubating/apache-juneau-6.0.0-incubating-bin.zip.md5'>MD5</a>,

http://git-wip-us.apache.org/repos/asf/juneau-website/blob/b1ebfeda/content/dto.html
----------------------------------------------------------------------
diff --git a/content/dto.html b/content/dto.html
index c257a1b..489a3d7 100644
--- a/content/dto.html
+++ b/content/dto.html
@@ -18,18 +18,18 @@
 	<xt>&lt;dependency&gt;</xt>
 		<xt>&lt;groupId&gt;</xt>org.apache.juneau<xt>&lt;/groupId&gt;</xt>
 		<xt>&lt;artifactId&gt;</xt>juneau-dto<xt>&lt;/artifactId&gt;</xt>
-		<xt>&lt;version&gt;</xt>6.4.0-incubating<xt>&lt;/version&gt;</xt>
+		<xt>&lt;version&gt;</xt>7.0.0<xt>&lt;/version&gt;</xt>
 	<xt>&lt;/dependency&gt;</xt>
 		</p>	
 	
 		<h6 class='figure'>Java Library</h6>
 		<p class='bcode' style='width:500px;'>
-	juneau-dto-6.4.0-incubating.jar 
+	juneau-dto-7.0.0.jar 
 		</p>	
 	
 		<h6 class='figure'>OSGi Module</h6>
 		<p class='bcode' style='width:500px;'>
-	org.apache.juneau.dto_6.4.0-incubating.jar 
+	org.apache.juneau.dto_7.0.0.jar 
 		</p>	
 
 		<p>
@@ -248,7 +248,7 @@
 		</p>
 		
 		<ul class='doctree'>
-			<li class='link'>See <a class='doclink' href='http://juneau.incubator.apache.org/site/apidocs/overview-summary.html#juneau-dto'>juneau-dto</a> for more information.
+			<li class='link'>See <a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-dto'>juneau-dto</a> for more information.
 		</ul>
 	</div>
 </body>

http://git-wip-us.apache.org/repos/asf/juneau-website/blob/b1ebfeda/content/examples.html
----------------------------------------------------------------------
diff --git a/content/examples.html b/content/examples.html
index c4b319f..585d5f7 100644
--- a/content/examples.html
+++ b/content/examples.html
@@ -23,7 +23,7 @@
 	
 			<h6 class='figure'>Archive File</h6>
 			<p class='bcode' style='width:500px;'>
-	juneau-examples-core-6.4.0-incubating.zip 
+	juneau-examples-core-7.0.0.zip 
 			</p>	
 
 			<p>
@@ -31,7 +31,7 @@
 			</p>
 			<p>
 				The project project can be loaded into your workspace by importing the 
-				<code>juneau-examples-core-6.4.0-incubating.zip</code> file. 
+				<code>juneau-examples-core-7.0.0.zip</code> file. 
 			</p>
 			<p>
 				Once loaded, you should see the following project structure:
@@ -45,7 +45,7 @@
 
 
 			<ul class='doctree'>
-				<li class='link'>See <a class='doclink' href='http://juneau.incubator.apache.org/site/apidocs/overview-summary.html#juneau-examples-core'>juneau-examples-core</a> for more information.
+				<li class='link'>See <a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-examples-core'>juneau-examples-core</a> for more information.
 			</ul>
 		</div>
 	
@@ -58,7 +58,7 @@
 	
 			<h6 class='figure'>Archive File</h6>
 			<p class='bcode' style='width:500px;'>
-	juneau-examples-rest-6.4.0-incubating.zip 
+	juneau-examples-rest-7.0.0.zip 
 			</p>	
 
 			<p>
@@ -67,7 +67,7 @@
 			</p>
 			<p>
 				The project project can be loaded into your workspace by importing the 
-				<code>juneau-examples-rest-6.4.0-incubating.zip</code> file. 
+				<code>juneau-examples-rest-7.0.0.zip</code> file. 
 			</p>
 			<p>
 				Once loaded, you should see the following project structure:
@@ -80,7 +80,7 @@
 			<img class='bordered' src='images/juneau-examples-rest.import4.png' style='width:466px'>
 		
 			<ul class='doctree'>
-				<li class='link'>See <a class='doclink' href='http://juneau.incubator.apache.org/site/apidocs/overview-summary.html#juneau-examples-rest'>juneau-examples-rest</a> for more information.
+				<li class='link'>See <a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-examples-rest'>juneau-examples-rest</a> for more information.
 			</ul>
 		</div>
 

http://git-wip-us.apache.org/repos/asf/juneau-website/blob/b1ebfeda/content/images/Components.png
----------------------------------------------------------------------
diff --git a/content/images/Components.png b/content/images/Components.png
deleted file mode 100644
index 7ae8596..0000000
Binary files a/content/images/Components.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/juneau-website/blob/b1ebfeda/content/images/alaska.png
----------------------------------------------------------------------
diff --git a/content/images/alaska.png b/content/images/alaska.png
deleted file mode 100644
index 2387c57..0000000
Binary files a/content/images/alaska.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/juneau-website/blob/b1ebfeda/content/images/asf.png
----------------------------------------------------------------------
diff --git a/content/images/asf.png b/content/images/asf.png
deleted file mode 100644
index ce28113..0000000
Binary files a/content/images/asf.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/juneau-website/blob/b1ebfeda/content/images/asf_juneau_logo.png
----------------------------------------------------------------------
diff --git a/content/images/asf_juneau_logo.png b/content/images/asf_juneau_logo.png
deleted file mode 100644
index 554e7ab..0000000
Binary files a/content/images/asf_juneau_logo.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/juneau-website/blob/b1ebfeda/content/images/asf_short.png
----------------------------------------------------------------------
diff --git a/content/images/asf_short.png b/content/images/asf_short.png
new file mode 100644
index 0000000..ebb4b85
Binary files /dev/null and b/content/images/asf_short.png differ

http://git-wip-us.apache.org/repos/asf/juneau-website/blob/b1ebfeda/content/images/feather_small.png
----------------------------------------------------------------------
diff --git a/content/images/feather_small.png b/content/images/feather_small.png
new file mode 100644
index 0000000..43b76a7
Binary files /dev/null and b/content/images/feather_small.png differ

http://git-wip-us.apache.org/repos/asf/juneau-website/blob/b1ebfeda/content/images/header.jpg
----------------------------------------------------------------------
diff --git a/content/images/header.jpg b/content/images/header.jpg
deleted file mode 100644
index d7d83e9..0000000
Binary files a/content/images/header.jpg and /dev/null differ

http://git-wip-us.apache.org/repos/asf/juneau-website/blob/b1ebfeda/content/images/incubator_feather_egg_logo2.png
----------------------------------------------------------------------
diff --git a/content/images/incubator_feather_egg_logo2.png b/content/images/incubator_feather_egg_logo2.png
deleted file mode 100644
index c42c1b4..0000000
Binary files a/content/images/incubator_feather_egg_logo2.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/juneau-website/blob/b1ebfeda/content/images/incubator_feather_egg_logo3.png
----------------------------------------------------------------------
diff --git a/content/images/incubator_feather_egg_logo3.png b/content/images/incubator_feather_egg_logo3.png
deleted file mode 100644
index 1cf0510..0000000
Binary files a/content/images/incubator_feather_egg_logo3.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/juneau-website/blob/b1ebfeda/content/images/juneau.png
----------------------------------------------------------------------
diff --git a/content/images/juneau.png b/content/images/juneau.png
deleted file mode 100644
index aa21eb0..0000000
Binary files a/content/images/juneau.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/juneau-website/blob/b1ebfeda/content/images/juneau_podling.png
----------------------------------------------------------------------
diff --git a/content/images/juneau_podling.png b/content/images/juneau_podling.png
deleted file mode 100644
index 4aa7cce..0000000
Binary files a/content/images/juneau_podling.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/juneau-website/blob/b1ebfeda/content/images/juneauicon.png
----------------------------------------------------------------------
diff --git a/content/images/juneauicon.png b/content/images/juneauicon.png
deleted file mode 100644
index db7bb12..0000000
Binary files a/content/images/juneauicon.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/juneau-website/blob/b1ebfeda/content/index.html
----------------------------------------------------------------------
diff --git a/content/index.html b/content/index.html
index c3d9a03..b0277bc 100644
--- a/content/index.html
+++ b/content/index.html
@@ -29,7 +29,7 @@
 			white-space: nowrap;
 		}
 		footer {
-		    padding: 10px;
+		    padding: 0px 10px;
 		    color: black;
 		    background-color: #e8ebef;
 		    text-align: left;
@@ -141,8 +141,7 @@
 	<header id='header'>
 	   <img src='images/juneau2.png' style='position:absolute;left:20px;height:50px;top:10px'>
 	   <span style='vertical-align: top;color: #cc1b1b; font-weight: lighter; padding-left: 100px'>APACHE JUNEAU <small>&trade;</small></span>
-	   <span style='vertical-align: top;color: #cc1b1b; font-size: 12pt; font-weight: lighter'>(incubating)</span>
-	   <a href="http://incubator.apache.org/" target="_blank"><img src='images/incubator_feather_egg_logo3.png' style='position:absolute;right:20px;height:50px;top:10px'></a>
+	   <a href="http://www.apache.org/" target="_blank"><img src='images/feather_small.png' style='position:absolute;right:20px;height:50px;top:10px'></a>
 	</header>
 
 	<nav>
@@ -181,8 +180,8 @@
 	<footer id='footer'>
 		<table>
 			<tr>
-				<td><a href="http://incubator.apache.org/" target="_blank"><br>
-					<img src="images/incubator_feather_egg_logo2.png" width="300px"/></a>
+				<td><a href="http://www.apache.org/foundation" target="_blank"><br>
+					<img src="images/asf_short.png"/></a><br>
 					<!-- hitwebcounter Code START -->
 					<a href="http://www.hitwebcounter.com" target="_blank">
 						<img src="http://hitwebcounter.com/counter/counter.php?page=6608331&style=0007&nbdigits=7&type=ip&initCount=0" title="" Alt=""  border="0">
@@ -192,12 +191,7 @@
 				</td>
 				<td style="padding-left:10px;">
 					<p>
-						Apache Juneau is an effort undergoing Incubation at The Apache Software Foundation (ASF), sponsored by the Incubator. 
-						Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. 
-						While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has yet to be fully endorsed by the ASF.
-					</p>
-					<p>
-						Copyright &copy; 2016 <a href="http://www.apache.org/">The Apache Software Foundation</a>, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
+						Copyright &copy; 2016, 2017 <a href="http://www.apache.org/">The Apache Software Foundation</a>, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
 						<br>Apache, Apache Juneau, and the Apache feather logo are trademarks of The Apache Software Foundation.
 						Eclipse is a registered trademark of the Eclipse Foundation. 
 					</p>

http://git-wip-us.apache.org/repos/asf/juneau-website/blob/b1ebfeda/content/marshall.html
----------------------------------------------------------------------
diff --git a/content/marshall.html b/content/marshall.html
index 5daa3a7..9aa5bff 100644
--- a/content/marshall.html
+++ b/content/marshall.html
@@ -18,18 +18,18 @@
 	<xt>&lt;dependency&gt;</xt>
 		<xt>&lt;groupId&gt;</xt>org.apache.juneau<xt>&lt;/groupId&gt;</xt>
 		<xt>&lt;artifactId&gt;</xt>juneau-marshall<xt>&lt;/artifactId&gt;</xt>
-		<xt>&lt;version&gt;</xt>6.4.0-incubating<xt>&lt;/version&gt;</xt>
+		<xt>&lt;version&gt;</xt>7.0.0<xt>&lt;/version&gt;</xt>
 	<xt>&lt;/dependency&gt;</xt>
 		</p>	
 	
 		<h6 class='figure'>Java Library</h6>
 		<p class='bcode' style='width:500px;'>
-	juneau-marshall-6.4.0-incubating.jar 
+	juneau-marshall-7.0.0.jar 
 		</p>	
 	
 		<h6 class='figure'>OSGi Module</h6>
 		<p class='bcode' style='width:500px;'>
-	org.apache.juneau.marshall_6.4.0-incubating.jar 
+	org.apache.juneau.marshall_7.0.0.jar 
 		</p>	
 
 		<p>
@@ -229,7 +229,7 @@
 		</ul>
 	
 		<ul class='doctree'>
-			<li class='link'>See <a class='doclink' href='http://juneau.incubator.apache.org/site/apidocs/overview-summary.html#juneau-marshall.PojoCategories'>POJO Categories</a> for a definition of supported POJOs.
+			<li class='link'>See <a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-marshall.PojoCategories'>POJO Categories</a> for a definition of supported POJOs.
 		</ul>
 	
 		<br><hr>
@@ -261,7 +261,7 @@
 		</p>
 
 		<ul class='doctree'>
-			<li class='link'>See <a class='doclink' href='http://juneau.incubator.apache.org/site/apidocs/org/apache/juneau/uon/package-summary.html#TOC'>org.apache.juneau.uon</a> for more information.
+			<li class='link'>See <a class='doclink' href='http://juneau.apache.org/site/apidocs/org/apache/juneau/uon/package-summary.html#TOC'>org.apache.juneau.uon</a> for more information.
 		</ul>
 
 		<br><hr>
@@ -329,7 +329,7 @@
 		<br><br><hr>
 
 		<ul class='doctree'>
-			<li class='link'>See <a class='doclink' href='http://juneau.incubator.apache.org/site/apidocs/overview-summary.html#juneau-marshall'>juneau-marshall</a> for more information.
+			<li class='link'>See <a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-marshall'>juneau-marshall</a> for more information.
 		</ul>
 	</div>
 	
@@ -344,18 +344,18 @@
 	<xt>&lt;dependency&gt;</xt>
 		<xt>&lt;groupId&gt;</xt>org.apache.juneau<xt>&lt;/groupId&gt;</xt>
 		<xt>&lt;artifactId&gt;</xt>juneau-marshall-rdf<xt>&lt;/artifactId&gt;</xt>
-		<xt>&lt;version&gt;</xt>6.4.0-incubating<xt>&lt;/version&gt;</xt>
+		<xt>&lt;version&gt;</xt>7.0.0<xt>&lt;/version&gt;</xt>
 	<xt>&lt;/dependency&gt;</xt>
 		</p>	
 	
 		<h6 class='figure'>Java Library</h6>
 		<p class='bcode' style='width:500px;'>
-	juneau-marshall-rdf-6.4.0-incubating.jar 
+	juneau-marshall-rdf-7.0.0.jar 
 		</p>	
 	
 		<h6 class='figure'>OSGi Module</h6>
 		<p class='bcode' style='width:500px;'>
-	org.apache.juneau.marshall.rdf_6.4.0-incubating.jar 
+	org.apache.juneau.marshall.rdf_7.0.0.jar 
 		</p>	
 
 		<p>
@@ -410,7 +410,7 @@
 		</p>
 		
 		<ul class='doctree'>
-			<li class='link'>See <a class='doclink' href='http://juneau.incubator.apache.org/site/apidocs/overview-summary.html#juneau-marshall-rdf'>juneau-marshall-rdf</a> for more information.
+			<li class='link'>See <a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-marshall-rdf'>juneau-marshall-rdf</a> for more information.
 		</ul>
 	</div>
 </body>

http://git-wip-us.apache.org/repos/asf/juneau-website/blob/b1ebfeda/content/microservice.html
----------------------------------------------------------------------
diff --git a/content/microservice.html b/content/microservice.html
index f3727c7..a98f23f 100644
--- a/content/microservice.html
+++ b/content/microservice.html
@@ -31,18 +31,18 @@
 	<xt>&lt;dependency&gt;</xt>
 		<xt>&lt;groupId&gt;</xt>org.apache.juneau<xt>&lt;/groupId&gt;</xt>
 		<xt>&lt;artifactId&gt;</xt>juneau-microservice-server<xt>&lt;/artifactId&gt;</xt>
-		<xt>&lt;version&gt;</xt>6.4.0-incubating<xt>&lt;/version&gt;</xt>
+		<xt>&lt;version&gt;</xt>7.0.0<xt>&lt;/version&gt;</xt>
 	<xt>&lt;/dependency&gt;</xt>
 			</p>	
 		
 			<h6 class='figure'>Java Library</h6>
 			<p class='bcode' style='width:500px;'>
-	juneau-microservice-server-6.4.0-incubating.jar 
+	juneau-microservice-server-7.0.0.jar 
 			</p>	
 		
 			<h6 class='figure'>OSGi Module</h6>
 			<p class='bcode' style='width:500px;'>
-	org.apache.juneau.microservice.server_6.4.0-incubating.jar 
+	org.apache.juneau.microservice.server_7.0.0.jar 
 			</p>	
 
 			<p>
@@ -184,7 +184,7 @@
 			</p>
 		
 			<ul class='doctree'>
-				<li class='link'>See <a class='doclink' href='http://juneau.incubator.apache.org/site/apidocs/overview-summary.html#juneau-microservice-server'>juneau-microservice-server</a> for more information.
+				<li class='link'>See <a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-microservice-server'>juneau-microservice-server</a> for more information.
 			</ul>
 		</div>
 
@@ -197,7 +197,7 @@
 		
 			<h6 class='figure'>Archive File</h6>
 			<p class='bcode' style='width:500px;'>
-	my-microservice-6.4.0-incubating.zip 
+	my-microservice-7.0.0.zip 
 			</p>	
 		
 			<p>
@@ -219,7 +219,7 @@
 			<img class='bordered' src='images/juneau-microservice-template.import4.png' style='width:467px'>
 
 			<ul class='doctree'>
-				<li class='link'>See <a class='doclink' href='http://juneau.incubator.apache.org/site/apidocs/overview-summary.html#juneau-microservice-template'>juneau-microservice-template</a> for more information.
+				<li class='link'>See <a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-microservice-template'>juneau-microservice-template</a> for more information.
 			</ul>
  		</div>
 	</div>

http://git-wip-us.apache.org/repos/asf/juneau-website/blob/b1ebfeda/content/rest-client.html
----------------------------------------------------------------------
diff --git a/content/rest-client.html b/content/rest-client.html
index b2520c5..4b1f011 100644
--- a/content/rest-client.html
+++ b/content/rest-client.html
@@ -18,18 +18,18 @@
 	<xt>&lt;dependency&gt;</xt>
 		<xt>&lt;groupId&gt;</xt>org.apache.juneau<xt>&lt;/groupId&gt;</xt>
 		<xt>&lt;artifactId&gt;</xt>juneau-rest-client<xt>&lt;/artifactId&gt;</xt>
-		<xt>&lt;version&gt;</xt>6.4.0-incubating<xt>&lt;/version&gt;</xt>
+		<xt>&lt;version&gt;</xt>7.0.0<xt>&lt;/version&gt;</xt>
 	<xt>&lt;/dependency&gt;</xt>
 		</p>	
 	
 		<h6 class='figure'>Java Library</h6>
 		<p class='bcode' style='width:500px;'>
-	juneau-rest-client-6.4.0-incubating.jar 
+	juneau-rest-client-7.0.0.jar 
 		</p>	
 	
 		<h6 class='figure'>OSGi Module</h6>
 		<p class='bcode' style='width:500px;'>
-	org.apache.juneau.rest.client_6.4.0-incubating.jar 
+	org.apache.juneau.rest.client_7.0.0.jar 
 		</p>	
 
 		<p>
@@ -128,7 +128,7 @@
 			Although remoteable proxies work perfectly well for any of the other supported languages.  For example, RPC over Turtle!
 		</p>
 		<p>
-			The parameters and return types of the Java methods can be any of the supported serializable and parsable types in <a class='doclink' href='http://juneau.incubator.apache.org/site/apidocs/overview-summary.html#juneau-marshall.PojoCategories'>POJO Categories</a>.
+			The parameters and return types of the Java methods can be any of the supported serializable and parsable types in <a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-marshall.PojoCategories'>POJO Categories</a>.
 			This ends up being WAY more flexible than other proxy interfaces since Juneau can handle so may POJO types out-of-the-box.
 			Most of the time you don't even need to modify your existing Java implementation code.
 		</p>
@@ -161,7 +161,7 @@
 		</p>
 	
 		<ul class='doctree'>
-			<li class='link'>See <a class='doclink' href='http://juneau.incubator.apache.org/site/apidocs/overview-summary.html#juneau-rest-client'>juneau-rest-client</a> for more information.
+			<li class='link'>See <a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-rest-client'>juneau-rest-client</a> for more information.
 		</ul>
 	</div>	
 </body>

http://git-wip-us.apache.org/repos/asf/juneau-website/blob/b1ebfeda/content/rest-server.html
----------------------------------------------------------------------
diff --git a/content/rest-server.html b/content/rest-server.html
index 7d63b93..b79dcd7 100644
--- a/content/rest-server.html
+++ b/content/rest-server.html
@@ -19,18 +19,18 @@
 	<xt>&lt;dependency&gt;</xt>
 		<xt>&lt;groupId&gt;</xt>org.apache.juneau<xt>&lt;/groupId&gt;</xt>
 		<xt>&lt;artifactId&gt;</xt>juneau-rest-server<xt>&lt;/artifactId&gt;</xt>
-		<xt>&lt;version&gt;</xt>6.4.0-incubating<xt>&lt;/version&gt;</xt>
+		<xt>&lt;version&gt;</xt>7.0.0<xt>&lt;/version&gt;</xt>
 	<xt>&lt;/dependency&gt;</xt>
 		</p>	
 	
 		<h6 class='figure'>Java Library</h6>
 		<p class='bcode' style='width:500px;'>
-	juneau-rest-server-6.4.0-incubating.jar 
+	juneau-rest-server-7.0.0.jar 
 		</p>	
 	
 		<h6 class='figure'>OSGi Module</h6>
 		<p class='bcode' style='width:500px;'>
-	org.apache.juneau.rest.server_6.4.0-incubating.jar 
+	org.apache.juneau.rest.server_7.0.0.jar 
 		</p>	
 
 		<p>
@@ -644,7 +644,7 @@
 		</ul>
 	
 		<ul class='doctree'>
-			<li class='link'>See <a class='doclink' href='http://juneau.incubator.apache.org/site/apidocs/overview-summary.html#juneau-rest-server'>juneau-rest-server</a> for more information.
+			<li class='link'>See <a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-rest-server'>juneau-rest-server</a> for more information.
 		</ul>
 		
 		<h6 class='toc' id='juneau-rest-server.UIvsDI'>User Interfaces (UI) vs. Developer Interfaces (DI)</h6>
@@ -703,18 +703,18 @@
 	<xt>&lt;dependency&gt;</xt>
 		<xt>&lt;groupId&gt;</xt>org.apache.juneau<xt>&lt;/groupId&gt;</xt>
 		<xt>&lt;artifactId&gt;</xt>juneau-rest-server-jaxrs<xt>&lt;/artifactId&gt;</xt>
-		<xt>&lt;version&gt;</xt>6.4.0-incubating<xt>&lt;/version&gt;</xt>
+		<xt>&lt;version&gt;</xt>7.0.0<xt>&lt;/version&gt;</xt>
 	<xt>&lt;/dependency&gt;</xt>
 		</p>	
 	
 		<h6 class='figure'>Java Library</h6>
 		<p class='bcode' style='width:500px;'>
-	juneau-rest-server-jaxrs-6.4.0-incubating.jar 
+	juneau-rest-server-jaxrs-7.0.0.jar 
 		</p>	
 		
 		<h6 class='figure'>OSGi Module</h6>
 		<p class='bcode' style='width:500px;'>
-	org.apache.juneau.rest.server.jaxrs_6.4.0-incubating.jar 
+	org.apache.juneau.rest.server.jaxrs_7.0.0.jar 
 		</p>	
 		
 		<p>
@@ -741,7 +741,7 @@
 		</p>
 
 		<ul class='doctree'>
-			<li class='link'>See <a class='doclink' href='http://juneau.incubator.apache.org/site/apidocs/overview-summary.html#juneau-rest-server-jaxrs'>juneau-rest-server-jaxrs</a> for more information.
+			<li class='link'>See <a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-rest-server-jaxrs'>juneau-rest-server-jaxrs</a> for more information.
 		</ul>
 	</div>
 </body>

http://git-wip-us.apache.org/repos/asf/juneau-website/blob/b1ebfeda/content/sourceCode.html
----------------------------------------------------------------------
diff --git a/content/sourceCode.html b/content/sourceCode.html
index c31bc5a..0c91271 100644
--- a/content/sourceCode.html
+++ b/content/sourceCode.html
@@ -15,9 +15,9 @@
 		The GitHub repository is read-only.  If you want to make contributions to the source tree, you'll need to use the Apache GIT repository.
 	</p>
 	<ul class='spaced-list'>
-		<li><a class='doclink' href='https://git-wip-us.apache.org/repos/asf/incubator-juneau.git' target="_top">Apache GIT repository</a>
-		<li><a class='doclink' href='http://github.com/apache/incubator-juneau' target="_top">GitHub mirror</a>
-		<li><a class='doclink' href='https://git-wip-us.apache.org/repos/asf/incubator-juneau-website.git' target="_top">GIT repository for this website</a>
+		<li><a class='doclink' href='https://git-wip-us.apache.org/repos/asf/juneau.git' target="_top">Apache GIT repository</a>
+		<li><a class='doclink' href='http://github.com/apache/juneau' target="_top">GitHub mirror</a>
+		<li><a class='doclink' href='https://git-wip-us.apache.org/repos/asf/juneau-website.git' target="_top">GIT repository for this website</a>
 		<li><a class='doclink' href='https://cwiki.apache.org/confluence/display/JUNEAU/Setting+up+your+Eclipse+workspace' target="_top">Workspace setup instructions</a>
 	</ul>
 	<h5 class='toc'>Builds</h5>



[3/4] juneau-website git commit: Update for 7.0.0

Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/juneau-website/blob/b1ebfeda/content/7.0.0/index.html
----------------------------------------------------------------------
diff --git a/content/7.0.0/index.html b/content/7.0.0/index.html
deleted file mode 100644
index b0277bc..0000000
--- a/content/7.0.0/index.html
+++ /dev/null
@@ -1,204 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-	<link rel="icon" type="image/png" href="http://www.apache.org/favicons/favicon-32x32.png" sizes="32x32">
-	<link rel="icon" type="image/png" href="http://www.apache.org/favicons/favicon-194x194.png" sizes="194x194">
-	<link rel="icon" type="image/png" href="http://www.apache.org/favicons/favicon-96x96.png" sizes="96x96">
-	<link rel="icon" type="image/png" href="http://www.apache.org/favicons/android-chrome-192x192.png" sizes="192x192">
-	<link rel="icon" type="image/png" href="http://www.apache.org/favicons/favicon-16x16.png" sizes="16x16">
-	<link rel="shortcut icon" href="http://www.apache.org/favicons/favicon.ico">
-
-	<meta name="description" content="Apache Juneau Universal Serialization and REST API Library" />
-	<meta name="keywords" content="Apache Juneau,Apache,Juneau,REST,JSON,HTML,XML,MessagePack,Java,UON,urlencoding,Swagger,Jackson,SOAP,ATOM,Cognos,INI,Jena,CSV,JSON-Schema,XML-Schema,Servlet,JAX-RS,JAXRS,JAX-WS,JAXWS,bean" />
-	<title>Apache Juneau Universal Serialization and REST API Library</title>
-	<style>
-		@import url("styles/juneau-code.css");
-		@import url("styles/juneau-doc.css");
-
-		html, body { margin:0px; height: 100%; width: 100%; font-family: sans-serif;}
-		header {
-			background-color: #e8ebef;
-		    font-size: 2.0em;
-		    height: 50px;
-		    color: #2874A6;
-		    clear: left;
-		    margin: 0px;
-			padding: 20px 20px 0px 20px;
-			box-shadow: 5px 5px 2px #999999;
-			text-shadow: rgba(0,0,0,.2) 2px 6px 5px,rgba(125,32,191,.4) 0 -4px 30px;
-			white-space: nowrap;
-		}
-		footer {
-		    padding: 0px 10px;
-		    color: black;
-		    background-color: #e8ebef;
-		    text-align: left;
-		    font-size: 0.9em;
-		}
-		div.container {
-		    width: 100%;
-		    height: 100%;
-		}
-		nav {
-		    float: left;
-		    width: 150px;
-		    margin: 40px 20px;
-		    padding: 1em;
-		    border: 1px solid gray;
-			box-shadow: 5px 5px 2px #999999;
-			color: rgb(44, 69, 87);
-			background-color: #eef3f7;
-		    font-size: 1.0em;
-		    text-transform: uppercase;
-		    font-weight: lighter;
-		}
-		nav ul { list-style-type: none; padding: 0; }
-		nav ul li { padding: 5px 0px; }
-		nav ul ul { padding: 0px 10px; }
-		nav ul ul li { padding: 5px 0px 0px 3px; font-size: smaller; }
-		nav ul a { text-decoration: none; color: rgb(44, 69, 87); }
-		nav ul a:hover { font-weight: normal; }
-		nav ul a.selected { font-weight: normal; }
-		article {
-			margin: 0px 20px 20px 170px; 
-		    padding: 10px 2px;
-		    overflow: hidden;
-		    min-height: 500px;
-		}
-		p.download {
-			color: #2C4557;
-		    padding: 5px 20px;
-		    margin: 10px 0px 10px 0px;
-		    text-decoration: none;	
-		    font-size: 0.9em;
-	    	font-weight: bold;
-	    	background: linear-gradient(to bottom, #F5F5F5, #DEE3E9) repeat scroll 0% 0% transparent;
-		}
-	</style>
-
-	<script>
-		var selectedNode;
-		
-		function select(node) {
-			if (selectedNode)
-				selectedNode.classList.remove("selected");
-			node.classList.add("selected");
-			selectedNode = node;
-			var buff = document.getElementById("buff");
-			buff.src = node.id + ".html";
-			history.pushState(null, null, "#" + node.id + ".html");
-			return false;
-		}
-		
-		// Load results from IFrame into this document.
-		function loadResults(buff) {
-			var doc = buff.contentDocument || buff.contentWindow.document;
-			var body = doc.body;
-			var article = document.getElementById('article');
-			var header = document.getElementById('header');
-			var footer = document.getElementById('footer');
-			if (body != null) {
-				article.innerHTML = body.innerHTML;
-				nodeScriptReplace(article);
-			}
-			var availableHeight = window.innerHeight - header.clientHeight - footer.clientHeight - 40; 
-			article.style.minHeight = availableHeight + 'px';
-		}
-		
-		window.onload = function() {
-			var hash = window.location.hash;
-			if (hash == null || hash.length == 0) {
-				hash = "#about.html";
-			}
-			var id = hash.substring(1, hash.length - 5);
-			document.getElementById(id).click();   
-		}
-		
-		function nodeScriptReplace(node) {
-			if (node.tagName === 'SCRIPT') {
-				node.parentNode.replaceChild(nodeScriptClone(node) , node);
-			} else {
-				node.childNodes.forEach(nodeScriptReplace);
-			}
-			return node;
-		}
-		
-		function nodeScriptClone(node) {
-			var script  = document.createElement("script");
-			script.text = node.innerHTML;
-			var attrs = node.attributes;
-			for (var i = attrs.length - 1; i >= 0; i--) {
-				script.setAttribute(attrs[i].name, attrs[i].value);
-			}
-			return script;
-		}		
-	</script>
-</head>
-
-<body>
-<div class="container">
-
-	<header id='header'>
-	   <img src='images/juneau2.png' style='position:absolute;left:20px;height:50px;top:10px'>
-	   <span style='vertical-align: top;color: #cc1b1b; font-weight: lighter; padding-left: 100px'>APACHE JUNEAU <small>&trade;</small></span>
-	   <a href="http://www.apache.org/" target="_blank"><img src='images/feather_small.png' style='position:absolute;right:20px;height:50px;top:10px'></a>
-	</header>
-
-	<nav>
-		<ul>
-			<li><a href='about.html' id='about' onclick="return select(this)">About</a>
-			<li><a href='components.html' id='components' onclick="return select(this)">Components</a>
-				<ul>
-					<li><a href='marshall.html' id='marshall' onclick="return select(this)">marshall</a>
-					<li><a href='dto.html' id='dto' onclick="return select(this)">dto</a>
-					<li><a href='svl.html' id='svl' onclick="return select(this)">svl</a>
-					<li><a href='config.html' id='config' onclick="return select(this)">config</a>
-					<li><a href='rest-server.html' id='rest-server' onclick="return select(this)">rest-server</a>
-					<li><a href='rest-client.html' id='rest-client' onclick="return select(this)">rest-client</a>
-					<li><a href='microservice.html' id='microservice' onclick="return select(this)">microservice</a>
-					<li><a href='examples.html' id='examples' onclick="return select(this)">examples</a>
-				</ul>
-			</li>
-			<li><a href='documentation.html' id='documentation' onclick="return select(this)">Documentation</a></li>
-			<li><a href='downloads.html' id='downloads' onclick="return select(this)">Downloads</a></li>
-			<li><a href='sourceCode.html' id='sourceCode' onclick="return select(this)">Source Code</a></li>
-			<li><a href='issues.html' id='issues' onclick="return select(this)">Issues</a></li>
-			<li><a href='community.html' id='community' onclick="return select(this)">Community</a></li>
-			<li><a href='twitter.html' id='twitter' onclick="return select(this)">Twitter</a></li>
-			<li><a href="http://www.apache.org/licenses/" target="_blank">License</a></li>
-			<li><a href="http://www.apache.org/security" target="_blank">Security</a></li>
-			<li><a href="http://www.apache.org/foundation/sponsorship.html" target="_blank">Donate</a></li>
-			<li><a href="http://www.apache.org/foundation/thanks.html" target="_blank">Thanks</a></li>
-			<li><a href="http://www.apache.org/foundation" target="_blank">Apache</a></li>
-		</ul>
-	</nav>
-
-	<article id='article'>
-		Loading...
-	</article>
-	
-	<footer id='footer'>
-		<table>
-			<tr>
-				<td><a href="http://www.apache.org/foundation" target="_blank"><br>
-					<img src="images/asf_short.png"/></a><br>
-					<!-- hitwebcounter Code START -->
-					<a href="http://www.hitwebcounter.com" target="_blank">
-						<img src="http://hitwebcounter.com/counter/counter.php?page=6608331&style=0007&nbdigits=7&type=ip&initCount=0" title="" Alt=""  border="0">
-					</a>            
-				    <!-- hitwebcounter.com -->
-				    <a href="http://www.hitwebcounter.com" title="Hitwebcounter.com Free" target="_blank" style="font-family: Arial, Helvetica, sans-serif; font-size: 12px; color: #FFFFFF; text-decoration: underline ; display:none;"><strong>Hitwebcounter.com Free</strong></a>   	
-				</td>
-				<td style="padding-left:10px;">
-					<p>
-						Copyright &copy; 2016, 2017 <a href="http://www.apache.org/">The Apache Software Foundation</a>, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
-						<br>Apache, Apache Juneau, and the Apache feather logo are trademarks of The Apache Software Foundation.
-						Eclipse is a registered trademark of the Eclipse Foundation. 
-					</p>
-				</td>
-		</table>
-	</footer>
-</div>
-<iframe id='buff' style='display:none' onload="parent.loadResults(this)" sandbox="allow-same-origin"></iframe>
-</body>
-</html>

http://git-wip-us.apache.org/repos/asf/juneau-website/blob/b1ebfeda/content/7.0.0/issues.html
----------------------------------------------------------------------
diff --git a/content/7.0.0/issues.html b/content/7.0.0/issues.html
deleted file mode 100644
index ebd0806..0000000
--- a/content/7.0.0/issues.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<style>
-	@import url("styles/juneau-code.css");
-	@import url("styles/juneau-doc.css");
-</style>
-</head>
-<body>
-	<h5 class='toc'>Issues</h5>
-	<p>
-		Juneau has no bugs.  However, in the <i>extremely unlikely</i> event that you happen to find a bug, please report it at the JIRA repository listed below.
-	</p>
-	<ul class='spaced-list'>
-		<li><a class='doclink' href='https://issues.apache.org/jira/browse/JUNEAU' target="_top">JIRA</a>
-	</ul>
-	<p>
-		External developers should use the following categories for requests:
-	</p>
-	<ul class='spaced-list'>
-		<li><l>Bug</l> - Broken functionality.
-		<li><l>Feature Request</l> - Requests for brand new functionality.
-		<li><l>Improvement</l> - Requests for improvements to existing functionality.
-		<li><l>Wish</l> - Trivial requests.
-	</ul>
-	<h5 class='toc'>Security Vulnerabilities</h5>
-	<p>
-		If you discover any security vulnerabilities in this code, please refer to the instructions found here:
-	</p>
-	<ul class='spaced-list'>
-		<li><a class='doclink' href='http://www.apache.org/security'>SECURITY</a>
-	</ul>
-</body>
-</html>

http://git-wip-us.apache.org/repos/asf/juneau-website/blob/b1ebfeda/content/7.0.0/marshall.html
----------------------------------------------------------------------
diff --git a/content/7.0.0/marshall.html b/content/7.0.0/marshall.html
deleted file mode 100644
index 9aa5bff..0000000
--- a/content/7.0.0/marshall.html
+++ /dev/null
@@ -1,417 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<style>
-	@import url("styles/juneau-code.css");
-	@import url("styles/juneau-doc.css");
-</style>
-</head>
-<body>
-	<!-- ======================================================================================================= -->
-	<!-- === JUNEAU-MARSHALL =================================================================================== -->
-	<!-- ======================================================================================================= -->
-	
-	<h5 class='toc' id='juneau-marshall'>juneau-marshall</h5>
-	<div>
-		<h6 class='figure'>Maven Dependency</h6>
-		<p class='bcode' style='width:500px;'>
-	<xt>&lt;dependency&gt;</xt>
-		<xt>&lt;groupId&gt;</xt>org.apache.juneau<xt>&lt;/groupId&gt;</xt>
-		<xt>&lt;artifactId&gt;</xt>juneau-marshall<xt>&lt;/artifactId&gt;</xt>
-		<xt>&lt;version&gt;</xt>7.0.0<xt>&lt;/version&gt;</xt>
-	<xt>&lt;/dependency&gt;</xt>
-		</p>	
-	
-		<h6 class='figure'>Java Library</h6>
-		<p class='bcode' style='width:500px;'>
-	juneau-marshall-7.0.0.jar 
-		</p>	
-	
-		<h6 class='figure'>OSGi Module</h6>
-		<p class='bcode' style='width:500px;'>
-	org.apache.juneau.marshall_7.0.0.jar 
-		</p>	
-
-		<p>
-			The <code>juneau-marshall</code> library includes easy-to-use and highly customizable serializers and parsers
-			based around a common API.  
-			They provide support for the following languages:
-		</p>
-		<ul>
-			<li>JSON
-			<li>XML
-			<li>HTML
-			<li>UON (URL-Encoded Object Notation)
-			<li>URL-Encoding
-			<li>MessagePack
-			<li>SOAP/XML
-			<li>CSV
-			<li>BSON (coming soon)
-			<li>YAML (coming soon)
-			<li>Protobuf (coming soon)
-		</ul>				
-		<p>
-			The default serializers can often be used to serialize POJOs in a single line of code:
-		</p>
-		<p class='bcode'>
-	<jc>// A simple bean</jc>
-	<jk>public class</jk> Person {
-		<jk>public</jk> String name = <js>"John Smith"</js>;
-		<jk>public int</jk> age = 21;
-	}
-	
-	Person p = <jk>new</jk> Person();
-	
-	<jc>// Produces:
-	// "{name:'John Smith',age:21}"</jc>
-	String laxJson = JsonSerializer.<jsf>DEFAULT_LAX</jsf>.serialize(p);
-	
-	<jc>// Produces:
-	// "{"name":"John Smith","age":21}"</jc>
-	String strictJson = JsonSerializer.<jsf>DEFAULT</jsf>.serialize(p);
-	
-	<jc>// Produces:
-	// &lt;object&gt;
-	//   &lt;name&gt;John Smith&lt;/name&gt;
-	//   &lt;age&gt;21&lt;/age&gt;
-	// &lt;/object&gt;</jc>
-	String xml = XmlSerializer.<jsf>DEFAULT_SIMPLE</jsf>.serialize(p);
-	
-	<jc>// Produces:
-	// &lt;table&gt;
-	//   &lt;tr&gt;&lt;td&gt;name&lt;/td&gt;&lt;td&gt;John Smith&lt;/td&gt;&lt;/tr&gt;
-	//   &lt;tr&gt;&lt;td&gt;age&lt;/td&gt;&lt;td&gt;21&lt;/td&gt;&lt;/tr&gt;
-	// &lt;/table&gt;</jc>
-	String html = HtmlSerializer.<jsf>DEFAULT</jsf>.serialize(p);
-	
-	<jc>// Same as Html, but wraps it in HTML and BODY elements with page title/description/links:</jc>
-	String htmlDoc = HtmlDocSerializer.<jsf>DEFAULT</jsf>.serialize(p);
-
-	<jc>// Produces:
-	// name='John+Smith'&amp;age=21</jc>
-	String urlEncoding = UrlEncodingSerializer.<jsf>DEFAULT</jsf>.serialize(p);
-
-	<jc>// Produces:
-	// (name='John Smith',age=21)</jc>
-	String uon = UonSerializer.<jsf>DEFAULT</jsf>.serialize(p);
-
-	<jc>// Produces:
-	// 82 A4 name AA 4A John Smith 68 A3 age 15</jc>
-	<jk>byte</jk>[] messagePack = MsgPackSerializer.<jsf>DEFAULT</jsf>.serialize(p);
-		</p>
-		<p>
-			Parsing back into POJOs is equally simple for any of the supported languages shown above.  
-			Language fragments are also supported.
-		</p>
-		<p>
-			JSON parsing shown here:
-		</p>
-		<p class='bcode'>
-	<jc>// Use one of the predefined parsers.</jc>
-	ReaderParser parser = JsonParser.<jsf>DEFAULT</jsf>;
-	
-	<jc>// Parse a JSON object (creates a generic ObjectMap).</jc>
-	String json = <js>"{name:'John Smith',age:21}"</js>;
-	Map m1 = parser.parse(json, Map.<jk>class</jk>);
-	
-	<jc>// Parse a JSON string.</jc>
-	json = <js>"'foobar'"</js>;
-	String s2 = parser.parse(json, String.<jk>class</jk>);
-	
-	<jc>// Parse a JSON number as a Long or Float.</jc>
-	json = <js>"123"</js>;
-	Long l3 = parser.parse(json, Long.<jk>class</jk>);
-	Float f3 = parser.parse(json, Float.<jk>class</jk>);
-	
-	<jc>// Parse a JSON object as a bean.</jc>
-	json = <js>"{name:'John Smith',age:21}"</js>;
-	Person p4 = parser.parse(json, Person.<jk>class</jk>);
-	
-	<jc>// Parse a JSON object as a HashMap&lt;String,Person&gt;.</jc>
-	json = <js>"{a:{name:'John Smith',age:21},b:{name:'Joe Smith',age:42}}"</js>;
-	Map&lt;String,Person&gt; m5 = parser.parse(json, HashMap.<jk>class</jk>, String.<jk>class</jk>, Person.<jk>class</jk>);
-	
-	<jc>// Parse a JSON object as a HashMap&lt;String,LinkedList&lt;Person&gt;&gt;.</jc>
-	json = <js>"{a:[{name:'John Smith',age:21},{name:'Joe Smith',age:42}]}"</js>;
-	Map&lt;String,List&lt;Person&gt;&gt; m6 = parser.parse(json, HashMap.<jk>class</jk>, String.<jk>class</jk>, LinkedList.<jk>class</jk>, Person.<jk>class</jk>);
-
-	<jc>// Parse a JSON array of integers as a Collection of Integers or int[] array.</jc>
-	json = <js>"[1,2,3]"</js>;
-	List&lt;Integer&gt; l7 = parser.parse(json, LinkedList.<jk>class</jk>, Integer.<jk>class</jk>);
-	<jk>int</jk>[] i7 = parser.parse(json, <jk>int</jk>[].<jk>class</jk>);
-	
-	<jc>// Parse arbitrary input into ObjectMap or ObjectList objects 
-	// (similar to JSONObject/JSONArray but generalized for all languages).</jc>
-	json = <js>"{name:'John Smith',age:21}"</js>;
-	ObjectMap m8a = parser.parse(json, ObjectMap.<jk>class</jk>);
-	<jk>int</jk> age = m8a.getInt(<js>"age"</js>);
-	ObjectMap m8b = (ObjectMap)parser.parse(json, Object.<jk>class</jk>);  <jc>// Equivalent.</jc>
-	
-	json = <js>"[1,true,null]"</js>;
-	ObjectList l9a = parser.parse(json, ObjectList.<jk>class</jk>);  
-	<jk>boolean</jk> b = l9a.getBoolean(1);
-	ObjectList l9b = (ObjectList)parser.parse(json, Object.<jk>class</jk>);  <jc>// Equivalent.</jc>  
-		</p>
-		
-		<h6 class='topic'>Features</h6>
-		<ul class='spaced-list'>
-			<li>Serializers can send output directly to Writers, OutputStreams, Files, Strings, or byte arrays.
-			<li>Parsers can receive input directly from Readers, InputStreams, Files, Strings, or byte arrays.
-			<li>Parsers can reconstruct arbitrarily complex data structures consisting of maps, collections, beans, and other POJOs.
-			<li>Serializers and parsers do not use intermediate DOMs!  POJOs are serialized directly to streams and parsed back directly to POJOs, making them extremely efficient and fast.
-			<li>Supported languages are highly-customizable and powerful.  For example, JSON support includes:
-				<ul>
-					<li>Support for variants such as LAX syntax (unquoted attributes and single quotes).
-					<li>Support for embedded Javascript comments.
-					<li>Fully RFC1759 compliant.
-					<li>20% faster than Jackson.
-				</ul>
-		</ul>
-		<br><hr>
-		<p>
-			Serializers and parsers are builder-based.  Build from scratch or clone existing instances.  Lots of configuration options available for all the languages.
-		</p>
-		<p class='bcode'>
-	<jc>// Create a serializer from scratch using a builder</jc>
-	JsonSerializer serializer = <jk>new</jk> JsonSerializerBuilder()
-		.simple()  <jc>// Simple mode</jc>
-		.sq()  <jc>// Use single quotes</jc>
-		.pojoSwaps(   <jc>// Swap unserializable classes with surrogate POJOs</jc>
-			IteratorSwap.<jk>class</jk>, <jc>// Iterators swapped with lists</jc>
-			ByteArrayBase64Swap.<jk>class</jk>, <jc>// byte[] swapped with base-64 encoded strings</jc>
-			CalendarSwap.ISO8601DT.<jk>class</jk> <jc>// Calendars swapped with ISO8601-compliant strings</jc>
-		)
-		.beanFilters(MyBeanFilter.<jk>class</jk>)  <jc>// Control how bean properties are handled</jc>
-		.timeZone(TimeZone.<jsf>GMT</jsf>)  <jc>// For serializing Calendars</jc>
-		.locale(Locale.<jsf>JAPAN</jsf>)  <jc>// For timezone-specific serialization</jc>
-		.sortCollections(<jk>true</jk>)  <jc>// For locale-specific serialization</jc>
-		.sortProperties(<jk>true</jk>)  <jc>// Various behavior settings</jc>
-		.trimNullProperties(<jk>true</jk>)
-		.trimStrings(<jk>true</jk>)
-		.methodVisibility(<jsf>PROTECTED</jsf>)  <jc>// Control which fields/methods are serialized</jc>
-		.beanDictionary(  <jc>// Adds type variables for resolution during parsing</jc>
-			MyBeanA.<jk>class</jk>, 
-			MyBeanB.<jk>class</jk>
-		)
-		.debug(<jk>true</jk>)  <jc>// Add debug output</jc>
-		.build();
-	   
-	<jc>// Clone an existing serializer and modify it to use single-quotes</jc>
-	JsonSerializer serializer = JsonSerializer.<jsf>DEFAULT</jsf>.builder()
-		.sq()
-		.build();	
-		</p>
-		<br><br><hr>
-		<p>
-			Many POJOs such as primitives, beans, collections, arrays, and classes with various known constructors and methods are serializable out-of-the-box.  
-			For other objects, "transforms" allow you to perform various mutations on them before serialization and after parsing.  
-		</p>
-		<ul class='spaced-list'>
-			<li>Transforms
-				<ul>
-					<li>Bean filters - Control how bean properties are handled (naming conventions, ordering, visibility,...).
-					<li>POJO swaps - Replace non-serializable POJOs with serializable equivalents.
-						<br>Predefined swaps provided for common cases: <code>ByteArrayBase64Swap</code>, 50+ variants of Calendar/Date swaps, <code>Enumeration/Iterator</code> swaps.
-				</ul>
-			<li>Annotations 
-				<br>Various annotations available for your POJO classes that are recognized by ALL serializers and parsers:  
-				<br><ja>@Bean</ja>, <ja>@Pojo</ja>, <ja>@BeanIgnore</ja>, <ja>@BeanParam</ja>, <ja>@BeanProperty</ja>, <ja>@NameProperty</ja>, <ja>@ParentProperty</ja>
-				<br>
-				<br>Annotations also provided for language-specific behaviors where it makes sense:
-				<br><ja>@Json</ja>, <ja>@Html</ja>, <ja>@Xml</ja>, <ja>@UrlEncoding</ja>
-				<br>
-				<br>All annotations have programmatic equivalents when you don't have access to POJO source.
-				
-			<li>Swap methods
-				<br>By default, various instance and static methods and constructors are automatically detected and supported:
-				<br><code>valueOf(String)</code>, <code>parse(String)</code>, <code>parseString(String)</code>, <code>forName(String)</code>, <code>forString(String)</code>, 
-					<code>fromString(String)</code>, <code>T(String)</code>, <code>Object swap(BeanSession)</code>, <code>T unswap(BeanSession, T.class)</code>
-		</ul>
-	
-		<ul class='doctree'>
-			<li class='link'>See <a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-marshall.PojoCategories'>POJO Categories</a> for a definition of supported POJOs.
-		</ul>
-	
-		<br><hr>
-		<p>
-			UON (URL-Encoded Object Notation) allows JSON-like data structures (OBJECT, ARRAY, NUMBER, BOOLEAN, STRING, NULL) in HTTP constructs (query parameters, form parameters,
-			headers, URL parts) without violating RFC2396.
-			This allows POJOs to be converted directly into these HTTP constructs which is not possible in any other language such as JSON.
-		</p>
-		<p class='bcode'>
-	(
-		id=1, 
-		name=<js>'John+Smith'</js>, 
-		uri=<js>http://sample/addressBook/person/1</js>, 
-		addressBookUri=<js>http://sample/addressBook</js>,
-		birthDate=<js>1946-08-12T00:00:00Z</js>,
-		addresses=@(
-			(
-				uri=<js>http://sample/addressBook/address/1</js>, 
-				personUri=<js>http://sample/addressBook/person/1</js>, 
-				id=<js>1</js>, 
-				street=<js>'100+Main+Street'</js>, 
-				city=<js>Anywhereville</js>, 
-				state=<js>NY</js>, 
-				zip=<js>12345</js>, 
-				isCurrent=<jk>true</jk>
-			)
-		)
-	)
-		</p>
-
-		<ul class='doctree'>
-			<li class='link'>See <a class='doclink' href='http://juneau.apache.org/site/apidocs/org/apache/juneau/uon/package-summary.html#TOC'>org.apache.juneau.uon</a> for more information.
-		</ul>
-
-		<br><hr>
-		<p>
-			Lots of shortcuts are provided throughout the API to simplify tasks, and the APIs are often useful for debugging and logging purposes as well...
-		</p>
-		<p class='bcode'>
-	<jc>// Create JSON strings from scratch using fluent-style code.</jc>
-	String jsonObject = <jk>new</jk> ObjectMap().append(<js>"foo"</js>,<js>"bar"</js>).toString(); 
-	String jsonArray = <jk>new</jk> ObjectList().append(<js>"foo"</js>).append(123).append(<jk>null</jk>).toString(); 
-	
-	<jc>// Create maps and beans directly from JSON.</jc>
-	Map&lt;String,Object&gt; myMap = <jk>new</jk> ObjectMap(<js>"{foo:'bar'}"</js>); 
-	List&lt;Object&gt; myList = <jk>new</jk> ObjectList(<js>"['foo',123,null]"</js>); 
-
-	<jc>// Load a POJO from a JSON file.</jc>
-	MyPojo myPojo = JsonParser.<jsf>DEFAULT</jsf>.parse(<jk>new</jk> File(<js>"myPojo.json"</js>));
-
-	<jc>// Serialize POJOs and ignore exceptions (great for logging)</jc>
-	String json = JsonSerializer.<jsf>DEFAULT_LAX</jsf>.toString(myPojo);
-	
-	<jc>// Dump a POJO to the console.</jc>
-	JsonSerializer.<jsf>DEFAULT_LAX</jsf>.println(myPojo);
-	
-	<jc>// Delayed serialization.</jc>
-	<jc>// (e.g. don't serialize an object if it's not going to be logged).</jc>
-	logger.log(<jsf>FINE</jsf>, <js>"My POJO was: {0}"</js>, <jk>new</jk> StringObject(myPojo));
-	logger.log(<jsf>FINE</jsf>, <js>"My POJO in XML was: {0}"</js>, <jk>new</jk> StringObject(XmlSerializer.<jsf>DEFAULT</jsf>, myPojo));
-	
-	String message = <jk>new</jk> StringMessage(<js>"My POJO in {0}: {1}"</js>, <js>"JSON"</js>, <jk>new</jk> StringObject(myPojo)).toString();
-	
-	<jc>// Create a 'REST-like' wrapper around a POJO.</jc>
-	<jc>// Allows you to manipulate POJO trees using URIs and GET/PUT/POST/DELETE commands.</jc>
-	PojoRest pojoRest = <jk>new</jk> PojoRest(myPojo);
-	pojoRest.get(String.<jk>class</jk>, <js>"addressBook/0/name"</js>);
-	pojoRest.put(<js>"addressBook/0/name"</js>, <js>"John Smith"</js>);
-		</p>
-		<br><br><hr>
-		<p>
-			<code>SerializerGroup</code> and <code>ParserGroup</code> classes allow serializers and parsers 
-			to be retrieved by W3C-compliant HTTP <code>Accept</code> and <code>Content-Type</code> values:
-		</p>
-		<p class='bcode'>
-	<jc>// Construct a new serializer group with configuration parameters that get applied to all serializers.</jc>
-	SerializerGroup sg = <jk>new</jk> SerializerGroupBuilder()
-		.append(JsonSerializer.<jk>class</jk>, UrlEncodingSerializer.<jk>class</jk>);
-		.ws()   <jc>// or .setUseWhitespace(true)</jc>
-		.pojoSwaps(CalendarSwap.ISO8601DT.<jk>class</jk>)
-		.build();
-
-	<jc>// Find the appropriate serializer by Accept type and serialize our POJO to the specified writer.</jc>
-	<jc>// Fully RFC2616 compliant.</jc>
-	sg.getSerializer(<js>"text/invalid, text/json;q=0.8, text/*;q:0.6, *\/*;q=0.0"</js>)
-		.serialize(myPersonObject, myWriter);
-		
-	<jc>// Construct a new parser group with configuration parameters that get applied to all parsers.</jc>
-	ParserGroup pg = <jk>new</jk> ParserGroupBuilder()
-		.append(JsonParser.<jk>class</jk>, UrlEncodingParser.<jk>class</jk>);
- 		.pojoSwaps(CalendarSwap.ISO8601DT.<jk>class</jk>)
- 		.build();
-
-	Person p = pg.getParser(<js>"text/json"</js>).parse(myReader, Person.<jk>class</jk>);
-		</p>
-		
-		<br><br><hr>
-
-		<ul class='doctree'>
-			<li class='link'>See <a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-marshall'>juneau-marshall</a> for more information.
-		</ul>
-	</div>
-	
-	<!-- ======================================================================================================= -->
-	<!-- === JUNEAU-MARSHALL-RDF =============================================================================== -->
-	<!-- ======================================================================================================= -->
-	
-	<h5 class='toc' id='juneau-marshall-rdf'>juneau-marshall-rdf</h5>
-	<div>
-		<h6 class='figure'>Maven Dependency</h6>
-		<p class='bcode' style='width:500px;'>
-	<xt>&lt;dependency&gt;</xt>
-		<xt>&lt;groupId&gt;</xt>org.apache.juneau<xt>&lt;/groupId&gt;</xt>
-		<xt>&lt;artifactId&gt;</xt>juneau-marshall-rdf<xt>&lt;/artifactId&gt;</xt>
-		<xt>&lt;version&gt;</xt>7.0.0<xt>&lt;/version&gt;</xt>
-	<xt>&lt;/dependency&gt;</xt>
-		</p>	
-	
-		<h6 class='figure'>Java Library</h6>
-		<p class='bcode' style='width:500px;'>
-	juneau-marshall-rdf-7.0.0.jar 
-		</p>	
-	
-		<h6 class='figure'>OSGi Module</h6>
-		<p class='bcode' style='width:500px;'>
-	org.apache.juneau.marshall.rdf_7.0.0.jar 
-		</p>	
-
-		<p>
-			The <code>juneau-marshall-rdf</code> library provides additional serializers and parsers for RDF.
-			These rely on the Apache Jena library to provide support for the following languages:
-		</p>
-		<ul>
-			<li>RDF/XML
-			<li>RDF/XML-Abbrev 	
-			<li>N-Triple
-			<li>Turtle
-			<li>N3
-		</ul>				
-		<p>
-			The serializers and parsers work identically to those in <code>juneau-marshall</code>, but are
-			packaged separately so that you don't need to pull in the Jena dependency unless you need it.
-		</p>
-	
-		<p class='bcode'>
-	<jc>// A simple bean</jc>
-	<jk>public class</jk> Person {
-		<jk>public</jk> String name = <js>"John Smith"</js>;
-		<jk>public int</jk> age = 21;
-	}
-	
-	<jc>// Serialize a bean to JSON, XML, or HTML</jc>
-	Person p = <jk>new</jk> Person();
-
-	<jc>// Produces:
-	// &lt;rdf:RDF
-	//  xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-	//  xmlns:jp="http://www.apache.org/juneaubp/"
-	//  xmlns:j="http://www.apache.org/juneau/"&gt;
-	// 	&lt;rdf:Description&gt;
-	// 		&lt;jp:name&gt;John Smith&lt;/jp:name&gt;
-	// 		&lt;jp:age&gt;21&lt;/jp:age&gt;
-	// 	&lt;/rdf:Description&gt;
-	// &lt;/rdf:RDF&gt;</jc>
-	String rdfXml = RdfSerializer.<jsf>DEFAULT_XMLABBREV</jsf>.serialize(p);
-	
-	<jc>// Produces:
-	// @prefix jp:      &lt;http://www.apache.org/juneaubp/&gt; .
-	// @prefix j:       &lt;http://www.apache.org/juneau/&gt; .
-	//	[]    jp:age  "21" ;
-	//	      jp:name "John Smith" .</jc>
-	String rdfN3 = RdfSerializer.<jsf>DEFAULT_N3</jsf>.serialize(p);
-
-	<jc>// Produces:
-	// _:A3bf53c85X3aX157cf407e2dX3aXX2dX7ffd &lt;http://www.apache.org/juneaubp/name&gt; "John Smith" .
-	// _:A3bf53c85X3aX157cf407e2dX3aXX2dX7ffd &lt;http://www.apache.org/juneaubp/age&gt; "21" .</jc>
-	String rdfNTriple = RdfSerializer.<jsf>DEFAULT_NTRIPLE</jsf>.serialize(p);
-		</p>
-		
-		<ul class='doctree'>
-			<li class='link'>See <a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-marshall-rdf'>juneau-marshall-rdf</a> for more information.
-		</ul>
-	</div>
-</body>
-</html>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/juneau-website/blob/b1ebfeda/content/7.0.0/microservice.html
----------------------------------------------------------------------
diff --git a/content/7.0.0/microservice.html b/content/7.0.0/microservice.html
deleted file mode 100644
index a98f23f..0000000
--- a/content/7.0.0/microservice.html
+++ /dev/null
@@ -1,227 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<style>
-	@import url("styles/juneau-code.css");
-	@import url("styles/juneau-doc.css");
-</style>
-</head>
-<body>
-	<!-- =========================================================================================================== -->
-	<!-- === JUNEAU MICROSERVICE =================================================================================== -->
-	<!-- =========================================================================================================== -->
-	
-	<h5 class='toc' id='juneau-microservice'>juneau-microservice</h5>
-	<div>
-
-		<p>
-			Microservices combine all the functionality of the core, server, and client APIs to provide truly powerful
-			and easy-to-use REST interfaces with minimal overhead.
-		</p>
-
-		<!-- ======================================================================================================= -->
-		<!-- === JUNEAU-MICROSERVICE-SERVER ======================================================================== -->
-		<!-- ======================================================================================================= -->
-	
-		<h6 class='toc' id='juneau-microservice-server'>juneau-microservice-server</h6>
-		<div>
-			
-			<h6 class='figure'>Maven Dependency</h6>
-			<p class='bcode' style='width:500px;'>
-	<xt>&lt;dependency&gt;</xt>
-		<xt>&lt;groupId&gt;</xt>org.apache.juneau<xt>&lt;/groupId&gt;</xt>
-		<xt>&lt;artifactId&gt;</xt>juneau-microservice-server<xt>&lt;/artifactId&gt;</xt>
-		<xt>&lt;version&gt;</xt>7.0.0<xt>&lt;/version&gt;</xt>
-	<xt>&lt;/dependency&gt;</xt>
-			</p>	
-		
-			<h6 class='figure'>Java Library</h6>
-			<p class='bcode' style='width:500px;'>
-	juneau-microservice-server-7.0.0.jar 
-			</p>	
-		
-			<h6 class='figure'>OSGi Module</h6>
-			<p class='bcode' style='width:500px;'>
-	org.apache.juneau.microservice.server_7.0.0.jar 
-			</p>	
-
-			<p>
-				The Microservice API combines all the features above with a built-in Jetty server to produce a lightweight 
-				REST service packaged as three simple files:
-			</p>
-			<ul class='spaced-list'>
-				<li>An executable jar file that starts up a REST interface in milliseconds.
-				<li>A configurable <code>jetty.xml</code> file.
-				<li>An external INI file that can be used to configure your REST resources on the fly.
-			</ul>
-			<p>
-				The microservice API was originally designed for and particularly suited for use in Docker containers.
-			</p>
-			<p>
-				REST microservices can also be started programmatically in existing code:
-			</p>
-			<p class='bcode'>
-	RestMicroservice myRestService = <jk>new</jk> RestMicroservice()
-		.setConfig(<js>"microservice.cfg"</js>, <jk>false</jk>)
-		.setJettyXml(<js>"my-jetty.xml"</js>);
-	myRestService.start();
-	URI uri = myRestService.getURI();
-			</p>
-			<p>
-				The provided microservice.cfg template file gives you a starting point for defining your microservice:
-			</p>
-			<p class='bcode'>
-	<cc>#================================================================================
-	# Basic configuration file for SaaS microservices
-	# Subprojects can use this as a starting point.
-	#================================================================================</cc>
-	
-	<cc>#================================================================================
-	# REST settings
-	#================================================================================</cc>
-	<cs>[REST]</cs>
-	
-	<cc># The location of the jetty.xml file to use for configuring Jetty.</cc>
-	<ck>jettyXml</ck> = <cv>jetty.xml</cv>
-
-	<cc># Stylesheet to use for HTML views.
-	# The default options are:
-	#  - styles/juneau.css
-	#  - styles/devops.css
-	# Other stylesheets can be referenced relative to the servlet package or working
-	# 	directory.</cc>
-	<ck>stylesheet</ck> = <cv>styles/devops.css</cv>
-	
-	<cc># What to do when the config file is saved.
-	# Possible values:
-	# 	NOTHING - Don't do anything. 
-	#	RESTART_SERVER - Restart the Jetty server.
-	#	RESTART_SERVICE - Shutdown and exit with code '3'.</cc>
-	<ck>saveConfigAction</ck> = <cv>RESTART_SERVER</cv>
-	
-	<cc>#================================================================================
-	# Logger settings
-	# See FileHandler Java class for details.
-	#================================================================================</cc>
-	<cs>[Logging]</cs>
-
-	<cc># The directory where to create the log file.
-	# Default is "."</cc>
-	<ck>logDir</ck> = <cv>logs</cv>
-	
-	<cc># The name of the log file to create for the main logger.
-	# The logDir and logFile make up the pattern that's passed to the FileHandler
-	# constructor.
-	# If value is not specified, then logging to a file will not be set up.</cc>
-	<ck>logFile</ck> = <cv>microservice.%g.log</cv>
-	
-	<cc># Whether to append to the existing log file or create a new one.
-	# Default is false.</cc>
-	<ck>append</ck> = 
-	
-	<cc># The SimpleDateFormat format to use for dates.
-	# Default is "yyyy.MM.dd hh:mm:ss".</cc>
-	<ck>dateFormat</ck> = 
-	
-	<cc># The log message format.
-	# The value can contain any of the following variables:
-	# 	{date} - The date, formatted per dateFormat.
-	#	{class} - The class name.
-	#	{method} - The method name.
-	#	{logger} - The logger name.
-	#	{level} - The log level name.
-	#	{msg} - The log message.
-	#	{threadid} - The thread ID.
-	#	{exception} - The localized exception message.
-	# Default is "[{date} {level}] {msg}%n".</cc>
-	<ck>format</ck> =
-	
-	<cc># The maximum log file size.
-	# Suffixes available for numbers.
-	# See ConfigFile.getInt(String,int) for details.
-	# Default is 1M.</cc>
-	<ck>limit</ck> = <cv>10M</cv>
-	
-	<cc># Max number of log files.
-	# Default is 1.</cc>
-	<ck>count</ck> = <cv>5</cv>
-	
-	<cc># Default log levels.
-	# Keys are logger names.
-	# Values are serialized Level POJOs.</cc>
-	<ck>levels</ck> = <cv>{ org.apache.juneau:'INFO' }</cv>
-	
-	<cc># Only print unique stack traces once and then refer to them by a simple 8 character hash identifier.
-	# Useful for preventing log files from filling up with duplicate stack traces.
-	# Default is false.</cc>
-	<ck>useStackTraceHashes</ck> = <cv>true</cv>
-	
-	<cc># The default level for the console logger.
-	# Default is WARNING.</cc>
-	<ck>consoleLevel</ck> = 
-	
-	<cc>#================================================================================
-	# System properties
-	#--------------------------------------------------------------------------------
-	# These are arbitrary system properties that are set during startup.
-	#================================================================================</cc>
-	<cs>[SystemProperties]</cs>
-	
-	<cc># Configure Jetty for StdErrLog Logging</cc>
-	<ck>org.eclipse.jetty.util.log.class</ck> = <cv>org.eclipse.jetty.util.log.StrErrLog</cv>
-	
-	<cc># Jetty logging level</cc>
-	<ck>org.eclipse.jetty.LEVEL</ck> = <cv>WARN</cv>		
-			</p>
-			<p>
-				This external config file is meant to be used for all of your resource configurations.  
-				APIs are provided in the REST Server APIs for easily accessing these values programmatically, or
-				by using <js>"$C{...}"</js> variables in your <ja>@RestResource</ja> and <ja>@RestMethod</ja> annotations.
-			</p>
-			<p>
-				Various predefined reusable REST resource classes are provided for accessing log files, viewing and editing the config file, etc...
-				These allow you to quickly put together sophisticated REST microservices.
-			</p>
-		
-			<ul class='doctree'>
-				<li class='link'>See <a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-microservice-server'>juneau-microservice-server</a> for more information.
-			</ul>
-		</div>
-
-		<!-- ======================================================================================================= -->
-		<!-- === JUNEAU-MICROSERVICE-TEMPLATE ====================================================================== -->
-		<!-- ======================================================================================================= -->
-	
-		<h6 class='toc' id='juneau-microservice-template'>juneau-microservice-template</h6>
-		<div>
-		
-			<h6 class='figure'>Archive File</h6>
-			<p class='bcode' style='width:500px;'>
-	my-microservice-7.0.0.zip 
-			</p>	
-		
-			<p>
-				The <code>juneau-microservice-template</code> module is a bare-bones microservice project that can be
-				used as a starting point for creating your own microservice.  
-			</p>
-			<p>
-				The template project ships as a zipped Eclipse project that can be quickly imported into your 
-				workspace as an Eclipse project called "my-microservice".
-			</p>
-			<p>
-				Once loaded, you should see the following project structure:
-			</p>
-			<img class='bordered' src='images/juneau-microservice-template.import3.png' style='width:412px'>
-			<p>
-				The microservice can be started from the <code>my-microservice.launch</code> file.
-				It will start up the microservice on port 10000 which you can then view through a browser:
-			</p>
-			<img class='bordered' src='images/juneau-microservice-template.import4.png' style='width:467px'>
-
-			<ul class='doctree'>
-				<li class='link'>See <a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-microservice-template'>juneau-microservice-template</a> for more information.
-			</ul>
- 		</div>
-	</div>
-</body>
-</html>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/juneau-website/blob/b1ebfeda/content/7.0.0/rest-client.html
----------------------------------------------------------------------
diff --git a/content/7.0.0/rest-client.html b/content/7.0.0/rest-client.html
deleted file mode 100644
index 4b1f011..0000000
--- a/content/7.0.0/rest-client.html
+++ /dev/null
@@ -1,168 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<style>
-	@import url("styles/juneau-code.css");
-	@import url("styles/juneau-doc.css");
-</style>
-</head>
-<body>
-	<!-- ======================================================================================================= -->
-	<!-- === JUNEAU-REST-CLIENT ================================================================================ -->
-	<!-- ======================================================================================================= -->
-	
-	<h5 class='toc' id='juneau-rest-client'>juneau-rest-client</h5>
-	<div>
-		<h6 class='figure'>Maven Dependency</h6>
-		<p class='bcode' style='width:500px;'>
-	<xt>&lt;dependency&gt;</xt>
-		<xt>&lt;groupId&gt;</xt>org.apache.juneau<xt>&lt;/groupId&gt;</xt>
-		<xt>&lt;artifactId&gt;</xt>juneau-rest-client<xt>&lt;/artifactId&gt;</xt>
-		<xt>&lt;version&gt;</xt>7.0.0<xt>&lt;/version&gt;</xt>
-	<xt>&lt;/dependency&gt;</xt>
-		</p>	
-	
-		<h6 class='figure'>Java Library</h6>
-		<p class='bcode' style='width:500px;'>
-	juneau-rest-client-7.0.0.jar 
-		</p>	
-	
-		<h6 class='figure'>OSGi Module</h6>
-		<p class='bcode' style='width:500px;'>
-	org.apache.juneau.rest.client_7.0.0.jar 
-		</p>	
-
-		<p>
-			The REST client API allows you to access REST interfaces using POJOs:
-		</p>
-		<p class='bcode'>
-	<jc>// Create a reusable JSON client.</jc>
-	RestClient client = <jk>new</jk> RestClientBuilder().build();
-	
-	<jc>// The address of the root resource.</jc>
-	String url = <js>"http://localhost:10000/systemProperties"</js>;
-	
-	<jc>// Do a REST GET against a remote REST interface and convert
-	// the response to an unstructured ObjectMap object.</jc>
-	Map m1 = client.doGet(url).getResponse(TreeMap.<jk>class</jk>);
-	
-	<jc>// Add some new system properties.
-	// Use XML as the transport medium.</jc>
-	client = <jk>new</jk> RestClientBuilder(XmlSerializer.<jk>class</jk>, XmlParser.<jk>class</jk>).build();
-	Properties p = <jk>new</jk> Properties();
-	p.load(reader);
-	<jk>int</jk> returnCode = client.doPost(url + <js>"/systemProperties"</js>, p).execute();
-		</p>
-		<p>
-			The client API uses the same serializers and parsers (and subsequently their flexibility and configurability) as the server side to marshall POJOs back and forth.
-		</p>
-		<br><hr>
-		<p>
-			The remote proxy interface API allows you to invoke server-side POJO methods on the client side using REST (i.e. RPC over REST):
-		</p>
-		<p class='bcode'>
- 	<jc>// Get an interface proxy.</jc>
- 	IAddressBook ab = restClient.getRemoteableProxy(IAddressBook.<jk>class</jk>);
-	
-	<jc>// Invoke a method on the server side and get the returned result.</jc>
-	Person p = ab.createPerson(
-		<jk>new</jk> Person(
-			<js>"John Smith"</js>, 
-			<js>"Aug 1, 1999"</js>,
-			<jk>new</jk> Address(<js>"My street"</js>, <js>"My city"</js>, <js>"My state"</js>, 12345, <jk>true</jk>)
-		)
-	);
-		</p>
-		<p>
-			Although the client API is not dependent on the <code>juneau-rest-server</code> module, the server
-			module provides some convenience APIs for exposing remoteable proxies on the server side:
-		</p>
-		<ol>
-			<li>Extending from <code>RemoteableServlet</code>.
-			<li>Using a <code><ja>@RestMethod</ja>(name=<jsf>PROXY</jsf>)</code> annotation on a Java method.
-		</ol>
-		<p>
-			The <code>RemoteableServlet</code> class is a simple specialized servlet with an abstract <code>getServiceMap()</code>
-			method to define the server-side POJOs:
-		</p>
-		<p class='bcode'>
-	<ja>@RestResource</ja>(
-		path=<js>"/remote"</js>
-	)
-	<jk>public class</jk> SampleRemoteableServlet <jk>extends</jk> RemoteableServlet {
-	
-		<jc>// Our server-side POJO.</jc>
-		AddressBook <jf>addressBook</jf> = <jk>new</jk> AddressBook();
-	
-		<ja>@Override</ja> <jc>/* RemoteableServlet */</jc>
-		<jk>protected</jk> Map&lt;Class&lt;?&gt;,Object&gt; getServiceMap() <jk>throws</jk> Exception {
-			Map&lt;Class&lt;?&gt;,Object&gt; m = <jk>new</jk> LinkedHashMap&lt;Class&lt;?&gt;,Object&gt;();
-	
-			<jc>// In this simplified example, we expose the same POJO service under two different interfaces.
-			// One is IAddressBook which only exposes methods defined on that interface, and
-			// the other is AddressBook itself which exposes all methods defined on the class itself (dangerous!).</jc>
-			m.put(IAddressBook.<jk>class</jk>, <jf>addressBook</jf>);
-			m.put(AddressBook.<jk>class</jk>, <jf>addressBook</jf>);
-			<jk>return</jk> m;
-		}
-	}
-		</p>
-		<p>
-			The <code><ja>@RestMethod</ja>(name=<jsf>PROXY</jsf>)</code> approach is easier if you only have a single interface you want to expose.  
-			You simply define a Java method whose return type is an interface, and return the implementation of that interface:
-		</p>
-		<p class='bcode'>
-	<jc>// Our exposed proxy object.</jc>
-	<ja>@RestMethod</ja>(name=<jsf>PROXY</jsf>, path=<js>"/addressbookproxy/*"</js>)
-	<jk>public</jk> IAddressBook getProxy() {
-		<jk>return</jk> addressBook;
-	}
-		</p>
-		<p>
-			In either case, the proxy communications layer is pure REST.   
-			Parameters passed in on the client side are serialized as an HTTP POST, parsed on the
-			server side, and then passed to the invocation method.  The returned POJO is then marshalled back as an HTTP response.
-		</p>
-		<p>
-			In most cases, you'll want to use JSON or MessagePack as your communications layer since these are the most efficient.
-			Although remoteable proxies work perfectly well for any of the other supported languages.  For example, RPC over Turtle!
-		</p>
-		<p>
-			The parameters and return types of the Java methods can be any of the supported serializable and parsable types in <a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-marshall.PojoCategories'>POJO Categories</a>.
-			This ends up being WAY more flexible than other proxy interfaces since Juneau can handle so may POJO types out-of-the-box.
-			Most of the time you don't even need to modify your existing Java implementation code.
-		</p>
-		<p>
-			The <code>RemoteableServlet</code> class itself shows how sophisticated REST interfaces can be built on the Juneau REST Servlet
-			API using very little code.  
-			The class consists of only 53 lines of code, yet is a sophisticated discoverable and self-documenting REST interface.  
-			And since the remote proxy API is built on top of REST, it can be debugged using just a browser.
-		</p>
-		<br><hr>
-		<p>
-			Remoteable proxies can also be used to define interface proxies against 3rd-party REST interfaces.
-			This is an extremely powerful feature that allows you to quickly define easy-to-use interfaces against virtually any REST interface.
-		</p>
-		<p>
-			Similar in concept to remoteable services defined above, but in this case we simply define our interface with
-			special annotations that tell us how to convert input and output to HTTP headers, query parameters, form post parameters, or request/response bodies.
-		</p>
-		<p class='bcode'>	
-	<ja>@Remoteable</ja>
-	<jk>public interface</jk> MyProxyInterface {
-		
-		<ja>@RemoteMethod</ja>(httpMethod=<jsf>POST</jsf>, path=<js>"/method"</js>)
-		String doSomething(<ja>@Header</ja>(<js>"E-Tag"</js>) UUID etag, <ja>@Query</ja>(<js>"debug"</js>) <jk>boolean</jk> debug, <ja>@Body</ja> MyPojo pojo);
-	}
-	
-	RestClient client = <jk>new</jk> RestClientBuilder().build(); <jc>// Default is JSON</jc>
-	MyProxyInterface p = client.getRemoteableProxy(MyProxyInterface.<jk>class</jk>, <js>"http://hostname/some/rest/interface"</js>);
-	String response = p.doSomething(UUID.<jsm>generate</jsm>(), <jk>true</jk>, <jk>new</jk> MyPojo());
-		</p>
-	
-		<ul class='doctree'>
-			<li class='link'>See <a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-rest-client'>juneau-rest-client</a> for more information.
-		</ul>
-	</div>	
-</body>
-</html>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/juneau-website/blob/b1ebfeda/content/7.0.0/rest-server.html
----------------------------------------------------------------------
diff --git a/content/7.0.0/rest-server.html b/content/7.0.0/rest-server.html
deleted file mode 100644
index b79dcd7..0000000
--- a/content/7.0.0/rest-server.html
+++ /dev/null
@@ -1,748 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<style>
-	@import url("styles/juneau-code.css");
-	@import url("styles/juneau-doc.css");
-</style>
-</head>
-<body>
-
-	<!-- ======================================================================================================= -->
-	<!-- === JUNEAU-REST-SERVER ================================================================================ -->
-	<!-- ======================================================================================================= -->
-	
-	<h5 class='toc' id='juneau-rest-server'>juneau-rest-server</h5>
-	<div>
-		<h6 class='figure'>Maven Dependency</h6>
-		<p class='bcode' style='width:500px;'>
-	<xt>&lt;dependency&gt;</xt>
-		<xt>&lt;groupId&gt;</xt>org.apache.juneau<xt>&lt;/groupId&gt;</xt>
-		<xt>&lt;artifactId&gt;</xt>juneau-rest-server<xt>&lt;/artifactId&gt;</xt>
-		<xt>&lt;version&gt;</xt>7.0.0<xt>&lt;/version&gt;</xt>
-	<xt>&lt;/dependency&gt;</xt>
-		</p>	
-	
-		<h6 class='figure'>Java Library</h6>
-		<p class='bcode' style='width:500px;'>
-	juneau-rest-server-7.0.0.jar 
-		</p>	
-	
-		<h6 class='figure'>OSGi Module</h6>
-		<p class='bcode' style='width:500px;'>
-	org.apache.juneau.rest.server_7.0.0.jar 
-		</p>	
-
-		<p>
-			The REST server API builds upon the <code>SerializerGroup</code> and <code>ParserGroup</code> classes 
-			to provide annotated REST servlets that automatically negotiate the HTTP media types for you.
-			<br>Developers simply work with requests, responses, headers, path variables, query parameters, and form data as POJOs.
-			<br>It allows you to create sophisticated REST interfaces using tiny amounts of code.
-		</p>
-		<p>
-			The end goal is to provide simple and flexible yet sophisticated REST interfaces that allow POJOs to be automatically represented as 
-			different content types depending on whatever the particular need: 
-		</p>
-		<ul class='spaced-list'>
-			<li>HTML for viewing POJOs in easy-to-read format in a browser.
-			<li>JSON for interacting through Javascript.
-			<li>XML for interacting with other applications.
-			<li>RDF for interacting with triple stores.
-			<li>URL-Encoding for interacting through HTML forms.
-			<li>MessagePack for efficiently transmitting large amounts of data.
-		</ul>
-		<p>
-			A simple example that supports all languages:
-		</p>
-		<p class='bcode'>
-	<ja>@RestResource</ja>(
-		path=<js>"/systemProperties"</js>,
-		title=<js>"System properties resource"</js>
-	)
-	<jk>public class</jk> SystemPropertiesResource <jk>extends</jk> RestServletDefault {
-	
-		<ja>@RestMethod</ja>(name=<jsf>GET</jsf>, path=<js>"/"</js>)
-		<jk>public</jk> Map getSystemProperties(<ja>@Query</ja>(<js>"sort"</js>) <jk>boolean</jk> sort) <jk>throws</jk> Throwable {
-			<jk>if</jk> (sort)
-				<jk>return new</jk> TreeMap(System.<jsm>getProperties</jsm>());
-			<jk>return</jk> System.<jsm>getProperties</jsm>();
-		}
-	
-		<ja>@RestMethod</ja>(name=<jsf>GET</jsf>, path=<js>"/{propertyName}"</js>)
-		<jk>public</jk> String getSystemProperty(<ja>@Path</ja> String propertyName) <jk>throws</jk> Throwable {
-			<jk>return</jk> System.<jsm>getProperty</jsm>(propertyName);
-		}
-	
-		<ja>@RestMethod</ja>(name=<jsf>PUT</jsf>, path=<js>"/{propertyName}"</js>, guards=AdminGuard.<jk>class</jk>)
-		<jk>public</jk> String setSystemProperty(<ja>@Path</ja> String propertyName, <ja>@Body</ja> String value) {
-			System.<jsm>setProperty</jsm>(propertyName, value);
-			<jk>return</jk> <js>"OK"</js>;
-		}
-	
-		<ja>@RestMethod</ja>(name=<jsf>POST</jsf>, path=<js>"/"</js>, guards=AdminGuard.<jk>class</jk>)
-		<jk>public</jk> String setSystemProperties(<ja>@Body</ja> java.util.Properties newProperties) {
-			System.<jsm>setProperties</jsm>(newProperties);
-			<jk>return</jk> <js>"OK"</js>;
-		}
-	
-		<ja>@RestMethod</ja>(name=<jsf>DELETE</jsf>, path=<js>"/{propertyName}"</js>, guards=AdminGuard.<jk>class</jk>)
-		<jk>public</jk> String deleteSystemProperty(<ja>@Path</ja> String propertyName) {
-			System.<jsm>clearProperty</jsm>(propertyName);
-			<jk>return</jk> <js>"OK"</js>;
-		}
-	}
-		</p>
-		<p>
-			A more sophisticated example of the same resource using various features, including information
-			for fully populating the Swagger documentation, guards for restricting access to particular
-			methods, customizing supported content types and serialization options, adding g-zip compression, 
-			and adding customized branding for the HTML views.
-		</p>
-		<p class='bcode'>
-	<ja>@RestResource</ja>(
-		path=<js>"/systemProperties"</js>,
-		title=<js>"System properties resource"</js>,
-		description=<js>"REST interface for performing CRUD operations on system properties."</js>,
-		messages=<js>"nls/SystemPropertiesResource"</js>,  <jc>// Location of localized messages.</jc>
-		
-		<jc>// Widget used for content-type pull-down menu.</jc>		
-		widgets={
-			ContentTypeMenuItem.<jk>class</jk>
-		},
-	
-		<jc>// Links on the HTML rendition page.
-		// "request:/..." URIs are relative to the request URI.
-		// "servlet:/..." URIs are relative to the servlet URI.</jc>
-		htmldoc=<ja>@HtmlDoc</ja>(
-			
-			<jc>// Custom navigation links.</jc>
-			links={
-				<js>"up: request:/.."</js>,
-				<js>"options: servlet:/?method=OPTIONS"</js>,
-				<js>"form: servlet:/formPage"</js>,
-				<js>"$W{ContentTypeMenuItem}"</js>,
-				<js>"source: $C{Source/gitHub}/org/apache/juneau/examples/rest/SystemPropertiesResource.java"</js>
-			},
-			
-			<jc>// Custom page text in aside section.</jc>
-			aside={
-				<js>"&lt;div style='max-width:800px' class='text'&gt;"</js>,
-				<js>"	&lt;p&gt;Shows standard GET/PUT/POST/DELETE operations and use of Swagger annotations.&lt;/p&gt;"</js>,
-				<js>"&lt;/div&gt;"</js>
-			},
-				
-			<jc>// Custom CSS styles applied to HTML view.</jc>
-			style={
-				<js>"aside {display:table-caption;}"</js>
-			}
-		),
-				
-		<jc>// Set serializer, parser, and REST context properties.</jc>
-		properties={
-			<ja>@Property</ja>(name=<jsf>SERIALIZER_quoteChar</jsf>, value=<js>"'"</js>)
-		},
-		
-		<jc>// Add compression support.</jc>
-		encoders=GzipEncoder.<jk>class</jk>,
-		
-		<jc>// Augment generated Swagger information.</jc>
-		swagger=<ja>@ResourceSwagger</ja>(
-			contact=<js>"{name:'John Smith',email:'john@smith.com'}"</js>,
-			license=<js>"{name:'Apache 2.0',url:'http://www.apache.org/licenses/LICENSE-2.0.html'}"</js>,
-			version=<js>"2.0"</js>,
-			termsOfService=<js>"You're on your own."</js>,
-			tags=<js>"[{name:'Java',description:'Java utility',externalDocs:{description:'Home page',url:'http://juneau.apache.org'}}]"</js>,
-			externalDocs=<js>"{description:'Home page',url:'http://juneau.apache.org'}"</js>
-		)
-	)
-	<jk>public class</jk> SystemPropertiesResource <jk>extends</jk> RestServlet {
-	
-		<ja>@RestMethod</ja>(
-			name=<jsf>GET</jsf>, path=<js>"/"</js>,
-			summary=<js>"Show all system properties"</js>,
-			description=<js>"Returns all system properties defined in the JVM."</js>,
-			
-			<jc>// Augment generated Swagger information.</jc>
-			swagger=<ja>@MethodSwagger</ja>(
-				parameters={
-					<ja>@Parameter</ja>(in=<js>"query"</js>, name=<js>"sort"</js>, description=<js>"Sort results alphabetically."</js>, _default=<js>"false"</js>)
-				},
-				responses={
-					<ja>@Response</ja>(value=200, description=<js>"Returns a map of key/value pairs."</js>)
-				}
-			)
-		)
-		<jk>public</jk> Map getSystemProperties(<ja>@Query</ja>(<js>"sort"</js>) <jk>boolean</jk> sort) <jk>throws</jk> Throwable {
-			<jk>if</jk> (sort)
-				<jk>return new</jk> TreeMap(System.<jsm>getProperties</jsm>());
-			<jk>return</jk> System.<jsm>getProperties</jsm>();
-		}
-	
-		...
-	}
-		</p>
-		
-		<p>
-			In HTML, our resource looks like this:
-		</p>
-		<img class='bordered' src='images/SystemPropertiesResource.png' width="800px">
-		
-		<p>
-			When combined with the support for HTML5 beans, simple HTML forms can be constructed for easy input and output
-			using nothing more than Java:
-		</p>
-		<p class='bcode'>
-	<jk>import static</jk> org.apache.juneau.dto.html5.HtmlBuilder.*;
-	
-	<ja>@RestMethod</ja>(
-		name=<jsf>GET</jsf>, path=<js>"/formPage"</js>,
-		summary=<js>"Form entry page"</js>,
-		description=<js>"A form post page for setting a single system property value."</js>,
-		guards=AdminGuard.<jk>class</jk>
-	)
-	<jk>public</jk> Form getFormPage() {
-		<jk>return</jk> <jsm>form</jsm>().method(<jsf>POST</jsf>).action(<js>"formPagePost"</js>).children(
-			<jsm>table</jsm>(
-				<jsm>tr</jsm>(
-					<jsm>th</jsm>(<js>"Set system property"</js>).colspan(2)
-				),
-				<jsm>tr</jsm>(
-					<jsm>td</jsm>(<js>"Name: "</js>), <jsm>td</jsm>(<jsm>input</jsm>(<js>"text"</js>).name(<js>"name"</js>))
-				),
-				<jsm>tr</jsm>(
-					<jsm>td</jsm>(<js>"Value: "</js>), <jsm>td</jsm>(<jsm>input</jsm>(<js>"text"</js>).name(<js>"value"</js>))
-				)
-			),
-			<jsm>button</jsm>(<js>"submit"</js>,<js>"Click me!"</js>).<jsm>style</jsm>(<js>"float:right"</js>)
-		);
-	}
-
-	<ja>@RestMethod</ja>(
-		name=<jsf>POST</jsf>, path=<js>"/formPagePost"</js>, 
-		description=<js>"Accepts a simple form post of a system property name/value pair."</js>,
-		guards=AdminGuard.<jk>class</jk>
-	)
-	<jk>public</jk> Redirect formPagePost(<ja>@FormData</ja>(<js>"name"</js>) String name, <ja>@FormData</ja>(<js>"value"</js>) String value) {
-		System.<jsm>setProperty</jsm>(name, value);
-		<jk>return new</jk> Redirect(<js>"servlet:/"</js>);  <jc>// Redirect to the servlet top page.</jc>
-	}
-		</p>	
-		<img class='bordered' src='images/SystemPropertiesForm.png' width="800px">
-		<p>
-			The REST API is built on top of Servlets, making them easy to deploy in any JEE environment.  
-		</p>
-		<p>
-			REST Java methods can return any of the following objects:  
-			<br>POJOs, <code>Readers</code>, <code>InputStreams</code>, <code>ZipFiles</code>, <code>Redirects</code>, <code>Streamables</code>, and <code>Writables</code>.
-		</p>
-		<p>
-			Or add your own handlers for other types.  
-		</p>
-		<p>
-			REST Java methods can be passed any of the following objects in any order:
-		</p>
-		<ul class='spaced-list'>
-			<li>Low-level request/response objects:
-				<br><code>HttpServletRequest</code>, <code>HttpServletResponse</code>, <code>RestRequest</code>, <code>RestResponse</code>.
-			<li>Intermediate-level objects:  
-				<br><code>RequestHeaders</code>, <code>RequestQuery</code>, <code>RequestFormData</code>, <code>RequestPathMatch</code>, <code>RequestBody</code>.
-			<li>All RFC 2616 request header objects:  
-				<br><code>Accept</code>, <code>AcceptLanguage</code>, <code>AcceptEncoding</code>...
-			<li>Annotated parameters:  
-				<br><ja>@Header</ja>, <ja>@Query</ja>, <ja>@FormData</ja>, <ja>@Path</ja>, <ja>@PathRemainder</ja>, <ja>@Body</ja>.  
-			<li>Other objects:  
-				<br><code>Locale</code>, <code>ResourceBundle</code>, <code>MessageBundle</code>, <code>InputStream</code>, <code>OutputStream</code>, <code>Reader</code>, <code>Writer</code>...
-			<li>User-defined parameter types.
-		</ul>
-		<p>
-			It's up to you how you want to define your REST methods. 
-			As a general rule, there are 3 broad approaches typically used:
-		</p>
-		
-		<h5 class='topic'>Methodology #1 - Annotated parameters</h5>	
-		<p>
-			This approach uses annotated parameters for retrieving input from the request.
-		</p>
-		<p class='bcode'>
-	<ja>@RestMethod</ja>(name=<jsf>GET</jsf>, path=<js>"/example1/{p1}/{p2}/{p3}/*"</js>)
-	<jk>public</jk> String example1(
-			<ja>@Method</ja> String method,                  <jc>// HTTP method.</jc>
-			<ja>@Path</ja> String p1,                        <jc>// Path variables.</jc>
-			<ja>@Path</ja> <jk>int</jk> p2,
-			<ja>@Path</ja> UUID p3,
-			<ja>@Query</ja>(<js>"q1"</js>) <jk>int</jk> q1,                    <jc>// Query parameters.</jc>
-			<ja>@Query</ja>(<js>"q2"</js>) String q2,
-			<ja>@Query</ja>(<js>"q3"</js>) UUID q3,
-			<ja>@PathRemainder</ja> String remainder,        <jc>// Path remainder after pattern match.</jc>
-			<ja>@Header</ja>(<js>"Accept-Language"</js>) String lang, <jc>// Headers.</jc>
-			<ja>@Header</ja>(<js>"Accept"</js>) String accept,
-			<ja>@Header</ja>(<js>"DNT"</js>) <jk>int</jk> doNotTrack
-		) {
-
-		<jc>// Send back a simple String response</jc>
-		String output = String.<jsm>format</jsm>(
-				<js>"method=%s, p1=%s, p2=%d, p3=%s, remainder=%s, q1=%d, q2=%s, q3=%s, lang=%s, accept=%s, dnt=%d"</js>,
-				method, p1, p2, p3, remainder, q1, q2, q3, lang, accept, doNotTrack);
-		<jk>return</jk> output;
-	}
-		</p>	
-		
-		<h5 class='topic'>Methodology #2 - Low-level request/response objects</h5>	
-		<p>
-			This approach uses low-level request/response objects to perform the same as above.
-		</p>
-		<p class='bcode'>
-	<ja>@RestMethod</ja>(name=<jsf>GET</jsf>, path=<js>"/example2/{p1}/{p2}/{p3}/*"</js>)
-	<jk>public</jk> String example2(
-			RestRequest req,          <jc>// A direct subclass of HttpServletRequest.</jc>
-			RestResponse res          <jc>// A direct subclass of HttpServletResponse.</jc>
-		) {
-		
-		<jc>// HTTP method.</jc>
-		String method = req.getMethod();
-
-		<jc>// Path variables.</jc>
-		RequestPathMatch path = req.getPathMatch();
-		String p1 = path.get(<js>"p1"</js>, String.<jk>class</jk>);
-		<jk>int</jk> p2 = path.get(<js>"p2"</js>, <jk>int</jk>.<jk>class</jk>);
-		UUID p3 = path.get(<js>"p3"</js>, UUID.<jk>class</jk>);
-
-		<jc>// Query parameters.</jc>
-		RequestQuery query = req.getQuery();
-		<jk>int</jk> q1 = query.get(<js>"q1"</js>, 0, <jk>int</jk>.<jk>class</jk>);
-		String q2 = query.get(<js>"q2"</js>, String.<jk>class</jk>);
-		UUID q3 = query.get(<js>"q3"</js>, UUID.<jk>class</jk>);
-
-		<jc>// Path remainder after pattern match.</jc>
-		String remainder = req.getPathMatch().getRemainder();
-
-		<jc>// Headers.</jc>
-		String lang = req.getHeader(<js>"Accept-Language"</js>);
-		String accept = req.getHeader(<js>"Accept"</js>);
-		<jk>int</jk> doNotTrack = req.getHeaders().get(<js>"DNT"</js>, <jk>int</jk>.<jk>class</jk>);
-
-		<jc>// Send back a simple String response</jc>
-		String output = String.format(
-				<js>"method=%s, p1=%s, p2=%d, p3=%s, remainder=%s, q1=%d, q2=%s, q3=%s, lang=%s, accept=%s, dnt=%d"</js>,
-				method, p1, p2, p3, remainder, q1, q2, q3, lang, accept, doNotTrack);
-		res.setOutput(output);  <jc>// Or use getWriter().</jc>
-	}
-		</p>	
-		
-		<h5 class='topic'>Methodology #3 - Intermediate-level API objects</h5>	
-		<p>
-			This approach is sort of the middle ground where you get access functional area APIs.
-		</p>
-		<p class='bcode'>
-	<ja>@RestMethod</ja>(name=<jsf>GET</jsf>, path=<js>"/example3/{p1}/{p2}/{p3}/*"</js>)
-	<jk>public</jk> String example3(
-			HttpMethod method,           <jc>// HTTP method.</jc>
-			RequestPathMatch path,       <jc>// Path variables.</jc>
-			RequestQuery query,          <jc>// Query parameters.</jc>
-			RequestHeaders headers,      <jc>// Headers.</jc>
-			AcceptLanguage lang,         <jc>// Specific header classes.</jc>
-			Accept accept
-		) {
-		
-		<jc>// Path variables.</jc>
-		String p1 = path.get(<js>"p1"</js>, String.<jk>class</jk>);
-		<jk>int</jk> p2 = path.get(<js>"p2"</js>, <jk>int</jk>.<jk>class</jk>);
-		UUID p3 = path.get(<js>"p3"</js>, UUID.<jk>class</jk>);
-
-		<jc>// Query parameters.</jc>
-		<jk>int</jk> q1 = query.get(<js>"q1"</js>, 0, <jk>int</jk>.<jk>class</jk>);
-		String q2 = query.get(<js>"q2"</js>, String.<jk>class</jk>);
-		UUID q3 = query.get(<js>"q3"</js>, UUID.<jk>class</jk>);
-
-		<jc>// Path remainder after pattern match.</jc>
-		String remainder = path.getRemainder();
-
-		<jc>// Headers.</jc>
-		int doNotTrack = headers.get(<js>"DNT"</js>, <jk>int</jk>.<jk>class</jk>);
-
-		<jc>// Send back a simple String response</jc>
-		String output = String.format(
-				<js>"method=%s, p1=%s, p2=%d, p3=%s, remainder=%s, q1=%d, q2=%s, q3=%s, lang=%s, accept=%s, dnt=%d"</js>,
-				method, p1, p2, p3, remainder, q1, q2, q3, lang, accept, doNotTrack);
-		res.setOutput(output);
-	}
-		</p>	
-		<p>
-			All three are completely equivalent.  It's up to your own coding preferences which methodology you use.
-		</p>
-		<br><hr>
-		<p>
-			Lifecycle hooks allow you to hook into lifecycle events of the servlet or REST call.
-			Like <ja>@RestMethod</ja> methods, the list of parameters are specified by the developer.
-		</p>
-		<p>
-			For example, if you want to add an initialization method to your resource:
-		</p>
-		<p class='bcode'>
-	<ja>@RestResource</ja>(...)
-	<jk>public class</jk> MyResource  {
-
-		<jc>// Our database.</jc>
-		<jk>private</jk> Map&lt;Integer,Object&gt; <jf>myDatabase</jf>;
-
-		<ja>@RestHook</ja>(<jsf>INIT</jsf>)
-		<jk>public void</jk> initMyDatabase(RestConfig config) <jk>throws</jk> Exception {
-			<jf>myDatabase</jf> = <jk>new</jk> LinkedHashMap&lt;&gt;();
-		}
-	}
-		</p>
-		<p>
-			Or if you want to intercept REST calls:
-		</p>
-		<p class='bcode'>
-	<ja>@RestResource</ja>(...)
-	<jk>public class</jk> MyResource {
-
-		<jc>// Add a request attribute to all incoming requests.</jc>
-		<ja>@RestHook</ja>(<jsf>PRE_CALL</jsf>)
-		<jk>public void</jk> onPreCall(RestRequest req) {
-			req.setAttribute(<js>"foo"</js>, <js>"bar"</js>);
-		}
-	}
-		</p>
-		<p>
-			The hook events can be broken down into two categories:
-		</p>
-		<ul class='spaced-list'>
-			<li>Resource lifecycle events:
-				<ul>
-					<li><jsf>INIT</jsf> - Right before initialization.
-					<li><jsf>POST_INIT</jsf> - Right after initialization.
-					<li><jsf>POST_INIT_CHILD_FIRST</jsf> - Right after initialization, but run child methods first.
-					<li><jsf>DESTROY</jsf> - Right before servlet destroy.
-				</ul>
-			<li>REST call lifecycle events:
-				<ul>
-					<li><jsf>START_CALL</jsf> - At the beginning of a REST call.
-					<li><jsf>PRE_CALL</jsf> - Right before the <ja>@RestMethod</ja> method is invoked.
-					<li><jsf>POST_CALL</jsf> - Right after the <ja>@RestMethod</ja> method is invoked.
-					<li><jsf>END_CALL</jsf> - At the end of the REST call after the response has been flushed.
-				</ul>
-		</ul>
-		<br><hr>
-		<p>
-			Auto-generated OPTIONS pages are constructed from Swagger DTO beans, here shown serialized as HTML:
-		</p>
-		<img class='bordered' src='images/Swagger.png' width="800px">
-		<p>
-			Swagger documentation can be populated from annotations (as above), resource bundles, or Swagger JSON files.
-		</p>
-		<p>
-			The page shown above is implemented on the RestServletDefault class in the method below which shows that it's doing nothing more than 
-			serializing a Swagger bean which is constructed in the RestRequest object:
-		</p>
-		<p class='bcode'>
-	<ja>@RestMethod</ja>(name=<jsf>OPTIONS</jsf>, path=<js>"/*"</js>)
-	<jk>public</jk> Swagger getOptions(RestRequest req) {
-		<jk>return</jk> req.getSwagger();
-	}
-		</p>
-		<br><br><hr>
-		<p>	
-			Navigable hierarchies of REST resources are easy to set up either programmatically or through annotations.
-			<br>
-			The following example is the <code>RootResources</code> class from the REST examples showing how to construct
-			a grouping of resources using the <code>children()</code> annotation:
-		</p>
-		<p class='bcode'>
-	<ja>@RestResource</ja>(
-		path=<js>"/"</js>,
-		title=<js>"Root resources"</js>,
-		description=<js>"Example of a router resource page."</js>,
-		widgets={
-			PoweredByApache.<jk>class</jk>,
-			ContentTypeMenuItem.<jk>class</jk>
-		},
-		htmldoc=<ja>@HtmlDoc</ja>(
-			links={
-				<js>"options: ?method=OPTIONS"</js>,
-				<js>"$W{ContentTypeMenuItem}"</js>,
-				<js>"source: $C{Source/gitHub}/org/apache/juneau/examples/rest/RootResources.java"</js>
-			},
-			aside={
-				<js>"&lt;div style='max-width:400px' class='text'&gt;"</js>,
-				<js>"	&lt;p&gt;This is an example of a 'router' page that serves as a jumping-off point to child resources.&lt;/p&gt;"</js>,
-				<js>"	&lt;p&gt;Resources can be nested arbitrarily deep through router pages.&lt;/p&gt;"</js>,
-				<js>"	&lt;p&gt;Note the options link provided that lets you see the generated swagger doc for this page.&lt;/p&gt;"</js>,
-				<js>"	&lt;p&gt;Also note the source link on these pages to view the source code for the page.&lt;/p&gt;"</js>,
-				<js>"	&lt;p&gt;All content on pages in the UI are serialized POJOs.  In this case, it's a serialized array of beans with 2 properties, 'name' and 'description'.&lt;/p&gt;"</js>,
-				<js>"	&lt;p&gt;Other features (such as this aside) are added through annotations.&lt;/p&gt;"</js>,
-				<js>"&lt;/div&gt;"</js>
-			},
-			footer=<js>"$W{PoweredByApache}"</js>
-		),
-		children={
-			HelloWorldResource.<jk>class</jk>,
-			PetStoreResource.<jk>class</jk>,
-			SystemPropertiesResource.<jk>class</jk>,
-			MethodExampleResource.<jk>class</jk>,
-			RequestEchoResource.<jk>class</jk>,
-			TempDirResource.<jk>class</jk>,
-			AddressBookResource.<jk>class</jk>,
-			SampleRemoteableServlet.<jk>class</jk>,
-			PhotosResource.<jk>class</jk>,
-			AtomFeedResource.<jk>class</jk>,
-			JsonSchemaResource.<jk>class</jk>,
-			SqlQueryResource.<jk>class</jk>,
-			TumblrParserResource.<jk>class</jk>,
-			CodeFormatterResource.<jk>class</jk>,
-			UrlEncodedFormResource.<jk>class</jk>,
-			ConfigResource.<jk>class</jk>,
-			LogsResource.<jk>class</jk>,
-			DockerRegistryResource.<jk>class</jk>,
-			ShutdownResource.<jk>class</jk>
-		}
-	)
-	<jk>public class</jk> RootResources <jk>extends</jk> RestServletGroupDefault { <jc>/* No code needed! */</jc> }
-		</p>
-		<p>
-			The above resource when rendered in HTML shows how easy it is to discover and navigate to child resources using a browser:
-		</p>
-		<img class='bordered' src='images/Samples_RootResources.png' width="800px">
-		<p>
-			Resources can be nested arbitrarily deep.  
-			The <ja>@RestResource</ja> and <ja>@RestMethod</ja> annotations can be applied to any classes, not just
-			servlets.  The only requirement is that the top-level resource be a subclass of <code>RestServlet</code> as a hook into
-			the servlet container.
-		</p>
-		
-		<p>
-			The <code>juneau-examples-rest</code> project includes various other examples that highlight some of the 
-			capabilities of the REST servlet API.
-			<br>
-			For example, the <code>PetStoreResource</code> class shows some advanced features such as using POJO renders
-			and converters, and HTML widgets.
-		</p>
-		<img class='bordered' src='images/PetStore.png' width="1000px">
-		
-		<p>
-			The beans being serialized are shown here:
-		</p>
-		<p class='bcode'>
-	<jc>// Our bean class.</jc>
-	<jk>public class</jk> Pet {
-
-		<ja>@Html</ja>(link=<js>"servlet:/{id}"</js>)  <jc>// Creates a hyperlink in HTML view.</jc>
-		<ja>@NameProperty</ja>                <jc>// Links the parent key to this bean.</jc>
-		<jk>public int</jk> <jf>id</jf>;
-
-		<jk>public</jk> String <jf>name</jf>;
-		<jk>public</jk> Kind <jf>kind</jf>;
-
-		<ja>@BeanProperty</ja>(format=<js>"$%.2f"</js>)  <jc>// Renders price in dollars.</jc>
-		<jk>public float</jk> <jf>price</jf>;
-
-		<ja>@BeanProperty</ja>(swap=DateSwap.<jsf>RFC2822D</jsf>.<jk>class</jk>)  <jc>// Renders dates in RFC2822 format.</jc>
-		<jk>public</jk> Date <jf>birthDate</jf>;
-
-		<jk>public int</jk> getAge() {
-			Calendar c = <jk>new</jk> GregorianCalendar();
-			c.setTime(<jf>birthDate</jf>);
-			<jk>return new</jk> GregorianCalendar().get(Calendar.<jsf>YEAR</jsf>) - c.get(Calendar.<jsf>YEAR</jsf>);
-		}
-	}
-
-	<ja>@Html</ja>(render=KindRender.<jk>class</jk>)  <jc>// Render as an icon in HTML.</jc>
-	<jk>public static enum</jk> Kind {
-		<jsf>CAT</jsf>, <jsf>DOG</jsf>, <jsf>BIRD</jsf>, <jsf>FISH</jsf>, <jsf>MOUSE</jsf>, <jsf>RABBIT</jsf>, <jsf>SNAKE</jsf>
-	}
-
-	<jk>public static class</jk> KindRender <jk>extends</jk> HtmlRender&lt;Kind&gt; {
-		<ja>@Override</ja>
-		<jk>public</jk> Object getContent(SerializerSession session, Kind value) {
-			<jk>return new</jk> Img().src(<js>"servlet:/htdocs/"</js>+value.toString().toLowerCase()+<js>".png"</js>);
-		}
-		<ja>@Override</ja>
-		<jk>public</jk> String getStyle(SerializerSession session, Kind value) {
-			<jk>return</jk> <js>"background-color:#FDF2E9"</js>;
-		}
-	}
-		</p>
-	
-		<p>
-			The <code>QUERY</code> menu item shows the capabilities of Converters which are post-processors that
-			work to filter POJOs after they've been returned by your Java method.
-			<br>
-			In this case, we're using the <code>Queryable</code> converter that allows us to perform search/view/sort/paging
-			against collections of beans:
-		</p>
-		<img class='bordered' src='images/PetStore_Query.png' width="1000px">
-	
-		<p>
-			The drop-down menu items are implemented through "widgets" which allow you to embed arbitrary HTML, Javascript, 
-			and CSS in the HTML view of the page.
-		</p>
-		<p class='bcode'>
-	<ja>@RestMethod</ja>(
-		name=<jsf>GET</jsf>,
-		path=<js>"/"</js>,
-		summary=<js>"The complete list of pets in the store"</js>,
-		
-		<jc>// Add 'query' and 'content-types' menu items.</jc>
-		widgets={
-			QueryMenuItem.<jk>class</jk>,
-			ContentTypeMenuItem.<jk>class</jk>,
-			StyleMenuItem.<jk>class</jk>
-		},
-
-		<jc>// Add our converter for POJO query support.</jc>
-		converters=Queryable.<jk>class</jk>,
-		
-		<jc>// Add our menu items in the nav links.</jc>
-		htmldoc=<ja>@HtmlDoc</ja>(
-			links={
-				<js>"up: request:/.."</js>,
-				<js>"options: servlet:/?method=OPTIONS"</js>,
-				<js>"$W{QueryMenuItem}"</js>,
-				<js>"$W{ContentTypeMenuItem}"</js>,
-				<js>"$W{StyleMenuItem}"</js>,
-				<js>"source: $C{Source/gitHub}/org/apache/juneau/examples/rest/PetStoreResource.java"</js>
-			}
-		)
-	)
-	<jk>public</jk> Collection&lt;Pet&gt; getPets() {
-		</p>
-		
-		<p>
-			HTML views are highly customizable with abilities such as defining your own look-and-feel and even allowing
-			you to define your own templates.
-		</p>
-		<p>
-			For example, the PetStore page above rendered in one of the other predefined stylesheets:
-		</p>	
-		<img class='bordered' src='images/PetStore_light.png'>
-		<br><hr>
-		<p>
-			Automatic error handling is provided for a variety of conditions: 
-		</p>
-		<ul>
-			<li>Automatic 401 errors (Unauthorized) on failed guards.
-			<li>Automatic 404 errors (Not Found) on unmatched path patterns.
-			<li>Automatic 405 errors (Method Not Implemented) on unimplemented methods.
-			<li>Automatic 406 errors (Not Acceptable) when no matching serializer was found to handle the <l>Accept</l> header.
-			<li>Automatic 412 errors (Precondition Failed) when all matchers failed to match.
-			<li>Automatic 415 errors (Unsupported Media Type) when no matching parser was found was found to handle the <l>Content-Type</l> header.
-			<li>Automatic 500 errors on uncaught exceptions.
-			<li>Throw your own runtime RestException with HTTP status and response object. 
-		</ul>
-		<p>
-			Other features include: 
-		</p> 
-		<ul class='spaced-list'>
-			<li>Extremely simple debuggability using nothing more than your browser.
-			<li>Simplified localization support.
-			<li>Configurability through external INI files.
-			<li>Client-versioned responses (and other customizable heuristic matching APIs).
-			<li>Define and use your own HTML stylesheets.
-			<li>Lots of up-to-date documentation and examples.
-			<li>MUCH MORE!....
-		</ul>
-	
-		<ul class='doctree'>
-			<li class='link'>See <a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-rest-server'>juneau-rest-server</a> for more information.
-		</ul>
-		
-		<h6 class='toc' id='juneau-rest-server.UIvsDI'>User Interfaces (UI) vs. Developer Interfaces (DI)</h6>
-		<div>
-			<p>
-				An important distinction needs to be made about the HTML representations produced by the REST
-				API.  These should not be considered User Interfaces, but rather Developer Interfaces.
-			</p>
-			<p>
-				UIs should hide the end-user from the underlying architecture.
-				The audience generally consists of non-technical people not interested in how the UI works.  
-			</p>
-			<p>
-				DIs, on the other hand, should NOT hide the end-user from the underlying architecture.  
-				Instead, it's a thin veneer over the REST interface with the following goals:
-			</p>
-			<ul class='spaced-list'>
-				<li>Make it easy for the developer to explore and understand the REST API.
-				<li>Make it easy for the developer to debug the REST API using simple tools (hopefully just a browser).
-			</ul>		
-			<p>
-				As a result, the following guidelines are recommended: 
-			</p>		
-			<ul class='spaced-list'>
-				<li>
-					Use titles/descriptions/asides to describe why the REST interface exists.
-					A developer knowing little about it should be able to access it with a browser and quickly 
-					understand what it is and how to use it.
-				<li>
-					Don't hide the raw data!  
-					The HTML view should simply be considered an easier-to-read representation of the data normally 
-					rendered in JSON or some other format.
-				<li>
-					Limit your use of Javascript!  
-					You can use it sparingly if you want to implement something simple like a pull-down menu to 
-					simplify some debug task, but remember that your audience cares more about interacting with your 
-					service programmatically using REST.  
-					Remember that the HTML is just icing on the cake.
-				<li>
-					Don't use it to implement a Web 2.0 interface!  
-					If you want a Web 2.0 UI, implement it separately ON TOP OF this REST interface.
-					The architecture is flexible enough that you could in theory pull in and use jQuery, React, 
-					Angular, or any number of sophisticated Javascript UI frameworks.  Resist the urge to do so.
-			</ul>		
-		</div>			
-	</div>
-
-	<!-- ======================================================================================================= -->
-	<!-- === JUNEAU-REST-SERVER-JAXRS ========================================================================== -->
-	<!-- ======================================================================================================= -->
-
-	<h5 class='toc' id='juneau-rest-server-jaxrs'>juneau-rest-server-jaxrs</h5>
-	<div>
-		<h6 class='figure'>Maven Dependency</h6>
-		<p class='bcode' style='width:500px;'>
-	<xt>&lt;dependency&gt;</xt>
-		<xt>&lt;groupId&gt;</xt>org.apache.juneau<xt>&lt;/groupId&gt;</xt>
-		<xt>&lt;artifactId&gt;</xt>juneau-rest-server-jaxrs<xt>&lt;/artifactId&gt;</xt>
-		<xt>&lt;version&gt;</xt>7.0.0<xt>&lt;/version&gt;</xt>
-	<xt>&lt;/dependency&gt;</xt>
-		</p>	
-	
-		<h6 class='figure'>Java Library</h6>
-		<p class='bcode' style='width:500px;'>
-	juneau-rest-server-jaxrs-7.0.0.jar 
-		</p>	
-		
-		<h6 class='figure'>OSGi Module</h6>
-		<p class='bcode' style='width:500px;'>
-	org.apache.juneau.rest.server.jaxrs_7.0.0.jar 
-		</p>	
-		
-		<p>
-			The <code>juneau-rest-server-jaxrs</code> module defines predefined <code>MessageBodyReader</code> and 
-			<code>MessageBodyWriter</code> implementations for using Juneau serializers and parsers in JAX-RS environments.
-			It consists of the following classes:
-		</p>	
-		<ul class='spaced-list'>
-			<li>
-				<code>org.apache.juneau.rest.jaxrs.BaseProvider</code> - The base provider class that implements the JAX-RS 
-				<code>MessageBodyReader</code> and <code>MessageBodyWriter</code> interfaces.
-			<li>
-				<code>org.apache.juneau.rest.jaxrs.JuneauProvider</code> - Annotation that is applied to subclasses of <code>BaseProvider</code>
-				to specify the serializers/parsers associated with a provider, and optionally filters and properties to 
-				apply to those serializers and parsers.
-			<li>
-				<code>org.apache.juneau.rest.jaxrs.DefaultProvider</code> - A default provider that provides the same level
-				of media type support as the <code>RestServletDefault</code> class.
-		</ul>
-		<p>
-			The JAX/RS support does provide you will the full marshalling capabilities of Juneau.
-			However, it should be noted that you lose some sophisticated functionality by not using the REST servlet
-			API (such as the Developer Interfaces, guards, path matchers, localization, auto-generated Swagger docs, etc...).
-		</p>
-
-		<ul class='doctree'>
-			<li class='link'>See <a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-rest-server-jaxrs'>juneau-rest-server-jaxrs</a> for more information.
-		</ul>
-	</div>
-</body>
-</html>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/juneau-website/blob/b1ebfeda/content/7.0.0/sitemap.xml
----------------------------------------------------------------------
diff --git a/content/7.0.0/sitemap.xml b/content/7.0.0/sitemap.xml
deleted file mode 100644
index ac114f4..0000000
--- a/content/7.0.0/sitemap.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<urlset
-      xmlns="http://www.sitemaps.org/schemas/sitemap/0.9"
-      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="http://www.sitemaps.org/schemas/sitemap/0.9
-            http://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd">
-	<url>
-	  <loc>http://juneau.apache.org/</loc>
-	  <changefreq>weekly</changefreq>
-	</url>
-	<url>
-	  <loc>http://juneau.apache.org/about.html</loc>
-	  <changefreq>weekly</changefreq>
-	</url>
-	<url>
-	  <loc>http://juneau.apache.org/community.html</loc>
-	  <changefreq>weekly</changefreq>
-	</url>
-	<url>
-	  <loc>http://juneau.apache.org/documentation.html</loc>
-	  <changefreq>weekly</changefreq>
-	</url>
-	<url>
-	  <loc>http://juneau.apache.org/downloads.html</loc>
-	  <changefreq>weekly</changefreq>
-	</url>
-	<url>
-	  <loc>http://juneau.apache.org/sourceCode.html</loc>
-	  <changefreq>weekly</changefreq>
-	</url>
-</urlset>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/juneau-website/blob/b1ebfeda/content/7.0.0/sourceCode.html
----------------------------------------------------------------------
diff --git a/content/7.0.0/sourceCode.html b/content/7.0.0/sourceCode.html
deleted file mode 100644
index 0c91271..0000000
--- a/content/7.0.0/sourceCode.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<style>
-	@import url("styles/juneau-code.css");
-	@import url("styles/juneau-doc.css");
-</style>
-</head>
-<body>
-	<h5 class='toc'>Source Code</h5>
-	<p>
-		Source code can be accessed through either GitHub or the Apache Git repository.
-	</p>
-	<p>
-		The GitHub repository is read-only.  If you want to make contributions to the source tree, you'll need to use the Apache GIT repository.
-	</p>
-	<ul class='spaced-list'>
-		<li><a class='doclink' href='https://git-wip-us.apache.org/repos/asf/juneau.git' target="_top">Apache GIT repository</a>
-		<li><a class='doclink' href='http://github.com/apache/juneau' target="_top">GitHub mirror</a>
-		<li><a class='doclink' href='https://git-wip-us.apache.org/repos/asf/juneau-website.git' target="_top">GIT repository for this website</a>
-		<li><a class='doclink' href='https://cwiki.apache.org/confluence/display/JUNEAU/Setting+up+your+Eclipse+workspace' target="_top">Workspace setup instructions</a>
-	</ul>
-	<h5 class='toc'>Builds</h5>
-	<ul class='spaced-list'>
-		<li><a class='doclink' href='https://builds.apache.org/job/Juneau-Java-1.8'>Jenkins</a> &nbsp;&nbsp;&nbsp; <a href='https://builds.apache.org/job/Juneau-Java-1.8/'><img src='https://builds.apache.org/job/Juneau-Java-1.8/badge/icon'></a>
-	</ul>	
-</body>
-</html>

http://git-wip-us.apache.org/repos/asf/juneau-website/blob/b1ebfeda/content/7.0.0/styles/juneau-code.css
----------------------------------------------------------------------
diff --git a/content/7.0.0/styles/juneau-code.css b/content/7.0.0/styles/juneau-code.css
deleted file mode 100644
index 3db6880..0000000
--- a/content/7.0.0/styles/juneau-code.css
+++ /dev/null
@@ -1,124 +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.                                              *
- ***************************************************************************************************************************/
-/***************************************************************************************************************************
- * Styles for embedded highlighted code.
- * 
- * Allows you to embed paragraphs of highlighted code into HTML documents.
- * For example:
- * 	<p class='bcode'>
- *		<jk>public static void</jk> myMethod(<jk>int</jk> foo, String bar) <jk>throws</jk> Exception {
- *			System.<jsm>err</jsm>.println(<js>"Hello world!"</js>);
- *		}
- * 	</p>
- *
- * The various tags can also be used outside of code blocks.
- * For example:
- * 	<div>This is how you represent a java <jk>int</jk>.</div> 
- * 
- * Available classes:
- * 	code - Unbordered code block
- * 	bcode - Bordered code block
- * 
- * Available tags:
- *	<jc> - Java comment
- *	<jd> - Javadoc comment
- *	<jt> - Javadoc tag
- *	<jk> - Java keyword
- *	<js> - Java string
- *	<jf> - Java field
- *	<jsf> - Java static field
- *	<jsm> - Java static method
- *	<ja> - Java annotation
- * 	<xt> - XML tag
- * 	<xa> - XML attribute
- * 	<xc> - XML comment
- * 	<xs> - XML string
- * 	<xv> - XML value
- * 	<mk> - Manifest file key
- * 	<mv> - Manifest file value
- *  <cc> - Config file comment	
- * 	<cs> - Config file section
- * 	<ck> - Config file key
- * 	<ce> - Config file entry
- ***************************************************************************************************************************/
-
-/* Monospaced font size */
-.code,
-.bcode,
-jc,jd,jt,jk,js,jf,jsf,jsm,ja, 
-xt,xa,xc,xs,
-mk,mv,
-cc,cs,ck,ce {
-	font-size: 9pt;
-	white-space: pre;
-	font-family: monospace;
-	tab-size: 3;
-	-moz-tab-size: 3;
-	-o-tab-size: 3;
-}
-
-/*--- Bordered code ---*/
-p.bcode {
-	border: 1px solid black;
-	margin: 0px 20px;
-	border-radius: 10px;
-	overflow: hidden;
-	background-color: #f8f8f8;
-	border-color: #cccccc;
-	box-shadow: 1px 1px 1px 0px rgba(0, 0, 0, 0.5);
-}
-
-/*--- Bordered code in a section of a method doc ---*/
-dd p.bcode {
-	margin-left:0px;
-	margin-right:20px;
-}
-
-/* Override padding bottom in javadoc comments. */
-.blockList p.bcode {
-	padding-bottom: 0px !important;
-}
-
-/*--- Unbordered code ---*/
-p.code {
-	padding-bottom: 15px;
-	margin: -15px;
-}
-
-/*--- Java code effects ---*/
-jc { color: green; }
-jd { color: #3f5fbf; }
-jt { color: #7f9fbf; font-weight: bold; }
-jk { color: #7f0055; font-weight: bold; }
-js { color: blue; }
-jf { color: DarkBlue; }
-jsf { color: DarkBlue; font-style: italic; }
-jsm { font-style: italic; }
-ja { color: grey; }
-
-/*--- XML code effects ---*/
-xt { color: DarkCyan; }
-xa { color: purple; }
-xc { color: mediumblue; }
-xs { color: blue; font-style: italic; }
-xv { color: black; }
-
-/*--- Manifest-file code effects ---*/
-mk { color: DarkRed; font-weight: bold; }
-mv { color: DarkBlue;}
-
-/*--- Config file effects ---*/
-cc { color: green; }
-cs { color: DarkRed;font-weight: bold;}
-ck { color: DarkRed; }
-cv { color: DarkBlue; }


[4/4] juneau-website git commit: Update for 7.0.0

Posted by ja...@apache.org.
Update for 7.0.0

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

Branch: refs/heads/asf-site
Commit: b1ebfeda504e0090de119740611daadccc41f3c1
Parents: f02bb7c
Author: JamesBognar <ja...@apache.org>
Authored: Wed Oct 25 18:08:43 2017 -0400
Committer: JamesBognar <ja...@apache.org>
Committed: Wed Oct 25 18:08:43 2017 -0400

----------------------------------------------------------------------
 content/7.0.0/about.html                        |  55 --
 content/7.0.0/community.html                    |  76 --
 content/7.0.0/components.html                   | 227 ------
 content/7.0.0/config.html                       | 140 ----
 content/7.0.0/doap.rdf                          |  66 --
 content/7.0.0/documentation.html                | 124 ---
 content/7.0.0/downloads.html                    | 223 ------
 content/7.0.0/dto.html                          | 255 -------
 content/7.0.0/examples.html                     |  90 ---
 content/7.0.0/googlee7b40be42ec36bc2.html       |   1 -
 content/7.0.0/images/PetStore.png               | Bin 121032 -> 0 bytes
 content/7.0.0/images/PetStore_Query.png         | Bin 202082 -> 0 bytes
 content/7.0.0/images/PetStore_light.png         | Bin 193402 -> 0 bytes
 content/7.0.0/images/Samples_RootResources.png  | Bin 165357 -> 0 bytes
 content/7.0.0/images/Swagger.png                | Bin 95579 -> 0 bytes
 content/7.0.0/images/SystemPropertiesForm.png   | Bin 42428 -> 0 bytes
 .../7.0.0/images/SystemPropertiesResource.png   | Bin 179512 -> 0 bytes
 content/7.0.0/images/asf_short.png              | Bin 8858 -> 0 bytes
 content/7.0.0/images/feather.png                | Bin 3242 -> 0 bytes
 content/7.0.0/images/feather_small.png          | Bin 11470 -> 0 bytes
 .../images/juneau-examples-core.import3.png     | Bin 133875 -> 0 bytes
 .../images/juneau-examples-rest.import3.png     | Bin 242539 -> 0 bytes
 .../images/juneau-examples-rest.import4.png     | Bin 405372 -> 0 bytes
 .../juneau-microservice-template.import3.png    | Bin 127563 -> 0 bytes
 .../juneau-microservice-template.import4.png    | Bin 77752 -> 0 bytes
 .../images/juneau-microservice-template.png     | Bin 39172 -> 0 bytes
 content/7.0.0/images/juneau1.png                | Bin 322146 -> 0 bytes
 content/7.0.0/images/juneau1_square.png         | Bin 348468 -> 0 bytes
 content/7.0.0/images/juneau2.png                | Bin 6274 -> 0 bytes
 content/7.0.0/index.html                        | 204 -----
 content/7.0.0/issues.html                       |  34 -
 content/7.0.0/marshall.html                     | 417 -----------
 content/7.0.0/microservice.html                 | 227 ------
 content/7.0.0/rest-client.html                  | 168 -----
 content/7.0.0/rest-server.html                  | 748 -------------------
 content/7.0.0/sitemap.xml                       |  31 -
 content/7.0.0/sourceCode.html                   |  28 -
 content/7.0.0/styles/juneau-code.css            | 124 ---
 content/7.0.0/styles/juneau-doc.css             | 297 --------
 content/7.0.0/svl.html                          |  89 ---
 content/7.0.0/twitter.html                      |   6 -
 content/community.html                          |  25 +-
 content/components.html                         |  24 +-
 content/config.html                             |   8 +-
 content/documentation.html                      | 144 ++--
 content/downloads.html                          |  56 +-
 content/dto.html                                |   8 +-
 content/examples.html                           |  12 +-
 content/images/Components.png                   | Bin 44703 -> 0 bytes
 content/images/alaska.png                       | Bin 103236 -> 0 bytes
 content/images/asf.png                          | Bin 8875 -> 0 bytes
 content/images/asf_juneau_logo.png              | Bin 12232 -> 0 bytes
 content/images/asf_short.png                    | Bin 0 -> 8858 bytes
 content/images/feather_small.png                | Bin 0 -> 11470 bytes
 content/images/header.jpg                       | Bin 9126 -> 0 bytes
 content/images/incubator_feather_egg_logo2.png  | Bin 25324 -> 0 bytes
 content/images/incubator_feather_egg_logo3.png  | Bin 16600 -> 0 bytes
 content/images/juneau.png                       | Bin 26745 -> 0 bytes
 content/images/juneau_podling.png               | Bin 42332 -> 0 bytes
 content/images/juneauicon.png                   | Bin 14179 -> 0 bytes
 content/index.html                              |  16 +-
 content/marshall.html                           |  20 +-
 content/microservice.html                       |  12 +-
 content/rest-client.html                        |  10 +-
 content/rest-server.html                        |  16 +-
 content/sourceCode.html                         |   6 +-
 content/svl.html                                |   8 +-
 67 files changed, 184 insertions(+), 3811 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/juneau-website/blob/b1ebfeda/content/7.0.0/about.html
----------------------------------------------------------------------
diff --git a/content/7.0.0/about.html b/content/7.0.0/about.html
deleted file mode 100644
index 004a93f..0000000
--- a/content/7.0.0/about.html
+++ /dev/null
@@ -1,55 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<style>
-	@import url("styles/juneau-code.css");
-	@import url("styles/juneau-doc.css");
-</style>
-</head>
-<body>
-	
-	<!-- =========================================================================================================== -->
-	<!-- === ABOUT ================================================================================================= -->
-	<!-- =========================================================================================================== -->
-	
-	<h5 class='toc'>About</h5>
-	<div>
-		<p>
-			Apache Juneau&trade; is a single cohesive framework consisting of the following parts:
-		</p>
-		<ul class='spaced-list'>
-			<li>A universal toolkit for marshalling POJOs to a wide variety of content types using a common framework.
-			<li>A universal REST server API for creating Swagger-based self-documenting REST interfaces using POJOs, simply deployed as 
-				one or more top-level servlets in any Servlet 3.1.0+ container.
-			<li>A universal REST client API for interacting with Juneau or 3rd-party REST interfaces using POJOs and proxy interfaces.
-			<li>A sophisticated configuration file API.
-			<li>A REST microservice API that combines all the features above with a simple configurable Jetty server for 
-				creating lightweight standalone REST interfaces that start up in milliseconds.
-			<li>Built on top of Servlet and Apache HttpClient APIs that allow you to use the newest HTTP/2 features
-				such as request/response multiplexing and server push.
-		</ul>
-		<p>
-			Questions via email to <a class='doclink' href='mailto:dev@juneau.apache.org?Subject=Apache%20Juneau%20question'>dev@juneau.apache.org</a> are always welcome.
-		</p>
-		<p>
-			Juneau is packed with features that may not be obvious at first.  
-			Users are encouraged to ask for code reviews by providing links to specific source files such as through GitHub.
-			Not only can we help you with feedback, but it helps us understand usage patterns to further improve the product.
-		</p>
-	</div>
-
-	<!-- =========================================================================================================== -->
-	<!-- === FEATURES ============================================================================================== -->
-	<!-- =========================================================================================================== -->
-	
-	<h5 class='toc'>Features</h5>
-	<div>
-		<ul class='spaced-list'>
-			<li>KISS is our mantra!  No auto-wiring.  No code generation.  No dependency injection.  Just add it to your classpath and use it.  Extremely simple unit testing!
-			<li>Tiny - ~1MB
-			<li>Exhaustively tested
-		</ul>
-	</div>
-	
-</body>
-</html>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/juneau-website/blob/b1ebfeda/content/7.0.0/community.html
----------------------------------------------------------------------
diff --git a/content/7.0.0/community.html b/content/7.0.0/community.html
deleted file mode 100644
index 1f01881..0000000
--- a/content/7.0.0/community.html
+++ /dev/null
@@ -1,76 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<style>
-	@import url("styles/juneau-code.css");
-	@import url("styles/juneau-doc.css");
-</style>
-</head>
-<body>
-	<h5 class='toc'>Community</h5>
-	<p>
-		Anyone wishing to become a committer to the Juneau project should subscribe to the mailing list <l>dev@juneau.apache.org</l>.<br>
-		To do so, simply send an empty email from your account to <a class='doclink' href='mailto:dev-subscribe@juneau.apache.org'>dev-subscribe@juneau.apache.org</a> 
-		or <a class='doclink' href='mailto:dev-digest-subscribe@juneau.apache.org'>dev-digest-subscribe@juneau.apache.org</a>
-	</p>
-	<p>
-		In general, all discussion should be performed through the mailing list.
-	</p>
-	<ul class='spaced-list'>
-		<li><a class='doclink' href='http://apache.org/foundation/mailinglists.html' target='_top'>Apache mailing lists</a> - How to subscribe to the mailing list.
-		<li><a class='doclink' href='https://lists.apache.org/list.html?dev@juneau.apache.org' target='_top'>Pony Mail</a> - Mailing list archive.
-		<li><a class='doclink' href='https://cwiki.apache.org/confluence/display/JUNEAU' target='_top'>Confluence workspace</a> - Design documents and information for developers.
-		<li><a class='doclink' href='https://cwiki.apache.org/confluence/pages/viewrecentblogposts.action?key=JUNEAU' target='_top'>Confluence blog</a> - Updates on new features and changes.
-		<li><a class='doclink' href='https://twitter.com/ApacheJuneau' target='_top'>Twitter</a> - Announcements.
-		<li><a class='doclink' href='https://the-asf.slack.com/messages/C4RHGMTC2' target='_top'>Slack</a> - Intra-team communication.
-	</ul>
-	
-	<h5 class='toc'>Becoming a contributor</h5>
-	<p>
-		We are actively looking for contributors to join and take an active role in the project!  
-	</p>
-	<p>
-		To become a contributor, we recommend joining and contributing code changes through the mailing list.
-		Once you're contributing and your work is good, one of our team may invite you to be a committer.  After that, the team will call for a vote. 
-		When that happens, if you accept, the following process kicks into place...
-	</p>
-	<ul class='spaced-list'>
-		<li>Download and print the Apache Contributor License Agreement from the <a class='doclink' href='http://www.apache.org/dev/new-committers-guide.html' target='_top'>New committers guide</a>.
-		<li>Sign and fax (or email) the CLA to Apache.
-		<li>Wait for your name to appear on the list of received CLAs.
-			Once that's done, let us know and we can apply to Apache Infrastructure to have your account created.  
-			We'll need the following information:  Full name, preferred email address, preferred unix account name.
-		<li>Read the <a class='doclink' href='http://www.apache.org/dev/new-committers-guide.html' target='_top'>New committers guide</a>.
-		<li>More information for new committers can be found in the <a class='doclink' href='http://www.apache.org/dev/committers.html' target='_top'>Committers information</a> doc.
-	</ul>
-	<p>
-		The Juneau project does not currently have distinct roles for Committers and PMC (Project Management Committee).
-		All Committers are also voting members.  
-	</p>
-
-	<h5 class='toc'>Developer how-to articles</h5>
-	<ul class='spaced-list'>
-		<li><a class='doclink' target='_top' href='https://cwiki.apache.org/confluence/display/JUNEAU/Contributing+for+Non-committers'>How non-committers can contribute code</a>
-		<li><a class='doclink' target='_top' href='https://cwiki.apache.org/confluence/display/JUNEAU/Setting+up+your+Eclipse+workspace'>Setting up your Eclipse workspace</a>
-		<li><a class='doclink' target='_top' href='https://cwiki.apache.org/confluence/display/JUNEAU/Coding+guidelines'>Coding guidelines</a>
-		<li><a class='doclink' target='_top' href='https://cwiki.apache.org/confluence/display/JUNEAU/New+release+guidelines'>New release guidelines</a>
-		<li><a class='doclink' target='_top' href='https://cwiki.apache.org/confluence/display/JUNEAU/Versioning+guidelines'>Versioning guidelines</a>
-		<li><a class='doclink' target='_top' href='https://cwiki.apache.org/confluence/display/JUNEAU/Using+the+code+formatting+stylesheet'>Using the code formatting stylesheet</a>
-	</ul>
-
-	<h5 class='toc'>Current members</h5>
-	<br>
-	<table class='styled' style='width:95%'>
-		<tr><th>Name</th><th>Role</th><th>User ID</th></tr>
-		<tr class='light'><td>John D. Ament</td><td>PMC / Committer</td><td>johnadament</td><tr>
-		<tr class='dark'><td>Steve Blackmon</td><td>PMC / Committer</td><td>sblackmon</td><tr>
-		<tr class='light'><td>James Bognar</td><td>PMC Chair / Committer</td><td>jamesbognar</td><tr>
-		<tr class='dark'><td>David M Goddard</td><td>PMC / Committer</td><td>dmg</td><tr>
-		<tr class='light'><td>Peter Haumer</td><td>PMC / Committer</td><td>phaumer</td><tr>
-		<tr class='dark'><td>Raphi D Lee</td><td>PMC / Committer</td><td>yidonguk</td><tr>
-		<tr class='light'><td>Craig L Russell</td><td>PMC / Committer</td><td>clr</td><tr>
-		<tr class='dark'><td>Stian Soiland-Reyes</td><td>PMC / Committer</td><td>stain</td><tr>
-		<tr class='light bb'><td>Jochen Wiedmann</td><td>PMC / Committer</td><td>jochen</td><tr>
-	</table>
-</body>
-</html>

http://git-wip-us.apache.org/repos/asf/juneau-website/blob/b1ebfeda/content/7.0.0/components.html
----------------------------------------------------------------------
diff --git a/content/7.0.0/components.html b/content/7.0.0/components.html
deleted file mode 100644
index aea608d..0000000
--- a/content/7.0.0/components.html
+++ /dev/null
@@ -1,227 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<style>
-	@import url("styles/juneau-code.css");
-	@import url("styles/juneau-doc.css");
-</style>
-</head>
-<body>
-	<!-- =========================================================================================================== -->
-	<!-- === COMPONENTS ============================================================================================ -->
-	<!-- =========================================================================================================== -->
-	
-	<h5 class='toc'>Components</h5>
-	<div>
-		<p>
-			We've strived to keep prerequisites to an absolute minimum in order to make adoption as easy as possible.
-		</p>
-		<p>
-			The library consists of the following artifacts found in the Maven group <code>"org.apache.juneau"</code>:
-		</p>
-		<table class='styled' style='min-width:800px;'>
-			<tr>
-				<th>Category</th><th>Maven Artifacts</th><th>Description</th><th>Prereqs</th>
-			</tr>
-			<tr class='dark bb'>
-				<td rowspan="5" style='text-align:center;font-weight:bold;padding:20px;' class='code'>juneau-core</td>
-				<td class='code'>juneau-marshall</td>
-				<td>Serializers and parsers for:
-					<ul style='margin:0px 10px;'>
-						<li>JSON
-						<li>XML
-						<li>HTML
-						<li>UON
-						<li>URL-Encoding
-						<li>MessagePack
-						<li>SOAP/XML
-						<li>CSV
-						<li>BSON (coming soon)
-						<li>YAML (coming soon)
-						<li>Protobuf (coming soon)
-					</ul>
-				</td>
-				<td>
-					<ul style='margin:0px 10px;'>
-						<li>Java 7
-					</ul>
-				</td>
-			</tr>
-			<tr class='dark bb'>
-				<td class='code'>juneau-marshall-rdf</td>
-				<td>
-					Serializers and parsers for:
-					<ul style='margin:0px 10px;'>
-						<li>RDF/XML
-						<li>RDF/XML-Abbrev 
-						<li>N-Triple
-						<li>Turtle
-						<li>N3
-					</ul>				
-				</td>
-				<td>
-					<ul style='margin:0px 10px;'>
-						<li>Java 7
-						<li>Apache Jena 2.7.1
-					</ul>
-				</td>
-			</tr>
-			<tr class='dark bb'>
-				<td class='code'>juneau-dto</td>
-				<td>
-					Data Transfer Objects for:
-					<ul style='margin:0px 10px;'>
-						<li>HTML5
-						<li>Atom
-						<li>Cognos
-						<li>JSON-Schema
-						<li>Swagger 2.0
-					</ul>				
-				</td>
-				<td><ul style='margin:0px 10px;'><li>Java 7</li></ul></td>
-			</tr>
-			<tr class='dark bb'>
-				<td class='code'>juneau-svl</td>
-				<td>
-					Simple Variable Language API
-				</td>
-				<td><ul style='margin:0px 10px;'><li>Java 7</li></ul></td>
-			</tr>
-			<tr class='dark bb'>
-				<td class='code'>juneau-config</td>
-				<td>
-					Configuration file API
-				</td>
-				<td><ul style='margin:0px 10px;'><li>Java 7</li></ul></td>
-			</tr>
-			<tr class='light bb'>
-				<td rowspan="3" style='text-align:center;font-weight:bold;padding:20px;' class='code'>juneau-rest</td>
-				<td class='code'>juneau-rest-server</td>
-				<td>
-					REST Servlet API
-				</td>
-				<td>
-					<ul style='margin:0px 10px;'>
-						<li>Java 7
-						<li>Servlet 3.1
-					</ul>
-				</td>
-			</tr>
-			<tr class='light bb'>
-				<td class='code'>juneau-rest-server-jaxrs</td>
-				<td>
-					Optional JAX-RS support
-				</td>
-				<td>
-					<ul style='margin:0px 10px;'>
-						<li>Java 7
-						<li>JAX-RS 2.0
-					</ul>
-				</td>
-			</tr>
-			<tr class='light bb'>
-				<td class='code'>juneau-rest-client</td>
-				<td>
-					REST Client API
-				</td>
-				<td>
-					<ul style='margin:0px 10px;'>
-						<li>Java 7
-						<li>Apache HttpClient 4.5.3
-					</ul>
-				</td>
-			</tr>
-			<tr class='dark bb'>
-				<td rowspan="2" style='text-align:center;font-weight:bold;padding:20px;' class='code'>juneau-microservice</td>
-				<td class='code'>juneau-microservice-server</td>
-				<td>
-					REST Microservice Server API
-				</td>
-				<td>
-					<ul style='margin:0px 10px;'>
-						<li>Java 8
-						<li>Eclipse Jetty 9.4.3
-					</ul>
-				</td>
-			</tr>
-			<tr class='dark bb'>
-				<td class='code'>juneau-microservice-template</td>
-				<td>
-					Developer template project
-				</td>
-				<td>
-					<ul style='margin:0px 10px;'>
-						<li>Java 8
-						<li>Eclipse Jetty 9.4.3
-					</ul>
-				</td>
-			</tr>
-			<tr class='light bb'>
-				<td rowspan="2" style='text-align:center;font-weight:bold;padding:20px;' class='code'>juneau-examples</td>
-				<td class='code'>juneau-examples-core</td>
-				<td>
-					Core code examples
-				</td>
-				<td></td>
-			</tr>
-			<tr class='light bb'>
-				<td class='code'>juneau-example-rest</td>
-				<td>
-					REST code examples
-				</td>
-				<td></td>
-			</tr>
-			<tr class='dark bb'>
-				<td rowspan="1" style='text-align:center;font-weight:bold;padding:20px;' class='code'>juneau-all</td>
-				<td class='code'><code>juneau-all</code></td>
-				<td>
-					Combination of the following:
-					<ul style='margin:0px 10px;'>
-						<li>juneau-marshall
-						<li>juneau-dto
-						<li>juneau-svl
-						<li>juneau-config
-						<li>juneau-rest-server
-						<li>juneau-rest-client
-					</ul>
-				</td>
-				<td>
-					<ul style='margin:0px 10px;'>
-						<li>Java 7
-						<li>Servlet 3.1
-						<li>Apache HttpClient 4.5.3
-					</ul>
-				</td>
-			</tr>
-		</table>
-		
-		<p>
-			The current version of Juneau is <code>7.0.0</code>.
-			The easiest way to pull in the library is through the following maven dependency:
-		</p>
-		<p class='bcode' style='width:500px;'>
-	<xt>&lt;dependency&gt;</xt>
-		<xt>&lt;groupId&gt;</xt>org.apache.juneau<xt>&lt;/groupId&gt;</xt>
-		<xt>&lt;artifactId&gt;</xt>juneau-all<xt>&lt;/artifactId&gt;</xt>
-		<xt>&lt;version&gt;</xt>7.0.0<xt>&lt;/version&gt;</xt>
-	<xt>&lt;/dependency&gt;</xt>
-		</p>	
-		<p>
-			If you would like to work with the bleeding-edge code, you can access the <code>7.0.1-SNAPSHOT</code>
-			version through the following repository:
-		</p>
-		<p class='bcode' style='width:500px;'>
-	<xt>&lt;pluginRepositories&gt;
-		&lt;pluginRepository&gt;
-			&lt;id&gt;<xv>apache.snapshots</xv>&lt;/id&gt;
-			&lt;url&gt;<xv>http://repository.apache.org/snapshots/</xv>&lt;/url&gt;
-			&lt;snapshots&gt;
-				&lt;enabled&gt;<xv>true</xv>&lt;/enabled&gt;
-				&lt;updatePolicy&gt;<xv>always</xv>&lt;/updatePolicy&gt;
-			&lt;/snapshots&gt;
-		&lt;/pluginRepository&gt;
-	&lt;/pluginRepositories&gt;</xt>
-		</p>			
-	</div>
-</body>
-</html>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/juneau-website/blob/b1ebfeda/content/7.0.0/config.html
----------------------------------------------------------------------
diff --git a/content/7.0.0/config.html b/content/7.0.0/config.html
deleted file mode 100644
index 10bde25..0000000
--- a/content/7.0.0/config.html
+++ /dev/null
@@ -1,140 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<style>
-	@import url("styles/juneau-code.css");
-	@import url("styles/juneau-doc.css");
-</style>
-</head>
-<body>
-	<!-- ======================================================================================================= -->
-	<!-- === JUNEAU-CONFIG ===================================================================================== -->
-	<!-- ======================================================================================================= -->
-	
-	<h5 class='toc' id='juneau-config'>juneau-config</h5>
-	<div>
-		<h6 class='figure'>Maven Dependency</h6>
-		<p class='bcode' style='width:500px;'>
-	<xt>&lt;dependency&gt;</xt>
-		<xt>&lt;groupId&gt;</xt>org.apache.juneau<xt>&lt;/groupId&gt;</xt>
-		<xt>&lt;artifactId&gt;</xt>juneau-config<xt>&lt;/artifactId&gt;</xt>
-		<xt>&lt;version&gt;</xt>7.0.0<xt>&lt;/version&gt;</xt>
-	<xt>&lt;/dependency&gt;</xt>
-		</p>	
-	
-		<h6 class='figure'>Java Library</h6>
-		<p class='bcode' style='width:500px;'>
-	juneau-config-7.0.0.jar 
-		</p>	
-	
-		<h6 class='figure'>OSGi Module</h6>
-		<p class='bcode' style='width:500px;'>
-	org.apache.juneau.config_7.0.0.jar 
-		</p>	
-
-		<p>
-			The <code>juneau-config</code> module defines an API allows you to interact with INI files using POJOs.  
-			It builds upon the marshalling and SVL APIs to provide sophisticated dynamic configuration files.
-		<p>
-		<p class='bcode'>
-	<cc>#--------------------------</cc>
-	<cc># My section</cc>
-	<cc>#--------------------------</cc>
-	<cs>[MySection]</cs>
-	
-	<cc># An integer</cc>
-	<ck>anInt</ck> = <cv>1</cv> 
-	
-	<cc># A boolean</cc>
-	<ck>aBoolean</ck> = <cv>true</cv>
-	
-	<cc># An int array</cc>
-	<ck>anIntArray</ck> = <cv>[1,2,3]</cv>
-	
-	<cc># A POJO that can be converted from a String</cc>
-	<ck>aURL</ck> = <cv>http://foo </cv>
-	
-	<cc># A POJO that can be converted from JSON</cc>
-	<ck>aBean</ck> = <cv>{foo:'bar',baz:123}</cv>
-	
-	<cc># A system property</cc>
-	<ck>locale</ck> = <cv>$S{java.locale, en_US}</cv>
-	
-	<cc># An environment variable</cc>
-	<ck>path</ck> = <cv>$E{PATH, unknown}</cv>
-	
-	<cc># A manifest file entry</cc>
-	<ck>mainClass</ck> = <cv>$MF{Main-Class}</cv>
-	
-	<cc># Another value in this config file</cc>
-	<ck>sameAsAnInt</ck> = <cv>$C{MySection/anInt}</cv>
-	
-	<cc># A command-line argument in the form "myarg=foo"</cc>
-	<ck>myArg</ck> = <cv>$ARG{myarg}</cv>
-	
-	<cc># The first command-line argument</cc>
-	<ck>firstArg</ck> = <cv>$ARG{0}</cv>
-
-	<cc># Look for system property, or env var if that doesn't exist, or command-line arg if that doesn't exist.</cc>
-	<ck>nested</ck> = <cv>$S{mySystemProperty,$E{MY_ENV_VAR,$ARG{0}}}</cv>
-
-	<cc># A POJO with embedded variables</cc>
-	<ck>aBean2</ck> = <cv>{foo:'$ARG{0}',baz:$C{MySection/anInt}}</cv>
-		</p>
-		<p>
-			You're probably wondering "why INI files?"
-			The beauty of these INI files is that they're easy to read and modify, yet sophisticated enough to allow you to
-			store arbitrary-complex data structures and retrieve them as simple values or complex POJOs:
-		</p>
-		<p class='bcode'>
-	<jc>// Load our config file</jc>
-	ConfigFile f = <jk>new</jk> ConfigFileBuilder().build(<js>"MyIniFile.cfg"</js>);
-	
-	<jk>int</jk> anInt = cf.getInt(<js>"MySection/anInt"</js>); 
-	<jk>boolean</jk> aBoolean = cf.getBoolean(<js>"MySection/aBoolean"</js>); 
-	<jk>int</jk>[] anIntArray = cf.getObject(<jk>int</jk>[].<jk>class</jk>, <js>"MySection/anIntArray"</js>); 
-	URL aURL = cf.getObject(URL.<jk>class</jk>, <js>"MySection/aURL"</js>); 
-	MyBean aBean = cf.getObject(MyBean.<jk>class</jk>, <js>"MySection/aBean"</js>); 
-	Locale locale = cf.getObject(Locale.<jk>class</jk>, <js>"MySection/locale"</js>); 
-	String path = cf.getString(<js>"MySection/path"</js>); 
-	String mainClass = cf.getString(<js>"MySection/mainClass"</js>); 
-	<jk>int</jk> sameAsAnInt = cf.getInt(<js>"MySection/sameAsAnInt"</js>); 
-	String myArg = cf.getString(<js>"MySection/myArg"</js>); 
-	String firstArg = cf.getString(<js>"MySection/firstArg"</js>); 
-		</p>
-		<p>
-			By default, values are LAX JSON (i.e. unquoted attributes, single quotes) except for top-level strings which are left unquoted.  
-			Any parsable object types are supported as values (e.g. arrays, collections, beans, swappable objects, enums, etc...).
-		</p>
-		<p>
-			One of the more powerful aspects of the REST servlets is that you can pull values directly from
-			config files by using the <js>"$C"</js> variable in annotations.
-			<br>For example, the HTML stylesheet for your REST servlet can be defined in a config file like so:
-		</p>
-		<p class='bcode'>
-	<ja>@RestResource</ja>(
-		path=<js>"/myResource"</js>,
-		config=<js>"$S{my.config.file}"</js>,  <jc>// Path to config file (here pulled from a system property)</jc>
-		stylesheet=<js>"$C{MyResourceSettings/myStylesheet}"</js>  <jc>// Stylesheet location pulled from config file.</jc>
-	)
-	<jk>public class</jk> MyResource <jk>extends</jk> RestServlet {
-		</p>
-		<p>
-			Other features:
-		</p>
-		<ul class='spaced-list'>
-			<li>A listener API that allows you to, for example, reinitialize your REST resource if the config file 
-				changes, or listen for changes to particular sections or values.
-			<li>Config files can be modified through the ConfigFile class (e.g. add/remove/modify sections and keys, add/remove comments and whitespace, etc...).
-				<br>When using these APIs, you <b>DO NOT</b> lose formatting in your existing configuration file.
-				All existing whitespace and comments are preserved for you!
-			<li>Config file sections can be used to directly populate beans.
-			<li>Config file sections can be accessed and manipulated through Java interface proxies.
-		</ul>
-		
-		<ul class='doctree'>
-			<li class='link'>See <a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-config'>juneau-config</a> for more information.
-		</ul>
-	</div>	
-</body>
-</html>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/juneau-website/blob/b1ebfeda/content/7.0.0/doap.rdf
----------------------------------------------------------------------
diff --git a/content/7.0.0/doap.rdf b/content/7.0.0/doap.rdf
deleted file mode 100644
index dbd7546..0000000
--- a/content/7.0.0/doap.rdf
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<?xml-stylesheet type="text/xsl"?>
-<rdf:RDF xml:lang="en"
-         xmlns="http://usefulinc.com/ns/doap#"
-         xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:asfext="http://projects.apache.org/ns/asfext#"
-         xmlns:foaf="http://xmlns.com/foaf/0.1/">
-  <Project rdf:about="http://juneau.apache.org/">
-    <created>2016-06-24</created>
-    <license rdf:resource="http://www.apache.org/licenses/LICENSE-2.0" />
-    <name>Apache Juneau</name>
-    <homepage rdf:resource="http://juneau.apache.org/" />
-    <asfext:pmc rdf:resource="http://juneau.apache.org/" />
-    <shortdesc>
-      Apache Juneau is a single cohesive framework for marshalling POJOs to a variety of languages and constructing
-      sophisticated REST interfaces.
-    </shortdesc>
-    <description>
- 	  Apache Juneau is a single cohesive framework consisting of the following parts:
-		1) A universal toolkit for marshalling POJOs to a wide variety of content types using a common framework.
-		2) A universal REST server API for creating Swagger-based self-documenting REST interfaces using POJOs, simply deployed as 
-				one or more top-level servlets in any Servlet 3.1.0+ container.
-		3) A universal REST client API for interacting with Juneau or 3rd-party REST interfaces using POJOs and proxy interfaces.
-		4) A sophisticated configuration file API.
-		5) A REST microservice API that combines all the features above with a simple configurable Jetty server for 
-				creating lightweight standalone REST interfaces that start up in milliseconds.
-		6) Built on top of Servlet and Apache HttpClient APIs that allow you to use the newest HTTP/2 features
-				such as request/response multiplexing and server push.
-    </description>
-    <bug-database rdf:resource="http://issues.apache.org/jira/browse/JUNEAU" />
-    <mailing-list rdf:resource="http://juneau.apache.org/community.html" />
-    <download-page rdf:resource="http://juneau.apache.org/downloads.html" />
-    <programming-language>Java</programming-language>
-    <category rdf:resource="http://projects.apache.org/category/rest" />
-    <release>
-      <Version>
-        <name>6.4.0</name>
-        <created>2017-10-05</created>
-      </Version>
-    </release>
-    <repository>
-      <GitRepository>
-        <location rdf:resource="https://git-wip-us.apache.org/repos/asf/juneau.git"/>
-        <browse rdf:resource="https://git-wip-us.apache.org/repos/asf?p=juneau.git"/>
-      </GitRepository>
-    </repository>
-  </Project>
-</rdf:RDF>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/juneau-website/blob/b1ebfeda/content/7.0.0/documentation.html
----------------------------------------------------------------------
diff --git a/content/7.0.0/documentation.html b/content/7.0.0/documentation.html
deleted file mode 100644
index e4ae7d6..0000000
--- a/content/7.0.0/documentation.html
+++ /dev/null
@@ -1,124 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<style>
-	@import url("styles/juneau-code.css");
-	@import url("styles/juneau-doc.css");
-</style>
-<base href='http://juneau.apache.org/site/apidocs/overview-summary.html'>
-</head>
-<body>
-	<h5 class='toc'>Documentation</h5>
-	<p>
-		All user documentation in Juneau is provided through Javadocs.
-	</p>
-	<p>
-		The Javadocs overview document provides a general overview for all of Juneau.
-		The package-level documents that link from the overview provide in-depth information on subtopics.
-	</p>
-	<ul class='spaced-list'>
-		<li><a class='doclink' href='http://juneau.apache.org/site/apidocs/index.html' target="_top">Javadocs</a>
-		<li><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#overview.description' target="_top">Overview</a>
-	</ul>
-	
-	<a id='TOC'></a><h5 class='toc'>Table of Contents</h5>
-	<ol class='toc'>
-		<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#Intro'>Introduction</a></p>
-		<ol>
-			<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#Intro.Features'>Features</a></p>
-			<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#Intro.Components'>Components</a></p>
-		</ol>
-		<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-core'><i>juneau-core</i></a></p>
-		<ol>
-			<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-marshall'><i>juneau-marshall</i></a></p>
-			<ol>
-				<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-marshall.Serializers'>Serializers</a></p>
-				<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-marshall.Parsers'>Parsers</a></p>
-				<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-marshall.SerializerAndParserGroups'>SerializerGroups and ParserGroups</a></p>
-				<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-marshall.ObjectMap'>ObjectMap and ObjectList</a></p>
-				<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-marshall.ConfigurableProperties'>Configurable Properties</a></p>
-				<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-marshall.Transforms'>Transforms</a></p>
-				<ol>
-					<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-marshall.PojoSwaps'>PojoSwaps</a></p>
-					<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-marshall.SwapAnnotation'>@Swap annotation</a></p>
-					<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-marshall.SwapMethods'>Swap methods</a></p>
-					<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-marshall.BeanFilters'>BeanFilters and @Bean annotations</a></p>
-					<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-marshall.SerializingReadersAndInputStreams'>Serializing Readers and InputStreams</a></p>
-				</ol>
-				<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-marshall.BeanDictionaries'>Bean Name and Dictionaries</a></p>
-				<ol>
-					<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-marshall.BeanSubTypes'>Bean Subtypes</a></p>
-				</ol>
-				<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-marshall.VirtualBeans'>Virtual Beans</a></p>
-				<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-marshall.JacksonComparison'>Comparison with Jackson</a></p>
-				<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-marshall.PojoCategories'>POJO Categories</a></p>
-				<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-marshall.BestPractices'>Best Practices</a></p>
-				<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-marshall.AdditionalInfo'>Additional Information</a></p>
-			</ol>
-			<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-marshall-rdf'><i>juneau-marshall-rdf</i></a></p>
-			<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-dto'><i>juneau-dto</i></a></p>
-			<ol>
-				<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-dto.HTML5'>HTML5</a></p>
-				<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-dto.Atom'>Atom</a></p>
-				<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-dto.Swagger'>Swagger</a></p>
-				<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-dto.JsonSchema'>JSON-Schema</a></p>
-			</ol>
-			<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-svl'><i>juneau-svl</i></a></p>
-			<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-config'><i>juneau-config</i></a></p>
-		</ol>
-		<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-rest'><i>juneau-rest</i></a></p>
-		<ol>
-			<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-rest-server'><i>juneau-rest-server</i></a></p>
-			<ol>
-				<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-rest-server.Remoteable'>Remoteable Proxies</a></p>
-				<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-rest-server.Injection'>Using with Spring or other Injection frameworks</a></p>
-				<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-rest-server.HTTP2'>Using HTTP/2 features</a></p>
-			</ol>
-			<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-rest-server-jaxrs'><i>juneau-rest-server-jaxrs</i></a></p>
-			<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-rest-client'><i>juneau-rest-client</i></a></p>
-			<ol>
-				<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-rest-client.3rdPartyProxies'>Interface proxies against 3rd-party REST interfaces</a></p>
-			</ol>
-		</ol>
-		<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-microservice'><i>juneau-microservice</i></a></p>
-		<ol>
-			<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-microservice-server'><i>juneau-microservice-server</i></a></p>
-			<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-microservice-template'><i>juneau-microservice-template</i></a></p>
-		</ol>
-		<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-examples'><i>juneau-examples</i></a></p>
-		<ol>
-			<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-examples-core'><i>juneau-examples-core</i></a></p>
-			<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-examples-rest'><i>juneau-examples-rest</i></a></p>
-			<ol>
-				<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-examples-rest.RootResources'>RootResources</a></p>
-				<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-examples-rest.HelloWorldResource'>HelloWorldResource</a></p>
-				<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-examples-rest.MethodExampleResource'>MethodExampleResource</a></p>
-				<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-examples-rest.UrlEncodedFormResource'>UrlEncodedFormResource</a></p>
-				<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-examples-rest.RequestEchoResource'>RequestEchoResource</a></p>
-				<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-examples-rest.AddressBookResource'>AddressBookResource</a></p>
-				<ol>
-					<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-examples-rest.AddressBookResource.Classes'>Classes</a></p>
-					<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-examples-rest.AddressBookResource.Demo'>Demo</a></p>
-					<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-examples-rest.AddressBookResource.Traversable'>Traversable</a></p>
-					<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-examples-rest.AddressBookResource.Queryable'>Queryable</a></p>
-					<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-examples-rest.AddressBookResource.Introspectable'>Introspectable</a></p>
-					<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-examples-rest.AddressBookResource.RestClient'>ClientTest</a></p>
-					<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-examples-rest.AddressBookResource.Browser'>Browser Tips</a></p>
-				</ol>
-				<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-examples-rest.SampleRemoteableServlet'>SampleRemoteableServlet</a></p>
-				<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-examples-rest.TempDirResource'>TempDirResource</a></p>
-				<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-examples-rest.AtomFeedResource'>AtomFeedResource</a></p>
-				<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-examples-rest.DockerRegistryResource'>DockerRegistryResource</a></p>
-				<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-examples-rest.TumblrParserResource'>TumblrParserResource</a></p>
-				<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-examples-rest.PhotosResource'>PhotosResource</a></p>
-				<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-examples-rest.JsonSchemaResource'>JsonSchemaResource</a></p>
-				<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-examples-rest.SqlQueryResource'>SqlQueryResource</a></p>
-				<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-examples-rest.ConfigResource'>ConfigResource</a></p>
-				<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-examples-rest.LogsResource'>LogsResource</a></p>
-			</ol>
-		</ol>
-		<li><p><a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#ReleaseNotes'>Release Notes</a></p>
-	</ol>
-	
-</body>
-</html>

http://git-wip-us.apache.org/repos/asf/juneau-website/blob/b1ebfeda/content/7.0.0/downloads.html
----------------------------------------------------------------------
diff --git a/content/7.0.0/downloads.html b/content/7.0.0/downloads.html
deleted file mode 100644
index a0cd938..0000000
--- a/content/7.0.0/downloads.html
+++ /dev/null
@@ -1,223 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<style>
-	@import url("styles/juneau-code.css");
-	@import url("styles/juneau-doc.css");
-	
-	p.download {
-		color: #2C4557;
-	    padding: 5px 20px;
-	    margin: 10px 0px 10px 0px;
-	    text-decoration: none;	
-	    font-size: 0.9em;
-    	font-weight: bold;
-    	background: linear-gradient(to bottom, #F5F5F5, #DEE3E9) repeat scroll 0% 0% transparent;
-	}
-</style>
-</head>
-<body>
-
-	<h5 class='toc'>Current release</h5>
-	<p class='download'>
-		7.0.0 (TBD, 2017) 
-		- <a href='http://juneau.apache.org/site/apidocs/overview-summary.html#7.0.0'>Release Notes</a>
-		- <a href='https://www.apache.org/dyn/closer.cgi/juneau/binaries/juneau-7.0.0/apache-juneau-7.0.0-bin.zip'>Binaries</a> 
-		(<a href='https://www.apache.org/dist/juneau/binaries/juneau-7.0.0/apache-juneau-7.0.0-bin.zip.asc'>ASC</a>,
-		<a href='https://www.apache.org/dist/juneau/binaries/juneau-7.0.0/apache-juneau-7.0.0-bin.zip.md5'>MD5</a>,
-		<a href='https://www.apache.org/dist/juneau/binaries/juneau-7.0.0/apache-juneau-7.0.0-bin.zip.sha1'>SHA1</a>)
-		- <a href='https://www.apache.org/dyn/closer.cgi/juneau/source/juneau-7.0.0/apache-juneau-7.0.0-src.zip'>Source</a>
-		(<a href='https://www.apache.org/dist/juneau/source/juneau-7.0.0/apache-juneau-7.0.0-src.zip.asc'>ASC</a>,
-		<a href='https://www.apache.org/dist/juneau/source/juneau-7.0.0/apache-juneau-7.0.0-src.zip.md5'>MD5</a>,
-		<a href='https://www.apache.org/dist/juneau/source/juneau-7.0.0/apache-juneau-7.0.0-src.zip.sha1'>SHA1</a>)
-	</p>
-	<ul>
-		<li><b>Binaries</b>
-		<ul>
-			<li><code>juneau-all.jar</code> - <small>Everything (except RDF, JAX/RS, and Microservice)</small>
-			<li><code>/lib</code> - <small>Jars</small>
-			<ul>
-				<li><code>juneau-marshall.jar</code> - <small>Marshalling</small>
-				<li><code>juneau-marshall-rdf.jar</code> - <small>Marshalling RDF extension (requires Apache Jena 2.7.1+)</small>
-				<li><code>juneau-dto.jar</code> - <small>Data Transfer Objects</small>
-				<li><code>juneau-svl.jar</code> - <small>Simple Variable Language</small>
-				<li><code>juneau-config.jar</code> - <small>Config File</small>
-				<li><code>juneau-rest-server.jar</code> - <small>REST Servlet</small>
-				<li><code>juneau-rest-server-jaxrs.jar</code> - <small>REST Servlet JAX/RS extension</small>
-				<li><code>juneau-rest-client.jar</code> - <small>REST Client (requires Apache HttpClient 4.5+)</small>
-				<li><code>juneau-microservice-server.jar</code> - <small>Microservice server</small>
-			</ul>
-			<li><code>/osgi</code> - <small>OSGi Libraries</small>
-			<ul>
-				<li><code>org.apache.juneau.marshall.jar</code> - <small>Marshalling</small>
-				<li><code>org.apache.juneau.marshall.rdf.jar</code> - <small>Marshalling RDF extension (requires Apache Jena 2.7.1+)</small>
-				<li><code>org.apache.juneau.dto.jar</code> - <small>Data Transfer Objects</small>
-				<li><code>org.apache.juneau.svl.jar</code> - <small>Simple Variable Language</small>
-				<li><code>org.apache.juneau.config.jar</code> - <small>Config File</small>
-				<li><code>org.apache.juneau.rest.server.jar</code> - <small>REST Servlet</small>
-				<li><code>org.apache.juneau.rest.server.jaxrs.jar</code> - <small>REST Servlet JAX/RS extension</small>
-				<li><code>org.apache.juneau.rest.client.jar</code> - <small>REST Client (requires Apache HttpClient 4.5+)</small>
-				<li><code>org.apache.juneau.microservice.server.jar</code> - <small>Microservice server</small>
-			</ul>
-			<li><code>/projects</code> - <small>Eclipse Projects</small>
-			<ul>
-				<li><code>my-microservice.zip</code> - <small>Microservice starter project</small>
-				<li><code>juneau-examples-core.zip</code> - <small>Core libraries examples</small>
-				<li><code>juneau-examples-rest.zip</code> - <small>REST libraries examples</small>
-			</ul>
-		</ul>
-		<li><b>Maven</b>
-		<p class='bcode' style='max-width:800px;'>
-		<xc>&lt;!--  Use the following dependency... --&gt;</xc>
-		<xt>&lt;dependency&gt;</xt>
-			<xt>&lt;groupId&gt;</xt>org.apache.juneau<xt>&lt;/groupId&gt;</xt>
-			<xt>&lt;artifactId&gt;</xt>juneau-XXX<xt>&lt;/artifactId&gt;</xt>
-			<xt>&lt;version&gt;</xt>7.0.0<xt>&lt;/version&gt;</xt>
-		<xt>&lt;/dependency&gt;</xt>
-
-		<xc>&lt;!--  ...where the artifactId can be any of the following... --&gt;</xc>
-		<xt>&lt;artifactId&gt;</xt>juneau-all<xt>&lt;/artifactId&gt;</xt>
-		<xt>&lt;artifactId&gt;</xt>juneau-marshall<xt>&lt;/artifactId&gt;</xt>
-		<xt>&lt;artifactId&gt;</xt>juneau-marshall-rdf<xt>&lt;/artifactId&gt;</xt>
-		<xt>&lt;artifactId&gt;</xt>juneau-dto<xt>&lt;/artifactId&gt;</xt>
-		<xt>&lt;artifactId&gt;</xt>juneau-svl<xt>&lt;/artifactId&gt;</xt>
-		<xt>&lt;artifactId&gt;</xt>juneau-config<xt>&lt;/artifactId&gt;</xt>
-		<xt>&lt;artifactId&gt;</xt>juneau-rest-server<xt>&lt;/artifactId&gt;</xt>
-		<xt>&lt;artifactId&gt;</xt>juneau-rest-server-jaxrs<xt>&lt;/artifactId&gt;</xt>
-		<xt>&lt;artifactId&gt;</xt>juneau-rest-client<xt>&lt;/artifactId&gt;</xt>
-		<xt>&lt;artifactId&gt;</xt>juneau-microservice-server<xt>&lt;/artifactId&gt;</xt>
-		</p>
-	</ul>
-	
-	<h5 class='toc'>Verifying file integrity</h5>
-	<p>
-		It is essential that you verify the integrity of the downloaded files using the PGP or MD5 signatures. 
-	</p>
-	<p>
-		The PGP signatures can be verified using PGP or GPG. 
-		<br>First download the <a class='doclink' href='https://www.apache.org/dist/incubator/juneau/KEYS'>KEYS</a> as well 
-		as the asc signature file for the relevant distribution. 
-		<br>Make sure you get these files from the <a class='doclink' href='http://www.apache.org/dist/incubator/juneau'>main distribution directory</a> rather than from a mirror. 
-		<br>Then verify the signatures using:
-	</p>
-	<p class='bcode' style='max-width:800px;'>
-	pgpk -a KEYS
-	pgpv apache-juneau-7.0.0-bin.zip.asc 
-	</p>
-	<p>
-		... or ... 
-	</p>
-	<p class='bcode' style='max-width:800px;'>
-	pgp -ka KEYS
-	apache-juneau-7.0.0-bin.zip.asc 
-	</p>
-	<p>
-		... or ... 
-	</p>
-	<p class='bcode' style='max-width:800px;'>
-	gpg --import KEYS
-	gpg --verify apache-juneau-7.0.0-bin.zip.asc apache-juneau-7.0.0-bin.zip
-	</p>
-	<p>	
-		Alternatively, you can verify the MD5 signature on the files. 
-		<br>A unix program called md5 or md5sum is included in many unix distributions. 
-		It is also available as part of <a class='doclink' href='http://www.gnu.org/software/textutils/textutils.html'>GNU Textutils</a>. 
-		<br>Windows users can get binary md5 programs from any of the following:
-	</p>
-	<ul>
-		<li><a class='doclink' href='http://www.fourmilab.ch/md5/'>MD5 Command Line Message Digest Utility</a>
-		<li><a class='doclink' href='http://www.pc-tools.net/win32/freeware/console/'>PC-Tools MD5SUMS</a>
-		<li><a class='doclink' href='http://www.slavasoft.com/fsum/'>SlavaSoft FSUM</a>
-	</ul>
-	<p> 
-		An MD5 signature consists of 32 hex characters, and a SHA1 signature consists of 40 hex characters. 
-		<br>Ensure your generated signature string matches the signature string published in the files above.
-	</p>
-	
-	<h5 class='toc'>Older releases</h5>
-	<p class='download'>
-		6.4.0 (Oct 04, 2017) 
-		- <a href='http://juneau.apache.org/site/apidocs/overview-summary.html#6.4.0'>Release Notes</a>
-		- <a href='http://archive.apache.org/dist/incubator/juneau/binaries/juneau-6.4.0-incubating/apache-juneau-6.4.0-incubating-bin.zip'>Binaries</a> 
-		(<a href='https://archive.apache.org/dist/incubator/juneau/binaries/juneau-6.4.0-incubating/apache-juneau-6.4.0-incubating-bin.zip.asc'>ASC</a>,
-		<a href='https://archive.apache.org/dist/incubator/juneau/binaries/juneau-6.4.0-incubating/apache-juneau-6.4.0-incubating-bin.zip.md5'>MD5</a>,
-		<a href='https://archive.apache.org/dist/incubator/juneau/binaries/juneau-6.4.0-incubating/apache-juneau-6.4.0-incubating-bin.zip.sha1'>SHA1</a>)
-		- <a href='http://archive.apache.org/dist/incubator/juneau/source/juneau-6.4.0-incubating/apache-juneau-6.4.0-incubating-src.zip'>Source</a>
-		(<a href='https://archive.apache.org/dist/incubator/juneau/source/juneau-6.4.0-incubating/apache-juneau-6.4.0-incubating-src.zip.asc'>ASC</a>,
-		<a href='https://archive.apache.org/dist/incubator/juneau/source/juneau-6.4.0-incubating/apache-juneau-6.4.0-incubating-src.zip.md5'>MD5</a>,
-		<a href='https://archive.apache.org/dist/incubator/juneau/source/juneau-6.4.0-incubating/apache-juneau-6.4.0-incubating-src.zip.sha1'>SHA1</a>)
-	</p>
-	<p class='download'>
-		6.3.1 (Aug 02, 2017) 
-		- <a href='http://juneau.apache.org/site/apidocs/overview-summary.html#6.3.1'>Release Notes</a>
-		- <a href='http://archive.apache.org/dist/incubator/juneau/binaries/juneau-6.3.1-incubating/apache-juneau-6.3.1-incubating-bin.zip'>Binaries</a> 
-		(<a href='https://archive.apache.org/dist/incubator/juneau/binaries/juneau-6.3.1-incubating/apache-juneau-6.3.1-incubating-bin.zip.asc'>ASC</a>,
-		<a href='https://archive.apache.org/dist/incubator/juneau/binaries/juneau-6.3.1-incubating/apache-juneau-6.3.1-incubating-bin.zip.md5'>MD5</a>,
-		<a href='https://archive.apache.org/dist/incubator/juneau/binaries/juneau-6.3.1-incubating/apache-juneau-6.3.1-incubating-bin.zip.sha1'>SHA1</a>)
-		- <a href='http://archive.apache.org/dist/incubator/juneau/source/juneau-6.3.1-incubating/apache-juneau-6.3.1-incubating-src.zip'>Source</a>
-		(<a href='https://archive.apache.org/dist/incubator/juneau/source/juneau-6.3.1-incubating/apache-juneau-6.3.1-incubating-src.zip.asc'>ASC</a>,
-		<a href='https://archive.apache.org/dist/incubator/juneau/source/juneau-6.3.1-incubating/apache-juneau-6.3.1-incubating-src.zip.md5'>MD5</a>,
-		<a href='https://archive.apache.org/dist/incubator/juneau/source/juneau-6.3.1-incubating/apache-juneau-6.3.1-incubating-src.zip.sha1'>SHA1</a>)
-	</p>
-	<p class='download'>
-		6.3.0 (Jun 28, 2017) 
-		- <a href='http://juneau.apache.org/site/apidocs/overview-summary.html#6.3.0'>Release Notes</a>
-		- <a href='http://archive.apache.org/dist/incubator/juneau/binaries/juneau-6.3.0-incubating/apache-juneau-6.3.0-incubating-bin.zip'>Binaries</a> 
-		(<a href='https://archive.apache.org/dist/incubator/juneau/binaries/juneau-6.3.0-incubating/apache-juneau-6.3.0-incubating-bin.zip.asc'>ASC</a>,
-		<a href='https://archive.apache.org/dist/incubator/juneau/binaries/juneau-6.3.0-incubating/apache-juneau-6.3.0-incubating-bin.zip.md5'>MD5</a>,
-		<a href='https://archive.apache.org/dist/incubator/juneau/binaries/juneau-6.3.0-incubating/apache-juneau-6.3.0-incubating-bin.zip.sha1'>SHA1</a>)
-		- <a href='http://archive.apache.org/dist/incubator/juneau/source/juneau-6.3.0-incubating/apache-juneau-6.3.0-incubating-src.zip'>Source</a>
-		(<a href='https://archive.apache.org/dist/incubator/juneau/source/juneau-6.3.0-incubating/apache-juneau-6.3.0-incubating-src.zip.asc'>ASC</a>,
-		<a href='https://archive.apache.org/dist/incubator/juneau/source/juneau-6.3.0-incubating/apache-juneau-6.3.0-incubating-src.zip.md5'>MD5</a>,
-		<a href='https://archive.apache.org/dist/incubator/juneau/source/juneau-6.3.0-incubating/apache-juneau-6.3.0-incubating-src.zip.sha1'>SHA1</a>)
-	</p>
-	<p class='download'>
-		6.2.0 (Apr 28, 2017) 
-		- <a href='http://juneau.apache.org/site/apidocs/overview-summary.html#6.2.0'>Release Notes</a>
-		- <a href='http://archive.apache.org/dist/incubator/juneau/binaries/juneau-6.2.0-incubating/apache-juneau-6.2.0-incubating-bin.zip'>Binaries</a> 
-		(<a href='https://archive.apache.org/dist/incubator/juneau/binaries/juneau-6.2.0-incubating/apache-juneau-6.2.0-incubating-bin.zip.asc'>ASC</a>,
-		<a href='https://archive.apache.org/dist/incubator/juneau/binaries/juneau-6.2.0-incubating/apache-juneau-6.2.0-incubating-bin.zip.md5'>MD5</a>,
-		<a href='https://archive.apache.org/dist/incubator/juneau/binaries/juneau-6.2.0-incubating/apache-juneau-6.2.0-incubating-bin.zip.sha1'>SHA1</a>)
-		- <a href='http://archive.apache.org/dist/incubator/juneau/source/juneau-6.2.0-incubating/apache-juneau-6.2.0-incubating-src.zip'>Source</a>
-		(<a href='https://archive.apache.org/dist/incubator/juneau/source/juneau-6.2.0-incubating/apache-juneau-6.2.0-incubating-src.zip.asc'>ASC</a>,
-		<a href='https://archive.apache.org/dist/incubator/juneau/source/juneau-6.2.0-incubating/apache-juneau-6.2.0-incubating-src.zip.md5'>MD5</a>,
-		<a href='https://archive.apache.org/dist/incubator/juneau/source/juneau-6.2.0-incubating/apache-juneau-6.2.0-incubating-src.zip.sha1'>SHA1</a>)
-	</p>
-	<p class='download'>
-		6.1.0 (Feb 25, 2017) 
-		- <a href='http://juneau.apache.org/site/apidocs/overview-summary.html#6.1.0'>Release Notes</a>
-		- <a href='http://archive.apache.org/dist/incubator/juneau/binaries/juneau-6.1.0-incubating/apache-juneau-6.1.0-incubating-bin.zip'>Binaries</a> 
-		(<a href='https://archive.apache.org/dist/incubator/juneau/binaries/juneau-6.1.0-incubating/apache-juneau-6.1.0-incubating-bin.zip.asc'>ASC</a>,
-		<a href='https://archive.apache.org/dist/incubator/juneau/binaries/juneau-6.1.0-incubating/apache-juneau-6.1.0-incubating-bin.zip.md5'>MD5</a>,
-		<a href='https://archive.apache.org/dist/incubator/juneau/binaries/juneau-6.1.0-incubating/apache-juneau-6.1.0-incubating-bin.zip.sha1'>SHA1</a>)
-		- <a href='http://archive.apache.org/dist/incubator/juneau/source/juneau-6.1.0-incubating/apache-juneau-6.1.0-incubating-src.zip'>Source</a>
-		(<a href='https://archive.apache.org/dist/incubator/juneau/source/juneau-6.1.0-incubating/apache-juneau-6.1.0-incubating-src.zip.asc'>ASC</a>,
-		<a href='https://archive.apache.org/dist/incubator/juneau/source/juneau-6.1.0-incubating/apache-juneau-6.1.0-incubating-src.zip.md5'>MD5</a>,
-		<a href='https://archive.apache.org/dist/incubator/juneau/source/juneau-6.1.0-incubating/apache-juneau-6.1.0-incubating-src.zip.sha1'>SHA1</a>)
-	</p>
-	<p class='download'>
-		6.0.1 (Jan 03, 2017) 
-		- <a href='http://juneau.apache.org/site/apidocs/overview-summary.html#6.0.1'>Release Notes</a>
-		- <a href='http://archive.apache.org/dist/incubator/juneau/binaries/juneau-6.0.1-incubating/apache-juneau-6.0.1-incubating-bin.zip'>Binaries</a> 
-		(<a href='https://archive.apache.org/dist/incubator/juneau/binaries/juneau-6.0.1-incubating/apache-juneau-6.0.1-incubating-bin.zip.asc'>ASC</a>,
-		<a href='https://archive.apache.org/dist/incubator/juneau/binaries/juneau-6.0.1-incubating/apache-juneau-6.0.1-incubating-bin.zip.md5'>MD5</a>,
-		<a href='https://archive.apache.org/dist/incubator/juneau/binaries/juneau-6.0.1-incubating/apache-juneau-6.0.1-incubating-bin.zip.sha1'>SHA1</a>)
-		- <a href='http://archive.apache.org/dist/incubator/juneau/source/juneau-6.0.1-incubating/apache-juneau-6.0.1-incubating-src.zip'>Source</a>
-		(<a href='https://archive.apache.org/dist/incubator/juneau/source/juneau-6.0.1-incubating/apache-juneau-6.0.1-incubating-src.zip.asc'>ASC</a>,
-		<a href='https://archive.apache.org/dist/incubator/juneau/source/juneau-6.0.1-incubating/apache-juneau-6.0.1-incubating-src.zip.md5'>MD5</a>,
-		<a href='https://archive.apache.org/dist/incubator/juneau/source/juneau-6.0.1-incubating/apache-juneau-6.0.1-incubating-src.zip.sha1'>SHA1</a>)
-	</p>
-	<p class='download'>
-		6.0.0 (Oct 25, 2016) 
-		- <a href='http://juneau.apache.org/site/apidocs/overview-summary.html#6.0.0'>Release Notes</a>
-		- <a href='http://archive.apache.org/dist/incubator/juneau/binaries/juneau-6.0.0-incubating/apache-juneau-6.0.0-incubating-bin.zip'>Binaries</a> 
-		(<a href='https://archive.apache.org/dist/incubator/juneau/binaries/juneau-6.0.0-incubating/apache-juneau-6.0.0-incubating-bin.zip.asc'>ASC</a>,
-		<a href='https://archive.apache.org/dist/incubator/juneau/binaries/juneau-6.0.0-incubating/apache-juneau-6.0.0-incubating-bin.zip.md5'>MD5</a>,
-		<a href='https://archive.apache.org/dist/incubator/juneau/binaries/juneau-6.0.0-incubating/apache-juneau-6.0.0-incubating-bin.zip.sha1'>SHA1</a>)
-		- <a href='http://archive.apache.org/dist/incubator/juneau/source/juneau-6.0.0-incubating/apache-juneau-6.0.0-incubating-source.zip'>Source</a>
-		(<a href='https://archive.apache.org/dist/incubator/juneau/source/juneau-6.0.0-incubating/apache-juneau-6.0.0-incubating-source.zip.asc'>ASC</a>,
-		<a href='https://archive.apache.org/dist/incubator/juneau/source/juneau-6.0.0-incubating/apache-juneau-6.0.0-incubating-source.zip.md5'>MD5</a>,
-		<a href='https://archive.apache.org/dist/incubator/juneau/source/juneau-6.0.0-incubating/apache-juneau-6.0.0-incubating-source.zip.sha1'>SHA1</a>)
-	</p>
-</body>
-</html>

http://git-wip-us.apache.org/repos/asf/juneau-website/blob/b1ebfeda/content/7.0.0/dto.html
----------------------------------------------------------------------
diff --git a/content/7.0.0/dto.html b/content/7.0.0/dto.html
deleted file mode 100644
index 489a3d7..0000000
--- a/content/7.0.0/dto.html
+++ /dev/null
@@ -1,255 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<style>
-	@import url("styles/juneau-code.css");
-	@import url("styles/juneau-doc.css");
-</style>
-</head>
-<body>
-	<!-- ======================================================================================================= -->
-	<!-- === JUNEAU-DTO ======================================================================================== -->
-	<!-- ======================================================================================================= -->
-	
-	<h5 class='toc' id='juneau-dto'>juneau-dto</h5>
-	<div>
-		<h6 class='figure'>Maven Dependency</h6>
-		<p class='bcode' style='width:500px;'>
-	<xt>&lt;dependency&gt;</xt>
-		<xt>&lt;groupId&gt;</xt>org.apache.juneau<xt>&lt;/groupId&gt;</xt>
-		<xt>&lt;artifactId&gt;</xt>juneau-dto<xt>&lt;/artifactId&gt;</xt>
-		<xt>&lt;version&gt;</xt>7.0.0<xt>&lt;/version&gt;</xt>
-	<xt>&lt;/dependency&gt;</xt>
-		</p>	
-	
-		<h6 class='figure'>Java Library</h6>
-		<p class='bcode' style='width:500px;'>
-	juneau-dto-7.0.0.jar 
-		</p>	
-	
-		<h6 class='figure'>OSGi Module</h6>
-		<p class='bcode' style='width:500px;'>
-	org.apache.juneau.dto_7.0.0.jar 
-		</p>	
-
-		<p>
-			Data Transfer Object libraries are provided for a variety of languages that allow you to serialize commonly-used
-			documents.  
-		</p>
-		<ul>
-			<li>HTML5
-			<li>Atom
-			<li>Cognos
-			<li>JSON-Schema
-			<li>Swagger 2.0
-		</ul>				
-		<p>	
-			HTML5 documents and fragments can be constructed using the HTML5 DTOs and HTML or XML serializers:
-		</p>
-		<p class='bcode'>
-	<jk>import static</jk> org.apache.juneau.dto.html5.HtmlBuilder.*;
-		
-	Object myform =
-		<jsm>form</jsm>().action(<js>"/submit"</js>).method(<js>"POST"</js>)
-		.children(
-			<js>"Position (1-10000): "</js>, <jsm>input</jsm>(<js>"number"</js>).name(<js>"pos"</js>).value(1), <jsm>br</jsm>(),
-			<js>"Limit (1-10000): "</js>, <jsm>input</jsm>(<js>"number"</js>).name(<js>"limit"</js>).value(100), <jsm>br</jsm>(),
-			<jsm>button</jsm>(<js>"submit"</js>, <js>"Submit"</js>),
-			<jsm>button</jsm>(<js>"reset"</js>, <js>"Reset"</js>)
-		); 	
-
-	String html = HtmlSerializer.<jsf>DEFAULT</jsf>.serialize(myform);
-		</p>
-		<p class='bcode'><xt>
-	&lt;form <xa>action</xa>=<xs>'/submit'</xs> <xa>method</xa>=<xs>'POST'</xs>&gt;
-		<xv>Position (1-10000):</xv> &lt;input <xa>name</xa>=<xs>'pos'</xs> <xa>type</xa>=<xs>'number'</xs> <xa>value</xa>=<xs>'1'</xs>/&gt;&lt;br/&gt;
-		<xv>Limit (1-10000):</xv> &lt;input <xa>name</xa>=<xs>'pos'</xs> <xa>type</xa>=<xs>'number'</xs> <xa>value</xa>=<xs>'100'</xs>/&gt;&lt;br/&gt;
-		&lt;button <xa>type</xa>=<xs>'submit'</xs>&gt;<xv>Submit</xv>&lt;/button&gt;
-		&lt;button <xa>type</xa>=<xs>'reset'</xs>&gt;<xv>Reset</xv>&lt;/button&gt;			 
-	&lt;/form&gt;
-		</xt></p>
-		<p>
-			And you're not limited to just HTML.  The HTML5 beans are POJOs that can be serialized using any
-			of the serializers, such as lax JSON:
-		</p>
-		<p class='bcode'>
-	{
-		<jf>_type</jf>: <js>'form'</js>,
-		<jf>a</jf>: { <jf>action</jf>: <js>'/submit'</js>, <jf>method</jf>: <js>'POST'</js> },
-		<jf>c</jf>: [
-			<js>'Position (1-10000): '</js>,
-			{ <jf>_type</jf>: <js>'input'</js>, <jf>a</jf>: { <jf>type</jf>: <js>'number'</js>, <jf>name</jf>: <js>'pos'</js>, <jf>value</jf>: 1 } },
-			{ <jf>_type</jf>: <js>'br'</js> },
-			<js>'Limit (1-10000): '</js>,
-			{ <jf>_type</jf>: <js>'input'</js>, <jf>a</jf>: { <jf>type</jf>: <js>'number'</js>, <jf>name</jf>: <js>'limit'</js>, <jf>value</jf>: 100 } },
-			{ <jf>_type</jf>: <js>'br'</js> },
-			{ <jf>_type</jf>: <js>'button'</js>, <jf>a</jf>: { <jf>type</jf>: <js>'submit'</js> }, <jf>c</jf>: [ <js>'Submit'</js> ] },
-			{ <jf>_type</jf>: <js>'button'</js>, <jf>a</jf>: { <jf>type</jf>: <js>'reset'</js> }, <jf>c</jf>: [ <js>'Reset'</js> ] }
-		]
-	}			
-		</p>
-		
-		<p>	
-			ATOM feeds can be constructed using the ATOM DTOs and XML serializer:
-		</p>
-		<p class='bcode'>
-	<jk>import static</jk> org.apache.juneau.dto.atom.AtomBuilder.*;
-	
-	Feed feed = 
-		<jsm>feed</jsm>(<js>"tag:juneau.apache.org"</js>, <js>"Juneau ATOM specification"</js>, <js>"2016-01-02T03:04:05Z"</js>)
-		.subtitle(<jsm>text</jsm>(<js>"html"</js>).text(<js>"Describes &lt;em&gt;stuff&lt;/em&gt; about Juneau"</js>))
-		.links(
-			<jsm>link</jsm>(<js>"alternate"</js>, <js>"text/html"</js>, <js>"http://juneau.apache.org/"</js>).hreflang(<js>"en"</js>),
-			<jsm>link</jsm>(<js>"self"</js>, <js>"application/atom+xml"</js>, <js>"http://juneau.apache.org/feed.atom"</js>)
-		)
-		.rights(<js>"Copyright (c) 2016, Apache Foundation"</js>)
-		.entries(
-			<jsm>entry</jsm>(<js>"tag:juneau.sample.com,2013:1.2345"</js>, <js>"Juneau ATOM specification snapshot"</js>, <js>"2016-01-02T03:04:05Z"</js>)
-			.published(<js>"2016-01-02T03:04:05Z"</js>)
-			.content(
-				<jsm>content</jsm>(<js>"xhtml"</js>)
-				.lang(<js>"en"</js>)
-				.base(<js>"http://www.apache.org/"</js>)
-				.text(<js>"&lt;div&gt;&lt;p&gt;&lt;i&gt;[Update: Juneau supports ATOM.]&lt;/i&gt;&lt;/p&gt;&lt;/div&gt;"</js>)
-			)
-		);
-	
-	<jc>// Serialize to ATOM/XML</jc>
-	String atomXml = XmlSerializer.<jsf>DEFAULT</jsf>.serialize(feed);
-			</p>
-			<p class='bcode'>
-	<xt>&lt;feed&gt;</xt>
-		<xt>&lt;id&gt;</xt>
-			tag:juneau.apache.org
-		<xt>&lt;/id&gt;</xt>
-		<xt>&lt;link</xt> <xa>href</xa>=<xs>'http://juneau.apache.org/'</xs> <xa>rel</xa>=<xs>'alternate'</xs> <xa>type</xa>=<xs>'text/html'</xs> <xa>hreflang</xa>=<xs>'en'</xs>/<xt>&gt;</xt>
-		<xt>&lt;link</xt> <xa>href</xa>=<xs>'http://juneau.apache.org/feed.atom'</xs> <xa>rel</xa>=<xs>'self'</xs> <xa>type</xa>=<xs>'application/atom+xml'</xs>/<xt>&gt;</xt>
-		<xt>&lt;rights&gt;</xt>
-			Copyright (c) 2016, Apache Foundation
-		<xt>&lt;/rights&gt;</xt>
-		<xt>&lt;title</xt> <xa>type</xa>=<xs>'text'</xs>&gt;</xt>
-			Juneau ATOM specification
-		<xt>&lt;/title&gt;</xt>
-		<xt>&lt;updated&gt;</xt>2016-01-02T03:04:05Z<xt>&lt;/updated&gt;</xt>
-		<xt>&lt;subtitle</xt> <xa>type</xa>=<xs>'html'</xs><xt>&gt;</xt>
-			Describes &lt;em&gt;stuff&lt;/em&gt; about Juneau
-		<xt>&lt;/subtitle&gt;</xt>
-		<xt>&lt;entry&gt;</xt>
-			<xt>&lt;id&gt;</xt>
-				tag:juneau.apache.org
-			<xt>&lt;/id&gt;</xt>
-			<xt>&lt;title&gt;</xt>
-				Juneau ATOM specification snapshot
-			<xt>&lt;/title&gt;</xt>
-			<xt>&lt;updated&gt;</xt>2016-01-02T03:04:05Z<xt>&lt;/updated&gt;</xt>
-			<xt>&lt;content</xt> <xa>base</xa>=<xs>'http://www.apache.org/'</xs> <xa>lang</xa>=<xs>'en'</xs> <xa>type</xa>=<xs>'xhtml'</xs><xt>&gt;</xt>
-				<xt>&lt;div</xt> <xa>xmlns</xa>=<xs>"http://www.w3.org/1999/xhtml"</xs><xt>&gt;&lt;p&gt;&lt;i&gt;</xt>[Update: Juneau supports ATOM.]<xt>&lt;/i&gt;&lt;/p&gt;&lt;/div&gt;</xt>
-			<xt>&lt;/content&gt;</xt>
-			<xt>&lt;published&gt;</xt>2016-01-02T03:04:05Z<xt>&lt;/published&gt;</xt>
-		<xt>&lt;/entry&gt;</xt>
-	<xt>&lt;/feed&gt;</xt>		
-		</p>
-		<p>	
-			Swagger documents can be constructed using the Swagger DTOs and JSON serializer:
-		</p>
-		<p class='bcode'>
-	<jk>import static</jk> org.apache.juneau.dto.swagger.SwaggerBuilder.*;
-
-	Swagger swagger = <jsm>swagger</jsm>()
-		.swagger(<js>"2.0"</js>)
-		.info(
-			<jsm>info</jsm>(<js>"Swagger Petstore"</js>, <js>"1.0.0"</js>)
-				.description(<js>"This is a sample server Petstore server."</js>)
-				.termsOfService(<js>"http://swagger.io/terms/"</js>)
-				.contact(
-					<jsm>contact</jsm>().email(<js>"apiteam@swagger.io"</js>)
-				)
-				.license(
-					<jsm>license</jsm>(<js>"Apache 2.0"</js>).url(<js>"http://www.apache.org/licenses/LICENSE-2.0.html"</js>)
-				)
-		)
-		.path(<js>"/pet"</js>, <js>"post"</js>,
-			<jsm>operation</jsm>()
-				.tags(<js>"pet"</js>)
-				.summary(<js>"Add a new pet to the store"</js>)
-				.description(<js>""</js>)
-				.operationId(<js>"addPet"</js>)
-				.consumes(MediaType.<jsf>JSON</jsf>, MediaType.<jsf>XML</jsf>)
-				.produces(MediaType.<jsf>JSON</jsf>, MediaType.<jsf>XML</jsf>)
-				.parameters(
-					<jsm>parameterInfo</jsm>(<js>"body"</js>, <js>"body"</js>)
-						.description(<js>"Pet object that needs to be added to the store"</js>)
-						.required(<jk>true</jk>)
-				)
-				.response(405, <jsm>responseInfo</jsm>(<js>"Invalid input"</js>))
-		);
-
-	<jc>// Serialize to Swagger/JSON</jc>
-	String swaggerJson = JsonSerializer.<jsf>DEFAULT_READABLE</jsf>.serialize(swagger);
-		</p>
-		<p class='bcode'>
-	{
-		<jf>"swagger"</jf>: <js>"2.0"</js>,
-		<jf>"info"</jf>: {
-			<jf>"title"</jf>: <js>"Swagger Petstore"</js>,
-			<jf>"description"</jf>: <js>"This is a sample server Petstore server."</js>,
-			<jf>"version"</jf>: <js>"1.0.0"</js>,
-			<jf>"termsOfService"</jf>: <js>"http://swagger.io/terms/"</js>,
-			<jf>"contact"</jf>: {
-				<jf>"email"</jf>: <js>"apiteam@swagger.io"</js>
-			},
-			<jf>"license"</jf>: {
-				<jf>"name"</jf>: <js>"Apache 2.0"</js>,
-				<jf>"url"</jf>: <js>"http://www.apache.org/licenses/LICENSE-2.0.html"</js>
-			}
-		},
-		<jf>"paths"</jf>: {
-			<jf>"/pet"</jf>: {
-				<jf>"post"</jf>: {
-					<jf>"tags"</jf>: [
-						<js>"pet"</js>
-					],
-					<jf>"summary"</jf>: <js>"Add a new pet to the store"</js>,
-					<jf>"description"</jf>: <js>""</js>,
-					<jf>"operationId"</jf>: <js>"addPet"</js>,
-					<jf>"consumes"</jf>: [
-						<js>"application/json"</js>,
-						<js>"text/xml"</js>
-					],
-					<jf>"produces"</jf>: [
-						<js>"application/json"</js>,
-						<js>"text/xml"</js>
-					],
-					<jf>"parameters"</jf>: [
-						{
-							<jf>"in"</jf>: <js>"body"</js>,
-							<jf>"name"</jf>: <js>"body"</js>,
-							<jf>"description"</jf>: <js>"Pet object that needs to be added to the store"</js>,
-							<jf>"required"</jf>: <jk>true</jk>
-						}
-					],
-					<jf>"responses"</jf>: {
-						<jf>"405"</jf>: {
-							<jf>"description"</jf>: <js>"Invalid input"</js>
-						}
-					}
-				}
-			}
-		},
-	}		
-		</p>
-		<p>
-			Note that these DTOs can also be serialized to any of the other supported languages such as JSON or MessagePack!
-			And they can be parsed back into their original objects!
-		</p>
-		<p>
-			As a convenience, you can also simply call <code>toString()</code> on any of these DTOs and they will
-			be serialized directly to a string in the typical language (e.g. HTML5 beans to HTML, Swagger to JSON, etc...).
-		</p>
-		
-		<ul class='doctree'>
-			<li class='link'>See <a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-dto'>juneau-dto</a> for more information.
-		</ul>
-	</div>
-</body>
-</html>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/juneau-website/blob/b1ebfeda/content/7.0.0/examples.html
----------------------------------------------------------------------
diff --git a/content/7.0.0/examples.html b/content/7.0.0/examples.html
deleted file mode 100644
index 585d5f7..0000000
--- a/content/7.0.0/examples.html
+++ /dev/null
@@ -1,90 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<style>
-	@import url("styles/juneau-code.css");
-	@import url("styles/juneau-doc.css");
-</style>
-</head>
-<body>
-	<!-- =========================================================================================================== -->
-	<!-- === JUNEAU-EXAMPLES ======================================================================================= -->
-	<!-- =========================================================================================================== -->
-
-	<h5 class='toc' id='juneau-examples'>juneau-examples</h5>
-	<div>
-
-		<!-- ======================================================================================================= -->
-		<!-- === JUNEAU-EXAMPLES-CORE ============================================================================== -->
-		<!-- ======================================================================================================= -->
-	
-		<h6 class='toc' id='juneau-examples-core'>juneau-examples-core</h6>
-		<div>
-	
-			<h6 class='figure'>Archive File</h6>
-			<p class='bcode' style='width:500px;'>
-	juneau-examples-core-7.0.0.zip 
-			</p>	
-
-			<p>
-				The <code>juneau-examples-core</code> project contains various code examples for using the core APIs. 
-			</p>
-			<p>
-				The project project can be loaded into your workspace by importing the 
-				<code>juneau-examples-core-7.0.0.zip</code> file. 
-			</p>
-			<p>
-				Once loaded, you should see the following project structure:
-			</p>
-			<img class='bordered' src='images/juneau-examples-core.import3.png' style='width:33%'>
-
-			<p>
-				FYI...<br>
-				The Core library samples are currently a work-in-progress so there's not much here yet.
-			</p>
-
-
-			<ul class='doctree'>
-				<li class='link'>See <a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-examples-core'>juneau-examples-core</a> for more information.
-			</ul>
-		</div>
-	
-		<!-- ======================================================================================================= -->
-		<!-- === JUNEAU-EXAMPLES-REST ============================================================================== -->
-		<!-- ======================================================================================================= -->
-	
-		<h6 class='toc' id='juneau-examples-rest'>juneau-examples-rest</h6>
-		<div>
-	
-			<h6 class='figure'>Archive File</h6>
-			<p class='bcode' style='width:500px;'>
-	juneau-examples-rest-7.0.0.zip 
-			</p>	
-
-			<p>
-				The <code>juneau-examples-core</code> project provides various code examples on how to use the core
-				libraries.
-			</p>
-			<p>
-				The project project can be loaded into your workspace by importing the 
-				<code>juneau-examples-rest-7.0.0.zip</code> file. 
-			</p>
-			<p>
-				Once loaded, you should see the following project structure:
-			</p>
-			<img class='bordered' src='images/juneau-examples-rest.import3.png' style='width:412px'>
-			<p>
-				The microservice can be started from the <code>juneau-examples-rest.launch</code> file.
-				It will start up the microservice on port 10000 which you can then view through a browser:
-			</p>
-			<img class='bordered' src='images/juneau-examples-rest.import4.png' style='width:466px'>
-		
-			<ul class='doctree'>
-				<li class='link'>See <a class='doclink' href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-examples-rest'>juneau-examples-rest</a> for more information.
-			</ul>
-		</div>
-
-	</div>
-	
-</body>
-</html>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/juneau-website/blob/b1ebfeda/content/7.0.0/googlee7b40be42ec36bc2.html
----------------------------------------------------------------------
diff --git a/content/7.0.0/googlee7b40be42ec36bc2.html b/content/7.0.0/googlee7b40be42ec36bc2.html
deleted file mode 100644
index b4d8248..0000000
--- a/content/7.0.0/googlee7b40be42ec36bc2.html
+++ /dev/null
@@ -1 +0,0 @@
-google-site-verification: googlee7b40be42ec36bc2.html
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/juneau-website/blob/b1ebfeda/content/7.0.0/images/PetStore.png
----------------------------------------------------------------------
diff --git a/content/7.0.0/images/PetStore.png b/content/7.0.0/images/PetStore.png
deleted file mode 100644
index 4254abd..0000000
Binary files a/content/7.0.0/images/PetStore.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/juneau-website/blob/b1ebfeda/content/7.0.0/images/PetStore_Query.png
----------------------------------------------------------------------
diff --git a/content/7.0.0/images/PetStore_Query.png b/content/7.0.0/images/PetStore_Query.png
deleted file mode 100644
index 67e4b4b..0000000
Binary files a/content/7.0.0/images/PetStore_Query.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/juneau-website/blob/b1ebfeda/content/7.0.0/images/PetStore_light.png
----------------------------------------------------------------------
diff --git a/content/7.0.0/images/PetStore_light.png b/content/7.0.0/images/PetStore_light.png
deleted file mode 100644
index 2b0b38d..0000000
Binary files a/content/7.0.0/images/PetStore_light.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/juneau-website/blob/b1ebfeda/content/7.0.0/images/Samples_RootResources.png
----------------------------------------------------------------------
diff --git a/content/7.0.0/images/Samples_RootResources.png b/content/7.0.0/images/Samples_RootResources.png
deleted file mode 100644
index 8ac7790..0000000
Binary files a/content/7.0.0/images/Samples_RootResources.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/juneau-website/blob/b1ebfeda/content/7.0.0/images/Swagger.png
----------------------------------------------------------------------
diff --git a/content/7.0.0/images/Swagger.png b/content/7.0.0/images/Swagger.png
deleted file mode 100644
index 821f61f..0000000
Binary files a/content/7.0.0/images/Swagger.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/juneau-website/blob/b1ebfeda/content/7.0.0/images/SystemPropertiesForm.png
----------------------------------------------------------------------
diff --git a/content/7.0.0/images/SystemPropertiesForm.png b/content/7.0.0/images/SystemPropertiesForm.png
deleted file mode 100644
index 594d7d5..0000000
Binary files a/content/7.0.0/images/SystemPropertiesForm.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/juneau-website/blob/b1ebfeda/content/7.0.0/images/SystemPropertiesResource.png
----------------------------------------------------------------------
diff --git a/content/7.0.0/images/SystemPropertiesResource.png b/content/7.0.0/images/SystemPropertiesResource.png
deleted file mode 100644
index e9b7d85..0000000
Binary files a/content/7.0.0/images/SystemPropertiesResource.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/juneau-website/blob/b1ebfeda/content/7.0.0/images/asf_short.png
----------------------------------------------------------------------
diff --git a/content/7.0.0/images/asf_short.png b/content/7.0.0/images/asf_short.png
deleted file mode 100644
index ebb4b85..0000000
Binary files a/content/7.0.0/images/asf_short.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/juneau-website/blob/b1ebfeda/content/7.0.0/images/feather.png
----------------------------------------------------------------------
diff --git a/content/7.0.0/images/feather.png b/content/7.0.0/images/feather.png
deleted file mode 100644
index 3fc62b7..0000000
Binary files a/content/7.0.0/images/feather.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/juneau-website/blob/b1ebfeda/content/7.0.0/images/feather_small.png
----------------------------------------------------------------------
diff --git a/content/7.0.0/images/feather_small.png b/content/7.0.0/images/feather_small.png
deleted file mode 100644
index 43b76a7..0000000
Binary files a/content/7.0.0/images/feather_small.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/juneau-website/blob/b1ebfeda/content/7.0.0/images/juneau-examples-core.import3.png
----------------------------------------------------------------------
diff --git a/content/7.0.0/images/juneau-examples-core.import3.png b/content/7.0.0/images/juneau-examples-core.import3.png
deleted file mode 100644
index 6c8521c..0000000
Binary files a/content/7.0.0/images/juneau-examples-core.import3.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/juneau-website/blob/b1ebfeda/content/7.0.0/images/juneau-examples-rest.import3.png
----------------------------------------------------------------------
diff --git a/content/7.0.0/images/juneau-examples-rest.import3.png b/content/7.0.0/images/juneau-examples-rest.import3.png
deleted file mode 100644
index 82792c0..0000000
Binary files a/content/7.0.0/images/juneau-examples-rest.import3.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/juneau-website/blob/b1ebfeda/content/7.0.0/images/juneau-examples-rest.import4.png
----------------------------------------------------------------------
diff --git a/content/7.0.0/images/juneau-examples-rest.import4.png b/content/7.0.0/images/juneau-examples-rest.import4.png
deleted file mode 100644
index cd366dc..0000000
Binary files a/content/7.0.0/images/juneau-examples-rest.import4.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/juneau-website/blob/b1ebfeda/content/7.0.0/images/juneau-microservice-template.import3.png
----------------------------------------------------------------------
diff --git a/content/7.0.0/images/juneau-microservice-template.import3.png b/content/7.0.0/images/juneau-microservice-template.import3.png
deleted file mode 100644
index 207b291..0000000
Binary files a/content/7.0.0/images/juneau-microservice-template.import3.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/juneau-website/blob/b1ebfeda/content/7.0.0/images/juneau-microservice-template.import4.png
----------------------------------------------------------------------
diff --git a/content/7.0.0/images/juneau-microservice-template.import4.png b/content/7.0.0/images/juneau-microservice-template.import4.png
deleted file mode 100644
index 0f27f36..0000000
Binary files a/content/7.0.0/images/juneau-microservice-template.import4.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/juneau-website/blob/b1ebfeda/content/7.0.0/images/juneau-microservice-template.png
----------------------------------------------------------------------
diff --git a/content/7.0.0/images/juneau-microservice-template.png b/content/7.0.0/images/juneau-microservice-template.png
deleted file mode 100644
index cf1cef2..0000000
Binary files a/content/7.0.0/images/juneau-microservice-template.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/juneau-website/blob/b1ebfeda/content/7.0.0/images/juneau1.png
----------------------------------------------------------------------
diff --git a/content/7.0.0/images/juneau1.png b/content/7.0.0/images/juneau1.png
deleted file mode 100644
index ff1728f..0000000
Binary files a/content/7.0.0/images/juneau1.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/juneau-website/blob/b1ebfeda/content/7.0.0/images/juneau1_square.png
----------------------------------------------------------------------
diff --git a/content/7.0.0/images/juneau1_square.png b/content/7.0.0/images/juneau1_square.png
deleted file mode 100644
index 45dfd08..0000000
Binary files a/content/7.0.0/images/juneau1_square.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/juneau-website/blob/b1ebfeda/content/7.0.0/images/juneau2.png
----------------------------------------------------------------------
diff --git a/content/7.0.0/images/juneau2.png b/content/7.0.0/images/juneau2.png
deleted file mode 100644
index 42a1656..0000000
Binary files a/content/7.0.0/images/juneau2.png and /dev/null differ