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

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

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