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:48 UTC

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

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>