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/09/18 15:56:57 UTC

incubator-juneau-website git commit: Update docs.

Repository: incubator-juneau-website
Updated Branches:
  refs/heads/asf-site dc30718cc -> 5070ee331


Update docs.

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

Branch: refs/heads/asf-site
Commit: 5070ee331c352d7c9d63923a65f8e37891559a10
Parents: dc30718
Author: JamesBognar <ja...@apache.org>
Authored: Mon Sep 18 11:56:54 2017 -0400
Committer: JamesBognar <ja...@apache.org>
Committed: Mon Sep 18 11:56:54 2017 -0400

----------------------------------------------------------------------
 content/about.html                              | 223 +++++++++++++++----
 content/community.html                          |  13 +-
 content/images/juneau-examples-core.import3.png | Bin 0 -> 133875 bytes
 content/images/juneau-examples-rest.import3.png | Bin 0 -> 242539 bytes
 content/images/juneau-examples-rest.import4.png | Bin 0 -> 405372 bytes
 .../juneau-microservice-template.import3.png    | Bin 0 -> 127563 bytes
 .../juneau-microservice-template.import4.png    | Bin 0 -> 77752 bytes
 content/site/apidocs/overview-summary.html      |  79 ++++---
 8 files changed, 235 insertions(+), 80 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5070ee33/content/about.html
----------------------------------------------------------------------
diff --git a/content/about.html b/content/about.html
index 2e783d0..b2dbb3a 100644
--- a/content/about.html
+++ b/content/about.html
@@ -202,14 +202,14 @@
 			</tr>
 			<tr class='light bb'>
 				<td rowspan="2" style='text-align:center;font-weight:bold;padding:20px;' class='code'><a class='doclink' href='#juneau-examples'>juneau-examples</a></td>
-				<td class='code'><code>juneau-examples-core</code></td>
+				<td class='code'><a class='doclink' href='#juneau-examples-core'>juneau-examples-core</a></td>
 				<td>
 					Core code examples
 				</td>
 				<td></td>
 			</tr>
 			<tr class='light bb'>
-				<td class='code'><code>juneau-examples-rest</code></td>
+				<td class='code'><a class='doclink' href='#juneau-examples-rest'>juneau-example-rest</a></td>
 				<td>
 					REST code examples
 				</td>
@@ -254,7 +254,7 @@
 		<h6 class='toc' id='juneau-marshall'>4.1 - juneau-marshall</h6>
 		<div>
 			<h6 class='figure'>Maven Dependency</h6>
-			<p class='bcode'>
+			<p class='bcode' style='width:500px;'>
 	&lt;<xt>dependency</xt>&gt;
 		&lt;<xt>groupId</xt>&gt;org.apache.juneau&lt;<xt>/groupId</xt>&gt;
 		&lt;<xt>artifactId</xt>&gt;juneau-marshall&lt;<xt>/artifactId</xt>&gt;
@@ -262,11 +262,16 @@
 	&lt;<xt>/dependency</xt>&gt;
 			</p>	
 		
-			<h6 class='figure'>OSGi Module</h6>
-			<p class='bcode'>
+			<h6 class='figure'>Java Library</h6>
+			<p class='bcode' style='width:500px;'>
 	juneau-marshall-6.4.0-incubating.jar 
 			</p>	
 		
+			<h6 class='figure'>OSGi Module</h6>
+			<p class='bcode' style='width:500px;'>
+	org.apache.juneau.marshall_6.4.0-incubating.jar 
+			</p>	
+
 			<p>
 				The <code>juneau-marshall</code> library includes easy-to-use and highly customizable serializers and parsers
 				based around a common API.  
@@ -575,7 +580,7 @@
 		<h6 class='toc' id='juneau-marshall-rdf'>4.2 - juneau-marshall-rdf</h6>
 		<div>
 			<h6 class='figure'>Maven Dependency</h6>
