http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d94d89db/juneau-core/src/main/javadoc/overview.html ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/javadoc/overview.html b/juneau-core/src/main/javadoc/overview.html index ef06af5..477c103 100644 --- a/juneau-core/src/main/javadoc/overview.html +++ b/juneau-core/src/main/javadoc/overview.html @@ -240,10 +240,10 @@ <p> Juneau requires Java 6+. The majority of the code has no other dependencies except for the following packages: </p> - <ul class='javahierarchy'> - <li class='p'> <a class='doclink' href='org/apache/juneau/jena/package-summary.html#TOC'>org.apache.juneau.jena</a> - RDF support. Requires Apache Jena 2.7.1+. - <li class='p'> <a class='doclink' href='org/apache/juneau/rest/package-summary.html#TOC'>org.apache.juneau.rest</a> - REST servlet support. Requires JEE 1.3+. - <li class='p'> <a class='doclink' href='org/apache/juneau/rest/client/package-summary.html#TOC'>org.apache.juneau.rest.client</a> - REST client support. Requires Apache HttpClient 4.5+. + <ul class='doctree'> + <li class='jp'> <a class='doclink' href='org/apache/juneau/jena/package-summary.html#TOC'>org.apache.juneau.jena</a> - RDF support. Requires Apache Jena 2.7.1+. + <li class='jp'> <a class='doclink' href='org/apache/juneau/rest/package-summary.html#TOC'>org.apache.juneau.rest</a> - REST servlet support. Requires JEE 1.3+. + <li class='jp'> <a class='doclink' href='org/apache/juneau/rest/client/package-summary.html#TOC'>org.apache.juneau.rest.client</a> - REST client support. Requires Apache HttpClient 4.5+. </ul> <p> OSGi bundles are also provided that break down Juneau into the following components: @@ -263,11 +263,11 @@ These are discussed in detail in the <a class='doclink' href="#Samples">Samples</a> section. </ul> - <h5 class='topic'>A note about examples</h5> - <p class='info'> - Many of the examples below use beans with public field properties instead of standard getters/setters. - This is to simplify the examples. - </p> + <ul class='doctree'> + <li class='info'> + Many of the examples below use beans with public field properties instead of standard getters/setters. + This is to simplify the examples. + </ul> </div> <!-- ======================================================================================================== --> @@ -360,8 +360,8 @@ </p> <h6 class='topic'>Additional Information</h6> - <ul class='javahierarchy'> - <li class='p'><a class='doclink' href='org/apache/juneau/serializer/package-summary.html#TOC'>org.apache.juneau.serializer</a> - Serializer API Javadoc + <ul class='doctree'> + <li class='jp'><a class='doclink' href='org/apache/juneau/serializer/package-summary.html#TOC'>org.apache.juneau.serializer</a> - Serializer API Javadoc </ul> </div> @@ -431,18 +431,17 @@ Map<String,Person> m3 = <jk>new</jk> TreeMap<String,Person>(); parser.parseIntoMap(json, m3, String.<jk>class</jk>, Person.<jk>class</jk>); </p> - <p class='info'> + <ul class='doctree'> + <li class='info'> In the example above, we're parsing "lax" JSON (single quotes, unquoted attributes). The JSON parser can handle any valid JSON syntax (such as quoted or unquoted attributes, single or double quotes).<br> It can also handle JSON fragements and embedded Javascript comments. Many of the JSON examples provided will use lax syntax which is easier to read since we don't have to deal with escapes. - </p> - <p> - </p> + </ul> <h6 class='topic'>Additional Information</h6> - <ul class='javahierarchy'> - <li class='p'><a class='doclink' href='org/apache/juneau/parser/package-summary.html#TOC'>org.apache.juneau.parser</a> - Parser API Javadoc + <ul class='doctree'> + <li class='jp'><a class='doclink' href='org/apache/juneau/parser/package-summary.html#TOC'>org.apache.juneau.parser</a> - Parser API Javadoc </ul> </div> @@ -480,9 +479,9 @@ to work with requests and responses as POJOs. </p> <h6 class='topic'>Additional Information</h6> - <ul class='javahierarchy'> - <li class='c'>{@link org.apache.juneau.serializer.SerializerGroup} - <li class='c'>{@link org.apache.juneau.parser.ParserGroup} + <ul class='doctree'> + <li class='jc'>{@link org.apache.juneau.serializer.SerializerGroup} + <li class='jc'>{@link org.apache.juneau.parser.ParserGroup} </ul> </div> @@ -498,14 +497,14 @@ <p> These classes extend directly from the following JCF classes: </p> - <ul class='javahierarchy'> - <li class='c'> {@link java.util.LinkedHashMap java.util.LinkedHashMap} + <ul class='doctree'> + <li class='jc'> {@link java.util.LinkedHashMap java.util.LinkedHashMap} <ul> - <li class='c'> {@link org.apache.juneau.ObjectMap org.apache.juneau.ObjectMap} + <li class='jc'> {@link org.apache.juneau.ObjectMap org.apache.juneau.ObjectMap} </ul> - <li class='c'> {@link java.util.LinkedList java.util.LinkedList} + <li class='jc'> {@link java.util.LinkedList java.util.LinkedList} <ul> - <li class='c'> {@link org.apache.juneau.ObjectMap org.apache.juneau.ObjectList} + <li class='jc'> {@link org.apache.juneau.ObjectMap org.apache.juneau.ObjectList} </ul> </ul> <p> @@ -540,14 +539,15 @@ <jc>// Or convert it to XML.</jc> String xml = XmlSerializer.<jsf>DEFAULT</jsf>.serialize(m); </p> - <p class='info'> - As a general rule, if you do not specify a target type during parsing, or if the target type cannot be determined - through reflection, the parsers automatically generate <l>ObjectMaps</l> and <l>ObjectLists</l>. - </p> + <ul class='doctree'> + <li class='info'> + As a general rule, if you do not specify a target type during parsing, or if the target type cannot be determined + through reflection, the parsers automatically generate <l>ObjectMaps</l> and <l>ObjectLists</l>. + </ul> <h6 class='topic'>Additional Information</h6> - <ul class='javahierarchy'> - <li class='c'>{@link org.apache.juneau.ObjectMap} - <li class='c'>{@link org.apache.juneau.ObjectList} + <ul class='doctree'> + <li class='jc'>{@link org.apache.juneau.ObjectMap} + <li class='jc'>{@link org.apache.juneau.ObjectList} </ul> </div> @@ -566,18 +566,18 @@ However, each of the serializers and parsers already contain reusable instances with common configurations.<br> For example, JSON has the following predefined reusable serializers and parsers: </p> - <ul class='javahierarchy'> - <li class='c'>{@link org.apache.juneau.json.JsonSerializer} + <ul class='doctree'> + <li class='jc'>{@link org.apache.juneau.json.JsonSerializer} <ul> - <li class='f'>{@link org.apache.juneau.json.JsonSerializer#DEFAULT DEFAULT} - <li class='f'>{@link org.apache.juneau.json.JsonSerializer#DEFAULT_LAX DEFAULT_LAX} - <li class='f'>{@link org.apache.juneau.json.JsonSerializer#DEFAULT_READABLE DEFAULT_READABLE} - <li class='f'>{@link org.apache.juneau.json.JsonSerializer#DEFAULT_LAX_READABLE DEFAULT_LAX_READABLE} + <li class='jf'>{@link org.apache.juneau.json.JsonSerializer#DEFAULT DEFAULT} + <li class='jf'>{@link org.apache.juneau.json.JsonSerializer#DEFAULT_LAX DEFAULT_LAX} + <li class='jf'>{@link org.apache.juneau.json.JsonSerializer#DEFAULT_READABLE DEFAULT_READABLE} + <li class='jf'>{@link org.apache.juneau.json.JsonSerializer#DEFAULT_LAX_READABLE DEFAULT_LAX_READABLE} </ul> - <li class='c'>{@link org.apache.juneau.json.JsonParser} + <li class='jc'>{@link org.apache.juneau.json.JsonParser} <ul> - <li class='f'>{@link org.apache.juneau.json.JsonParser#DEFAULT DEFAULT} - <li class='f'>{@link org.apache.juneau.json.JsonParser#DEFAULT_STRICT DEFAULT_STRICT} + <li class='jf'>{@link org.apache.juneau.json.JsonParser#DEFAULT DEFAULT} + <li class='jf'>{@link org.apache.juneau.json.JsonParser#DEFAULT_STRICT DEFAULT_STRICT} </ul> </ul> <p> @@ -606,39 +606,39 @@ <p> The following is a list of all configurable properties across all serializers and parsers. </p> - <ul class='javahierarchy'> - <li class='c'><a class='doclink' href='org/apache/juneau/BeanContext.html#ConfigProperties'>BeanContext</a> - Properties associated with handling beans on serializers and parsers. + <ul class='doctree'> + <li class='jc'><a class='doclink' href='org/apache/juneau/BeanContext.html#ConfigProperties'>BeanContext</a> - Properties associated with handling beans on serializers and parsers. <ul> - <li class='c'><a class='doclink' href='org/apache/juneau/serializer/SerializerContext.html#ConfigProperties'>SerializerContext</a> - Configurable properties common to all serializers. + <li class='jc'><a class='doclink' href='org/apache/juneau/serializer/SerializerContext.html#ConfigProperties'>SerializerContext</a> - Configurable properties common to all serializers. <ul> - <li class='c'><a class='doclink' href='org/apache/juneau/html/HtmlSerializerContext.html#ConfigProperties'>HtmlSerializerContext</a> - Configurable properties on the HTML serializer. + <li class='jc'><a class='doclink' href='org/apache/juneau/html/HtmlSerializerContext.html#ConfigProperties'>HtmlSerializerContext</a> - Configurable properties on the HTML serializer. <ul> - <li class='c'><a class='doclink' href='org/apache/juneau/html/HtmlDocSerializerContext.html#ConfigProperties'>HtmlDocSerializerContext</a> - Configurable properties on the HTML document serializer. + <li class='jc'><a class='doclink' href='org/apache/juneau/html/HtmlDocSerializerContext.html#ConfigProperties'>HtmlDocSerializerContext</a> - Configurable properties on the HTML document serializer. </ul> - <li class='i'><a class='doclink' href='org/apache/juneau/jena/RdfCommonContext.html#ConfigProperties'>RdfCommonContext</a> - Configurable properties common to the RDF serializers and parsers. + <li class='jic'><a class='doclink' href='org/apache/juneau/jena/RdfCommonContext.html#ConfigProperties'>RdfCommonContext</a> - Configurable properties common to the RDF serializers and parsers. <ul> - <li class='c'><a class='doclink' href='org/apache/juneau/jena/RdfSerializerContext.html#ConfigProperties'>RdfSerializerContext</a> - Configurable properties on the RDF serializers. + <li class='jc'><a class='doclink' href='org/apache/juneau/jena/RdfSerializerContext.html#ConfigProperties'>RdfSerializerContext</a> - Configurable properties on the RDF serializers. </ul> - <li class='c'><a class='doclink' href='org/apache/juneau/json/JsonSerializerContext.html#ConfigProperties'>JsonSerializerContext</a> - Configurable properties on the JSON serializer. - <li class='c'><a class='doclink' href='org/apache/juneau/msgpack/MsgPackSerializerContext.html#ConfigProperties'>MsgPackSerializerContext</a> - Configurable properties on the MessagePack serializer. - <li class='c'><a class='doclink' href='org/apache/juneau/soap/SoapXmlSerializerContext.html#ConfigProperties'>SoapXmlSerializerContext</a> - Configurable properties on the SOAP/XML serializer. - <li class='c'><a class='doclink' href='org/apache/juneau/urlencoding/UonSerializerContext.html#ConfigProperties'>UonSerializerContext</a> - Configurable properties on the URL-Encoding and UON serializers. - <li class='c'><a class='doclink' href='org/apache/juneau/xml/XmlSerializerContext.html#ConfigProperties'>XmlSerializerContext</a> - Configurable properties on the XML serializer. + <li class='jc'><a class='doclink' href='org/apache/juneau/json/JsonSerializerContext.html#ConfigProperties'>JsonSerializerContext</a> - Configurable properties on the JSON serializer. + <li class='jc'><a class='doclink' href='org/apache/juneau/msgpack/MsgPackSerializerContext.html#ConfigProperties'>MsgPackSerializerContext</a> - Configurable properties on the MessagePack serializer. + <li class='jc'><a class='doclink' href='org/apache/juneau/soap/SoapXmlSerializerContext.html#ConfigProperties'>SoapXmlSerializerContext</a> - Configurable properties on the SOAP/XML serializer. + <li class='jc'><a class='doclink' href='org/apache/juneau/urlencoding/UonSerializerContext.html#ConfigProperties'>UonSerializerContext</a> - Configurable properties on the URL-Encoding and UON serializers. + <li class='jc'><a class='doclink' href='org/apache/juneau/xml/XmlSerializerContext.html#ConfigProperties'>XmlSerializerContext</a> - Configurable properties on the XML serializer. </ul> - <li class='c'><a class='doclink' href='org/apache/juneau/parser/ParserContext.html#ConfigProperties'>ParserContext</a> - Configurable properties common to all parsers. + <li class='jc'><a class='doclink' href='org/apache/juneau/parser/ParserContext.html#ConfigProperties'>ParserContext</a> - Configurable properties common to all parsers. <ul> - <li class='c'><a class='doclink' href='org/apache/juneau/html/HtmlParserContext.html#ConfigProperties'>HtmlParserContext</a> - Configurable properties on the HTML parser. - <li class='i'><a class='doclink' href='org/apache/juneau/jena/RdfCommonContext.html#ConfigProperties'>RdfCommonContext</a> - Configurable properties common to the RDF serializers and parsers. + <li class='jc'><a class='doclink' href='org/apache/juneau/html/HtmlParserContext.html#ConfigProperties'>HtmlParserContext</a> - Configurable properties on the HTML parser. + <li class='jic'><a class='doclink' href='org/apache/juneau/jena/RdfCommonContext.html#ConfigProperties'>RdfCommonContext</a> - Configurable properties common to the RDF serializers and parsers. <ul> - <li class='c'><a class='doclink' href='org/apache/juneau/jena/RdfParserContext.html#ConfigProperties'>RdfParserContext</a> - Configurable properties on the RDF parsers. + <li class='jc'><a class='doclink' href='org/apache/juneau/jena/RdfParserContext.html#ConfigProperties'>RdfParserContext</a> - Configurable properties on the RDF parsers. </ul> - <li class='c'><a class='doclink' href='org/apache/juneau/json/JsonParserContext.html#ConfigProperties'>JsonParserContext</a> - Configurable properties on the JSON parser. - <li class='c'><a class='doclink' href='org/apache/juneau/msgpack/MsgPackParserContext.html#ConfigProperties'>MsgPackParserContext</a> - Configurable properties on the MessagePack parser. - <li class='c'><a class='doclink' href='org/apache/juneau/urlencoding/UonParserContext.html#ConfigProperties'>UonParserContext</a> - Configurable properties on the URL-Encoding and UON parsers. - <li class='c'><a class='doclink' href='org/apache/juneau/xml/XmlParserContext.html#ConfigProperties'>XmlParserContext</a> - Configurable properties on the XML parser. + <li class='jc'><a class='doclink' href='org/apache/juneau/json/JsonParserContext.html#ConfigProperties'>JsonParserContext</a> - Configurable properties on the JSON parser. + <li class='jc'><a class='doclink' href='org/apache/juneau/msgpack/MsgPackParserContext.html#ConfigProperties'>MsgPackParserContext</a> - Configurable properties on the MessagePack parser. + <li class='jc'><a class='doclink' href='org/apache/juneau/urlencoding/UonParserContext.html#ConfigProperties'>UonParserContext</a> - Configurable properties on the URL-Encoding and UON parsers. + <li class='jc'><a class='doclink' href='org/apache/juneau/xml/XmlParserContext.html#ConfigProperties'>XmlParserContext</a> - Configurable properties on the XML parser. </ul> </ul> - <li class='c'><a class='doclink' href='org/apache/juneau/server/RestContext.html#ConfigProperties'>RestContext</a> - Configurable properties on the REST servlet. + <li class='jc'><a class='doclink' href='org/apache/juneau/server/RestContext.html#ConfigProperties'>RestContext</a> - Configurable properties on the REST servlet. </ul> </div> @@ -651,22 +651,22 @@ However, two special classes are provided tailor how certain Java objects are handled by the framework. These classes are: </p> - <ul class='javahierarchy'> - <li class='c'>{@link org.apache.juneau.transform.PojoSwap} - Tailor how specific non-bean classes are handled by the framework. - <li class='c'>{@link org.apache.juneau.transform.BeanFilter} - Tailor how specific bean classes are handled by the framework. + <ul class='doctree'> + <li class='jc'>{@link org.apache.juneau.transform.PojoSwap} - Tailor how specific non-bean classes are handled by the framework. + <li class='jc'>{@link org.apache.juneau.transform.BeanFilter} - Tailor how specific bean classes are handled by the framework. </ul> <p> Annotations are also provided that allow you to use transformations directly on class definitions: </p> - <ul class='javahierarchy'> - <li class='n'>{@link org.apache.juneau.annotation.Pojo @Pojo} - Used to tailor how non-bean POJOs get interpreted by the framework. - <li class='n'>{@link org.apache.juneau.annotation.Bean @Bean} - Used to tailor how beans get interpreted by the framework. - <li class='n'>{@link org.apache.juneau.annotation.BeanConstructor @BeanConstructor} - Maps constructor arguments to property names on beans with read-only properties. - <li class='n'>{@link org.apache.juneau.annotation.BeanIgnore @BeanIgnore} - Ignore classes, fields, and methods from being interpreted as bean or bean components. - <li class='n'>{@link org.apache.juneau.annotation.BeanProperty @BeanProperty} - Used to tailor how bean properties get interpreted by the framework. - <li class='n'>{@link org.apache.juneau.annotation.NameProperty @NameProperty} - Identifies a setter as a method for setting the name of a POJO as it's known by its parent object. - <li class='n'>{@link org.apache.juneau.annotation.ParentProperty @ParentProperty} - Identifies a setter as a method for adding a parent reference to a child object. - <li class='n'>{@link org.apache.juneau.annotation.URI @URI} - Used to identify a class or bean property as a URI. + <ul class='doctree'> + <li class='ja'>{@link org.apache.juneau.annotation.Pojo @Pojo} - Used to tailor how non-bean POJOs get interpreted by the framework. + <li class='ja'>{@link org.apache.juneau.annotation.Bean @Bean} - Used to tailor how beans get interpreted by the framework. + <li class='ja'>{@link org.apache.juneau.annotation.BeanConstructor @BeanConstructor} - Maps constructor arguments to property names on beans with read-only properties. + <li class='ja'>{@link org.apache.juneau.annotation.BeanIgnore @BeanIgnore} - Ignore classes, fields, and methods from being interpreted as bean or bean components. + <li class='ja'>{@link org.apache.juneau.annotation.BeanProperty @BeanProperty} - Used to tailor how bean properties get interpreted by the framework. + <li class='ja'>{@link org.apache.juneau.annotation.NameProperty @NameProperty} - Identifies a setter as a method for setting the name of a POJO as it's known by its parent object. + <li class='ja'>{@link org.apache.juneau.annotation.ParentProperty @ParentProperty} - Identifies a setter as a method for adding a parent reference to a child object. + <li class='ja'>{@link org.apache.juneau.annotation.URI @URI} - Used to identify a class or bean property as a URI. </ul> <!-- ======================================================================================================== --> @@ -733,26 +733,27 @@ <p> Several <code>PojoSwaps</code> are already provided for common Java objects: </p> - <ul class='javahierarchy'> - <li class='p'><a class='doclink' href='org/apache/juneau/transforms/package-summary.html#TOC'>org.apache.juneau.transforms</a> + <ul class='doctree'> + <li class='jp'><a class='doclink' href='org/apache/juneau/transforms/package-summary.html#TOC'>org.apache.juneau.transforms</a> <ul> - <li class='c'>{@link org.apache.juneau.transforms.ByteArrayBase64Swap} - <li class='a'>{@link org.apache.juneau.transforms.CalendarSwap} - <li class='a'>{@link org.apache.juneau.transforms.DateSwap} - <li class='c'>{@link org.apache.juneau.transforms.EnumerationSwap} - <li class='c'>{@link org.apache.juneau.transforms.IteratorSwap} - <li class='c'>{@link org.apache.juneau.transforms.ReaderSwap} - <li class='c'>{@link org.apache.juneau.transforms.XMLGregorianCalendarSwap} + <li class='jc'>{@link org.apache.juneau.transforms.ByteArrayBase64Swap} + <li class='jac'>{@link org.apache.juneau.transforms.CalendarSwap} + <li class='jac'>{@link org.apache.juneau.transforms.DateSwap} + <li class='jc'>{@link org.apache.juneau.transforms.EnumerationSwap} + <li class='jc'>{@link org.apache.juneau.transforms.IteratorSwap} + <li class='jc'>{@link org.apache.juneau.transforms.ReaderSwap} + <li class='jc'>{@link org.apache.juneau.transforms.XMLGregorianCalendarSwap} </ul> </ul> <p> In particular, the {@link org.apache.juneau.transforms.CalendarSwap} and {@link org.apache.juneau.transforms.DateSwap} tramsforms provide a large number of customized swaps to ISO, RFC, or localized strings. </p> - <p class='info'> - The 'swapped' class type must be a serializable type.<br> - See the definition for Category 4 objects in <a class='doclink' href='#Core.PojoCategories'>POJO Categories</a>. - </p> + <ul class='doctree'> + <li class='info'> + The 'swapped' class type must be a serializable type.<br> + See the definition for Category 4 objects in <a class='doclink' href='#Core.PojoCategories'>POJO Categories</a>. + </ul> </div> <!-- ======================================================================================================== --> @@ -957,8 +958,8 @@ </p> <h6 class='topic'>Additional Information</h6> - <ul class='javahierarchy'> - <li class='p'><a class='doclink' href='org/apache/juneau/transform/package-summary.html#TOC'>org.apache.juneau.transform</a> + <ul class='doctree'> + <li class='jp'><a class='doclink' href='org/apache/juneau/transform/package-summary.html#TOC'>org.apache.juneau.transform</a> </ul> </div> @@ -1034,20 +1035,18 @@ <li>On individual bean properties through the {@link org.apache.juneau.annotation.BeanProperty#beanDictionary() @BeanProperty.beanDictionary()} annotation. <li>Globally for a parser using the {@link org.apache.juneau.parser.ParserBuilder#beanDictionary(Class...)} method. </ul> - <p class='info'> - Type names do not need to be universally unique. - However, they must be unique within a dictionary. - </p> - <p class='info'> - The following reserved words cannot be used as type names: <code>object, array, number, boolean, null</code>. - </p> - <p class='info'> - Serialized type names are DISABLED by default. - They must be enabled on the serializer using the {@link org.apache.juneau.serializer.SerializerContext#SERIALIZER_addBeanTypeProperties} configuration property. - </p> - <p class='info'> - The <js>"_type"</js> property name can be overridden using the {@link org.apache.juneau.BeanContext#BEAN_beanTypePropertyName} configuration property. - </p> + <ul class='doctree'> + <li class='info'> + Type names do not need to be universally unique. + However, they must be unique within a dictionary. + <li class='info'> + The following reserved words cannot be used as type names: <code>object, array, number, boolean, null</code>. + <li class='info'> + Serialized type names are DISABLED by default. + They must be enabled on the serializer using the {@link org.apache.juneau.serializer.SerializerContext#SERIALIZER_addBeanTypeProperties} configuration property. + <li class='info'> + The <js>"_type"</js> property name can be overridden using the {@link org.apache.juneau.BeanContext#BEAN_beanTypePropertyName} configuration property. + </ul> <!-- ======================================================================================================== --> <a id="Core.BeanSubTypes"></a> @@ -1380,12 +1379,13 @@ <td style='background-color:salmon;text-align:center'><b>no</b></td> </tr> </table> - <p class='info'> - Serializers are designed to work on tree-shaped POJO models. - These are models where there are no referential loops (e.g. leaves with references to nodes, or nodes in one branch referencing nodes in another branch). - There is a serializer setting {@code detectRecursions} to look for and handle these kinds of loops (by setting these references to <jk>null</jk>), - but it is not enabled by default since it introduces a moderate performance penalty. - </p> + <ul class='doctree'> + <li class='info'> + Serializers are designed to work on tree-shaped POJO models. + These are models where there are no referential loops (e.g. leaves with references to nodes, or nodes in one branch referencing nodes in another branch). + There is a serializer setting {@code detectRecursions} to look for and handle these kinds of loops (by setting these references to <jk>null</jk>), + but it is not enabled by default since it introduces a moderate performance penalty. + </ul> </div> <!-- ======================================================================================================== --> @@ -1419,8 +1419,8 @@ It is used extensively in the ConfigFile, REST and Microservice APIs. </p> <h6 class='topic'>Additional Information</h6> - <ul class='javahierarchy'> - <li class='p'><a class='doclink' href='org/apache/juneau/svl/package-summary.html#TOC'>org.apache.juneau.svl</a> - Simple Variable Language Javadocs. + <ul class='doctree'> + <li class='jp'><a class='doclink' href='org/apache/juneau/svl/package-summary.html#TOC'>org.apache.juneau.svl</a> - Simple Variable Language Javadocs. </ul> </div> @@ -1655,8 +1655,8 @@ cf.save(); </p> <h6 class='topic'>Additional Information</h6> - <ul class='javahierarchy'> - <li class='p'><a class='doclink' href='org/apache/juneau/ini/package-summary.html#TOC'>org.apache.juneau.ini</a> - Config API Javadocs. + <ul class='doctree'> + <li class='jp'><a class='doclink' href='org/apache/juneau/ini/package-summary.html#TOC'>org.apache.juneau.ini</a> - Config API Javadocs. </ul> </div> @@ -1669,18 +1669,18 @@ Refer to these docs for language-specific information. </p> <h6 class='topic'>Additional Information</h6> - <ul class='javahierarchy'> - <li class='p'><a class='doclink' href='org/apache/juneau/html/package-summary.html#TOC'>org.apache.juneau.html</a> - HTML support. - <li class='p'><a class='doclink' href='org/apache/juneau/jena/package-summary.html#TOC'>org.apache.juneau.jena</a> - RDF support. - <li class='p'><a class='doclink' href='org/apache/juneau/jso/package-summary.html#TOC'>org.apache.juneau.jso</a> - Java Serialized Object support. - <li class='p'><a class='doclink' href='org/apache/juneau/json/package-summary.html#TOC'>org.apache.juneau.json</a> - JSON support. - <li class='p'><a class='doclink' href='org/apache/juneau/msgpack/package-summary.html#TOC'>org.apache.juneau.msgpack</a> - MessagePack support. - <li class='p'><a class='doclink' href='org/apache/juneau/plaintext/package-summary.html#TOC'>org.apache.juneau.plaintext</a> - Plain-text support. - <li class='p'><a class='doclink' href='org/apache/juneau/soap/package-summary.html#TOC'>org.apache.juneau.soap</a> - SOAP support. - <li class='p'><a class='doclink' href='org/apache/juneau/urlencoding/package-summary.html#TOC'>org.apache.juneau.urlencoding</a> - URL-Encoding and UON support. - <li class='p'><a class='doclink' href='org/apache/juneau/xml/package-summary.html#TOC'>org.apache.juneau.xml</a> - XML support. - <li class='p'><a class='doclink' href='org/apache/juneau/dto/atom/package-summary.html#TOC'>org.apache.juneau.dto.atom</a> - ATOM support. - <li class='p'><a class='doclink' href='org/apache/juneau/dto/cognos/package-summary.html#TOC'>org.apache.juneau.dto.cognos</a> - Cognos support. + <ul class='doctree'> + <li class='jp'><a class='doclink' href='org/apache/juneau/html/package-summary.html#TOC'>org.apache.juneau.html</a> - HTML support. + <li class='jp'><a class='doclink' href='org/apache/juneau/jena/package-summary.html#TOC'>org.apache.juneau.jena</a> - RDF support. + <li class='jp'><a class='doclink' href='org/apache/juneau/jso/package-summary.html#TOC'>org.apache.juneau.jso</a> - Java Serialized Object support. + <li class='jp'><a class='doclink' href='org/apache/juneau/json/package-summary.html#TOC'>org.apache.juneau.json</a> - JSON support. + <li class='jp'><a class='doclink' href='org/apache/juneau/msgpack/package-summary.html#TOC'>org.apache.juneau.msgpack</a> - MessagePack support. + <li class='jp'><a class='doclink' href='org/apache/juneau/plaintext/package-summary.html#TOC'>org.apache.juneau.plaintext</a> - Plain-text support. + <li class='jp'><a class='doclink' href='org/apache/juneau/soap/package-summary.html#TOC'>org.apache.juneau.soap</a> - SOAP support. + <li class='jp'><a class='doclink' href='org/apache/juneau/urlencoding/package-summary.html#TOC'>org.apache.juneau.urlencoding</a> - URL-Encoding and UON support. + <li class='jp'><a class='doclink' href='org/apache/juneau/xml/package-summary.html#TOC'>org.apache.juneau.xml</a> - XML support. + <li class='jp'><a class='doclink' href='org/apache/juneau/dto/atom/package-summary.html#TOC'>org.apache.juneau.dto.atom</a> - ATOM support. + <li class='jp'><a class='doclink' href='org/apache/juneau/dto/cognos/package-summary.html#TOC'>org.apache.juneau.dto.cognos</a> - Cognos support. </ul> </div> @@ -1899,8 +1899,8 @@ </p> <h6 class='topic'>Additional Information</h6> - <ul class='javahierarchy'> - <li class='p'><a class='doclink' href='org/apache/juneau/dto/html5/package-summary.html#TOC'>org.apache.juneau.dto.html5</a> - HTML5 beans. + <ul class='doctree'> + <li class='jp'><a class='doclink' href='org/apache/juneau/dto/html5/package-summary.html#TOC'>org.apache.juneau.dto.html5</a> - HTML5 beans. </ul> </div> @@ -2017,8 +2017,8 @@ </p> <h6 class='topic'>Additional Information</h6> - <ul class='javahierarchy'> - <li class='p'><a class='doclink' href='org/apache/juneau/dto/atom/package-summary.html#TOC'>org.apache.juneau.dto.atom</a> - Atom DTOs. + <ul class='doctree'> + <li class='jp'><a class='doclink' href='org/apache/juneau/dto/atom/package-summary.html#TOC'>org.apache.juneau.dto.atom</a> - Atom DTOs. </ul> </div> @@ -2440,8 +2440,8 @@ Refer to the additional information for an in-depth examination of the API. </p> <h6 class='topic'>Additional Information</h6> - <ul class='javahierarchy'> - <li class='p'><a class='doclink' href='org/apache/juneau/server/package-summary.html#TOC'>org.apache.juneau.rest</a> - Juneau Server API Javadocs. + <ul class='doctree'> + <li class='jp'><a class='doclink' href='org/apache/juneau/server/package-summary.html#TOC'>org.apache.juneau.rest</a> - Juneau Server API Javadocs. </ul> </div> @@ -2483,8 +2483,8 @@ Refer to the additional information for an in-depth examination of the API. </p> <h6 class='topic'>Additional Information</h6> - <ul class='javahierarchy'> - <li class='p'><a class='doclink' href='org/apache/juneau/client/package-summary.html#TOC'>org.apache.juneau.rest.client</a> - Juneau Client API Javadocs. + <ul class='doctree'> + <li class='jp'><a class='doclink' href='org/apache/juneau/client/package-summary.html#TOC'>org.apache.juneau.rest.client</a> - Juneau Client API Javadocs. </ul> </div> @@ -2633,8 +2633,8 @@ recreated on the client side. </ul> <h6 class='topic'>Additional Information</h6> - <ul class='javahierarchy'> - <li class='p'><a class='doclink' href='org/apache/juneau/server/remoteable/package-summary.html#TOC'>org.apache.juneau.rest.remoteable</a> - Juneau Remoteable API Javadocs. + <ul class='doctree'> + <li class='jp'><a class='doclink' href='org/apache/juneau/server/remoteable/package-summary.html#TOC'>org.apache.juneau.rest.remoteable</a> - Juneau Remoteable API Javadocs. </ul> <!-- ======================================================================================================== --> @@ -2716,8 +2716,8 @@ </ul> <h6 class='topic'>Additional Information</h6> - <ul class='javahierarchy'> - <li class='p'><a class='doclink' href='org/apache/juneau/remoteable/package-summary.html#TOC'>org.apache.juneau.remoteable</a> - Juneau Remoteable API Javadocs. + <ul class='doctree'> + <li class='jp'><a class='doclink' href='org/apache/juneau/remoteable/package-summary.html#TOC'>org.apache.juneau.remoteable</a> - Juneau Remoteable API Javadocs. </ul> </div> </div> @@ -2746,8 +2746,8 @@ and easy-to-use REST interfaces with minimal overhead. </p> <h6 class='topic'>Additional Information</h6> - <ul class='javahierarchy'> - <li class='p'><a class='doclink' href='org/apache/juneau/microservice/package-summary.html#TOC'>org.apache.juneau.microservice</a> - Juneau Microservice API Javadocs. + <ul class='doctree'> + <li class='jp'><a class='doclink' href='org/apache/juneau/microservice/package-summary.html#TOC'>org.apache.juneau.microservice</a> - Juneau Microservice API Javadocs. </ul> </div> @@ -2883,10 +2883,10 @@ If you open up a command prompt in the <l>build/microservice</l> folder, you can start your microservice as follows: </p> <img class='bordered' src='doc-files/Samples.Building.2.png'> - <p class='warn'> - If you get an error message saying <code class='snippet'>java.net.BindException: Address already in use</code>, this means that the microservice - is already running elsewhere, so it cannot bind to port 10000. - </p> + <ul class='doctree'> + <li class='warn'>If you get an error message saying <code class='snippet'>java.net.BindException: Address already in use</code>, this means that the microservice + is already running elsewhere, so it cannot bind to port 10000. + </ul> </div> <!-- ======================================================================================================== --> @@ -2935,9 +2935,9 @@ However, if you need to add extra libraries to your microservice, you'll need to copy them into your <l>lib</l> directory and add them to the classpath here. </ul> - <p class='warn'> - If you modify the manifest file and get <l>NoClassDefFoundErrors</l>, ensure that the classpath entries contain trailing spaces. - </p> + <ul class='doctree'> + <li class='warn'>If you modify the manifest file and get <l>NoClassDefFoundErrors</l>, ensure that the classpath entries contain trailing spaces. + </ul> </div> <!-- ======================================================================================================== --> @@ -2951,20 +2951,20 @@ <p> The class hierarchy for this class is: </p> - <ul class='javahierarchy'> - <li class='a'>{@link org.apache.juneau.rest.RestServlet org.apache.juneau.rest.RestServlet} + <ul class='doctree'> + <li class='jac'>{@link org.apache.juneau.rest.RestServlet org.apache.juneau.rest.RestServlet} <br>Contains all the REST servlet logic. <ul> - <li class='a'>{@link org.apache.juneau.rest.RestServletDefault org.apache.juneau.rest.RestServletDefault} + <li class='jac'>{@link org.apache.juneau.rest.RestServletDefault org.apache.juneau.rest.RestServletDefault} <br>Defines default serializers and parsers, and OPTIONs page logic. <ul> - <li class='a'>{@link org.apache.juneau.rest.RestServletGroupDefault org.apache.juneau.rest.RestServletGroupDefault} + <li class='jac'>{@link org.apache.juneau.rest.RestServletGroupDefault org.apache.juneau.rest.RestServletGroupDefault} <br>Specialized subclass for grouping other resources <ul> - <li class='a'>{@link org.apache.juneau.microservice.ResourceGroup org.apache.juneau.microservice.ResourceGroup} + <li class='jac'>{@link org.apache.juneau.microservice.ResourceGroup org.apache.juneau.microservice.ResourceGroup} <br>Specialized subclass when using the Microservice API. <ul> - <li class='c'><code>org.apache.juneau.rest.samples.RootResources</code> + <li class='jc'><code>org.apache.juneau.rest.samples.RootResources</code> </ul> </ul> </ul> @@ -3066,15 +3066,16 @@ Note that these router pages can be arbitrarily nested deep. You can define many levels of router pages for arbitrarily hierarchical REST interfaces. </p> - <p class='info'> - Let's step back and describe what's going on here:<br> - During servlet initialization of the <l>RootResources</l> object, the toolkit looks for the <l>@RestResource.children()</l> annotation. - If it finds it, it instantiates instances of each class and recursively performs servlet initialization on them. - It then associates the child resource with the parent by the name specified by the <l>@RestResource.path()</l> annotation on the child class. - When a request for the child URL (<l>/helloWorld</l>) is received, the <l>RootResources</l> servlet gets the request and sees that the URL remainder matches one of its child resources. - It then forwards the request to the child resource for processing. - The request passed to the child resource is the same as if the child resource had been deployed independently (e.g. path-info, resource-URI, and so forth). - </p> + <ul class='doctree'> + <li class='info'> + Let's step back and describe what's going on here:<br> + During servlet initialization of the <l>RootResources</l> object, the toolkit looks for the <l>@RestResource.children()</l> annotation. + If it finds it, it instantiates instances of each class and recursively performs servlet initialization on them. + It then associates the child resource with the parent by the name specified by the <l>@RestResource.path()</l> annotation on the child class. + When a request for the child URL (<l>/helloWorld</l>) is received, the <l>RootResources</l> servlet gets the request and sees that the URL remainder matches one of its child resources. + It then forwards the request to the child resource for processing. + The request passed to the child resource is the same as if the child resource had been deployed independently (e.g. path-info, resource-URI, and so forth). + </ul> </div> <!-- ======================================================================================================== --> @@ -3116,17 +3117,17 @@ <p> The class hierarchy for this class is: </p> - <ul class='javahierarchy'> - <li class='a'>{@link org.apache.juneau.rest.RestServlet org.apache.juneau.rest.RestServlet} + <ul class='doctree'> + <li class='jac'>{@link org.apache.juneau.rest.RestServlet org.apache.juneau.rest.RestServlet} <br>Contains all the REST servlet logic. <ul> - <li class='a'>{@link org.apache.juneau.rest.RestServletDefault org.apache.juneau.rest.RestServletDefault} + <li class='jac'>{@link org.apache.juneau.rest.RestServletDefault org.apache.juneau.rest.RestServletDefault} <br>Defines default serializers and parsers, and OPTIONs page logic. <ul> - <li class='a'>{@link org.apache.juneau.microservice.Resource org.apache.juneau.microservice.Resource} + <li class='jac'>{@link org.apache.juneau.microservice.Resource org.apache.juneau.microservice.Resource} <br>Specialized subclass when using the Microservice API. <ul> - <li class='c'><code>org.apache.juneau.rest.samples.HelloWorldResource</code> + <li class='jc'><code>org.apache.juneau.rest.samples.HelloWorldResource</code> </ul> </ul> </ul> @@ -3286,32 +3287,32 @@ <p> The class consists of 4 methods: </p> - <ul class='javahierarchy'> - <li class='m'><l>doExample()</l> + <ul class='doctree'> + <li class='jm'><l>doExample()</l> <br>The root page. <br>Performs a simple redirection to the <l>doGetExample1()</l> method using a {@link org.apache.juneau.rest.Redirect} object. - <li class='m'><l>example1()</l> + <li class='jm'><l>example1()</l> <br>Shows how to use the following annotations: <ul> - <li class='n'>{@link org.apache.juneau.rest.annotation.Path @Path} - <li class='n'>{@link org.apache.juneau.rest.annotation.Query @Query} - <li class='n'>{@link org.apache.juneau.rest.annotation.Header @Header} - <li class='n'>{@link org.apache.juneau.rest.annotation.Method @Method} - <li class='n'>{@link org.apache.juneau.rest.annotation.PathRemainder @PathRemainder} + <li class='ja'>{@link org.apache.juneau.rest.annotation.Path @Path} + <li class='ja'>{@link org.apache.juneau.rest.annotation.Query @Query} + <li class='ja'>{@link org.apache.juneau.rest.annotation.Header @Header} + <li class='ja'>{@link org.apache.juneau.rest.annotation.Method @Method} + <li class='ja'>{@link org.apache.juneau.rest.annotation.PathRemainder @PathRemainder} </ul> Method returns a POJO to be serialized as the output. - <li class='m'><l>example2()</l> + <li class='jm'><l>example2()</l> <br>Identical to <l>doGetExample1()</l> but shows how to use the {@link org.apache.juneau.rest.RestRequest} and {@link org.apache.juneau.rest.RestResponse} objects: <ul> - <li class='m'>{@link org.apache.juneau.rest.RestRequest#getPathMatch()} - <li class='m'>{@link org.apache.juneau.rest.RestRequest#getQuery()} - <li class='m'>{@link org.apache.juneau.rest.RestRequest#getFormData()} - <li class='m'>{@link org.apache.juneau.rest.RestRequest#getHeaders()} - <li class='m'>{@link org.apache.juneau.rest.RestRequest#getMethod()} - <li class='m'>{@link org.apache.juneau.rest.RequestPathMatch#getRemainder()} + <li class='jm'>{@link org.apache.juneau.rest.RestRequest#getPathMatch()} + <li class='jm'>{@link org.apache.juneau.rest.RestRequest#getQuery()} + <li class='jm'>{@link org.apache.juneau.rest.RestRequest#getFormData()} + <li class='jm'>{@link org.apache.juneau.rest.RestRequest#getHeaders()} + <li class='jm'>{@link org.apache.juneau.rest.RestRequest#getMethod()} + <li class='jm'>{@link org.apache.juneau.rest.RequestPathMatch#getRemainder()} </ul> Method sets the POJO to be serialized using the {@link org.apache.juneau.rest.RestResponse#setOutput(Object)} method. - <li class='m'><l>example3()</l> + <li class='jm'><l>example3()</l> <br>Identical to <l>doGetExample1()</l> but uses automatically resolved parameters based on class type. <br>Juneau automatically recognizes specific class types such as common header types and automatically resolves them to objects for you. @@ -3600,9 +3601,9 @@ </p> <h6 class='topic'>Additional Information</h6> - <ul class='javahierarchy'> - <li class='m'>{@link org.apache.juneau.rest.RestConfig#addVars(Class[])} - Servlet and request variables. - <li class='m'>{@link org.apache.juneau.rest.RestCallHandler#getSessionObjects(RestRequest)} - Var resolver session objects. + <ul class='doctree'> + <li class='jm'>{@link org.apache.juneau.rest.RestConfig#addVars(Class[])} - Servlet and request variables. + <li class='jm'>{@link org.apache.juneau.rest.RestCallHandler#getSessionObjects(RestRequest)} - Var resolver session objects. </ul> </div> @@ -3762,10 +3763,11 @@ <li><l>CreatePerson, CreateAddress</l> - POJOs for creating and updating people and address through the REST interface. <li><l>AddressBookResource</l> - The REST resource class. </ul> - <p class='info'> + <ul class='doctree'> + <li class='info'> For the sake of brevity, bean properties are defined as public fields instead of the normal getters/setters. Also, the examples are not the most efficient design and are not thread safe. - </p> + </ul> <p> The <l>package-info.java</l> file is used to define XML and RDF namespaces on beans and properties in this package. Here you define a default XML and RDF namespaces and URL mappings for namespace shortnames used throughout this package. @@ -4802,9 +4804,10 @@ <img class='bordered' src='doc-files/Samples.SampleRemoteableServlet.2.png'> <br><br> <img class='bordered' src='doc-files/Samples.SampleRemoteableServlet.3.png'> - <p class='info'> - As good practice, you'll want to use interfaces to prevent all public methods from being exposed. - </p> + <ul class='doctree'> + <li class='info'> + As good practice, you'll want to use interfaces to prevent all public methods from being exposed. + </ul> <p> Proxy interfaces are then retrieved using the {@link org.apache.juneau.rest.client.RestClient#getRemoteableProxy(Class)} method. </p> @@ -4827,13 +4830,13 @@ <jk>new</jk> CreateAddress(<js>"Test street"</js>, <js>"Test city"</js>, <js>"Test state"</js>, 12345, <jk>true</jk>)) ); <h6 class='topic'>Additional Information</h6> - <ul class='javahierarchy'> - <li class='p'><a class='doclink' href='org/apache/juneau/server/remoteable/package-summary.html#TOC'>org.apache.juneau.rest.remoteable</a> - Remoteable API Javadoc - <li class='a'>{@link org.apache.juneau.rest.remoteable.RemoteableServlet} - <li class='c'>{@link org.apache.juneau.rest.client.RestClient} + <ul class='doctree'> + <li class='jp'><a class='doclink' href='org/apache/juneau/server/remoteable/package-summary.html#TOC'>org.apache.juneau.rest.remoteable</a> - Remoteable API Javadoc + <li class='jac'>{@link org.apache.juneau.rest.remoteable.RemoteableServlet} + <li class='jc'>{@link org.apache.juneau.rest.client.RestClient} <ul> - <li class='m'>{@link org.apache.juneau.rest.client.RestClient#getRemoteableProxy(Class) getRemoteableProxy(Class)} - <li class='m'>{@link org.apache.juneau.rest.client.RestClient#getRemoteableProxy(Class,Object) getRemoteableProxy(Class,Object)} + <li class='jm'>{@link org.apache.juneau.rest.client.RestClient#getRemoteableProxy(Class) getRemoteableProxy(Class)} + <li class='jm'>{@link org.apache.juneau.rest.client.RestClient#getRemoteableProxy(Class,Object) getRemoteableProxy(Class,Object)} </ul> </ul> </div> @@ -4950,8 +4953,8 @@ Note how the HTML file contains localized variables for the servlet label and description. </p> <h6 class='topic'>Additional Information</h6> - <ul class='javahierarchy'> - <li class='a'>{@link org.apache.juneau.microservice.resources.DirectoryResource} + <ul class='doctree'> + <li class='jac'>{@link org.apache.juneau.microservice.resources.DirectoryResource} </ul> </div> @@ -5060,8 +5063,8 @@ } </p> <h6 class='topic'>Additional Information</h6> - <ul class='javahierarchy'> - <li class='p'><a class='doclink' href='org/apache/juneau/dto/atom/package-summary.html#TOC'>org.apache.juneau.dto.atom</a> - ATOM Feed DTO Javadocs. + <ul class='doctree'> + <li class='jp'><a class='doclink' href='org/apache/juneau/dto/atom/package-summary.html#TOC'>org.apache.juneau.dto.atom</a> - ATOM Feed DTO Javadocs. </ul> </div> @@ -5144,9 +5147,9 @@ <ck>url</ck> = <cv>http://clmdocker02.ratl.swg.usma.apache.org:5000/v1</cv> </p> <h6 class='topic'>Additional Information</h6> - <ul class='javahierarchy'> - <li class='c'>{@link org.apache.juneau.rest.labels.ResourceDescription} - <li class='m'>{@link org.apache.juneau.rest.RestContext#getConfigFile()} + <ul class='doctree'> + <li class='jc'>{@link org.apache.juneau.rest.labels.ResourceDescription} + <li class='jm'>{@link org.apache.juneau.rest.RestContext#getConfigFile()} </ul> </div>
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d94d89db/juneau-core/src/main/javadoc/resources/icons/abstract_class.png ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/javadoc/resources/icons/abstract_class.png b/juneau-core/src/main/javadoc/resources/icons/abstract_class.png new file mode 100644 index 0000000..f2b833a Binary files /dev/null and b/juneau-core/src/main/javadoc/resources/icons/abstract_class.png differ http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d94d89db/juneau-core/src/main/javadoc/resources/icons/annotation.png ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/javadoc/resources/icons/annotation.png b/juneau-core/src/main/javadoc/resources/icons/annotation.png new file mode 100644 index 0000000..41c670c Binary files /dev/null and b/juneau-core/src/main/javadoc/resources/icons/annotation.png differ http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d94d89db/juneau-core/src/main/javadoc/resources/icons/class.png ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/javadoc/resources/icons/class.png b/juneau-core/src/main/javadoc/resources/icons/class.png new file mode 100644 index 0000000..eca31b3 Binary files /dev/null and b/juneau-core/src/main/javadoc/resources/icons/class.png differ http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d94d89db/juneau-core/src/main/javadoc/resources/icons/extlink.png ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/javadoc/resources/icons/extlink.png b/juneau-core/src/main/javadoc/resources/icons/extlink.png new file mode 100644 index 0000000..5e7b6e6 Binary files /dev/null and b/juneau-core/src/main/javadoc/resources/icons/extlink.png differ http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d94d89db/juneau-core/src/main/javadoc/resources/icons/field.png ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/javadoc/resources/icons/field.png b/juneau-core/src/main/javadoc/resources/icons/field.png new file mode 100644 index 0000000..b5069b2 Binary files /dev/null and b/juneau-core/src/main/javadoc/resources/icons/field.png differ http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d94d89db/juneau-core/src/main/javadoc/resources/icons/info.png ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/javadoc/resources/icons/info.png b/juneau-core/src/main/javadoc/resources/icons/info.png new file mode 100644 index 0000000..34cc330 Binary files /dev/null and b/juneau-core/src/main/javadoc/resources/icons/info.png differ http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d94d89db/juneau-core/src/main/javadoc/resources/icons/interface.png ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/javadoc/resources/icons/interface.png b/juneau-core/src/main/javadoc/resources/icons/interface.png new file mode 100644 index 0000000..059d2fe Binary files /dev/null and b/juneau-core/src/main/javadoc/resources/icons/interface.png differ http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d94d89db/juneau-core/src/main/javadoc/resources/icons/link.png ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/javadoc/resources/icons/link.png b/juneau-core/src/main/javadoc/resources/icons/link.png new file mode 100644 index 0000000..77d4700 Binary files /dev/null and b/juneau-core/src/main/javadoc/resources/icons/link.png differ http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d94d89db/juneau-core/src/main/javadoc/resources/icons/method.png ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/javadoc/resources/icons/method.png b/juneau-core/src/main/javadoc/resources/icons/method.png new file mode 100644 index 0000000..72b0277 Binary files /dev/null and b/juneau-core/src/main/javadoc/resources/icons/method.png differ http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d94d89db/juneau-core/src/main/javadoc/resources/icons/package.png ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/javadoc/resources/icons/package.png b/juneau-core/src/main/javadoc/resources/icons/package.png new file mode 100644 index 0000000..538f2e5 Binary files /dev/null and b/juneau-core/src/main/javadoc/resources/icons/package.png differ http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d94d89db/juneau-core/src/main/javadoc/resources/icons/severe.png ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/javadoc/resources/icons/severe.png b/juneau-core/src/main/javadoc/resources/icons/severe.png new file mode 100644 index 0000000..d5309c1 Binary files /dev/null and b/juneau-core/src/main/javadoc/resources/icons/severe.png differ http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d94d89db/juneau-core/src/main/javadoc/resources/icons/sublink.png ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/javadoc/resources/icons/sublink.png b/juneau-core/src/main/javadoc/resources/icons/sublink.png new file mode 100644 index 0000000..08d73d1 Binary files /dev/null and b/juneau-core/src/main/javadoc/resources/icons/sublink.png differ http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d94d89db/juneau-core/src/main/javadoc/resources/icons/warn.png ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/javadoc/resources/icons/warn.png b/juneau-core/src/main/javadoc/resources/icons/warn.png new file mode 100644 index 0000000..c9b6327 Binary files /dev/null and b/juneau-core/src/main/javadoc/resources/icons/warn.png differ http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d94d89db/juneau-core/src/main/javadoc/resources/juneau-doc.css ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/javadoc/resources/juneau-doc.css b/juneau-core/src/main/javadoc/resources/juneau-doc.css index 1bc7c23..6026354 100755 --- a/juneau-core/src/main/javadoc/resources/juneau-doc.css +++ b/juneau-core/src/main/javadoc/resources/juneau-doc.css @@ -228,7 +228,7 @@ h6.toc, h6.notes { h5.topic, h6.topic { color: #2C4557; padding: 5px 20px; - margin: 30px 10px 20px 0px; + margin: 30px 10px 10px 0px; text-decoration: none; } @@ -301,68 +301,55 @@ l { .spaced-list li { padding:5px; } .footer .spaced-list ul { margin:0 } - -/* Java Hierarchy Tree */ -.javahierarchy li { - padding-left: 30px; - padding-top: 5px; - padding-bottom: 5px; - padding-top: 2px; - list-style: none; - background-repeat: no-repeat; - background-position: left top; - background-size: 16px; +/* Documentation Tree */ +.doctree li {} +.doctree li.link { + list-style-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABEElEQVQ4T2M0T3iVLyHKWvnvH4M4AwmAiYnh5adP/7oYvQrevmBmZiJJM8wekCGMvsXv/5NgMYrS33/+M1BkwOOX/ygzYM/pX8QZwMfN+L8lnZOhf+VPhvtP/zKC/HHh1h+Gx6+IdAEHG8P/WRVcDP///2con/aDYcfx34wgzSCAEgatGez/1WSZwDbgAm8//v8v7fcJrgbFAE1Fpv86iowMv/8gzPj7j4Hh7cd/DOkBrAzsrAwM9XN/MvQs/YUwQNb3zX9OdkxLP339z/Dtx3+GT9/+M/BwMv6/sZyTYdKa3wxdS36jKGZkMH9FdjoAh8GwMOD1AwYGBnky88NDRgbTNwkMTP8byDDkIcM/xgYA0dJ4nW6TgR4AAAAASUVORK5CYII='); } -.javahierarchy li.c { - background-image: url('data:image/gif;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAC7klEQVQ4jZWUW2hTWRSGv31Jk2qaaBttvBUvUTGKl1qtUDoKCoIwCD75UgTxUm/YAR8EpaDOMDhIQcFUxToPE+ZhHnRUBF8GBsYHHdSiIkSLqGiF4i22Dck+Kd3zEBrPOSmj/ocf1j57/f9aZx/2wlqLn1jmYDmJ5RaWHLb8ZLH0YunEMnN8rWuhCiKsCuKSKoiiKgj7BRZVQfyoCiLg9hDWWgCCgzoOXAea+Db8A3xvIiOfgJJh9dtAELgNLP9GszH8DWzMTyk6EkA58mflyOXKkbi5yq7icvhP+usGyMaGuRO9y+5AO/485ch1ypEnAETkWbABeAEId8mWUCuX49cJyVBFO5fuX6Qjug8hPJIhYLZURh5QRgplJG6eqUsRkiEymQzJZJJYLEYqlQJge+MOkheW4dPUKCO3aWXEen8Hy6pXkAjOB6Crq4un+Qw1F4Kcrj/JhjfrsUOw5P1SnvQ+QielW9qkpZENfsMF4YXluK+vjwlbq6iaocnygZYHjXxszwMwob6KqnkewxatjKjzG0ZttBwPDw8TiEuUKZ2XmqiY+lv4c7LxSGdp5XgqAFBw8uU4HA6jdelvfgXyUhmRU0bg5svss3JGIpFADIIygql2Clcab3Kl8Saba7fg1ykjXkhlxD3/xqOB+/QPvgago6OD2SZB7ehkfph7mKbaNTTVruHhL0/I/1WsMBSJ3+s6gWP+3tfGN3CuNY3WuuK70uk0bW1tzDwWITQ/4N7aKRb+GpsGvAQCfmFyaCV7Fx2iubkZrTWZTIaenh66u7sJNweYtqvGnZ4D4sJay+Lz9d1A+3innOtzeHcjR/75CHbUEoxrJrWEmPxdNUJ6bsr+x7sHzmoAZcRBYDHQ6jeMNASJ7AlWVip6VteAFPB5fK04NT0 KXAXWjtfp/+APYFvvoTcFjyHAyp9mKOAocBionApeZIHTwPF7R/pHx156DMewunNWFGgDNgHTgSXACKWpdJfSUE3/e/xVzq/9DyomQ6ck1QE9AAAAAElFTkSuQmCC'); +.doctree li.sublink { + list-style-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABXElEQVQ4T2M0T3iVLyHKWvnvH4M4AwmAiYnh5adP/7oYvQrevmBmZiJJM8wekCGMvsXv/8MErPVY/ytKMzMs2f6DkRjH/P7znwHFgLxwzv/G6qwM8U2fiDLg8ct/qAZkB3P8N1BjYUht/0KUAXtO/0I1ICuIHWxAWsdXFAP4uBn/9+RxMcza8JPhzPU/YLkLt/4wPH6F5oLMQLb/+qrMDBld31EM4GBj+D+rgouBlYWBoWvpT4b5m38ygjSDAEoYZASy/Xc2Ycbr/K8//v/Xi/7C8PTNP7A6FAPkJJj+G6kxoUTA338MDO8+/WPIDGQFu2DWht8MBRMRscQo6/vmPyc7pqWfvv5n+PbjP8Onb/8ZeDgZ/99excmwau8fhvwJv1AUMzKYv4KnA3xxb6PH9P/IJYizkQHRBuAyfFAY8PoBAwODPDFpH4uah4wMpm8SGJj+N5BhyEOGf4wNAOjWjp1FyKtJAAAAAElFTkSuQmCC'); } -.javahierarchy li.i { - background-image: url('data:image/gif;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAB70lEQVQ4jZWVPWgUQRiGn92d5cKZkIAQRUiMoCBoYUi6AyNYKIKI2AkShCv8QSzPIhYxAU2ZELTwrxERQeIPwhUKSkAsPKwCFgFPEhCtEvSc/cbTs9gz5OZmNuSFKZZ955nve9n5Nmg0Gtj6/uTXLuAcUAAGgXzz1SrwGZgD7vWeyi/be4P1wC8PVzqBGeAMoNpOalUdmALGd57u+d0G/HT/23bgBTC8AcjWPHB879ltq2vAj7eWcsB74MAmYf/1BjgyeL7PKAAtct0HGyoOkOtMu383vQjtkQMcAiaAUvDqxkI/UAUCl7NwYQ8dXTEAcRzzcrxCFDnj/QEMKC3mkg8GYH8FWgxR9Ndl7QJGlRY57IOlxNZHbYQo/ONzDyudmP5snlVhYohCZ4UABaVFtmYCXS37K+xTWkwWD/sipcDIZ9dKi6kBWzZXoRdYVVqkAhz0Aq0MExHCTGBiXmcC7ZYTkwV8qrTIbWAMiN1Au2VvhTXgUThbLn7VYu5qMbiWK0PPKs2Wiz/DpumyFjPvMl48cYd8rocgCKjX62jjhD3XYm7CuvF1cmiqG3gGjPgC8ugxMDpXKSUtQICj+yaiZp5XgI4NQCvANHCtvHB17eoErl/AyO6xbtKpfQzYAewnndBV4APpUH3wdnGyZu/9BxocEIfO9OfmAAAAAElFTkSuQmCC'); +.doctree li.extlink { + list-style-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABcklEQVQ4T52SvUtCYRTGn/Nq3VtBDRFmGGHg4FZQuPQXSLb0B+TiUAYFQeBWS9kHDRXNLg5Wa5s1uEVD0tCQQYVRaUogCeX9OHEvZWik3c76nuf3nPc5h3zB/FxvT0tE1+GAhRICuVJJXyf/fPHJZhOWxF8+BoQCCy9swbimVVEZTQHBcZkDYxI0DWixA5l7DYs7r2SQsjm9OcDlEOx2Ckz5ZXR3ET0WdJ7ZKJuA5FmlOcBojIbb2eMSuLjWoGiMldgbpa9UZPN/mGAtLPNgn8BG/B0jXhu6OwmTkTIZYqMaZhCdkUzx7qGCVFqlDhl886Dh9FIzv9AQsDrdym4nYftARSKpUDanoVj6uTDqDxS4TaoCTWp8WWLvAGF2q4LYkVL7WLdzgi9fg03tSTzkEQhFK0gcf4/6263UADZn7RyasJvi/RO9oXM1g/oJhj3E5xn+k9gMsR5g9awJvudbAANWhZ/9d4TRQhCCl/4BuYNOSx/YeJed6RTWWAAAAABJRU5ErkJggg=='); } -.javahierarchy li.a { - background-image: url('data:image/gif;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAACx0lEQVQ4jZWUTUhUURTHf3d8jo6NjdakfZhZSJkTZVgJiRW1kIKgDyJa9LGoSCiQVi3CKANpkdEiByqDQgqKwGpTUBQoEZIaBTU1m0QoMKKPccx5711Pi2km3xvD/MOBc+85///9cy4cRITMYKEI50ToFiE+rvRdhH4RmkQomYjrONgJ/HaCa3YCy04gk4RlJzhrJ8ger6FEBAAzrmYDD4BVTA1dwFbvNPkBJAVHvqkc4AVQNUWxFJ4B9XmFYnoAtEWLtqjSFowPkdV48x7gC3zFVzBKjr8fj9GAthSu3g3aohlAfRukFPgIqPFPZnnX45/1EKVyM+y87r/C/OBhlINBDCjzaItj2kK53eUVXkapXN5HIlRWVhIMBmlrawNg+cpDXGirdrvM1xb7DW2yye3AyKkmK3sxAOdbW7FG39F5A4qLTvP50yZ+xuDTlyr6+npZscxBXWXYFqVuwey8inQejUY5vA8WlQIM8SVawY4DydrSUggtcVBrDW0yM2NIEkinw8PDLJgL2kyeC/Ph6d2/ran7P5hvaCtDDtuKp3O/30+uNzmn/8AvjzaJazP5UioSsQ/pjvLycmI//ziRIooruimu6CZ3+m7cPG3y0aNNet2Fka89jMQGAWhsbOTHyBJkbAYFJafwBWrxBWo50TzA/UeZgoZt8QRY53SuGYo0ULKyk1AoRCgUcVQ7Ojq4fusFN1vBdo6iU72+xxxgAMh2DyQ6VMf0siZqamowDINIJEJ7ezvhcJjNdWO0HHe0x4HZSkR4dVeFgSMTTbnvLVy+A2+ioMegbB5s3wi76sHjcbQerdopl5SI0HtLeYHHQN2/vm8S3Ae2Ve8RSa+vnhsqANwD1k9R7Dawf80+GQX+7kOA51dVFnASOAFkbgUnvgMXgTN rD8pY6tIhmEJXWAWAvcAWYC6wDLBJbqWXJJdqR12DxN3c3xwok/9rc3QeAAAAAElFTkSuQmCC'); +.doctree li.info { + list-style-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABTklEQVQ4T2M0T3iVLyHKWvnvH4M4AwmAiYnh5adP/7oYvQrevmBmZiJJM8wekCGMvsXv/5NgMYrS33/+M1BkwOOX//AbUJ/M9V9Flokhv/8rw7uP/xnRXbrn9C/8BpTGcPxXl2NmKJv6DcOAC7f+MDx+hccFPtYs/y11WBk+fv3HMGnVT4YfvxjgLoBpBrkIZxhEuLL8D7JnZfj3n4GhePIPhqev/jO+/fif4crdPwyfviHCHW8gtqaz/1eQZGCIqv/BcPzyH8a3nzAjjFHW981/TnaM8GH49PU/w7oO9v/aiswMxgnfGO48/YepCOQFBvNXONPB4ekc/7UVGRnMkn+SZ8DBqWz/9VSYGSxSfjDcfIwZjeBAxOeCA1PY/qvJMjDYZv5muPuMDAOISeKMDOavHzAwMMgToxiLmoeMDKZvEhiY/jeQYchDhn+MDQDaPZad/sBJ8AAAAABJRU5ErkJggg=='); } -.javahierarchy li.n { - background-image: url('data:image/gif;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAD3klEQVQ4jaWUfUyVVRzHP899nvsi98LlzbgC8hIUaCiCxWyGOF9WiE2IZM4NMFn2Qrnsn1xz9qKW/KW1YZuWq0bWqDUFZ8O05cQSULBsUxHWNaFB7XovXu693APPPf3BHnZlrdb6br9/fud8P/udnXO+SCmZXUiZjZRNSNmJlIGoRR9S9iHlbqRM/zuvIqXEkCaEA3gfqAU0/llTQBPw1pTFMmk0Z4A2f8AFtAMP/wtots4DT07E2sdmgHaP1wpcBJb8R5ih74HHA0kJQgPQhHj3f8AAVgJ7gNeUBPftDMANKNE7nCaFOoedqpgYsjQNTYFhXefb0ASH744zpOuzoX4gS9PC4uXZsGKblY9cKcxR4JPOC3S3txMYuk1+bi4NDQ3Uulxs7R/kfIw92hYL1Cuuq9d6gSKjm2rWOJOTza27Y5SvKGN0aIiYp6rRFj6EYrOh/HaLo2tWUbp0KctPdTBWVBwNPaZpYjIjurM3bR5mJBtKS/FI2N3Vw3PZmcRrKleDIfYNj7DLP0633c7Tvw5wNGUeanKyYV9uUsMiSQ0L1LDAFZGsjY+jpf0kt91udnz2BW/m5fLLwADNhw5R4rBT2PENnt5euvwB1pStJPT1Vxh+NSzmmzQxiVElc2xoisKJD4/gfKKCnQX5uD0eyhcv4rtr1wEY/qkP0dPFHV1nbnoaE10/EsUImVQhAqoQqEKQbZn+HDdv3ODRivUkmM2cbmvDNPc+Fmx7EYCRkRHMcU5iFIWgEER8Pgy/KoTbpIbFZWNkXUwBEIlESE1NA2Dc68VeWESWzQrA6Ogo1rg4CuNi+flGP6rVFn1kt6aJybPACgBvMARATk4OA394iEQkNTU1+BOTqc+evrvKykqy1q0nxWblYFMTczKz0cTMVz6uplZ t7Dfp+naTrqveYIjavPuRUnKyf5Cg1cry+Wk86Ephz+et4PHQsPUZEjWVVw8c5HRLC5kvbMdit2PS9YBJ17coUkoe+fTLD4DnAd4oWUJFXi6N+/bTk5HLaMcpfj/eimp3kFa9Ce/FC/iuXMaSlEz6pjoSS5YZ073UU7exWZFSsuzIMQtwBih1WMy8U5RPyeJFXLo5SO9YAN9EmHiblQVzE9l7rgtfKIRiMkU/3zag8uKzm+VMfD3W/LETOAGUyVCIYs8QVWtXs7CggMSEBO74/Vy53s8rr+/CWb4BsyPWgLUC9Z2NWyaAewO27MBhFdgF7JS6bhvp/oE/+3oIjo4wGRzH7IglNiOLB6o3Y4lz+oD3gLfP7dgWMRj3AA2t3t/sZDq11wGpQAHTCe0GLjEdqi1ndzYGZnv/Ahxrv7iITMWYAAAAAElFTkSuQmCC'); +.doctree li.warn { + list-style-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABdklEQVQ4T5WSv0tCcRTFz1WhNBtqSLIhGoKWgoYIbAmiraHFWvsPooigQXAQAsGpoqW9xSGpQEIqGyyXIKIiCEzw5Q9Synz+eM/njacQhV9D7/o993PPOXwpE5pbNZptW0DNho7GkIaa91I67EyRwdjhcuMSw5CmZHiZOzr8S8w1FZQ4FwPI2MUDU15oSh7vty4SHakWJVA81BowOLMPrfKBdHRdCJCTl6DY2ZIwgu7A7tiDpuaRumkGlHL3UGUJ9BL8D7BTj5CKbvxxUMw2lvWh59PWgCGHD6yVIUUagGolh1L2CZr69VMJPR6LAbrCPu3haimDRGSTKgUJ1XKuqUu6Phhjg8nc9KBbH5ndZaUgIXa1JiyxHiHk6xWWaOru5wnnBVhT8RBYgCKnhBAKeq1CgHVgkscXA6hpCu788yh/xsSAk20xQLdn6RvlivwGTZFbRzjytAa088XJ77a8AjTcjrhZw3E6dPWsgNlN1BmEmeMgcn8DcOyppYtyHnIAAAAASUVORK5CYII='); } -.javahierarchy li.p { - background-image: url('data:image/gif;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAACZklEQVQ4jZWVTUhUURiGn3PmNmNNcUUIxEJ0EYEF/SAhWSZKCUHYsk24MExTEdzkIsimhUQroxwyC5IW0aa6rgoEQQgXBUYLIdJczK4fk2FKx3vuaXGb4d5zR4Ze+DbnO+9zz3d+viu01kQ0KeqBXqAZOAbs+pdZB74CL4En9OiMaRVBoJsWu4F7wGXAin4pJBe4A9yy+vRWBLh5X1YDM0BjGZCpeeBCYsBbLwJz4zIBLABH/xNW0BzQkRzy8haAqxgLwRI2dv9ayKHdDby1z+Q/TZH/OAHaC6ZbgdvAdfH9rqwFVgFRyIqETdXgTx+kNZ7nIaVECH/K4tspahZ7iEkRhGaBOqkUg0ohlIJgFJRKpbAsi0rbxnEcAI6c7WbsXT2GZ49SdElX0e4qMCOo4TZYGsnR+PupX4EQfFENLH/Tpq/RchW15g4LA+h5oGSSqoaLxbFMJsOSDfvs0NRmsXwzFrnZssKmbuSHOVyU4zh0dnYyc1XSUB3aR89SKmrQgbHCoWSzWVZWVpieniadTtN2AA7uFRj+P5aryAHJ0AqNQxkdHUUKSMZhfyUMtwguHZeRvQZWLVeJD0BLGBgqg96TgmunYhH3NkBmTWDMPBRd0lxKr6RSPFKKre3uIfiPwsyXiJxSPBdaaxaG4mn8dlVUdlNz7qELQPcJyZWmaMmGBprG8w8Kb3kIOAScLmR3WoL5/h3F2WVKdoAJCLSvub64DbwGzpRbiqEXQFdrOr8RAgLM9sRjwA1gBKgoA/oFjAOp9sl8sfWIUr+AN90JG79rnwdqgMP4HXoVeI/fVJ91PN7Mmd6/kgcg4WKjGnYAAAAASUVORK5CYII='); +.doctree li.severe { + list-style-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABZ0lEQVQ4T5XSu0/CUBQG8O8UjRg0hqjogiQuTm4mLG5uRjcn44Cr8TWZGIKig884GDccTPwLXE3cnNwcdNDEKBRKRRAKxQeFe01rMBIuDXS95/udnnMvPU75V9o9g+tgbACtfJL0yrT8AT3PTarU5mgtXG0kSa8UDUzzVhrX1JYNkDwvBqjDyT3hY1QKGtI7ayRqYigyKG4D9B+dgWlZpIMLQqB4fQVK2AC9+6dgBQ3vocU64Pv+FuWkDFJsAPdexAJyG0s1QDVsjkVJG6B7+wT4+kR+c9kCKtkMSg934Hr+byWkNgDMClfwkLM3FfrWKpUVGSyXqdslyX4vJ2dn3YHZpWs3wivJOPSQeInWCLEhCN8Buft4z8UNmFGCPjsBllKEN0FyA8AxOsZd55fgRgnFmXGw2JMYSDQAzN+Thkc4VxPgH7ow/HsLPvEIzT5vE3ghwNds4H8dB6KU8iLAJYRbRawwQ/gH7UigfGJInWUAAAAASUVORK5CYII='); } -.javahierarchy li.m { - background-image: url('data:image/gif;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAC/0lEQVQ4jZ2VbUiVZxjHf+fJlzLnoUQtLcOX3uwFi2gwiQljbOgmfdyXFIrKoEYEvXzID+VirGLMxrCI+hQsxMz1MnRz5JA4FrVFW8cyZ5Kd0l7gGJle9/Wspw/H83ieoyD1hwee+77u63//r+t6+D8+x3GIx6lT5AHVQAmwCkgZCw0BD4DzwOlNm3gUn+uLJTxeL6nAMWADkDDhJi9s4DvgQPW2ZJ1A+OMPL+cAF4E1UxDFowP4csfOtCGX8PvDz5KBTqD4HcmiaAc+27UnwyQAGJFvgeLMrEQ2bslyTzWfe8Hd4Ii7zs5JonJjprs+1/Cc+/dGAUqBWmCvVVvTm6vG7FRjsNVtBQAj5jf++rsJNQY1hoLCJE/8zM+buf3PpWh8W21N72xLjexQIz41gq3Gk1BWVkZ3TxtqBDXCoiUzJtRqq0bjH6iRKktFPlERVMSjcGBgAL/fT848GH39Cn8aZGQmMzj4zEP4v20TzVeRNZYayY0qiFXY0tICQPkXn9PbF2Bx0cyx/V+9Cm1XIWqkxFKRdFehGSdsbW3FcRwqKiro7rnCshV+z0WuQtVYhfMT1EhMPxLd93A4TNedfoqW51K4dDoL8tMIhZ4QDAbjSo4oHMOIZYwMGyMYI2hMD1NTU+m40gXA0aOHsCwfDQ1nSZ+V7SFUW4nmGyN9lorcHB/KeMkpKSm0tV7HcRzy8/MBaGxsZMG81XEle4bSZ6mRPyYbimVZPOp/THfXIAChUIhAIEDG7MWTljz2NFsqclJFNDIU74dtq6Hzz4cANDU1kZzoZ2ZSZtwZdyjDKnLW5zgO69edqCdiVwy96qf91iEAVi2sJDfrI3pCbdx50Eje3FJWFnzF03AXgX/rAFi7tJq56cUA25s7tv7kcxyH8g+PJQF twDreDxeA9Zevfe249vVp8RE/8Avw8TuSNQBVv9/aPQpxBlta9M00YD+wD5g+BVEYqAMOtgf3v4lu+ib7BZQU1PiJuHYZkA0sJ+LQfcANIqZ65up/tcPxuW8B5sK/IDeOZ/cAAAAASUVORK5CYII='); +.doctree li.jc { + list-style-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACaElEQVQ4T42TXUhTYRjH/8/Z2cxNDZzZRXaVixKCaRc2P9KQGPallnolESJBF6FCUN3UsojKTNHCkiIvhCANLbsoiTEZYkRGRSZ+kIvKKDaZ07np9DyxkzsdR0bvxYHnOe//93+e931eQtTKrcvNTorbWCGQYGHm1PBvIpqQWBp0z/3ocJ5zDqglFAmYWXu4peyixNLpaGgk1pDGz4yW7urOs5GcDAiLj7SW25d5OWctsTovChrnoxOdu+Xqwp+SttIr0c75pjwuTy9Dwrp4hKQlDE8N47r9hlKxQMLV7uNdZyitPi3TZNz+Uu1g3bqXqzIrQSBMTruQqE+EL+hDbe8pBSCSxj/i/lBAObfzm4x6Y3UEECPG8K0DzbLzNWcDXn8bUkTR7X2fnWok0Rbr2JyQkmcymqDXxsKSsourM0/i488R1Dkv/VU8Hwpg3DOOL76v/SRe1nsJWB+mx+vicTB1P7dab+KFy476Vw0ywBPwyOaBUADugAfBpaAcM8NLYr3BS/QbEF7FWw5xu/Uueiae4Fhf1ZrlrwBmSGw2OAjIiwB2Jmfws3298CxMY9uDHf8GAP2kuxNnA3BefUA9BV2ck5xFY7Pj3DZ6D4WbrMhOtqDIXooh9xs19AJp7xvMkMihbiMMe77nKWckpiubR31jfHSwEp/mJleGDzMhYcksB9oOQw2BGqOvKSvJwht0SXDNf8Y77/tV7TC4NlThb1KSuodxPQAV/c8oA/x4sXyuWBllZYi6DTUMwRbdzp8HhxmCZFso8TetekxqV22fwUzLmmJizmcis+zC/JaJHItYbEdh0KXe/wv8BudlhAxYAQAAAABJRU5ErkJggg=='); } -.javahierarchy li.f { - background-image: url('data:image/gif;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAACOElEQVQ4jZWUS2gTURSGv4kjSppSm4UExYqLuFGkoUUoSWOhouIT3LgqBVcWqjZkYSlaMIWKC4UUbKmCK8UHpD7ahaiREpWKWpduRBrQhVSRDiUovY9xERMmk4mpP1wY7rnnu+dx5xi2beNWfHRuG3AKiAIRwP/XZAELwAPgZm6o46vb13ACo6lcABgDegCz6qZKSeAycPH1cFxUATuGsyFgGmivA3LrJXBkLtVtlYG7h56sA94Arf8JK2kW2P929MCKCaCkuOSGpU60cqhtS5Xn7dxnrs58dG93ASPAOV8kOdWilRjQSuBcm4P+KhjA9w/TfMlex31eK9EXSU4FfUqK00oKQ0mBc9m2BiCdTmMYRnklEgm0VrjPKykalRS9ppKi2ysSZ/eDu/YRivVU2JUUbheAdlNJ0eKZmwOota4FcCtqhE9OVr9s4M7gUdrCoar9/vFnPJ1fqAXUppKyRoCe9/DtxSTWj2YCWyNe5l8+JUXBo8DllN1NyWQyaOXZFJQUeVNLMQ/E/xVhIByjOXKsMjfvmuZNJUXWC+hsir36pjw0lRQ3gPPAWqfl53IB27axLGu1wAJw17Btm42HL0xQHFcVst7dY2XxE/5wJw3b99QD9i/OjFwr/ctngR1Ap/NEIHK8/F0nwsfAODjG14a9ySbgEVA3FJfuA71Lz6/8rgACNHadWUOxnoPA+jqgJSANpJZnx3Rp0/B6wA2xviaKU/sgsAnYSXFC54H3FIfqrcKriYLb9w8elEANsOQ8SwAAAABJRU5ErkJggg=='); +.doctree li.jac { + list-style-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACQUlEQVQ4T41TX0hTURj/ffdutj+6TE2o2MhaC6KHQYUspxY9BBGlPvQQ0VvP6VP11KKXjEAhgnqL6H1FbxUxs2U1CYMZtZYz1LKa6Ebu3t3t3i/unbv7U1Ln7fvO+f37zjmEupWMd3eJtrYz0CgAaN7StpCEwBOqnL7v3TserYZQuWBm68yngavE6oV60nJNEFYButmxO3yp0gOgg1OJgWeAGlwPXKNK4niHL9yj9wwHnxP916DVKjubDvOm1lMQRBeYC5BzcfxcvGE6hiAO7/SFL9L0uz2dtg3eV9UKja6j3LL5nMGv5FMQLS3Q1Cy+zQ2aBHocKZ84Qh/iB0etlrbzZibBxlvctyCKLqS/D0Nanayo1uVTlK8j9HaCItYGd6/N5oMgOmB3Bri1fQiy9B7pxdBfwZqagywnUFDmxmjyJa0QaKNxWWITXM0neKvnDn5ln2Dpx3WDoFhIG9qaJqFYTIM1ueSFeaWGQO+5mvt52/Z7yC6HsfDl7Lr2DTw4Q7EoRQjUW45nd+xnj/cxVHUJyeld/yIYo1hU0INerp6Pe8cjtju7qaAkeDl9G42uY7A7gphPHYeUqwyVgSv0Jgo/MUWwNocykcf7lG32faYDJf+RF2ZPo6DMrPU4YxHZbxSxFxgEhJH6V+ho7GJRbIeipJCXpuriaEMHghg1m6+f0wMiOvk/T5mZH3b2cJ/5lMsg3QlrFAKVrvWPxZwhgUO6cs1nqj6oz4SLQh+ID4HhN/YIU2CKaA3a3UAAs9XnfwMcseP32xAmPAAAAABJRU5ErkJggg=='); } - -.javahierarchy ul { - margin-top: 10px; - padding-left: 5px; +.doctree li.jic { + list-style-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACLklEQVQ4T42TXUhTYRjH/8/ZdGgfc+ywi2l2YXSRXuyikOzDoKCLoHQlFH1ZoBh9bF6YRuQ+ImkFbWaUVGSBEHaz6sarYjakLruWBWKRsQ7znNWUdNsT5+DWdrbA5+Lwfvz/v/d53uc9BF1c2uPfZRbXnyKinZzlLeo2CRRj5o+K9Hv8QXRwutBCuQkzV3icwzczafTrobm5YKCUQBjxhV3XcmsaQDX7nA/fZ9KZ3f8zF64bjYaoJ3xxr5ad+vG1j97mdLbk5KN9B1isrcFL/ySSiVQ+W81oFAKecM8AdW8baq5rsH4qd/L5e21sq7fgqTsM6ZtcBBAMhtTcTHw/9bcMhzZY17nKAc7cOcS2zRY8c79FYj5ZBFD1C/PJIDlxNSJuqmm1bxVhqq4s4pwMHGSx3owXvZOQf/zKA/4sLuP7jATpqzxFHbguE8isOqs2mlBtNqGyqkIDuV51sK3BgmD7BKQ5hZaXVpCUFrGylNb2GZDpOLxqcRpAH4PTZ7m2UcSN7WOIxxIlJTCg0GncigBoLQcYiJ7guiYR/h3jiMcWSgAApqgTAS8ATzlA34djbG+0Yqh5Aj9jxV1Y1fuoE0GHAdkIVu+hEOR6d5jtTRbcbQlD+qLvAisZCA4trW7cdwMUXMsr/Kfh3se4EsrX1YNHrwk4shYIA29GcaEt/5Rzpst44mbAm2urHsZghQDvCLpCRT9TodCNMQcAlb4PgDpW4zMAtVvPQzg3W6j/C6P8uEsqsSt1AAAAAElFTkSuQmCC'); } - -p.severe, p.warn, p.info { - background-repeat: no-repeat; - background-position: left center; - background-size: 16px; - padding-left: 30px; - min-height: 24px; +.doctree li.ja { + list-style-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACoklEQVQ4T42TXUiTYRTH/+fdtJx96JzMwj7EsAzTdRGRZRpLBKk00UDwtkhTN0WxUdpSzAzTlUnUhRgkXZRfXSRdlDMrtZk2+qBETDNakbmtnN/bE3vtndM+6Nyd/3PO7znnPOchLLGowuLdspUr0oiwy+Fgm5zHHEcDjKFz9Mf4zY6SoifuKSQ4jDGPpIpLJXMOR8FSqOCLOM5GRNVNeSqNoPEAPrmy+uEcc+z5W7K7LuZEHU25WXudGg84rLty/l83/wkq5rjyJnXmSdqqKdwZLA/ocg8K8pcxlTIGgVJfXh6z2dDca8S9l69dLYuIbP2fTUqKLKvQ+Xl7qwRAZHAQy9m/D5aJCTT0GjFrt+NQxDYE+vpQY5+R1Xf3uCAmq6WKcCxbv07qGx0i94fE0xM1R5IYEcEw/AHKzSH4PjWJ0vsPkBEViQ1SKbLvNOOj2Uz9X75iZMzcTkjPtYCw2llB2Bo568zNhE7/GObJSaQowhG+NgDtA4Ooe/YctakpUNZcQ/fQyK8qmIWQme8CJEeEsRupyUirv41z8bHw8vDgO2sbGER52yMY1BmIu16Hp++H5wEMVoJaowcQ7fQ3Sn2YUZ2OrJZWVB6Iw5DZAqnEi4+1Tk1BJpEgtKIa4zOzwhzaCXmntQDOCEN8ozrOGIDLnQYc3bEdw2YLlonFWC4W48TdVrwb/eYaIoCzhHytAhycVfBzSAwNYbUJ8bBOT+OqoQ8zdjtSw0Kx3mcVDtY3oOeTSQBYQVDMO5piNYiqhCrC5f6sKjYGW2R+fKOmcRsudvXg1qu3C7czloOyIt2CUFjaDFDC/6wywFpQcirRtcquJG25GoAWIL6d341Z+XNtgW7RZ1oUWHpBAYcoEQwxIKaYfy56AYIedq4O2pwh9/if 1/D1lK2FX8oAAAAASUVORK5CYII='); } - -p.severe { - color: DarkRed; - background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABFklEQVQ4EWPkYWEW7NLVWGUhIujCQAI48eb9nrLLN8IYpxlq7yZVM8wekCGM51xt/sMEyKGZyNGErAfDAGYeHgbRwFAGEA0DILZcSSWKGEwOwwAhV08Gmcw8BpWeSWANIM0gtrCbFwNIDh2woAu8Xr+agVNZBawBpBEEuJRUGd7u2sYAkkMHGAaAFDzqaQerA9kKAiDNMDGwABKB4QWQHMjZnCqqSMpwMzEMgPkZ5uxv926DvQMKRGwAwwDpjFy4n0HOvlOSxwAzBBQ76AAjIYFcwG9pw/Bu9w64WpAYyOCnMyYz/P3yBS4OYmAYgCJLBAfDC0ToQVHCBMoQKCIkcEB6mQ++ebdFk5fHWIaLU4kEvQyw7AwANERa0Te1fdYAAAAASUVORK5CYII=') +.doctree li.jm { + list-style-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACq0lEQVQ4T42Ta0jTYRTGn7OLNu+hGGji8rJCoQYFVjo1MyEpnYYfDEkcXaHSWGSWlWWIQulilWHgjIzQEbM+6IcoFfMCftDAyobIItASI2eZl+ZO/KdbUwr8fzvPOc/vfc7L+yes+lT7b8QHBfvkEdEuu52jhLZIRCPM3Ds58bOxq+1qt7uFnAUzS7ML7pTbFlG8GuqsxSKaIYLe1FBY4tQcAIdZU/vaZuOE/5nddYlE1GUynEoUNAcgS1NXabPZXSdrT6bwr9nfqH3U5einxCtYtTMS12+3uRJLJKIqU/3xixSTUBEXGRnc536CvlzN3l4e0GibHYbSolRWxobgzOUWjE9MOzSxWDRjNn/ZS7vV93SBAd6FTsA6TwnXVanhJfNA5f1ODA1/xd2bBxHgJ4Pe0IPOPosrxfiEtYaw8UpHWIhfkiIiCF4yKbbGbODS0yoQgdp7Lfyq24Ly88nCrtTaPsKG5kES1jOPTuLz2HQnIbx8CoC/kMDPxwPaY3F84UQcZuds+G6dQ//bcWSmRcNuZ/QNjOGAxkiz87blwDxFkFe6AIL6sGIf52ZswWPTexzJjsXEtxlYfyxgft6GwPUyRO2pd60AwEqQV3eAkOS8gx7jIZaH+iIx14R+Uw6kUhHVPhni8FBfpCWEYYfaiJFP1iUIo5MQoS8D0TWh9vGS8rvWbExNL2Bbhon6n2WyYpM/UvPboE4Nx9n8WBy91IWm1tFlAF8nyOuUELOQwj8owJM/tGXiZc8YDmvf0K3i7ZyeFIqY9BeUFh/CTToVHjw1o6R6gMCwYtGuXCJFGYpAqFnLK3TNMM5hpED390IUjS0gZK4JwngOc57a9ZRdps3GIoDLhHX+CRJig8rwMUe34mdaMRxtUkIMgZ4MQLncGwTQ AaABw1kW9/k/Y0T5zKW4eEsAAAAASUVORK5CYII='); } -p.warn { - color: DarkRed; - background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAAA3NCSVQICAjb4U/gAAAAY1BMVEX////ht0zds0vds0vds0vds0vds0vds0vbsUrZr0rZr0rZr0rXrUr/01H90VH7z1D5zVD3y0/1yk/zx0/wxE7swU7rwE3pvk3nvE3nu0zlukzjuUzftUvds0vZr0rXrUqBWzo+M1gKAAAAIXRSTlMAESJEVWZ3maq7zO7u//////////////////////////9zCPjNAAAACXBIWXMAAAsSAAALEgHS3X78AAAAHHRFWHRTb2Z0d2FyZQBBZG9iZSBGaXJld29ya3MgQ1M26LyyjAAAABR0RVh0Q3JlYXRpb24gVGltZQA2LzEvMTM4qUXQAAAAe0lEQVQYlV2N2RaDIAwFo6LWNhdsrV1wif//lUUownHeMmeSEHkqZkUZBVvLZSZaMVi6NJf8BB6SlroFjul2BDJg29BL8xfXGbvAlws/K7kHoaUNwYQgMPqklj4Kve4JWxy8XNKsBrGAcYm/EAXe7H7qtGI+Qool50Jnfgc2C3zDPO17AAAAAElFTkSuQmCC') +.doctree li.jf { + list-style-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACN0lEQVQ4T42SXUiTcRTGn/NuRh+mQeJFFA3nJgnBpEDM6RYRFRRpZIyQQNkCr9y8SQlruhp2kVtISFJzF4ZgH6ur7sShMROL2IXkGhYkZaLhok2quRPv6/b2tlr4vzsfz++c5/AnZL2aE93VRcX5jURUlUpxqVgWBIoyc2hp8dvQ+LMrz5USygTMnHem6ZYruYZL2dBMrBIoToS+gL+1I5OTAJK4uX80mWRjLrEyr1YL44HBlloxJwHqmwd6ksmUPPlwtY7PnqwQybJOEAj3H09jYmpO0qjVwo2A72I7lRvdlVpt8aRyQsuFKj5aq6d44genUpweA/iGpxCcXAeoVEI8Elk4Qofqbnt37tjWqgTYzh/k42Y9uryjCM8syHfKtvdpMeYh7O4c27OrwKQvKcLWLXlSj9VSwcdMWgq9nOfPy3GoBAGhV/N4+25ZgiVWfyIyt4QPH78GCXtdKwAKxUJB/iYUbt+M7rYatpzap5zM7v5J+EfCtPQlgdXvyfQyvELQ9MiAzIreTjPbLPvRdi2IO8PhnBYAxAia3jEQTEp/nstGtlnKYXdN4O7ITG4AI0go6XOC6KoS0NtRydZzZXBcf4F7D2f/A+AugmbAABWLW0h3EN/N9gNsbdDB4Z6G71H03wBGDGspw3qxdNAOgmcjv1DuYTgQbfL+puuHnoBwekMQxlNEGuvkryyLyh7YAXYq7fwBFNcGOTHb4M3k//anCxiggkg3AzCkG18DGAPgx5v690roL9X0xswRYjlfAAAAAElFTkSuQmCC'); } -p.info { - background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQBAMAAADt3eJSAAAAA3NCSVQICAjb4U/gAAAAG1BMVEX///87c687c687c687c687c687c6////87c68225wXAAAACXRSTlMAEWaqu8zu///VQmatAAAACXBIWXMAAAsSAAALEgHS3X78AAAAHHRFWHRTb2Z0d2FyZQBBZG9iZSBGaXJld29ya3MgQ1M26LyyjAAAABR0RVh0Q3JlYXRpb24gVGltZQA2LzEvMTM4qUXQAAAARklEQVQImWNgYFDu6DBiAALRDiAIZGBgzAAx2gQYWDvAIIBBo6OjvaKjo4nBA8JoYeiAAhADJIKNAVcM1w43EG4F3FKYMwD5VTVUBOW+rQAAAABJRU5ErkJggg==') +.doctree li.jp { + list-style-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACSklEQVQ4T42TTWgTQRTH/29305RmTRoSxSK1glLUeIgnMVYrflA8WYMIQtu7iNhatXoyWkRT0QQqHrwo1oN6MAoi+IGkRlEv0qOGitK01dK03XxW080+ydas21ihcxiYee//+8+8N0OoGJ/6t2+zLnO3gWgrWFunh0kYBvO7X5nk3fXHYm/NEiovmNkycsffy6z2VEKNNYk5Iupv6IicLe/pgJI4MeB/BVab/is2BUiQYvXtkR364UrT2MCBy4y/zs6mk2xxNYIECVohi7lkHMqH68Zp54VScFV75Awlwhu3iO61783OzpZrLNWuIS2fZKG6FhAkUqeHeebFaQNCJObUyfhuGr/pCws213EzwLGnj0VHA5SnR6DNTpNj3w0WbW6knp9AMT1qQLT09xCNBBAV7fXNkqsRgqVG59h2BVmwr0bu2VEdIO8NMcl1yL3shpYZI20uD3UqjmI6MUijF6AQ4NDvVWWHUO2A7H/I4nIPihNDEOQ6kG0lacpXztxvoWI+CaizuhEzFPrRCwV/AOVryG1vmFZsJir1p1iANvER+Scd4Oz4gkICSNHkRUQBNJtrYD0cY8G9CT9veRYTmVMHaeoSAgScM+9Kh14zXB6o93zAzOdKVyOVgfOU7YNX1RAt10GPHowynBuABz4g9WVRAAMpK8OrB7NBdIIQWsorNNl3yT0IG/T8FTwiwv6lQJjxuOYUWo2nXBYVrqITjABovq3/DEYKhEBVN8ILPpM5kUPwakArM3YS4NX7DQwRISoAt6kL38z5vwEadtq3UJGa2gAAAABJRU5ErkJggg=='); } -p.idea { - background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAAA3NCSVQICAjb4U/gAAAAWlBMVEX////ht0yBWzqBWzrbsUqBWzrbsUrZr0qBWzrZr0rXrUrXrUr//zP++zX/3kn/01H80FD4zFD3y0/zyE/zx07wxU7pvk3nvUzmu0zjuEzbsUrZr0rXrUrVq0nE1QREAAAAHnRSTlMAERFmd4iZu7vM3e7///////////////////////+xkXesAAAACXBIWXMAAAsSAAALEgHS3X78AAAAFHRFWHRDcmVhdGlvbiBUaW1lADYvMS8xMzipRdAAAAAcdEVYdFNvZnR3YXJlAEFkb2JlIEZpcmV3b3JrcyBDUzbovLKMAAAAf0lEQVQYlXWO2xKDIAwF8YqN4EFoq8Xw/7/ZSaAzfXGfYGdDMEYYiZlpNI2O8hFDPJm6KigHCCFT7a96ByLrFB348dGEE7B55zfgWUSUHfDOOQ/sKtY34ATgXEXMV2pF5FnXWH7pGyk/2s9sYaFYc8tSuQ/MoMHwZ/ppmXo9fQGVFAicfw5XKAAAAABJRU5ErkJggg==')} -p.todo { - color: graytext; + +.doctree ul { + padding: 0px 0px 0px 20px; +} + +ul.doctree { + padding: 0px 0px 0px 20px; + margin-left: 5px; } .topic a { http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d94d89db/juneau-microservice/src/main/java/org/apache/juneau/microservice/package.html ---------------------------------------------------------------------- diff --git a/juneau-microservice/src/main/java/org/apache/juneau/microservice/package.html b/juneau-microservice/src/main/java/org/apache/juneau/microservice/package.html index a643da5..f7f0912 100755 --- a/juneau-microservice/src/main/java/org/apache/juneau/microservice/package.html +++ b/juneau-microservice/src/main/java/org/apache/juneau/microservice/package.html @@ -509,10 +509,11 @@ <cc># Jetty logging level</cc> <ck>org.eclipse.jetty.LEVEL</ck> = <cv>WARN</cv> </p> - <p class='info'> - The predefined config file includes all settings for instructional purposes. - In your microservice, you can remove all lines from your config file that have default values. - </p> + <ul class='doctree'> + <li class='info'> + The predefined config file includes all settings for instructional purposes. + In your microservice, you can remove all lines from your config file that have default values. + </ul> <p> Although the config file looks deceptively simple, the config file API is a very powerful feature with many capabilities, including: </p> @@ -590,8 +591,8 @@ String firstArg = cf.getString(<js>"MySection/firstArg"</js>); </p> <h6 class='topic'>Additional Information</h6> - <ul class='javahierarchy'> - <li class='p'><a href='../core/ini/package-summary.html#TOC'><l>org.apache.juneau.ini</l></a> - Juneau Configuration API Javadocs. + <ul class='doctree'> + <li class='jp'><a href='../core/ini/package-summary.html#TOC'><l>org.apache.juneau.ini</l></a> - Juneau Configuration API Javadocs. </ul> <!-- ======================================================================================================== --> @@ -601,8 +602,8 @@ <p> There are 3 primary ways of getting access to the config file. </p> - <ul class='javahierarchy'> - <li class='m'>{@link org.apache.juneau.microservice.Microservice#getConfig()} - A static method that can be used to access + <ul class='doctree'> + <li class='jm'>{@link org.apache.juneau.microservice.Microservice#getConfig()} - A static method that can be used to access the config file from anywhere in your application.<br> When using this method, any of the following variables can be resolved: <ul> @@ -614,7 +615,7 @@ </ul> Additional user-defined variables can be defined by overriding the {@link org.apache.juneau.microservice.Microservice#createVarResolver()} method and using the {@link org.apache.juneau.rest.RestConfig#addVars(Class...)} method. - <li class='m'>{@link org.apache.juneau.rest.RestContext#getConfigFile()} - An instance method to access it from inside a REST servlet.<br> + <li class='jm'>{@link org.apache.juneau.rest.RestContext#getConfigFile()} - An instance method to access it from inside a REST servlet.<br> The following variables are available in addition to the variables defined above: <ul> <li><l>$I{key}, $I{key,default}</l> - Servlet initialization parameters. @@ -644,7 +645,7 @@ Additional user-defined variables can be defined at this level by overriding the {@link org.apache.juneau.microservice.Resource#init(RestConfig)} method and using the {@link org.apache.juneau.rest.RestConfig#addVars(Class...)} method. </p> - <li class='m'>{@link org.apache.juneau.rest.RestRequest#getConfigFile()} - An instance method to access it from inside a REST method.<br> + <li class='jm'>{@link org.apache.juneau.rest.RestRequest#getConfigFile()} - An instance method to access it from inside a REST method.<br> The following variables are available in addition to the variables defined above: <ul> <li><l>$L{key}, $L{key,args}</l> - Localized variables pulled from {@link org.apache.juneau.rest.RestRequest#getMessage(String, Object...)}. @@ -808,8 +809,8 @@ are powerful servlets designed specifically for creating REST APIs using nothing more than serialized and parsed POJOs. </p> <h6 class='topic'>Additional Information</h6> - <ul class='javahierarchy'> - <li class='p'><a href='../server/package-summary.html#TOC'><l>org.apache.juneau.rest</l></a> - Juneau Server API Javadocs. + <ul class='doctree'> + <li class='jp'><a href='../server/package-summary.html#TOC'><l>org.apache.juneau.rest</l></a> - Juneau Server API Javadocs. </ul> </div> @@ -824,10 +825,10 @@ <p> The class hierarchy is: </p> - <ul class='javahierarchy'> - <li class='a'>{@link org.apache.juneau.microservice.Microservice} - Abstract class that defines simple start/stop methods and access to the manifest file, config file, and arguments. + <ul class='doctree'> + <li class='jac'>{@link org.apache.juneau.microservice.Microservice} - Abstract class that defines simple start/stop methods and access to the manifest file, config file, and arguments. <ul> - <li class='c'>{@link org.apache.juneau.microservice.RestMicroservice} - Specialized microservice for starting up REST interfaces using Jetty and specifying REST servlets + <li class='jc'>{@link org.apache.juneau.microservice.RestMicroservice} - Specialized microservice for starting up REST interfaces using Jetty and specifying REST servlets through the manifest file or config file. </ul> </ul> http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d94d89db/juneau-rest/src/main/java/org/apache/juneau/rest/RestResponse.java ---------------------------------------------------------------------- diff --git a/juneau-rest/src/main/java/org/apache/juneau/rest/RestResponse.java b/juneau-rest/src/main/java/org/apache/juneau/rest/RestResponse.java index 524c8f3..50f25f6 100644 --- a/juneau-rest/src/main/java/org/apache/juneau/rest/RestResponse.java +++ b/juneau-rest/src/main/java/org/apache/juneau/rest/RestResponse.java @@ -366,7 +366,7 @@ public final class RestResponse extends HttpServletResponseWrapper { return w; // If plain text requested, override it now. - if (request.isPlainText()) + if (request.isPlainText()) setHeader("Content-Type", "text/plain"); try { @@ -430,10 +430,11 @@ public final class RestResponse extends HttpServletResponseWrapper { * {@link RestMethod#pageTitle() @RestMethod#pageTitle()} annotations. * <p> * This is a shortcut for calling <code>setProperty(<jsf>HTMLDOC_title</jsf>, title);</code> - * <p class='info'> - * <b>Tip:</b> Use {@link StringMessage} to generate a page title with delayed serialization so as not to - * waste string concatenation cycles on non-HTML views. - * </p> + * <ul class='doctree'> + * <li class='info'> + * <b>Tip:</b> Use {@link StringMessage} to generate a page title with delayed serialization so as not to + * waste string concatenation cycles on non-HTML views. + * </ul> * * @param title The localized page title to render on the page. * Object will be converted to a string using {@link Object#toString()}. @@ -450,10 +451,11 @@ public final class RestResponse extends HttpServletResponseWrapper { * {@link RestMethod#pageText() @RestMethod#pageText()} annotations. * <p> * This is a shortcut for calling <code>setProperty(<jsf>HTMLDOC_text</jsf>, text);</code> - * <p class='info'> - * <b>Tip:</b> Use {@link StringMessage} to generate page text with delayed serialization so as not to - * waste string concatenation cycles on non-HTML views. - * </p> + * <ul class='doctree'> + * <li class='info'> + * <b>Tip:</b> Use {@link StringMessage} to generate page text with delayed serialization so as not to + * waste string concatenation cycles on non-HTML views. + * </ul> * * @param text The localized page text to render on the page. * @return This object (for method chaining). @@ -469,10 +471,12 @@ public final class RestResponse extends HttpServletResponseWrapper { * {@link RestMethod#pageLinks() @RestMethod#pageLinks()} annotations. * <p> * This is a shortcut for calling <code>setProperty(<jsf>HTMLDOC_links</jsf>, links);</code> - * <p class='info'> - * <b>Tip:</b> Use {@link StringMessage} to generate page links with delayed serialization so as not to - * waste string concatenation cycles on non-HTML views. - * </p> + * + * <ul class='doctree'> + * <li class='info'> + * <b>Tip:</b> Use {@link StringMessage} to generate page links with delayed serialization so as not to + * waste string concatenation cycles on non-HTML views. + * </ul> * * @param links The localized page links render on the page. * @return This object (for method chaining). http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d94d89db/juneau-rest/src/main/java/org/apache/juneau/rest/annotation/RestResource.java ---------------------------------------------------------------------- diff --git a/juneau-rest/src/main/java/org/apache/juneau/rest/annotation/RestResource.java b/juneau-rest/src/main/java/org/apache/juneau/rest/annotation/RestResource.java index 91af182..52cfa07 100644 --- a/juneau-rest/src/main/java/org/apache/juneau/rest/annotation/RestResource.java +++ b/juneau-rest/src/main/java/org/apache/juneau/rest/annotation/RestResource.java @@ -753,12 +753,12 @@ public @interface RestResource { * This field can contain variables (e.g. <js>"$L{my.localized.variable}"</js>). * <p> * The programmatic equivalent to this annotation are the {@link RestConfig#setPageTitle(String)}/{@link RestResponse#setPageTitle(Object)} methods. - * <p class='info'> - * In most cases, you'll simply want to use the <code>@RestResource(title)</code> annotation to specify the page title. - * However, this annotation is provided in cases where you want the page title to be different that the one - * shown in the swagger document. - * </p> - * <b>Note:</b> - In most cases, you can + * <ul class='doctree'> + * <li class='info'> + * In most cases, you'll simply want to use the <code>@RestResource(title)</code> annotation to specify the page title. + * However, this annotation is provided in cases where you want the page title to be different that the one + * shown in the swagger document. + * </ul> */ String pageTitle() default ""; @@ -791,10 +791,11 @@ public @interface RestResource { * This field can contain variables (e.g. <js>"$L{my.localized.variable}"</js>). * <p> * The programmatic equivalent to this annotation are the {@link RestConfig#setPageText(String)}/{@link RestResponse#setPageText(Object)} methods. - * <p class='info'> - * In most cases, you'll simply want to use the <code>@RestResource(description)</code> or <code>@RestMethod(summary)</code> annotations to specify the page text. - * However, this annotation is provided in cases where you want the text to be different that the values shown in the swagger document. - * </p> + * <ul class='doctree'> + * <li class='info'> + * In most cases, you'll simply want to use the <code>@RestResource(description)</code> or <code>@RestMethod(summary)</code> annotations to specify the page text. + * However, this annotation is provided in cases where you want the text to be different that the values shown in the swagger document. + * </ul> */ String pageText() default "";
