This is an automated email from the ASF dual-hosted git repository.
jamesbognar pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/juneau-website.git
The following commit(s) were added to refs/heads/asf-site by this push:
new 5adf726 Update web page contents.
5adf726 is described below
commit 5adf72662d5a6a6a4dcb0821551e5971c49eff1b
Author: JamesBognar <[email protected]>
AuthorDate: Wed Mar 7 12:44:16 2018 -0500
Update web page contents.
---
content/components.html | 8 +-
content/config.html | 24 +++---
content/dto.html | 32 +++----
content/examples.html | 20 ++---
content/index.html | 2 +-
content/marshall.html | 52 ++++++------
content/microservice.html | 32 +++----
content/rest-client.html | 28 +++----
content/rest-server.html | 70 ++++++++--------
content/styles/juneau-code.css | 2 +-
content/styles/juneau-doc.css | 185 +++++++++++++++++++++++++++++++----------
content/svl.html | 22 ++---
12 files changed, 285 insertions(+), 192 deletions(-)
diff --git a/content/components.html b/content/components.html
index daf72e1..40bacbe 100644
--- a/content/components.html
+++ b/content/components.html
@@ -210,21 +210,21 @@
</table>
<p>
- The current version of Juneau is <code>7.0.1</code>.
+ The current version of Juneau is <code>7.1.0</code>.
The easiest way to pull in the library is through the
following maven dependency:
</p>
- <p class='bcode' style='width:500px;'>
+ <p class='bcode w500'>
<xt><dependency></xt>
<xt><groupId></xt>org.apache.juneau<xt></groupId></xt>
<xt><artifactId></xt>juneau-all<xt></artifactId></xt>
- <xt><version></xt>7.0.1<xt></version></xt>
+ <xt><version></xt>7.1.0<xt></version></xt>
<xt></dependency></xt>
</p>
<p>
If you would like to work with the bleeding-edge code,
you can access the <code>7.1.0-SNAPSHOT</code>
version through the following repository:
</p>
- <p class='bcode' style='width:500px;'>
+ <p class='bcode w500'>
<xt><pluginRepositories>
<pluginRepository>
<id><xv>apache.snapshots</xv></id>
diff --git a/content/config.html b/content/config.html
index 246f22e..0f16876 100644
--- a/content/config.html
+++ b/content/config.html
@@ -26,30 +26,30 @@
<h5 class='toc' id='juneau-config'>juneau-config</h5>
<div>
- <h6 class='figure'>Maven Dependency</h6>
- <p class='bcode' style='width:500px;'>
+ <h5 class='figure'>Maven Dependency</h5>
+ <p class='bcode w500'>
<xt><dependency></xt>
<xt><groupId></xt>org.apache.juneau<xt></groupId></xt>
<xt><artifactId></xt>juneau-config<xt></artifactId></xt>
- <xt><version></xt>7.0.1<xt></version></xt>
+ <xt><version></xt>7.1.0<xt></version></xt>
<xt></dependency></xt>
</p>
- <h6 class='figure'>Java Library</h6>
- <p class='bcode' style='width:500px;'>
- juneau-config-7.0.1.jar
+ <h5 class='figure'>Java Library</h5>
+ <p class='bcode w500'>
+ juneau-config-7.1.0.jar
</p>
- <h6 class='figure'>OSGi Module</h6>
- <p class='bcode' style='width:500px;'>
- org.apache.juneau.config_7.0.1.jar
+ <h5 class='figure'>OSGi Module</h5>
+ <p class='bcode w500'>
+ org.apache.juneau.config_7.1.0.jar
</p>
<p>
The <code>juneau-config</code> module defines an API
allows you to interact with INI files using POJOs.
<br>It builds upon the marshalling and SVL APIs to
provide sophisticated dynamic configuration files.
<p>
- <p class='bcode'>
+ <p class='bcode w800'>
<cc>#--------------------------</cc>
<cc># My section</cc>
<cc>#--------------------------</cc>
@@ -99,7 +99,7 @@
<br>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'>
+ <p class='bcode w800'>
<jc>// Load our config file</jc>
Config c =
Config.<jsm>create</jsm>().name(<js>"MyIniFile.cfg"</js>).build();
@@ -120,7 +120,7 @@
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'>
+ <p class='bcode w800'>
<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>
diff --git a/content/dto.html b/content/dto.html
index 612d4f8..6c69c80 100644
--- a/content/dto.html
+++ b/content/dto.html
@@ -26,23 +26,23 @@
<h5 class='toc' id='juneau-dto'>juneau-dto</h5>
<div>
- <h6 class='figure'>Maven Dependency</h6>
- <p class='bcode' style='width:500px;'>
+ <h5 class='figure'>Maven Dependency</h5>
+ <p class='bcode w500'>
<xt><dependency></xt>
<xt><groupId></xt>org.apache.juneau<xt></groupId></xt>
<xt><artifactId></xt>juneau-dto<xt></artifactId></xt>
- <xt><version></xt>7.0.1<xt></version></xt>
+ <xt><version></xt>7.1.0<xt></version></xt>
<xt></dependency></xt>
</p>
- <h6 class='figure'>Java Library</h6>
- <p class='bcode' style='width:500px;'>
- juneau-dto-7.0.1.jar
+ <h5 class='figure'>Java Library</h5>
+ <p class='bcode w500'>
+ juneau-dto-7.1.0.jar
</p>
- <h6 class='figure'>OSGi Module</h6>
- <p class='bcode' style='width:500px;'>
- org.apache.juneau.dto_7.0.1.jar
+ <h5 class='figure'>OSGi Module</h5>
+ <p class='bcode w500'>
+ org.apache.juneau.dto_7.1.0.jar
</p>
<p>
@@ -59,7 +59,7 @@
<p>
HTML5 documents and fragments can be constructed using
the HTML5 DTOs and HTML or XML serializers:
</p>
- <p class='bcode'>
+ <p class='bcode w800'>
<jk>import static</jk> org.apache.juneau.dto.html5.HtmlBuilder.*;
Object myform =
@@ -73,7 +73,7 @@
String html = HtmlSerializer.<jsf>DEFAULT</jsf>.serialize(myform);
</p>
- <p class='bcode'><xt>
+ <p class='bcode w800'><xt>
<form <xa>action</xa>=<xs>'/submit'</xs>
<xa>method</xa>=<xs>'POST'</xs>>
<xv>Position (1-10000):</xv> <input
<xa>name</xa>=<xs>'pos'</xs> <xa>type</xa>=<xs>'number'</xs>
<xa>value</xa>=<xs>'1'</xs>/><br/>
<xv>Limit (1-10000):</xv> <input
<xa>name</xa>=<xs>'pos'</xs> <xa>type</xa>=<xs>'number'</xs>
<xa>value</xa>=<xs>'100'</xs>/><br/>
@@ -85,7 +85,7 @@
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'>
+ <p class='bcode w800'>
{
<jf>_type</jf>: <js>'form'</js>,
<jf>a</jf>: { <jf>action</jf>: <js>'/submit'</js>,
<jf>method</jf>: <js>'POST'</js> },
@@ -105,7 +105,7 @@
<p>
ATOM feeds can be constructed using the ATOM DTOs and
XML serializer:
</p>
- <p class='bcode'>
+ <p class='bcode w800'>
<jk>import static</jk> org.apache.juneau.dto.atom.AtomBuilder.*;
Feed feed =
@@ -130,7 +130,7 @@
<jc>// Serialize to ATOM/XML</jc>
String atomXml = XmlSerializer.<jsf>DEFAULT</jsf>.serialize(feed);
</p>
- <p class='bcode'>
+ <p class='bcode w800'>
<xt><feed></xt>
<xt><id></xt>
tag:juneau.apache.org
@@ -165,7 +165,7 @@
<p>
Swagger documents can be constructed using the Swagger
DTOs and JSON serializer:
</p>
- <p class='bcode'>
+ <p class='bcode w800'>
<jk>import static</jk> org.apache.juneau.dto.swagger.SwaggerBuilder.*;
Swagger swagger = <jsm>swagger</jsm>()
@@ -200,7 +200,7 @@
<jc>// Serialize to Swagger/JSON</jc>
String swaggerJson =
JsonSerializer.<jsf>DEFAULT_READABLE</jsf>.serialize(swagger);
</p>
- <p class='bcode'>
+ <p class='bcode w800'>
{
<jf>"swagger"</jf>: <js>"2.0"</js>,
<jf>"info"</jf>: {
diff --git a/content/examples.html b/content/examples.html
index e0c77a4..af61a65 100644
--- a/content/examples.html
+++ b/content/examples.html
@@ -31,12 +31,12 @@
<!-- === JUNEAU-EXAMPLES-CORE
==============================================================================
-->
<!--
=======================================================================================================
-->
- <h6 class='toc'
id='juneau-examples-core'>juneau-examples-core</h6>
+ <h5 class='toc'
id='juneau-examples-core'>juneau-examples-core</h5>
<div>
- <h6 class='figure'>Archive File</h6>
- <p class='bcode' style='width:500px;'>
- juneau-examples-core-7.0.1.zip
+ <h5 class='figure'>Archive File</h5>
+ <p class='bcode w500'>
+ juneau-examples-core-7.1.0.zip
</p>
<p>
@@ -44,7 +44,7 @@
</p>
<p>
The project project can be loaded into your
workspace by importing the
- <code>juneau-examples-core-7.0.1.zip</code>
file.
+ <code>juneau-examples-core-7.1.0.zip</code>
file.
</p>
<p>
Once loaded, you should see the following
project structure:
@@ -66,12 +66,12 @@
<!-- === JUNEAU-EXAMPLES-REST
==============================================================================
-->
<!--
=======================================================================================================
-->
- <h6 class='toc'
id='juneau-examples-rest'>juneau-examples-rest</h6>
+ <h5 class='toc'
id='juneau-examples-rest'>juneau-examples-rest</h5>
<div>
- <h6 class='figure'>Archive File</h6>
- <p class='bcode' style='width:500px;'>
- juneau-examples-rest-7.0.1.zip
+ <h5 class='figure'>Archive File</h5>
+ <p class='bcode w500'>
+ juneau-examples-rest-7.1.0.zip
</p>
<p>
@@ -80,7 +80,7 @@
</p>
<p>
The project project can be loaded into your
workspace by importing the
- <code>juneau-examples-rest-7.0.1.zip</code>
file.
+ <code>juneau-examples-rest-7.1.0.zip</code>
file.
</p>
<p>
Once loaded, you should see the following
project structure:
diff --git a/content/index.html b/content/index.html
index 3dbf604..295e283 100644
--- a/content/index.html
+++ b/content/index.html
@@ -55,7 +55,7 @@
padding: 15px 20px 60px 20px;
text-shadow: rgba(0,0,0,.2) 2px 6px
5px,rgba(125,32,191,.4) 0 -4px 30px;
white-space: nowrap;
- background: #f4f4f4 url(images/data.png) top center;
+ background: #f4f4f4
url(images/stock-vector-technology-stylish-circular-abstract-element-on-gray-background-vector-eps-615000389.jpg)
top center;
background-attachment:fixed;
background-size:cover;
border-bottom: 1px solid #cccccc;
diff --git a/content/marshall.html b/content/marshall.html
index f9e1546..0c38546 100644
--- a/content/marshall.html
+++ b/content/marshall.html
@@ -26,23 +26,23 @@
<h5 class='toc' id='juneau-marshall'>juneau-marshall</h5>
<div>
- <h6 class='figure'>Maven Dependency</h6>
- <p class='bcode' style='width:500px;'>
+ <h5 class='figure'>Maven Dependency</h5>
+ <p class='bcode w500'>
<xt><dependency></xt>
<xt><groupId></xt>org.apache.juneau<xt></groupId></xt>
<xt><artifactId></xt>juneau-marshall<xt></artifactId></xt>
- <xt><version></xt>7.0.1<xt></version></xt>
+ <xt><version></xt>7.1.0<xt></version></xt>
<xt></dependency></xt>
</p>
- <h6 class='figure'>Java Library</h6>
- <p class='bcode' style='width:500px;'>
- juneau-marshall-7.0.1.jar
+ <h5 class='figure'>Java Library</h5>
+ <p class='bcode w500'>
+ juneau-marshall-7.1.0.jar
</p>
- <h6 class='figure'>OSGi Module</h6>
- <p class='bcode' style='width:500px;'>
- org.apache.juneau.marshall_7.0.1.jar
+ <h5 class='figure'>OSGi Module</h5>
+ <p class='bcode w500'>
+ org.apache.juneau.marshall_7.1.0.jar
</p>
<p>
@@ -67,7 +67,7 @@
<p>
The default serializers can often be used to serialize
POJOs in a single line of code:
</p>
- <p class='bcode'>
+ <p class='bcode w800'>
<jc>// A simple bean</jc>
<jk>public class</jk> Person {
<jk>public</jk> String name = <js>"John Smith"</js>;
@@ -120,7 +120,7 @@
<p>
JSON parsing shown here:
</p>
- <p class='bcode'>
+ <p class='bcode w800'>
<jc>// Use one of the predefined parsers.</jc>
ReaderParser parser = JsonParser.<jsf>DEFAULT</jsf>;
@@ -167,7 +167,7 @@
ObjectList l9b = (ObjectList)parser.parse(json, Object.<jk>class</jk>);
<jc>// Equivalent.</jc>
</p>
- <h6 class='topic'>Features</h6>
+ <h5 class='topic'>Features</h5>
<ul class='spaced-list'>
<li>Serializers can send output directly to Writers,
OutputStreams, Files, Strings, or byte arrays.
<li>Parsers can receive input directly from Readers,
InputStreams, Files, Strings, or byte arrays.
@@ -185,7 +185,7 @@
<p>
Serializers and parsers are builder-based. Build from
scratch or clone existing instances. Lots of configuration options available
for all the languages.
</p>
- <p class='bcode'>
+ <p class='bcode w800'>
<jc>// Create a serializer from scratch programmatically using a
builder.</jc>
JsonSerializer serializer = JsonSerializer.<jsm>create</jsm>()
.simple() <jc>// Simple mode</jc>
@@ -273,7 +273,7 @@
headers, URL parts) without violating RFC2396.
This allows POJOs to be converted directly into these
HTTP constructs which is not possible in any other language such as JSON.
</p>
- <p class='bcode'>
+ <p class='bcode w800'>
(
id=1,
name=<js>'John+Smith'</js>,
@@ -303,7 +303,7 @@
<p>
Lots of shortcuts are provided throughout the API to
simplify tasks, and the APIs are often useful for debugging and logging
purposes as well...
</p>
- <p class='bcode'>
+ <p class='bcode w800'>
<jc>// Create JSON strings from scratch using fluent-style code.</jc>
String jsonObject = <jk>new</jk>
ObjectMap().append(<js>"foo"</js>,<js>"bar"</js>).toString();
String jsonArray = <jk>new</jk>
ObjectList().append(<js>"foo"</js>).append(123).append(<jk>null</jk>).toString();
@@ -339,7 +339,7 @@
<code>SerializerGroup</code> and
<code>ParserGroup</code> classes allow serializers and parsers
to be retrieved by W3C-compliant HTTP
<code>Accept</code> and <code>Content-Type</code> values:
</p>
- <p class='bcode'>
+ <p class='bcode w800'>
<jc>// Construct a new serializer group with configuration parameters
that get applied to all serializers.</jc>
SerializerGroup sg = SerializerGroup.<jsm>create</jsm>()
.append(JsonSerializer.<jk>class</jk>,
UrlEncodingSerializer.<jk>class</jk>);
@@ -374,23 +374,23 @@
<h5 class='toc' id='juneau-marshall-rdf'>juneau-marshall-rdf</h5>
<div>
- <h6 class='figure'>Maven Dependency</h6>
- <p class='bcode' style='width:500px;'>
+ <h5 class='figure'>Maven Dependency</h5>
+ <p class='bcode w500'>
<xt><dependency></xt>
<xt><groupId></xt>org.apache.juneau<xt></groupId></xt>
<xt><artifactId></xt>juneau-marshall-rdf<xt></artifactId></xt>
- <xt><version></xt>7.0.1<xt></version></xt>
+ <xt><version></xt>7.1.0<xt></version></xt>
<xt></dependency></xt>
</p>
- <h6 class='figure'>Java Library</h6>
- <p class='bcode' style='width:500px;'>
- juneau-marshall-rdf-7.0.1.jar
+ <h5 class='figure'>Java Library</h5>
+ <p class='bcode w500'>
+ juneau-marshall-rdf-7.1.0.jar
</p>
- <h6 class='figure'>OSGi Module</h6>
- <p class='bcode' style='width:500px;'>
- org.apache.juneau.marshall.rdf_7.0.1.jar
+ <h5 class='figure'>OSGi Module</h5>
+ <p class='bcode w500'>
+ org.apache.juneau.marshall.rdf_7.1.0.jar
</p>
<p>
@@ -409,7 +409,7 @@
packaged separately so that you don't need to pull in
the Jena dependency unless you need it.
</p>
- <p class='bcode'>
+ <p class='bcode w800'>
<jc>// A simple bean</jc>
<jk>public class</jk> Person {
<jk>public</jk> String name = <js>"John Smith"</js>;
diff --git a/content/microservice.html b/content/microservice.html
index 61a3b0a..2bcdd85 100644
--- a/content/microservice.html
+++ b/content/microservice.html
@@ -36,26 +36,26 @@
<!-- === JUNEAU-MICROSERVICE-SERVER
======================================================================== -->
<!--
=======================================================================================================
-->
- <h6 class='toc'
id='juneau-microservice-server'>juneau-microservice-server</h6>
+ <h5 class='toc'
id='juneau-microservice-server'>juneau-microservice-server</h5>
<div>
- <h6 class='figure'>Maven Dependency</h6>
- <p class='bcode' style='width:500px;'>
+ <h5 class='figure'>Maven Dependency</h5>
+ <p class='bcode w500'>
<xt><dependency></xt>
<xt><groupId></xt>org.apache.juneau<xt></groupId></xt>
<xt><artifactId></xt>juneau-microservice-server<xt></artifactId></xt>
- <xt><version></xt>7.0.1<xt></version></xt>
+ <xt><version></xt>7.1.0<xt></version></xt>
<xt></dependency></xt>
</p>
- <h6 class='figure'>Java Library</h6>
- <p class='bcode' style='width:500px;'>
- juneau-microservice-server-7.0.1.jar
+ <h5 class='figure'>Java Library</h5>
+ <p class='bcode w500'>
+ juneau-microservice-server-7.1.0.jar
</p>
- <h6 class='figure'>OSGi Module</h6>
- <p class='bcode' style='width:500px;'>
- org.apache.juneau.microservice.server_7.0.1.jar
+ <h5 class='figure'>OSGi Module</h5>
+ <p class='bcode w500'>
+ org.apache.juneau.microservice.server_7.1.0.jar
</p>
<p>
@@ -73,7 +73,7 @@
<p>
REST microservices can also be started
programmatically in existing code:
</p>
- <p class='bcode'>
+ <p class='bcode w800'>
RestMicroservice myRestService = <jk>new</jk> RestMicroservice()
.setConfig(<js>"microservice.cfg"</js>, <jk>false</jk>)
.setJettyXml(<js>"my-jetty.xml"</js>);
@@ -83,7 +83,7 @@
<p>
The provided microservice.cfg template file
gives you a starting point for defining your microservice:
</p>
- <p class='bcode'>
+ <p class='bcode w800'>
<cc>#================================================================================
# Basic configuration file for SaaS microservices
# Subprojects can use this as a starting point.
@@ -205,12 +205,12 @@
<!-- === JUNEAU-MICROSERVICE-TEMPLATE
====================================================================== -->
<!--
=======================================================================================================
-->
- <h6 class='toc'
id='juneau-microservice-template'>juneau-microservice-template</h6>
+ <h5 class='toc'
id='juneau-microservice-template'>juneau-microservice-template</h5>
<div>
- <h6 class='figure'>Archive File</h6>
- <p class='bcode' style='width:500px;'>
- my-microservice-7.0.1.zip
+ <h5 class='figure'>Archive File</h5>
+ <p class='bcode w500'>
+ my-microservice-7.1.0.zip
</p>
<p>
diff --git a/content/rest-client.html b/content/rest-client.html
index 25d0bb8..6cde8b2 100644
--- a/content/rest-client.html
+++ b/content/rest-client.html
@@ -26,29 +26,29 @@
<h5 class='toc' id='juneau-rest-client'>juneau-rest-client</h5>
<div>
- <h6 class='figure'>Maven Dependency</h6>
- <p class='bcode' style='width:500px;'>
+ <h5 class='figure'>Maven Dependency</h5>
+ <p class='bcode w500'>
<xt><dependency></xt>
<xt><groupId></xt>org.apache.juneau<xt></groupId></xt>
<xt><artifactId></xt>juneau-rest-client<xt></artifactId></xt>
- <xt><version></xt>7.0.1<xt></version></xt>
+ <xt><version></xt>7.1.0<xt></version></xt>
<xt></dependency></xt>
</p>
- <h6 class='figure'>Java Library</h6>
- <p class='bcode' style='width:500px;'>
- juneau-rest-client-7.0.1.jar
+ <h5 class='figure'>Java Library</h5>
+ <p class='bcode w500'>
+ juneau-rest-client-7.1.0.jar
</p>
- <h6 class='figure'>OSGi Module</h6>
- <p class='bcode' style='width:500px;'>
- org.apache.juneau.rest.client_7.0.1.jar
+ <h5 class='figure'>OSGi Module</h5>
+ <p class='bcode w500'>
+ org.apache.juneau.rest.client_7.1.0.jar
</p>
<p>
The REST client API allows you to access REST
interfaces using POJOs:
</p>
- <p class='bcode'>
+ <p class='bcode w800'>
<jc>// Create a reusable JSON client.</jc>
RestClient client = RestClient.<jsm>create</jsm>().build();
@@ -73,7 +73,7 @@
<p>
The remote proxy interface API allows you to invoke
server-side POJO methods on the client side using REST (i.e. RPC over REST):
</p>
- <p class='bcode'>
+ <p class='bcode w800'>
<jc>// Get an interface proxy.</jc>
IAddressBook ab =
restClient.getRemoteableProxy(IAddressBook.<jk>class</jk>);
@@ -98,7 +98,7 @@
The <code>RemoteableServlet</code> class is a simple
specialized servlet with an abstract <code>getServiceMap()</code>
method to define the server-side POJOs:
</p>
- <p class='bcode'>
+ <p class='bcode w800'>
<ja>@RestResource</ja>(
path=<js>"/remote"</js>
)
@@ -124,7 +124,7 @@
The
<code><ja>@RestMethod</ja>(name=<jsf>PROXY</jsf>)</code> approach is easier if
you only have a single interface you want to expose.
You simply define a Java method whose return type is an
interface, and return the implementation of that interface:
</p>
- <p class='bcode'>
+ <p class='bcode w800'>
<jc>// Our exposed proxy object.</jc>
<ja>@RestMethod</ja>(name=<jsf>PROXY</jsf>,
path=<js>"/addressbookproxy/*"</js>)
<jk>public</jk> IAddressBook getProxy() {
@@ -160,7 +160,7 @@
Similar in concept to remoteable services defined
above, but in this case we simply define our interface with
special annotations that tell us how to convert input
and output to HTTP headers, query parameters, form post parameters, or
request/response bodies.
</p>
- <p class='bcode'>
+ <p class='bcode w800'>
<ja>@Remoteable</ja>
<jk>public interface</jk> MyProxyInterface {
diff --git a/content/rest-server.html b/content/rest-server.html
index 679f573..d8280d5 100644
--- a/content/rest-server.html
+++ b/content/rest-server.html
@@ -26,23 +26,23 @@
<h5 class='toc' id='juneau-rest-server'>juneau-rest-server</h5>
<div>
- <h6 class='figure'>Maven Dependency</h6>
- <p class='bcode' style='width:500px;'>
+ <h5 class='figure'>Maven Dependency</h5>
+ <p class='bcode w500'>
<xt><dependency></xt>
<xt><groupId></xt>org.apache.juneau<xt></groupId></xt>
<xt><artifactId></xt>juneau-rest-server<xt></artifactId></xt>
- <xt><version></xt>7.0.1<xt></version></xt>
+ <xt><version></xt>7.1.0<xt></version></xt>
<xt></dependency></xt>
</p>
- <h6 class='figure'>Java Library</h6>
- <p class='bcode' style='width:500px;'>
- juneau-rest-server-7.0.1.jar
+ <h5 class='figure'>Java Library</h5>
+ <p class='bcode w500'>
+ juneau-rest-server-7.1.0.jar
</p>
- <h6 class='figure'>OSGi Module</h6>
- <p class='bcode' style='width:500px;'>
- org.apache.juneau.rest.server_7.0.1.jar
+ <h5 class='figure'>OSGi Module</h5>
+ <p class='bcode w500'>
+ org.apache.juneau.rest.server_7.1.0.jar
</p>
<p>
@@ -66,12 +66,12 @@
<p>
A simple example that supports all languages:
</p>
- <p class='bcode'>
+ <p class='bcode w800'>
<ja>@RestResource</ja>(
path=<js>"/systemProperties"</js>,
title=<js>"System properties resource"</js>
)
- <jk>public class</jk> SystemPropertiesResource <jk>extends</jk>
RestServletDefault {
+ <jk>public class</jk> SystemPropertiesResource <jk>extends</jk>
BasicRestServlet {
<ja>@RestMethod</ja>(name=<jsf>GET</jsf>, path=<js>"/"</js>)
<jk>public</jk> Map
getSystemProperties(<ja>@Query</ja>(<js>"sort"</js>) <jk>boolean</jk> sort)
<jk>throws</jk> Throwable {
@@ -110,7 +110,7 @@
methods, customizing supported content types and
serialization options, adding g-zip compression,
and adding customized branding for the HTML views.
</p>
- <p class='bcode'>
+ <p class='bcode w800'>
<ja>@RestResource</ja>(
path=<js>"/systemProperties"</js>,
title=<js>"System properties resource"</js>,
@@ -203,7 +203,7 @@
When combined with the support for HTML5 beans, simple
HTML forms can be constructed for easy input and output
using nothing more than Java:
</p>
- <p class='bcode'>
+ <p class='bcode w800'>
<jk>import static</jk> org.apache.juneau.dto.html5.HtmlBuilder.*;
<ja>@RestMethod</ja>(
@@ -275,7 +275,7 @@
<p>
This approach uses annotated parameters for retrieving
input from the request.
</p>
- <p class='bcode'>
+ <p class='bcode w800'>
<ja>@RestMethod</ja>(name=<jsf>GET</jsf>,
path=<js>"/example1/{p1}/{p2}/{p3}/*"</js>)
<jk>public</jk> String example1(
<ja>@Method</ja> String method, <jc>//
HTTP method.</jc>
@@ -303,7 +303,7 @@
<p>
This approach uses low-level request/response objects
to perform the same as above.
</p>
- <p class='bcode'>
+ <p class='bcode w800'>
<ja>@RestMethod</ja>(name=<jsf>GET</jsf>,
path=<js>"/example2/{p1}/{p2}/{p3}/*"</js>)
<jk>public</jk> String example2(
RestRequest req, <jc>// A direct subclass of
HttpServletRequest.</jc>
@@ -345,7 +345,7 @@
<p>
This approach is sort of the middle ground where you
get access functional area APIs.
</p>
- <p class='bcode'>
+ <p class='bcode w800'>
<ja>@RestMethod</ja>(name=<jsf>GET</jsf>,
path=<js>"/example3/{p1}/{p2}/{p3}/*"</js>)
<jk>public</jk> String example3(
HttpMethod method, <jc>// HTTP method.</jc>
@@ -390,7 +390,7 @@
<p>
For example, if you want to add an initialization
method to your resource:
</p>
- <p class='bcode'>
+ <p class='bcode w800'>
<ja>@RestResource</ja>(...)
<jk>public class</jk> MyResource {
@@ -406,7 +406,7 @@
<p>
Or if you want to intercept REST calls:
</p>
- <p class='bcode'>
+ <p class='bcode w800'>
<ja>@RestResource</ja>(...)
<jk>public class</jk> MyResource {
@@ -445,10 +445,10 @@
Swagger documentation can be populated from annotations
(as above), resource bundles, or Swagger JSON files.
</p>
<p>
- The page shown above is implemented on the
RestServletDefault class in the method below which shows that it's doing
nothing more than
+ The page shown above is implemented on the
BasicRestServlet class in the method below which shows that it's doing nothing
more than
serializing a Swagger bean which is constructed in the
RestRequest object:
</p>
- <p class='bcode'>
+ <p class='bcode w800'>
<ja>@RestMethod</ja>(name=<jsf>OPTIONS</jsf>, path=<js>"/*"</js>)
<jk>public</jk> Swagger getOptions(RestRequest req) {
<jk>return</jk> req.getSwagger();
@@ -461,7 +461,7 @@
The following example is the <code>RootResources</code>
class from the REST examples showing how to construct
a grouping of resources using the
<code>children()</code> annotation:
</p>
- <p class='bcode'>
+ <p class='bcode w800'>
<ja>@RestResource</ja>(
path=<js>"/"</js>,
title=<js>"Root resources"</js>,
@@ -510,7 +510,7 @@
ShutdownResource.<jk>class</jk>
}
)
- <jk>public class</jk> RootResources <jk>extends</jk>
RestServletGroupDefault { <jc>/* No code needed! */</jc> }
+ <jk>public class</jk> RootResources <jk>extends</jk>
BasicRestServletGroup { <jc>/* No code needed! */</jc> }
</p>
<p>
The above resource when rendered in HTML shows how easy
it is to discover and navigate to child resources using a browser:
@@ -535,7 +535,7 @@
<p>
The beans being serialized are shown here:
</p>
- <p class='bcode'>
+ <p class='bcode w800'>
<jc>// Our bean class.</jc>
<jk>public class</jk> Pet {
@@ -589,7 +589,7 @@
The drop-down menu items are implemented through
"widgets" which allow you to embed arbitrary HTML, Javascript,
and CSS in the HTML view of the page.
</p>
- <p class='bcode'>
+ <p class='bcode w800'>
<ja>@RestMethod</ja>(
name=<jsf>GET</jsf>,
path=<js>"/"</js>,
@@ -659,7 +659,7 @@
<li class='link'>See <a class='doclink'
href='http://juneau.apache.org/site/apidocs/overview-summary.html#juneau-rest-server'>juneau-rest-server</a>
for more information.
</ul>
- <h6 class='toc' id='juneau-rest-server.UIvsDI'>User Interfaces
(UI) vs. Developer Interfaces (DI)</h6>
+ <h5 class='toc' id='juneau-rest-server.UIvsDI'>User Interfaces
(UI) vs. Developer Interfaces (DI)</h5>
<div>
<p>
An important distinction needs to be made about
the HTML representations produced by the REST
@@ -710,23 +710,23 @@
<h5 class='toc'
id='juneau-rest-server-jaxrs'>juneau-rest-server-jaxrs</h5>
<div>
- <h6 class='figure'>Maven Dependency</h6>
- <p class='bcode' style='width:500px;'>
+ <h5 class='figure'>Maven Dependency</h5>
+ <p class='bcode w500'>
<xt><dependency></xt>
<xt><groupId></xt>org.apache.juneau<xt></groupId></xt>
<xt><artifactId></xt>juneau-rest-server-jaxrs<xt></artifactId></xt>
- <xt><version></xt>7.0.1<xt></version></xt>
+ <xt><version></xt>7.1.0<xt></version></xt>
<xt></dependency></xt>
</p>
- <h6 class='figure'>Java Library</h6>
- <p class='bcode' style='width:500px;'>
- juneau-rest-server-jaxrs-7.0.1.jar
+ <h5 class='figure'>Java Library</h5>
+ <p class='bcode w500'>
+ juneau-rest-server-jaxrs-7.1.0.jar
</p>
- <h6 class='figure'>OSGi Module</h6>
- <p class='bcode' style='width:500px;'>
- org.apache.juneau.rest.server.jaxrs_7.0.1.jar
+ <h5 class='figure'>OSGi Module</h5>
+ <p class='bcode w500'>
+ org.apache.juneau.rest.server.jaxrs_7.1.0.jar
</p>
<p>
@@ -744,7 +744,7 @@
apply to those serializers and parsers.
<li>
<code>org.apache.juneau.rest.jaxrs.DefaultProvider</code> - A default provider
that provides the same level
- of media type support as the
<code>RestServletDefault</code> class.
+ of media type support as the
<code>BasicRestServlet</code> class.
</ul>
<p>
The JAX/RS support does provide you will the full
marshalling capabilities of Juneau.
diff --git a/content/styles/juneau-code.css b/content/styles/juneau-code.css
index 8be3dd9..d58bb74 100644
--- a/content/styles/juneau-code.css
+++ b/content/styles/juneau-code.css
@@ -49,7 +49,7 @@
* <cc> - Config file comment
* <cs> - Config file section
* <ck> - Config file key
- * <ce> - Config file entry
+ * <cv> - Config file value
***************************************************************************************************************************/
/* Monospaced font size */
diff --git a/content/styles/juneau-doc.css b/content/styles/juneau-doc.css
index 90c78de..c0fce8f 100755
--- a/content/styles/juneau-doc.css
+++ b/content/styles/juneau-doc.css
@@ -1,4 +1,16 @@
-/**********************************************************************************
+/***************************************************************************************************************************
+ * 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.
*
+
***************************************************************************************************************************/
+/***************************************************************************************************************************
* Juneau-specific javadoc styles.
*
* These are styles available in Javadocs in addition to the general Oracle
@@ -7,11 +19,10 @@
* Available classes:
* fixedWidth - Force block to be 800 px wide.
* table.styled - A table with alternating row colors.
- * h2/h3/h4/h5/h6.topic - Topic headers.
+ * h2/h3/h4/h5.topic - Topic headers.
* bordered - Put border around a block (e.g. an image).
* padded - Put padding around a block (e.g. an image).
* ol/ul.toc - Table of contents.
- * ol/ul.notes - Notes.
* code.snippet - A code snippet.
* ol/ul.spaced-list - A spaced list.
* ol/ul.javahierarchy - A Java class hierarchy list.
@@ -64,12 +75,31 @@ table.styled ul { padding: 0px 10px; }
table.styled tr:nth-child(1) { background-color: #dee3e9; }
table.styled tr:nth-child(2n+2) { background-color: #eeeeef; }
table.styled tr:nth-child(2n+3) { background-color: white; }
-
/* Same as r1 except with a border on the bottom */
table.styled tr.bb { border-bottom: 1px solid #9eadc0 }
table.styled tr.light { background-color: white !important;}
table.styled tr.dark { background-color: #eeeeef !important; }
+/*--- Override formatting on <table class='unstyled'> ---*/
+table.unstyled,.contentContainer .description table.unstyled,.contentContainer
ul li table.unstyled,ul.blockList ul.blockList li.blockList table.unstyled
+ {
+ padding: 0px;
+ position: relative;
+ width: auto;
+ border: 1px solid #9eadc0;
+ margin-left: 20px;
+ margin-right: 20px;
+ border-collapse: collapse;
+}
+
+table.unstyled { border: 1px solid #9eadc0; }
+table.unstyled th { background-color: #dee3e9; border: 1px solid #9eadc0;
padding: 3px 10px 3px 10px; }
+table.unstyled td { padding: 3px !important; border: 1px solid #b5c8de; }
+table.unstyled ul { padding: 0px 10px; }
+table.unstyled tr:nth-child(1) { background-color: white; }
+table.unstyled tr:nth-child(2n+2) { background-color: white; }
+table.unstyled tr:nth-child(2n+3) { background-color: white; }
+
/*--- Juneau topic headers ---*/
h2.topic,
h3.topic,
@@ -83,6 +113,7 @@ h4.topic {
background-image:
url('data:image/gif;base64,R0lGODlhEAAQAIQfACZJcSdKcjFTejVWfT5fhUFih0ZnjEhojUxskFFwk1Z0l1d1mFp4ml98nmaComiEpGuHpnKNq3SOrHiRroGZtYeeuJGmv5erwp+yx6O1yqm6zrDA0sTQ3s3X4+Dn7v///yH+EUNyZWF0ZWQgd2l0aCBHSU1QACH5BAEAAB8ALAAAAAAQABAAAAVk4CeOZGmWgmEQG/k0MHw4UY0gY1PvfG3kvaBhUqk4IMgkcuGrdJ7QaCfDiBgunKx2m1VYP5KNeEze0H4VjHrNVh9+HodlTq9bEr9PhMLv+ykOAyIaNEE8ACMFiouMigEnkJGQIQA7');
background-repeat: no-repeat;
background-position: left center;
+ cursor: zoom-out;
}
h2.topic { font-size: 14pt; }
h3.topic { font-size: 13pt; }
@@ -92,11 +123,12 @@ h2.closed,
h3.closed,
h4.closed {
background-image:
url('data:image/gif;base64,R0lGODlhEAAQAIQYADNVfDhagUNkiUZnjEhojUxskE9vklFwlFd1mF17nWJ/oGaCo2+KqXKNq3aQrX2WsoGZtYObtoeeuJKowJ2wxqm6zrbF1sTQ3v///////////////////////////////yH+EUNyZWF0ZWQgd2l0aCBHSU1QACH5BAEAAB8ALAAAAAAQABAAAAVi4CeOZGmST6EGpLK8cNHMi6GI8qzvcyEikqBwGByIIJekcpmEiByWqHQadYgYlax2m2WIFpSweBxeiBKTtHqdTvwi8LgcjhAdHPi8Hn8QERiAgYKABCIAAoiJiogAJ46PjiEAOw==')
!important;
+ cursor: zoom-in;
}
div.topic { margin-left: 10px; }
-h6.figure {
+h5.figure {
color: #2c4557;
margin-left: 30px;
margin-right: 30px;
@@ -137,33 +169,28 @@ tr.borderbottom td {
margin: 0px;
}
-ol.toc, ol.notes,
-ul.toc, ul.notes,
-.toc ol, .notes ol,
-.toc ul, .notes ul {
+ol.toc,
+ul.toc,
+.toc ol,
+.toc ul {
background: #dee3e9;
margin: 0px;
padding: 0px;
}
-p.toc2 {
- background-color: #dee3e950;
- border-radius: 0px 15px 15px 0px;
-}
-
-ul.toc, ul.notes,
-.toc ul, .notes ul {
+ul.toc,
+.toc ul {
list-style: disc;
}
-ol.toc p, ol.notes p,
-ul.toc p, ul.notes p,
-.toc ol p, .notes ol p,
-.toc ul p, .notes ul p,
-ol.toc div, ol.notes div,
-ul.toc div, ul.notes div,
-.toc ol div, .notes ol div,
-.toc ul div, .notes ul div {
+ol.toc p,
+ul.toc p,
+.toc ol p,
+.toc ul p,
+ol.toc div,
+ul.toc div,
+.toc ol div,
+.toc ul div {
color: #353833;
font: normal 1em Arial, Helvetica, sans-serif;
font-size: 1em;
@@ -177,29 +204,38 @@ ul.toc div, ul.notes div,
padding-left: 5px;
}
-.notes li {
- background: #FFFFFF;
- margin-left: 30px;
- padding-left: 5px;
- padding-top: 10px;
+p.toc2 {
+ background-color: #dee3e950;
+ border-radius: 0px 15px 15px 0px;
}
/* Linear gradients */
/* Light-colored background headers */
-h5.toc,h6.toc,
-h5.notes,h6.notes,
-h5.topic,h6.topic,
-h2.title {
+h5.toc,
+h5.topic,
+h2.title,
+div.docSummary > div.block,
+div.contentContainer > div.block > p:first-child {
background: linear-gradient(to bottom, #F5F5F5, #DEE3E9) repeat scroll
0% 0% transparent;
background: -moz-linear-gradient(to bottom, #F5F5F5, #DEE3E9) repeat
scroll 0% 0% transparent;
background: -webkit-gradient(linear, left top, left bottom,
from(#F5F5F5), to(#DEE3E9) );
}
+/* Dark-colored background headers */
+div.header > div.subTitle > div.block,
+div.footer > div.subTitle > div.block > p:first-child,
+h1.title,
+div.contentContainer > h2:first-of-type,
+body > p:first-child {
+ background: linear-gradient(to bottom, #3B596D, #6289A3) repeat scroll
0% 0% transparent;
+ background: -moz-linear-gradient(to bottom, #3B596D, #6289A3) repeat
scroll 0% 0% transparent;
+ background: -webkit-gradient(linear, left top, left bottom,
from(#3B596D), to(#6289A3) );
+}
+
/* Header styles */
-h5.toc, h5.notes,
-h6.toc, h6.notes {
+h5.toc {
color: #2C4557;
margin-bottom: 0px;
padding: 5px 30px;
@@ -208,13 +244,60 @@ h6.toc, h6.notes {
box-shadow: 1px 1px 1px 0px rgba(0, 0, 0, 0.5);
}
-h5.toc, h5.notes { font-size: 1.2em; }
-h6.toc, h6.notes { font-size: 1.1em; }
-
-h5.topic, h6.topic {
+h5.topic {
color: #2C4557;
padding: 5px 20px;
- margin: 30px 10px 20px 0px;
+ margin: 30px 10px 10px 0px;
+ text-decoration: none;
+}
+
+/* Light-colored title on package summary pages */
+div.docSummary > div.block,
+div.contentContainer > div.block > p:first-child {
+ font-size: 1.2em;
+ font-weight: bold;
+ color: #2C4557;
+ margin-top: 0px;
+ margin-bottom: 0px;
+ padding: 5px 30px;
+ border-radius: 0px 0px 15px 15px;
+ text-decoration: none;
+}
+
+/* Dark-colored title on overview page */
+div.header > div.subTitle > div.block,
+div.footer > div.subTitle > div.block > p:first-child,
+body > p:first-child {
+ font-size: 1.2em;
+ font-weight: bold;
+ color: white;
+ margin-bottom: 0px;
+ padding: 5px 30px;
+ border-radius: 15px;
+ text-decoration: none;
+}
+
+/* Dark-colored package title on package summary pages */
+h1.title,
+div.contentContainer > h2:first-of-type {
+ font-size: 1.2em;
+ font-weight: bold;
+ color: white;
+ margin-bottom: 0px;
+ padding: 5px 30px;
+ border-radius: 15px 15px 0px 0px;
+ text-decoration: none;
+}
+
+/* Class titles */
+h2.title {
+ font-size: 1.2em;
+ font-weight: bold;
+ color: #2C4557;
+ margin-top: 0px;
+ margin-bottom: 0px;
+ padding: 5px 30px;
+ border-radius: 15px;
text-decoration: none;
}
@@ -227,18 +310,20 @@ code.snippet {
}
l {
- color: DarkBlue;
+ color: #3b596d;
font-weight: bold;
- font-style: italic;
font-family: monospace;
font-size: 1.2em;
}
-.spaced-list li { padding:5px; }
+.spaced-list>li { padding:5px; }
.footer .spaced-list ul { margin:0 }
/* Documentation Tree */
.doctree li {}
+li.normal {
+ list-style-image:none;
+}
li.link {
list-style-image:
url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABEElEQVQ4T2M0T3iVLyHKWvnvH4M4AwmAiYnh5adP/7oYvQrevmBmZiJJM8wekCGMvsXv/5NgMYrS33/+M1BkwOOX/ygzYM/pX8QZwMfN+L8lnZOhf+VPhvtP/zKC/HHh1h+Gx6+IdAEHG8P/WRVcDP///2con/aDYcfx34wgzSCAEgatGez/1WSZwDbgAm8//v8v7fcJrgbFAE1Fpv86iowMv/8gzPj7j4Hh7cd/DOkBrAzsrAwM9XN/MvQs/YUwQNb3zX9OdkxLP339z/Dtx3+GT9/+M/BwMv6/sZyTYdKa3wxdS36jKGZkMH9FdjoAh8GwMOD1AwYGBnky88NDRgbTNwkMTP8byDDkIcM/xgYA0dJ4nW6TgR4AAAAASUVORK5CYII=');
}
@@ -280,7 +365,7 @@ li.jp {
}
.doctree ul {
- padding: 0px 0px 0px 20px;
+ padding: 5px 0px 5px 20px;
}
ul.doctree {
@@ -296,7 +381,15 @@ ul.doctree {
a.doclink {
font-weight: bold;
border-bottom: 1px dotted #4c6b87;
- text-decoration: none;
- color: #2c4557;
+}
+
+.w400 {
+ width:400px !important;
+}
+.w500 {
+ width:500px !important;
+}
+.w800 {
+ width:800px !important;
}
diff --git a/content/svl.html b/content/svl.html
index a516761..cb7b0a3 100644
--- a/content/svl.html
+++ b/content/svl.html
@@ -26,23 +26,23 @@
<h5 class='toc' id='juneau-svl'>juneau-svl</h5>
<div>
- <h6 class='figure'>Maven Dependency</h6>
- <p class='bcode' style='width:500px;'>
+ <h5 class='figure'>Maven Dependency</h5>
+ <p class='bcode w500'>
<xt><dependency></xt>
<xt><groupId></xt>org.apache.juneau<xt></groupId></xt>
<xt><artifactId></xt>juneau-svl<xt></artifactId></xt>
- <xt><version></xt>7.0.1<xt></version></xt>
+ <xt><version></xt>7.1.0<xt></version></xt>
<xt></dependency></xt>
</p>
- <h6 class='figure'>Java Library</h6>
- <p class='bcode' style='width:500px;'>
- juneau-svl-7.0.1.jar
+ <h5 class='figure'>Java Library</h5>
+ <p class='bcode w500'>
+ juneau-svl-7.1.0.jar
</p>
- <h6 class='figure'>OSGi Module</h6>
- <p class='bcode' style='width:500px;'>
- org.apache.juneau.svl_7.0.1.jar
+ <h5 class='figure'>OSGi Module</h5>
+ <p class='bcode w500'>
+ org.apache.juneau.svl_7.1.0.jar
</p>
<p>
@@ -54,14 +54,14 @@
Variables can be recursively nested within the varKey
(e.g. <js>"$FOO{$BAR{xxx},$BAZ{xxx}}"</js>).
Variables can also return values that themselves
contain more variables.
</p>
- <p class='bcode'>
+ <p class='bcode w800'>
<jc>// Use the default variable resolver to resolve a string that
contains $S (system property) variables</jc>
String myProperty = VarResolver.<jsf>DEFAULT</jsf>.resolve(<js>"The
Java home directory is $S{java.home}"</js>);
</p>
<p>
The following shows how variables can be arbitrarily
nested...
</p>
- <p class='bcode'>
+ <p class='bcode w800'>
<jc>// Look up a property in the following order:
// 1) MYPROPERTY environment variable.
// 2) 'my.property' system property if environment variable not found.
--
To stop receiving notification emails like this one, please contact
[email protected].