-			<p class='bcode'>
+			<p class='bcode' style='width:500px;'>
 	&lt;<xt>dependency</xt>&gt;
 		&lt;<xt>groupId</xt>&gt;org.apache.juneau&lt;<xt>/groupId</xt>&gt;
 		&lt;<xt>artifactId</xt>&gt;juneau-marshall-rdf&lt;<xt>/artifactId</xt>&gt;
@@ -583,11 +588,16 @@
 	&lt;<xt>/dependency</xt>&gt;
 			</p>	
 		
-			<h6 class='figure'>OSGi Module</h6>
-			<p class='bcode'>
+			<h6 class='figure'>Java Library</h6>
+			<p class='bcode' style='width:500px;'>
 	juneau-marshall-rdf-6.4.0-incubating.jar 
 			</p>	
 		
+			<h6 class='figure'>OSGi Module</h6>
+			<p class='bcode' style='width:500px;'>
+	org.apache.juneau.marshall.rdf_6.4.0-incubating.jar 
+			</p>	
+
 			<p>
 				The <code>juneau-marshall-rdf</code> library provides additional serializers and parsers for RDF.
 				These rely on the Apache Jena library to provide support for the following languages:
@@ -651,7 +661,7 @@
 		<h6 class='toc' id='juneau-dto'>4.3 - juneau-dto</h6>
 		<div>
 			<h6 class='figure'>Maven Dependency</h6>
-			<p class='bcode'>
+			<p class='bcode' style='width:500px;'>
 	&lt;<xt>dependency</xt>&gt;
 		&lt;<xt>groupId</xt>&gt;org.apache.juneau&lt;<xt>/groupId</xt>&gt;
 		&lt;<xt>artifactId</xt>&gt;juneau-dto&lt;<xt>/artifactId</xt>&gt;
@@ -659,11 +669,16 @@
 	&lt;<xt>/dependency</xt>&gt;
 			</p>	
 		
-			<h6 class='figure'>OSGi Module</h6>
-			<p class='bcode'>
+			<h6 class='figure'>Java Library</h6>
+			<p class='bcode' style='width:500px;'>
 	juneau-dto-6.4.0-incubating.jar 
 			</p>	
 		
+			<h6 class='figure'>OSGi Module</h6>
+			<p class='bcode' style='width:500px;'>
+	org.apache.juneau.dto_6.4.0-incubating.jar 
+			</p>	
+
 			<p>
 				Data Transfer Object libraries are provided for a variety of languages that allow you to serialize commonly-used
 				documents.  
@@ -891,7 +906,7 @@
 		<h6 class='toc' id='juneau-svl'>4.4 - juneau-svl</h6>
 		<div>
 			<h6 class='figure'>Maven Dependency</h6>
-			<p class='bcode'>
+			<p class='bcode' style='width:500px;'>
 	&lt;<xt>dependency</xt>&gt;
 		&lt;<xt>groupId</xt>&gt;org.apache.juneau&lt;<xt>/groupId</xt>&gt;
 		&lt;<xt>artifactId</xt>&gt;juneau-svl&lt;<xt>/artifactId</xt>&gt;
@@ -899,11 +914,16 @@
 	&lt;<xt>/dependency</xt>&gt;
 			</p>	
 		
-			<h6 class='figure'>OSGi Module</h6>
-			<p class='bcode'>
+			<h6 class='figure'>Java Library</h6>
+			<p class='bcode' style='width:500px;'>
 	juneau-svl-6.4.0-incubating.jar 
 			</p>	
 		
+			<h6 class='figure'>OSGi Module</h6>
+			<p class='bcode' style='width:500px;'>
+	org.apache.juneau.svl_6.4.0-incubating.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
@@ -965,7 +985,7 @@
 		<h6 class='toc' id='juneau-config'>4.5 - juneau-config</h6>
 		<div>
 			<h6 class='figure'>Maven Dependency</h6>
-			<p class='bcode'>
+			<p class='bcode' style='width:500px;'>
 	&lt;<xt>dependency</xt>&gt;
 		&lt;<xt>groupId</xt>&gt;org.apache.juneau&lt;<xt>/groupId</xt>&gt;
 		&lt;<xt>artifactId</xt>&gt;juneau-config&lt;<xt>/artifactId</xt>&gt;
@@ -973,11 +993,16 @@
 	&lt;<xt>/dependency</xt>&gt;
 			</p>	
 		
-			<h6 class='figure'>OSGi Module</h6>
-			<p class='bcode'>
+			<h6 class='figure'>Java Library</h6>
+			<p class='bcode' style='width:500px;'>
 	juneau-config-6.4.0-incubating.jar 
 			</p>	
 		
+			<h6 class='figure'>OSGi Module</h6>
+			<p class='bcode' style='width:500px;'>
+	org.apache.juneau.config_6.4.0-incubating.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.
@@ -1099,7 +1124,7 @@
 		<h6 class='toc' id='juneau-rest-server'>5.1 - juneau-rest-server</h6>
 		<div>
 			<h6 class='figure'>Maven Dependency</h6>
-			<p class='bcode'>
+			<p class='bcode' style='width:500px;'>
 	&lt;<xt>dependency</xt>&gt;
 		&lt;<xt>groupId</xt>&gt;org.apache.juneau&lt;<xt>/groupId</xt>&gt;
 		&lt;<xt>artifactId</xt>&gt;juneau-rest-server&lt;<xt>/artifactId</xt>&gt;
@@ -1107,11 +1132,16 @@
 	&lt;<xt>/dependency</xt>&gt;
 			</p>	
 		
-			<h6 class='figure'>OSGi Module</h6>
-			<p class='bcode'>
+			<h6 class='figure'>Java Library</h6>
+			<p class='bcode' style='width:500px;'>
 	juneau-rest-server-6.4.0-incubating.jar 
 			</p>	
 		
+			<h6 class='figure'>OSGi Module</h6>
+			<p class='bcode' style='width:500px;'>
+	org.apache.juneau.rest.server_6.4.0-incubating.jar 
+			</p>	
+
 			<p>
 				The REST server API builds upon the <code>SerializerGroup</code> and <code>ParserGroup</code> classes 
 				to provide annotated REST servlets that automatically negotiate the HTTP media types for you.
@@ -1734,7 +1764,7 @@
 		<h6 class='toc' id='juneau-rest-server-jaxrs'>5.2 - juneau-rest-server-jaxrs</h6>
 		<div>
 			<h6 class='figure'>Maven Dependency</h6>
-			<p class='bcode'>
+			<p class='bcode' style='width:500px;'>
 	&lt;<xt>dependency</xt>&gt;
 		&lt;<xt>groupId</xt>&gt;org.apache.juneau&lt;<xt>/groupId</xt>&gt;
 		&lt;<xt>artifactId</xt>&gt;juneau-rest-server-jaxrs&lt;<xt>/artifactId</xt>&gt;
@@ -1742,11 +1772,16 @@
 	&lt;<xt>/dependency</xt>&gt;
 			</p>	
 		
-			<h6 class='figure'>OSGi Module</h6>
-			<p class='bcode'>
+			<h6 class='figure'>Java Library</h6>
+			<p class='bcode' style='width:500px;'>
 	juneau-rest-server-jaxrs-6.4.0-incubating.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 
+			</p>	
+			
 			<p>
 				The <code>juneau-rest-server-jaxrs</code> module defines predefined <code>MessageBodyReader</code> and 
 				<code>MessageBodyWriter</code> implementations for using Juneau serializers and parsers in JAX-RS environments.
@@ -1778,7 +1813,7 @@
 		<h6 class='toc' id='juneau-rest-client'>5.3 - juneau-rest-client</h6>
 		<div>
 			<h6 class='figure'>Maven Dependency</h6>
-			<p class='bcode'>
+			<p class='bcode' style='width:500px;'>
 	&lt;<xt>dependency</xt>&gt;
 		&lt;<xt>groupId</xt>&gt;org.apache.juneau&lt;<xt>/groupId</xt>&gt;
 		&lt;<xt>artifactId</xt>&gt;juneau-rest-client&lt;<xt>/artifactId</xt>&gt;
@@ -1786,11 +1821,16 @@
 	&lt;<xt>/dependency</xt>&gt;
 			</p>	
 		
-			<h6 class='figure'>OSGi Module</h6>
-			<p class='bcode'>
+			<h6 class='figure'>Java Library</h6>
+			<p class='bcode' style='width:500px;'>
 	juneau-rest-client-6.4.0-incubating.jar 
 			</p>	
 		
+			<h6 class='figure'>OSGi Module</h6>
+			<p class='bcode' style='width:500px;'>
+	org.apache.juneau.rest.client_6.4.0-incubating.jar 
+			</p>	
+
 			<p>
 				The REST client API allows you to access REST interfaces using POJOs:
 			</p>
@@ -1932,6 +1972,10 @@
 	<h5 class='toc' id='juneau-microservice'>6 - juneau-microservice</h5>
 	<div>
 
+		<p>
+			Microservices combine all the functionality of the core, server, and client APIs to provide truly powerful
+			and easy-to-use REST interfaces with minimal overhead.
+		</p>
 
 		<!-- ======================================================================================================= -->
 		<!-- === JUNEAU-MICROSERVICE-SERVER ======================================================================== -->
@@ -1941,7 +1985,7 @@
 		<div>
 			
 			<h6 class='figure'>Maven Dependency</h6>
-			<p class='bcode'>
+			<p class='bcode' style='width:500px;'>
 	&lt;<xt>dependency</xt>&gt;
 		&lt;<xt>groupId</xt>&gt;org.apache.juneau&lt;<xt>/groupId</xt>&gt;
 		&lt;<xt>artifactId</xt>&gt;juneau-microservice-server&lt;<xt>/artifactId</xt>&gt;
@@ -1949,11 +1993,16 @@
 	&lt;<xt>/dependency</xt>&gt;
 			</p>	
 		
-			<h6 class='figure'>OSGi Module</h6>
-			<p class='bcode'>
+			<h6 class='figure'>Java Library</h6>
+			<p class='bcode' style='width:500px;'>
 	juneau-microservice-server-6.4.0-incubating.jar 
 			</p>	
 		
+			<h6 class='figure'>OSGi Module</h6>
+			<p class='bcode' style='width:500px;'>
+	org.apache.juneau.microservice.server_6.4.0-incubating.jar 
+			</p>	
+
 			<p>
 				The Microservice API combines all the features above with a built-in Jetty server to produce a lightweight 
 				REST service packaged as three simple files:
@@ -2093,7 +2142,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'>juneau-microservice</a> for more information.
+				<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.
 			</ul>
 		</div>
 
@@ -2103,10 +2152,33 @@
 	
 		<h6 class='toc' id='juneau-microservice-template'>6.2 - juneau-microservice-template</h6>
 		<div>
+		
+			<h6 class='figure'>Archive File</h6>
+			<p class='bcode' style='width:500px;'>
+	my-microservice-6.4.0-incubating.zip 
+			</p>	
+		
 			<p>
 				The <code>juneau-microservice-template</code> module is a bare-bones microservice project that can be
 				used as a starting point for creating your own microservice.  
 			</p>
+			<p>
+				The template project ships as a zipped Eclipse project that can be quickly imported into your 
+				workspace as an Eclipse project called "my-microservice".
+			</p>
+			<p>
+				Once loaded, you should see the following project structure:
+			</p>
+			<img class='bordered' src='images/juneau-microservice-template.import3.png' style='width:412px'>
+			<p>
+				The microservice can be started from the <code>my-microservice.launch</code> file.
+				It will start up the microservice on port 10000 which you can then view through a browser:
+			</p>
+			<img class='bordered' src='images/juneau-microservice-template.import4.png' style='width:467px'>
+
+			<ul class='doctree'>
+				<li class='link'>See <a class='doclink' href='http://juneau.incubator.apache.org/site/apidocs/overview-summary.html#juneau-microservice-template'>juneau-microservice-template</a> for more information.
+			</ul>
  		</div>
 	</div>
 
@@ -2116,24 +2188,77 @@
 
 	<h5 class='toc' id='juneau-examples'>7 - juneau-examples</h5>
 	<div>
+
+		<!-- ======================================================================================================= -->
+		<!-- === JUNEAU-EXAMPLES-CORE ============================================================================== -->
+		<!-- ======================================================================================================= -->
 	
-		<p>
-			The <code>juneau-examples-core</code> project provides various code examples on how to use the core
-			libraries.
-		</p>
-		<br><hr>
-		<p>
-			The <code>juneau-examples-rest</code> project is a full-functioning microservice that shows off 
-			the various functionality of all aspects of Juneau in a simple-to-invoke module.
-		</p>
-		<p>
-			It implements the <b>Root resources</b> page shown previously: 
-		</p>
-		<img class='bordered' src='images/Samples_RootResources.png' style='max-width: 25%'>
+		<h6 class='toc' id='juneau-examples-core'>7.1 - juneau-examples-core</h6>
+		<div>
+	
+			<h6 class='figure'>Archive File</h6>
+			<p class='bcode' style='width:500px;'>
+	juneau-examples-core-6.4.0-incubating.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-6.4.0-incubating.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:459px'>
+
+			<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.incubator.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'>7.2 - juneau-examples-rest</h6>
+		<div>
+	
+			<h6 class='figure'>Archive File</h6>
+			<p class='bcode' style='width:500px;'>
+	juneau-examples-rest-6.4.0-incubating.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-6.4.0-incubating.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:933px'>
 		
-		<ul class='doctree'>
-			<li class='link'>See <a class='doclink' href='http://juneau.incubator.apache.org/site/apidocs/overview-summary.html#juneau-examples'>juneau-examples</a> for more information.
-		</ul>
+			<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.
+			</ul>
+		</div>
+
 	</div>
 	
 	<!-- =========================================================================================================== -->
@@ -2143,7 +2268,7 @@
 	<h5 class='toc' id='juneau-all'>8 - juneau-all</h5>
 	<div>
 		<h6 class='figure'>Maven Dependency</h6>
-			<p class='bcode'>
+			<p class='bcode' style='width:500px;'>
 	&lt;<xt>dependency</xt>&gt;
 		&lt;<xt>groupId</xt>&gt;org.apache.juneau&lt;<xt>/groupId</xt>&gt;
 		&lt;<xt>artifactId</xt>&gt;juneau-all&lt;<xt>/artifactId</xt>&gt;
@@ -2151,8 +2276,8 @@
 	&lt;<xt>/dependency</xt>&gt;
 		</p>	
 	
-		<h6 class='figure'>OSGi Module</h6>
-		<p class='bcode'>
+		<h6 class='figure'>Java Library</h6>
+		<p class='bcode' style='width:500px;'>
 	juneau-all-6.4.0-incubating.jar 
 		</p>	
 		<p>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5070ee33/content/community.html
----------------------------------------------------------------------
diff --git a/content/community.html b/content/community.html
index 21b7a66..e76a625 100644
--- a/content/community.html
+++ b/content/community.html
@@ -65,17 +65,18 @@
 	<br>
 	<table class='styled' style='width:95%'>
 		<tr><th>Name</th><th>Role</th><th>User ID</th></tr>
-		<tr class='light'><td>Craig L Russell</td><td>Mentor</td><td>clr</td><tr>
-		<tr class='dark'><td>Jochen Wiedmann</td><td>Mentor</td><td>jochen</td><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>Stian Soiland-Reyes</td><td>Mentor</td><td>stain</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>Peter Haumer</td><td>Committer</td><td>phaumer</td><tr>
-		<tr class='dark'><td>David M Goddard</td><td>Committer</td><td>dmg</td><tr>
 		<tr class='light'><td>Craig Chaney</td><td>Committer</td><td></td><tr>
+		<tr class='dark'><td>David M Goddard</td><td>Committer</td><td>dmg</td><tr>
+		<tr class='light'><td>Peter Haumer</td><td>Committer</td><td>phaumer</td><tr>
 		<tr class='dark'><td>Min Idzelis</td><td>Committer</td><td></td><tr>
-		<tr class='light bb'><td>Brian Laskey</td><td>Committer</td><td></td><tr>
+		<tr class='light'><td>Brian Laskey</td><td>Committer</td><td></td><tr>
+		<tr class='dark bb'><td>Raphi D Lee</td><td>Committer</td><td>yidonguk</td><tr>
 	</table>
 </body>
 </html>

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

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

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

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

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

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5070ee33/content/site/apidocs/overview-summary.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/overview-summary.html b/content/site/apidocs/overview-summary.html
index c9f9d4f..62bdac2 100644
--- a/content/site/apidocs/overview-summary.html
+++ b/content/site/apidocs/overview-summary.html
@@ -809,11 +809,16 @@
    &lt;<xt>/dependency</xt>&gt;
       </p>  
       
-      <h6 class='figure'>OSGi Module</h6>
+      <h6 class='figure'>Java Library</h6>
       <p class='bcode'>
    juneau-marshall-6.4.0-incubating.jar 
       </p>  
       
+      <h6 class='figure'>OSGi Module</h6>
+      <p class='bcode'>
+   org.apache.juneau.marshall_6.4.0-incubating.jar 
+      </p>  
+
       <p>
          The <code>juneau-marshall</code> artifact contains the API for defining serializers and parsers, and
          marshalling support for JSON, XML, HTML, URL-Encoding, UON and others.
@@ -2538,11 +2543,16 @@
    &lt;<xt>/dependency</xt>&gt;
       </p>  
       
-      <h6 class='figure'>OSGi Module</h6>
+      <h6 class='figure'>Java Library</h6>
       <p class='bcode'>
    juneau-marshall-rdf-6.4.0-incubating.jar 
       </p>  
    
+      <h6 class='figure'>OSGi Module</h6>
+      <p class='bcode'>
+   org.apache.juneau.marshall.rdf_6.4.0-incubating.jar 
+      </p>  
+   
       <p>
          The <code>juneau-marshall-rdf</code> library provides additional serializers and parsers for RDF.
          These rely on the Apache Jena library to provide support for the following languages:
@@ -2616,11 +2626,16 @@
    &lt;<xt>/dependency</xt>&gt;
       </p>  
       
-      <h6 class='figure'>OSGi Module</h6>
+      <h6 class='figure'>Java Library</h6>
       <p class='bcode'>
    juneau-dto-6.4.0-incubating.jar 
       </p>  
    
+      <h6 class='figure'>OSGi Module</h6>
+      <p class='bcode'>
+   org.apache.juneau.dto_6.4.0-incubating.jar 
+      </p>  
+   
       <p>
          The <code>juneau-dto</code> library contains several predefined POJOs for generating commonly-used document types.
          This section describes support for these POJOs.
@@ -3030,11 +3045,16 @@
    &lt;<xt>/dependency</xt>&gt;
       </p>  
       
-      <h6 class='figure'>OSGi Module</h6>
+      <h6 class='figure'>Java Library</h6>
       <p class='bcode'>
    juneau-svl-6.4.0-incubating.jar 
       </p>  
    
+      <h6 class='figure'>OSGi Module</h6>
+      <p class='bcode'>
+   org.apache.juneau.svl_6.4.0-incubating.jar 
+      </p>  
+   
       <p>
          The <code>juneau-svl</code> library 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
@@ -3085,11 +3105,16 @@
    &lt;<xt>/dependency</xt>&gt;
       </p>  
       
-      <h6 class='figure'>OSGi Module</h6>
+      <h6 class='figure'>Java Library</h6>
       <p class='bcode'>
    juneau-config-6.4.0-incubating.jar 
       </p>  
    
+      <h6 class='figure'>OSGi Module</h6>
+      <p class='bcode'>
+   org.apache.juneau.config_6.4.0-incubating.jar 
+      </p>  
+   
       <p>
          The <code>juneau-config</code> library contains a powerful API for creating and using INI-style config files.
       </p>
@@ -3369,11 +3394,16 @@
    &lt;<xt>/dependency</xt>&gt;
       </p>  
       
-      <h6 class='figure'>OSGi Module</h6>
+      <h6 class='figure'>Java Library</h6>
       <p class='bcode'>
    juneau-rest-server-6.4.0-incubating.jar 
       </p>  
    
+      <h6 class='figure'>OSGi Module</h6>
+      <p class='bcode'>
+   org.apache.juneau.rest.server_6.4.0-incubating.jar 
+      </p>  
+   
       <p>
          The <code>juneau-rest-server</code> library provides servlet-based REST resources on top of existing POJOs.
       </p>
@@ -3990,11 +4020,16 @@
    &lt;<xt>/dependency</xt>&gt;
       </p>  
       
-      <h6 class='figure'>OSGi Module</h6>
+      <h6 class='figure'>Java Library</h6>
       <p class='bcode'>
    juneau-rest-server-jaxrs-6.4.0-incubating.jar 
       </p>  
       
+      <h6 class='figure'>OSGi Module</h6>
+      <p class='bcode'>
+   org.apache.juneau.rest.server_6.4.0-incubating.jar 
+      </p>  
+      
       <p>
          The <code>juneau-rest-server-jaxrs</code> library provides an implementation of a <code>MessageBodyReader</code>
          and <code>MessageBodyWriter</code> to allow any of the Juneau serializers and parsers to be used in a 
@@ -4022,11 +4057,16 @@
    &lt;<xt>/dependency</xt>&gt;
       </p>  
       
-      <h6 class='figure'>OSGi Module</h6>
+      <h6 class='figure'>Java Library</h6>
       <p class='bcode'>
    juneau-rest-client-6.4.0-incubating.jar 
       </p>  
    
+      <h6 class='figure'>OSGi Module</h6>
+      <p class='bcode'>
+   org.apache.juneau.rest.client_6.4.0-incubating.jar 
+      </p>  
+   
       <p>
          The REST client API provides the ability to access remote REST interfaces and transparently convert the input 
          and output to and from POJOs using any of the provided serializers and parsers.
@@ -4215,22 +4255,6 @@
    </ul>
 
    <p>
-      <b>WARNING - The microservice API is still in beta.  It may be replaced with an OSGi-based architecture.</b>
-   </p>
-   <p>
-      The <l>microservice-project.zip</l> file contains a stand-alone Eclipse project that can be used
-      to quickly create REST microservices as stand-alone executable jars without the need of an application server.
-      They start almost instantly and are started through a simple java command:
-   </p>
-   <p class='bcode'>
-   java -jar microservice.jar
-   </p>
-   <p>
-      When you execute this command, you can point your browser to <l>http://localhost:10000</l> to bring up the 
-      REST interface:
-   </p>
-   <img class='bordered' src="doc-files/Microservices.1.png">
-   <p>
       Microservices combine all the functionality of the core, server, and client APIs to provide truly powerful
       and easy-to-use REST interfaces with minimal overhead.
    </p>
@@ -4249,11 +4273,16 @@
    &lt;<xt>/dependency</xt>&gt;
       </p>  
       
-      <h6 class='figure'>OSGi Module</h6>
+      <h6 class='figure'>Java Library</h6>
       <p class='bcode'>
    juneau-microservice-server-6.4.0-incubating.jar 
       </p>  
 
+      <h6 class='figure'>OSGi Module</h6>
+      <p class='bcode'>
+   org.apache.juneau.microservice.server_6.4.0-incubating.jar 
+      </p>  
+
       <p>
          The <code>juneau-microservice-server</code> library consists of the following classes used for constructing
          stand-alone microservices as executable jars or inside docker containers: