http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/02c10736/content/site/apidocs/overview-summary.html ---------------------------------------------------------------------- diff --git a/content/site/apidocs/overview-summary.html b/content/site/apidocs/overview-summary.html index eebc834..4985ee0 100644 --- a/content/site/apidocs/overview-summary.html +++ b/content/site/apidocs/overview-summary.html @@ -4,7 +4,7 @@ <head> <!-- Generated by javadoc --> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> -<title>Overview (Apache Juneau (incubating) 6.0.0-incubating-SNAPSHOT)</title> +<title>Overview (Apache Juneau (incubating) 6.0.1-incubating-SNAPSHOT)</title> <link rel="stylesheet" type="text/css" href="javadoc.css" title="Style"> <script type="text/javascript" src="script.js"></script> </head> @@ -12,7 +12,7 @@ <script type="text/javascript"><!-- try { if (location.href.indexOf('is-external=true') == -1) { - parent.document.title="Overview (Apache Juneau (incubating) 6.0.0-incubating-SNAPSHOT)"; + parent.document.title="Overview (Apache Juneau (incubating) 6.0.1-incubating-SNAPSHOT)"; } } catch(err) { @@ -70,7 +70,7 @@ </a></div> <!-- ========= END OF TOP NAVBAR ========= --> <div class="header"> -<h1 class="title">Apache Juneau (incubating) 6.0.0-incubating-SNAPSHOT API</h1> +<h1 class="title">Apache Juneau (incubating) 6.0.1-incubating-SNAPSHOT API</h1> </div> <div class="header"> <div class="subTitle"> @@ -818,7 +818,7 @@ The <l>ObjectMap</l> and <l>ObjectList</l> classes are very similar to the <l>JSONObject</l> and <l>JSONArray</l> classes found in other libraries. However, the names were chosen because the concepts of <l>Maps</l> and <l>Lists</l> are already familiar to - Java programmers, and these classes can be used with any of the serialzers or parsers. + Java programmers, and these classes can be used with any of the serializers or parsers. </p> <p> These object can be serialized in one of two ways: @@ -1337,8 +1337,8 @@ </td> <td> <ul class='normal'> - <li><code>HashSet&lt;String,Integer&gt;</code> - <li><code>TreeMap&lt;Integer,Bean&gt;</code> + <li><code>HashSet<String,Integer></code> + <li><code>TreeMap<Integer,Bean></code> <li><code>List<<jk>int</jk>[][]></code> <li><code>Bean[]</code> </ul> @@ -1355,8 +1355,8 @@ </td> <td> <ul class='normal'> - <li><code>HashSet&lt;Bean,Integer&gt;</code> - <li><code>TreeMap&lt;Integer,Reader&gt;</code> + <li><code>HashSet<Bean,Integer></code> + <li><code>TreeMap<Integer,Reader></code> </ul> </td> <td style='background-color:lightgreen;text-align:center'><b>yes</b></td> @@ -1430,6 +1430,15 @@ <tr class='dark bb' style='background-color:lightyellow'> <td style='text-align:center'>5</td> <td> + <b>Objects with standardized static methods and/or constructors for converting to another POJO that's serializable.</b><br> + </td> + <td> </td> + <td> </td> + <td> </td> + </tr> + <tr class='light bb' style='background-color:lightyellow'> + <td style='text-align:center'>5a</td> + <td> <b>Objects with standardized <code>static T valueOf(String)</code>/<code>static T fromString(String)</code> methods, or constructors with a <code>String</code> argument.</b><br> During serialization, objects are converted to strings using the <code>toString()</code> method. During parsing, strings are converted to objects using one of these static methods or constructors. @@ -1437,6 +1446,18 @@ <td><code>java.util.UUID</code></td> <td style='background-color:lightgreen;text-align:center'><b>yes</b></td> <td style='background-color:lightgreen;text-align:center'><b>yes</b></td> + </tr> + <tr class='light bb' style='background-color:lightyellow'> + <td style='text-align:center'>5b</td> + <td> + <b>Objects with standardized <code>static T valueOf(ObjectMap)</code>/<code>static T fromObjectMap(ObjectMap)</code> methods, or constructors with an <code>ObjectMap</code> argument, + and having a <code>toObjectMap()</code> method.</b><br> + During serialization, objects are converted to <a href="org/apache/juneau/ObjectMap.html" title="class in org.apache.juneau"><code>ObjectMaps</code></a> using the <code>toObjectMap()</code> method. + During parsing, maps are converted to objects using one of these static methods or constructors. + </td> + <td> </td> + <td style='background-color:lightgreen;text-align:center'><b>yes</b></td> + <td style='background-color:lightgreen;text-align:center'><b>yes</b></td> </tr> <tr class='dark' style='background-color:lightyellow'> <td style='text-align:center'>6</td> @@ -1842,7 +1863,7 @@ <xt><web-app</xt> <xa>version</xa>=<xs>"2.3"</xs><xt>></xt> <xt><servlet></xt> <xt><servlet-name></xt>SystemPropertiesService<xt></servlet-name></xt> - <xt><servlet-class></xt>com.ibm.sample.SystemPropertiesService<xt></servlet-class></xt> + <xt><servlet-class></xt>org.apache.juneau.samples.SystemPropertiesService<xt></servlet-class></xt> <xt></servlet></xt> <xt><servlet-mapping></xt> <xt><servlet-name></xt>SystemPropertiesService<xt></servlet-name></xt> @@ -1864,7 +1885,7 @@ Arbitrarily complex POJO models can be serialized using any of the supported serializers, and content can be parsed using any of the supported parsers. </p> <p> - The <l>com.ibm.team.juneau.samples</l> project contains various REST resource examples in an easy-to-use REST microservice. + The <l>juneau-samples</l> project contains various REST resource examples in an easy-to-use REST microservice. One of these is <l>AddressBookResource</l> which serializes <l>AddressBook</l> objects defined below (some code omitted): </p> <p class='bcode'> @@ -1872,13 +1893,13 @@ <ja>@XmlSchema</ja>( prefix=<js>"ab"</js>, xmlNs={ - <ja>@XmlNs</ja>(prefix=<js>"ab"</js>, namespaceURI=<js>"http://www.ibm.com/addressBook/";</js>), - <ja>@XmlNs</ja>(prefix=<js>"per"</js>, namespaceURI=<js>"http://www.ibm.com/person/";</js>), - <ja>@XmlNs</ja>(prefix=<js>"addr"</js>, namespaceURI=<js>"http://www.ibm.com/address/";</js>), - <ja>@XmlNs</ja>(prefix=<js>"mail"</js>, namespaceURI=<js>"http://www.ibm.com/mail/";</js>) + <ja>@XmlNs</ja>(prefix=<js>"ab"</js>, namespaceURI=<js>"http://www.apache.org/addressBook/";</js>), + <ja>@XmlNs</ja>(prefix=<js>"per"</js>, namespaceURI=<js>"http://www.apache.org/person/";</js>), + <ja>@XmlNs</ja>(prefix=<js>"addr"</js>, namespaceURI=<js>"http://www.apache.org/address/";</js>), + <ja>@XmlNs</ja>(prefix=<js>"mail"</js>, namespaceURI=<js>"http://www.apache.org/mail/";</js>) } ) - <jk>package</jk> com.ibm.sample.addressbook; + <jk>package</jk> org.apache.juneau.samples.addressBook; <jk>import</jk> org.apache.juneau.xml.annotation.*; <jd>/** Address book bean */</jd> @@ -2402,7 +2423,7 @@ <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 peforms servlet initialization on them. + 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. @@ -3010,21 +3031,21 @@ <jc>// XML and RDF namespaces used in this package</jc> <ja>@Xml</ja>(ns=<js>"ab"</js>, namespaces={ - <ja>@XmlNs</ja>(name=<js>"ab"</js>, uri=<js>"http://www.ibm.com/addressBook/";</js>), - <ja>@XmlNs</ja>(name=<js>"per"</js>, uri=<js>"http://www.ibm.com/person/";</js>), - <ja>@XmlNs</ja>(name=<js>"addr"</js>, uri=<js>"http://www.ibm.com/address/";</js>), - <ja>@XmlNs</ja>(name=<js>"mail"</js>, uri=<js>"http://www.ibm.com/mail/";</js>) + <ja>@XmlNs</ja>(name=<js>"ab"</js>, uri=<js>"http://www.apache.org/addressBook/";</js>), + <ja>@XmlNs</ja>(name=<js>"per"</js>, uri=<js>"http://www.apache.org/person/";</js>), + <ja>@XmlNs</ja>(name=<js>"addr"</js>, uri=<js>"http://www.apache.org/address/";</js>), + <ja>@XmlNs</ja>(name=<js>"mail"</js>, uri=<js>"http://www.apache.org/mail/";</js>) } ) <ja>@Rdf</ja>(ns=<js>"ab"</js>, namespaces={ - <ja>@RdfNs</ja>(name=<js>"ab"</js>, uri=<js>"http://www.ibm.com/addressBook/";</js>), - <ja>@RdfNs</ja>(name=<js>"per"</js>, uri=<js>"http://www.ibm.com/person/";</js>), - <ja>@RdfNs</ja>(name=<js>"addr"</js>, uri=<js>"http://www.ibm.com/address/";</js>), - <ja>@RdfNs</ja>(name=<js>"mail"</js>, uri=<js>"http://www.ibm.com/mail/";</js>) + <ja>@RdfNs</ja>(name=<js>"ab"</js>, uri=<js>"http://www.apache.org/addressBook/";</js>), + <ja>@RdfNs</ja>(name=<js>"per"</js>, uri=<js>"http://www.apache.org/person/";</js>), + <ja>@RdfNs</ja>(name=<js>"addr"</js>, uri=<js>"http://www.apache.org/address/";</js>), + <ja>@RdfNs</ja>(name=<js>"mail"</js>, uri=<js>"http://www.apache.org/mail/";</js>) } ) - <jk>package</jk> com.ibm.sample.addressbook; + <jk>package</jk> org.apache.juneau.samples.addressBook; <jk>import</jk> org.apache.juneau.xml.annotation.*; </p> <p> @@ -3603,7 +3624,7 @@ </p> <h6 class='topic'>Notes</h6> <ul class='spaced-list'> - <li>The <l>@RestResource.messages()</l> annotation identifies <l>com/ibm/sample/addressbook/nls/AddressBookResource.properties</l> as the resource bundle for localized message for this class. + <li>The <l>@RestResource.messages()</l> annotation identifies <l>org/apache/juneau/samples/addressbook/nls/AddressBookResource.properties</l> as the resource bundle for localized message for this class. <li>You are setting <l>XML_enableNamespaces</l> to <l>true</l> to enable XML namespaces. By default, XML namespace support is disabled per <a href="org/apache/juneau/xml/XmlSerializerContext.html#XML_enableNamespaces"><code>XmlSerializerContext.XML_enableNamespaces</code></a>, so you have to explicitly enable it on our serializers. @@ -4217,33 +4238,33 @@ <jk>try</jk> { <jf>feed</jf> = <jk>new</jk> Feed() .setTitle(<jk>new</jk> Text(<js>"text"</js>, <js>"Juneau ATOM specification"</js>)) - .setSubTitle(<jk>new</jk> Text(<js>"html"</js>, <js>"A <em>lot</em> of effort went into making this effortless"</js>)) - .setUpdated(<jsm>parseDateTime</jsm>(<js>"2013-05-08T12:29:29Z"</js>)) - .setId(<jk>new</jk> Id(<js>"tag:juneau.sample.com,2013:1"</js>)) + .setSubTitle(<jk>new</jk> Text(<js>"html"</js>, <js>"Decribes <em>stuff</em> about Juneau"</js>)) + .setUpdated(<jsm>parseDateTime</jsm>(<js>"2016-01-02T03:04:05Z"</js>)) + .setId(<jk>new</jk> Id(<js>"tag:juneau.apache.org"</js>)) .addLinks( - <jk>new</jk> Link(<js>"alternate"</js>, <js>"text/html"</js>, <js>"http://www.sample.com/";</js>).setHreflang(<js>"en"</js>), - <jk>new</jk> Link(<js>"self"</js>, <js>"application/atom+xml"</js>, <js>"http://www.sample.com/feed.atom";</js>) + <jk>new</jk> Link(<js>"alternate"</js>, <js>"text/html"</js>, <js>"http://juneau.apache.org/";</js>).setHreflang(<js>"en"</js>), + <jk>new</jk> Link(<js>"self"</js>, <js>"application/atom+xml"</js>, <js>"http://juneau.apache.org/feed.atom";</js>) ) - .setRights(<jk>new</jk> Text(<js>"Copyright (c) 2013, IBM"</js>)) - .setGenerator(<jk>new</jk> Generator(<js>"Juneau"</js>).setUri(<jk>new</jk> URI(<js>"http://juneau.ibm.com/";</js>)).setVersion(<js>"1.0"</js>)) + .setRights(<jk>new</jk> Text(<js>"Copyright (c) 2016, Apache Foundation"</js>)) + .setGenerator(<jk>new</jk> Generator(<js>"Juneau"</js>).setUri(<jk>new</jk> URI(<js>"http://juneau.apache.org/";</js>)).setVersion(<js>"1.0"</js>)) .addEntries( <jk>new</jk> Entry() .setTitle(<jk>new</jk> Text(<js>"Juneau ATOM specification snapshot"</js>)) .addLinks( - <jk>new</jk> Link(<js>"alternate"</js>, <js>"text/html"</js>, <js>"http://www.sample.com/2012/05/08/juneau.atom";</js>), - <jk>new</jk> Link(<js>"enclosure"</js>, <js>"audio/mpeg"</js>, <js>"http://www.sample.com/audio/juneau_podcast.mp3";</js>).setLength(12345) + <jk>new</jk> Link(<js>"alternate"</js>, <js>"text/html"</js>, <js>"http://juneau.apache.org/juneau.atom";</js>), + <jk>new</jk> Link(<js>"enclosure"</js>, <js>"audio/mpeg"</js>, <js>"http://juneau.apache.org/audio/juneau_podcast.mp3";</js>).setLength(12345) ) - .setId(<jk>new</jk> Id(<js>"tag:juneau.sample.com,2013:1.2345"</js>)) - .setUpdated(<jsm>parseDateTime</jsm>(<js>"2013-05-08T12:29:29Z"</js>)) - .setPublished(<jsm>parseDateTime</jsm>(<js>"2013-05-08T12:29:29Z"</js>)) - .addAuthors(<jk>new</jk> Person(<js>"James Bognar"</js>).setUri(<jk>new</jk> URI(<js>"http://www.sample.com/";</js>)).setEmail(<js>"[email protected]"</js>)) + .setId(<jk>new</jk> Id(<js>"tag:juneau.apache.org"</js>)) + .setUpdated(<jsm>parseDateTime</jsm>(<js>"2016-01-02T03:04:05Z"</js>)) + .setPublished(<jsm>parseDateTime</jsm>(<js>"2016-01-02T03:04:05Z"</js>)) + .addAuthors(<jk>new</jk> Person(<js>"James Bognar"</js>).setUri(<jk>new</jk> URI(<js>"http://juneau.apache.org/";</js>)).setEmail(<js>"[email protected]"</js>)) .addContributors( <jk>new</jk> Person(<js>"Barry M. Caceres"</js>) ) .setContent( <jk>new</jk> Content() .setLang(<js>"en"</js>) - .setBase(<jk>new</jk> URI(<js>"http://www.ibm.com/";</js>)) + .setBase(<jk>new</jk> URI(<js>"http://www.apache.org/";</js>)) .setType(<js>"xhtml"</js>) .setText(<js>"<div xmlns=\"http://www.w3.org/1999/xhtml\"><p><i>[Update: Juneau supports ATOM.]</i></p></div>"</js>) ) @@ -4356,7 +4377,7 @@ # DockerRegistryResource properties #================================================================================</cc> <cs>[DockerRegistry]</cs> - <ck>url</ck> = <cv>http://clmdocker02.ratl.swg.usma.ibm.com:5000/v1</cv> + <ck>url</ck> = <cv>http://clmdocker02.ratl.swg.usma.apache.org:5000/v1</cv> </p> <h6 class='topic'>Additional Information</h6> <ul class='javahierarchy'> @@ -5291,6 +5312,7 @@ <h5 class='toc'>What's new in each release</h5> <ul class='toc'> + <li><p><a class='doclink' href='#6.0.1'>6.0.1 (TBD)</a></p> <li><p><a class='doclink' href='#6.0.0'>6.0.0 (Oct 3, 2016)</a></p> <li><p><a class='doclink' href='#5.2.0.1'>5.2.0.1 (Mar 23, 2016)</a></p> <li><p><a class='doclink' href='#5.2.0.0'>5.2.0.0 (Dec 30, 2015)</a></p> @@ -5356,6 +5378,32 @@ <!-- ======================================================================================================== --> + <a id="6.0.1"></a> + <h3 class='topic' onclick='toggle(this)'>6.0.1 (TBD)</h3> + <div class='topic'> + <p> + Juneau 6.0.1 is a minor update. + </p> + + <h6 class='topic'>org.apache.juneau</h6> + <ul class='spaced-list'> + <li>General improvements to JSON parser. + <ul> + <li>Several fixes to handle obscure edge cases. + </ul> + <li>New properties in <a href="org/apache/juneau/parser/ParserContext.html" title="class in org.apache.juneau.parser"><code>ParserContext</code></a>. + <ul> + <li><a href="org/apache/juneau/parser/ParserContext.html#PARSER_strict"><code>ParserContext.PARSER_strict</code></a> + <li><a href="org/apache/juneau/parser/ParserContext.html#PARSER_inputStreamCharset"><code>ParserContext.PARSER_inputStreamCharset</code></a> + <li><a href="org/apache/juneau/parser/ParserContext.html#PARSER_fileCharset"><code>ParserContext.PARSER_fileCharset</code></a> + </ul> + <li>Removed <code>JsonParserContext.JSON_strictMode</code>. Replaced by <code>PARSER_strict</code>. + <li><code><jk>byte[]</jk></code> arrays can now be passed to <a href="org/apache/juneau/parser/Parser.html#parse-java.lang.Object-java.lang.Class-"><code>Parser.parse(Object,Class)</code></a> for reader-based parsers. + </ul> + + </div> + + <!-- ======================================================================================================== --> <a id="6.0.0"></a> <h3 class='topic' onclick='toggle(this)'>6.0.0 (Oct 3, 2016)</h3> <div class='topic'> @@ -5526,7 +5574,7 @@ Juno 5.2.0.1 is a moderate update. </p> - <h6 class='topic'>com.ibm.team.juno</h6> + <h6 class='topic'>com.<h6 class='topic'>Core</h6>.team.juno</h6> <ul class='spaced-list'> <li>Improved support for multi-line values in config files. Any line that begins with whitespace is interpreted as a continuation of the previous line. @@ -5561,7 +5609,7 @@ <li>Default value for <a href="org/apache/juneau/xml/XmlParserContext.html#XML_trimWhitespace"><code>XmlParserContext.XML_trimWhitespace</code></a> changed to <jk>true</jk>. </ul> - <h6 class='topic'>com.ibm.team.juno.server</h6> + <h6 class='topic'>Server</h6> <ul class='spaced-list'> <li>New methods on <a href="org/apache/juneau/server/RestServlet.html" title="class in org.apache.juneau.server"><code>RestServlet</code></a>: <ul> @@ -5570,7 +5618,7 @@ </ul> </ul> - <h6 class='topic'>com.ibm.team.juno.client</h6> + <h6 class='topic'>Client</h6> <ul class='spaced-list'> <li>Fixed potential issue in <a href="org/apache/juneau/client/RestClient.html" title="class in org.apache.juneau.client"><code>RestClient</code></a> where the HTTP connection pool could end up exhausted if an error occurred. <li>Improved thread safety on <a href="org/apache/juneau/client/RestClient.html" title="class in org.apache.juneau.client"><code>RestClient</code></a>. @@ -5588,7 +5636,7 @@ Major changes have been made to the microservice architecture and config INI file APIs. </p> - <h6 class='topic'>com.ibm.team.juno</h6> + <h6 class='topic'>Core</h6> <ul class='spaced-list'> <li>Significant changes and enhancements to the <a href="org/apache/juneau/ini/package-summary.html"><code>org.apache.juneau.ini</code></a> API. <ul> @@ -5775,7 +5823,7 @@ <li>New <a href="org/apache/juneau/utils/PojoQuery.html" title="class in org.apache.juneau.utils"><code>PojoQuery</code></a> modified to handle bean getters that throw exceptions. </ul> - <h6 class='topic'>com.ibm.team.juno.client</h6> + <h6 class='topic'>Client</h6> <ul class='spaced-list'> <li>Upgraded to use Apache HttpClient 4.5. <li>New classes: @@ -5887,7 +5935,7 @@ </ul> </ul> - <h6 class='topic'>com.ibm.team.juno.server</h6> + <h6 class='topic'>Server</h6> <ul class='spaced-list'> <li>New <a href="org/apache/juneau/server/ReaderResource.html" title="class in org.apache.juneau.server"><code>ReaderResource</code></a> class. Represents the contents of a text file with convenience methods for resolving @@ -5947,7 +5995,7 @@ <li>New <a href="org/apache/juneau/server/RestUtils.html#trimPathInfo-java.lang.StringBuffer-java.lang.String-java.lang.String-"><code>RestUtils.trimPathInfo(StringBuffer,String,String)</code></a> method. </ul> - <h6 class='topic'>com.ibm.team.juno.microservice</h6> + <h6 class='topic'>Microservice</h6> <ul class='spaced-list'> <li>Completely revamped API. <li>New <a href="org/apache/juneau/microservice/Microservice.html" title="class in org.apache.juneau.microservice"><code>Microservice</code></a> class that serves as a generic @@ -5986,7 +6034,7 @@ </ul> </ul> - <h6 class='topic'>com.ibm.team.juno.samples</h6> + <h6 class='topic'>Samples</h6> <ul class='spaced-list'> <li>Converted to a REST microservice. <li>Look-and-feel changed to IBM DevOps. @@ -6013,7 +6061,7 @@ The biggest improvement is the ability to associate external INI config files with REST servlets using the <a href="org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini"><code>ConfigFile</code></a> functionality. </p> - <h6 class='topic'>com.ibm.team.juno</h6> + <h6 class='topic'>Core</h6> <ul class='spaced-list'> <li>Significant API changes to <a href="org/apache/juneau/ini/package-summary.html"><code>org.apache.juneau.ini</code></a> API. <ul> @@ -6042,7 +6090,7 @@ This affects the way most parsers handle blank values. </ul> - <h6 class='topic'>com.ibm.team.juno.server</h6> + <h6 class='topic'>Server</h6> <ul class='spaced-list'> <li>You can now parse into non-static inner classes of a servlet for parameters/attributes/content. Useful if you like to define your marshaller beans inside your servlet. @@ -6088,7 +6136,7 @@ </ul> </ul> - <h6 class='topic'>com.ibm.team.juno.microservice</h6> + <h6 class='topic'>Microservice</h6> <ul class='spaced-list'> <li>New juneau-microservice.jar file that encapsulates all 3 juneau jars with code necessary for creating fast and efficent jetty-powered REST microservices.<br> Contains the following: @@ -6110,7 +6158,7 @@ But it introduces a <a class='doclink' href='#Microservices'>Microservices</a> project for building REST microservices and docker containers. </p> - <h6 class='topic'>com.ibm.team.juno</h6> + <h6 class='topic'>Core</h6> <ul class='spaced-list'> <li>Beans can now be serialized to and parsed from <a href="org/apache/juneau/ObjectMap.html" title="class in org.apache.juneau"><code>ObjectMaps</code></a>. See <a class='doclink' href='org/apache/juneau/transform/package-summary.html#ToObjectMaps'>Serializing to ObjectMaps</a> for details. @@ -6120,12 +6168,12 @@ <li>Behavior change on <del><code>StringVarResolver</code></del>. <jk>null</jk> input now results in blank strings instead of <jk>null</jk>. </ul> - <h6 class='topic'>com.ibm.team.juno.client</h6> + <h6 class='topic'>Client</h6> <ul class='spaced-list'> <li>New <a href="org/apache/juneau/client/RestClient.html#doCallback-java.lang.String-"><code>RestClient.doCallback(String)</code></a> method. </ul> - <h6 class='topic'>com.ibm.team.juno.server</h6> + <h6 class='topic'>Server</h6> <ul class='spaced-list'> <li>New <a href="org/apache/juneau/server/RestRequest.html#getHeaders--"><code>RestRequest.getHeaders()</code></a> method. <li>New <code>RestResponse.getUnbufferedWriter()</code> method. @@ -6147,7 +6195,7 @@ Juno 5.1.0.18 is a minor update affecting the server component only. </p> - <h6 class='topic'>com.ibm.team.juno.server</h6> + <h6 class='topic'>Server</h6> <ul class='spaced-list'> <li>Fixed bug where localized strings weren't resolving when using chained resource bundles. <li>Servlet and method labels and descriptions can now contain embedded string variables. @@ -6175,7 +6223,7 @@ Juno 5.1.0.17 is a major update. </p> - <h6 class='topic'>com.ibm.team.juno</h6> + <h6 class='topic'>Core</h6> <ul class='spaced-list'> <li><a href="org/apache/juneau/BeanMap.html#get-java.lang.Object-"><code>BeanMap.get(Object)</code></a> and <a href="org/apache/juneau/BeanMap.html#put-java.lang.String-java.lang.Object-"><code>BeanMap.put(String,Object)</code></a> now automatically performs filtering if filters are defined on the bean property or bean property class. @@ -6206,7 +6254,7 @@ </ul> - <h6 class='topic'>com.ibm.team.juno.server</h6> + <h6 class='topic'>Server</h6> <ul class='spaced-list'> <li>New <a href="org/apache/juneau/server/response/ZipFileListResponseHandler.html" title="class in org.apache.juneau.server.response"><code>ZipFileListResponseHandler</code></a> class. <li>Simplified lables in servlet resource bundles: @@ -6277,7 +6325,7 @@ <li>Support for sorting resources by name in <a href="org/apache/juneau/server/labels/ChildResourceDescriptions.html" title="class in org.apache.juneau.server.labels"><code>ChildResourceDescriptions</code></a>. </ul> - <h6 class='topic'>com.ibm.team.juno.samples</h6> + <h6 class='topic'>Samples</h6> <ul class='spaced-list'> <li>Added <code>/tempDir/upload</code> showing how to use <code>ServletFileUpload</code> with multipart form posts. </ul> @@ -6292,7 +6340,7 @@ Juno 5.1.0.16 is a moderate update. </p> - <h6 class='topic'>com.ibm.team.juno</h6> + <h6 class='topic'>Core</h6> <ul class='spaced-list'> <li>New methods on <a href="org/apache/juneau/ClassMeta.html" title="class in org.apache.juneau"><code>ClassMeta</code></a> that eliminates language-specific code in the general class metadata. @@ -6320,14 +6368,14 @@ <li>FindBug fixes. </ul> - <h6 class='topic'>com.ibm.team.juno.server</h6> + <h6 class='topic'>Server</h6> <ul class='spaced-list'> <li>New <a href="org/apache/juneau/server/RestRequest.html#getServletParentURI--"><code>RestRequest.getServletParentURI()</code></a> method. <li>New <code>$R{servletParentURI}</code> variable. <li>Removed final modifier from <a href="org/apache/juneau/server/labels/ChildResourceDescriptions.html" title="class in org.apache.juneau.server.labels"><code>ChildResourceDescriptions</code></a>. </ul> - <h6 class='topic'>com.ibm.team.juno.samples</h6> + <h6 class='topic'>Samples</h6> <ul class='spaced-list'> <li>Added source code links to examples. </ul> @@ -6341,7 +6389,7 @@ Juno 5.1.0.15 is a minor update. </p> - <h6 class='topic'>com.ibm.team.juno</h6> + <h6 class='topic'>Core</h6> <ul class='spaced-list'> <li>New properties in <a href="org/apache/juneau/serializer/SerializerContext.html" title="class in org.apache.juneau.serializer"><code>SerializerContext</code></a>: <ol> @@ -6353,7 +6401,7 @@ <li>Improvements in <a href="org/apache/juneau/csv/CsvSerializer.html" title="class in org.apache.juneau.csv"><code>CsvSerializer</code></a>. </ul> - <h6 class='topic'>com.ibm.team.juno.server</h6> + <h6 class='topic'>Server</h6> <ul class='spaced-list'> <li>New properties in <code>RestServletProperties</code>: <ol> @@ -6364,7 +6412,7 @@ <li>Improvements involving path calculations when servlets deployed outside of a war file with a context root. </ul> - <h6 class='topic'>com.ibm.team.juno.client</h6> + <h6 class='topic'>Client</h6> <ul class='spaced-list'> <li>New convenience methods in <a href="org/apache/juneau/client/RestCall.html" title="class in org.apache.juneau.client"><code>RestCall</code></a>: <ol> @@ -6387,13 +6435,13 @@ to invoke server-side POJO methods through client-side proxy interfaces. </p> - <h6 class='topic'>com.ibm.team.juno</h6> + <h6 class='topic'>Core</h6> <ul class='spaced-list'> <li>Simplified <a href="org/apache/juneau/utils/PojoIntrospector.html" title="class in org.apache.juneau.utils"><code>PojoIntrospector</code></a> class. <li>New <a href="org/apache/juneau/internal/ClassUtils.html#getMethodSignature-java.lang.reflect.Method-"><code>ClassUtils.getMethodSignature(Method)</code></a> method. </ul> - <h6 class='topic'>com.ibm.team.juno.client</h6> + <h6 class='topic'>Client</h6> <ul class='spaced-list'> <li>New methods in <a href="org/apache/juneau/client/RestClient.html" title="class in org.apache.juneau.client"><code>RestClient</code></a> for working with remoteable services: <ul> @@ -6402,7 +6450,7 @@ </ul> </ul> - <h6 class='topic'>com.ibm.team.juno.server</h6> + <h6 class='topic'>Server</h6> <ul class='spaced-list'> <li>Added a default OPTIONS page to <a href="org/apache/juneau/server/RestServletDefault.html" title="class in org.apache.juneau.server"><code>RestServletDefault</code></a> and <a href="org/apache/juneau/server/jena/RestServletJenaDefault.html" title="class in org.apache.juneau.server.jena"><code>RestServletJenaDefault</code></a>. <li><code>RestServletProperties.REST_allowMethodParam</code> has been enhanced to allow you to @@ -6423,7 +6471,7 @@ Juno 5.1.0.13 is a minor update. </p> - <h6 class='topic'>com.ibm.team.juno</h6> + <h6 class='topic'>Core</h6> <ul class='spaced-list'> <li><a href="org/apache/juneau/ClassMeta.html#newInstance--"><code>ClassMeta.newInstance()</code></a> method can now create new instances of arrays. <li>Arguments passed to <a href="org/apache/juneau/dto/Link.html" title="class in org.apache.juneau.dto"><code>Link</code></a> are now serialized using <a href="org/apache/juneau/urlencoding/UrlEncodingSerializer.html" title="class in org.apache.juneau.urlencoding"><code>UrlEncodingSerializer</code></a>, so arbitrary POJOs can now be passed as arguments. @@ -6435,7 +6483,7 @@ <li>Improved implementation of <a href="org/apache/juneau/urlencoding/UrlEncodingSerializer.html#serializeUrlPart-java.lang.Object-"><code>UrlEncodingSerializer.serializeUrlPart(Object)</code></a> method. </ul> - <h6 class='topic'>com.ibm.team.juno.server</h6> + <h6 class='topic'>Server</h6> <ul class='spaced-list'> <li><a href="org/apache/juneau/server/RestConverter.html" title="interface in org.apache.juneau.server"><code>RestConverter</code></a> API fixed to handle the existence of POJO filters. <a href="org/apache/juneau/server/converters/Introspectable.html" title="class in org.apache.juneau.server.converters"><code>Introspectable</code></a>/<a href="org/apache/juneau/server/converters/Queryable.html" title="class in org.apache.juneau.server.converters"><code>Queryable</code></a>/<a href="org/apache/juneau/server/converters/Traversable.html" title="class in org.apache.juneau.server.converters"><code>Traversable</code></a> classes can now work with filtered POJOs. @@ -6444,7 +6492,7 @@ <li>Fixed bug where two REST java methods mapped to the same path pattern wasn't triggering an exception when it was supposed to. </ul> - <h6 class='topic'>com.ibm.team.juno.client</h6> + <h6 class='topic'>Client</h6> <ul class='spaced-list'> <li>New <a href="org/apache/juneau/client/RestCall.html#setRedirectMaxAttempts-int-"><code>RestCall.setRedirectMaxAttempts(int)</code></a> method to prevent endless redirection loops. <li>New <a href="org/apache/juneau/client/RestCall.html#setRetryable-int-long-org.apache.juneau.client.RetryOn-"><code>RestCall.setRetryable(int,long,RetryOn)</code></a> method to automatically retry on failed connection attempts. @@ -6460,14 +6508,14 @@ Juno 5.1.0.12 is a minor update. </p> - <h6 class='topic'>com.ibm.team.juno</h6> + <h6 class='topic'>Core</h6> <ul class='spaced-list'> <li>Fixed <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true#isEmpty--"; title="class or interface in java.util"><code>Map.isEmpty()</code></a> method. <li>Changed behavior on <a href="org/apache/juneau/urlencoding/UonParser.html" title="class in org.apache.juneau.urlencoding"><code>UonParser</code></a> to not treat <js>'~'</js> characters as escapes unless followed by one of the following characters: <code>( ) , $ = ~</code>. </ul> - <h6 class='topic'>com.ibm.team.juno.client</h6> + <h6 class='topic'>Client</h6> <ul class='spaced-list'> <li>New class <a href="org/apache/juneau/client/RestCallInterceptor.html" title="class in org.apache.juneau.client"><code>RestCallInterceptor</code></a>. Allows responses to be inspected and modified before being processed. @@ -6484,7 +6532,7 @@ Juno 5.1.0.11 is a moderate update. </p> - <h6 class='topic'>com.ibm.team.juno</h6> + <h6 class='topic'>Core</h6> <ul class='spaced-list'> <li>Additions to <a href="org/apache/juneau/html/annotation/Html.html" title="annotation in org.apache.juneau.html.annotation"><code>@Html</code></a> bean annotation. <ul> @@ -6513,7 +6561,7 @@ <li>Config INI files now support keys with name <js>"*"</js>. </ul> - <h6 class='topic'>com.ibm.team.juno.server</h6> + <h6 class='topic'>Server</h6> <ul class='spaced-list'> <li>REST method parameters can now be generic types (e.g. <del><ja>@Param</ja></del>(<js>"foo"</js>) Map<String,Integer> foo</code>). This applies to headers, attributes, and parameters. @@ -6545,7 +6593,7 @@ of <a href="org/apache/juneau/server/RestServletDefault.html" title="class in org.apache.juneau.server"><code>RestServletDefault</code></a> and <a href="org/apache/juneau/server/jena/RestServletJenaDefault.html" title="class in org.apache.juneau.server.jena"><code>RestServletJenaDefault</code></a>. </ul> - <h6 class='topic'>com.ibm.team.juno.client</h6> + <h6 class='topic'>Client</h6> <ul class='spaced-list'> <li>New method <a href="org/apache/juneau/client/RestCall.html#allowRedirectsOnPosts-boolean-"><code>RestCall.allowRedirectsOnPosts(boolean)</code></a>. <li>New method <code>RestCall.peekInputStream()</code> allows you to read response bodies without interrupting execution flow. @@ -6559,8 +6607,8 @@ <h6 class='topic'>Other changes</h6> <ul class='spaced-list'> - <li><code>com.ibm.team.juno.samples.ear</code> and <code>com.ibm.team.juno.samples.war</code> projects - have been replaced with an OSGi bundle with activated servlets in <code>com.ibm.team.juno.samples</code>. + <li><code>samples.ear</code> and <code>samples.war</code> projects + have been replaced with an OSGi bundle with activated servlets in <code>juno.samples</code>. </ul> </div> @@ -6572,7 +6620,7 @@ Juno 5.1.0.10 is a moderate update. </p> - <h6 class='topic'>com.ibm.team.juno</h6> + <h6 class='topic'>Core</h6> <ul class='spaced-list'> <li>Major changes to URL-Encoded serializer and parser. <ul> @@ -6589,7 +6637,7 @@ <li>New <a href="org/apache/juneau/serializer/WriterSerializer.html#toString-java.lang.Object-"><code>WriterSerializer.toString(Object)</code></a> method that's identical to the serialize method but throws <code>RuntimeExceptions</code> to make the serializer easier to use for debugging. </ul> - <h6 class='topic'>com.ibm.team.juno.server</h6> + <h6 class='topic'>Server</h6> <ul class='spaced-list'> <li>Fixed major issue that prevented parsing URL-Encoded form posts into POJOs. Calling <del><code>HttpServlet.getParameter(String)</code></del> was forcing the underlying servlet code to process the HTTP body itself, preventing the <code>UrlEncodingSerializer</code> @@ -6604,7 +6652,7 @@ <a href="org/apache/juneau/server/RestServletDefault.html" title="class in org.apache.juneau.server"><code>RestServletDefault</code></a> and <a href="org/apache/juneau/server/jena/RestServletJenaDefault.html" title="class in org.apache.juneau.server.jena"><code>RestServletJenaDefault</code></a>. </ul> - <h6 class='topic'>com.ibm.team.juno.client</h6> + <h6 class='topic'>Client</h6> <ul class='spaced-list'> <li>Moved to Apache HttpClient 4.3 to match Jazz 6.0. <li>Renamed <code>RestResponseEntity</code> to <a href="org/apache/juneau/client/RestRequestEntity.html" title="class in org.apache.juneau.client"><code>RestRequestEntity</code></a>. @@ -6620,7 +6668,7 @@ <li>Renamed <code>RestClient.shutdown()</code> to <a href="org/apache/juneau/client/RestClient.html#close--"><code>RestClient.close()</code></a> to mirror change in Apache API. </ul> - <h6 class='topic'>com.ibm.team.juno.samples.war</h6> + <h6 class='topic'>Samples</h6> <ul class='spaced-list'> <li>New <code>CodeFormatterResource</code> for quickly formatting Java and XML code samples in Javadocs. <li>New <code>UrlEncodedFormResource</code> for showing how to work with URL-Encoded form posts. @@ -7192,7 +7240,7 @@ Added <a href="org/apache/juneau/transforms/XMLGregorianCalendarSwap.html" title="class in org.apache.juneau.transforms"><code>XMLGregorianCalendarSwap</code></a> to convert these to ISO8601 strings during serialization, and vice versa during parsing. </li> <li> - Added a <a href="org/apache/juneau/json/JsonParserContext.html#JSON_strictMode"><code>strict</code></a> mode to <a href="org/apache/juneau/json/JsonParser.html" title="class in org.apache.juneau.json"><code>JsonParser</code></a>. + Added a strict mode to <a href="org/apache/juneau/json/JsonParser.html" title="class in org.apache.juneau.json"><code>JsonParser</code></a>. </li> <li> Added default <a href="org/apache/juneau/json/JsonParser.html#DEFAULT_STRICT"><code>JsonParser.DEFAULT_STRICT</code></a> parser.
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/02c10736/content/site/apidocs/overview-tree.html ---------------------------------------------------------------------- diff --git a/content/site/apidocs/overview-tree.html b/content/site/apidocs/overview-tree.html index d573fb7..5d8edea 100644 --- a/content/site/apidocs/overview-tree.html +++ b/content/site/apidocs/overview-tree.html @@ -4,7 +4,7 @@ <head> <!-- Generated by javadoc --> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> -<title>Class Hierarchy (Apache Juneau (incubating) 6.0.0-incubating-SNAPSHOT)</title> +<title>Class Hierarchy (Apache Juneau (incubating) 6.0.1-incubating-SNAPSHOT)</title> <link rel="stylesheet" type="text/css" href="javadoc.css" title="Style"> <script type="text/javascript" src="script.js"></script> </head> @@ -12,7 +12,7 @@ <script type="text/javascript"><!-- try { if (location.href.indexOf('is-external=true') == -1) { - parent.document.title="Class Hierarchy (Apache Juneau (incubating) 6.0.0-incubating-SNAPSHOT)"; + parent.document.title="Class Hierarchy (Apache Juneau (incubating) 6.0.1-incubating-SNAPSHOT)"; } } catch(err) { http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/02c10736/content/site/apidocs/resources/juneau-doc.css ---------------------------------------------------------------------- diff --git a/content/site/apidocs/resources/juneau-doc.css b/content/site/apidocs/resources/juneau-doc.css index 0152073..4804271 100644 --- a/content/site/apidocs/resources/juneau-doc.css +++ b/content/site/apidocs/resources/juneau-doc.css @@ -311,6 +311,7 @@ l { list-style: none; background-repeat: no-repeat; background-position: left top; + background-size: 16px; } .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'); http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/02c10736/content/site/apidocs/serialized-form.html ---------------------------------------------------------------------- diff --git a/content/site/apidocs/serialized-form.html b/content/site/apidocs/serialized-form.html index 28ed298..8077a61 100644 --- a/content/site/apidocs/serialized-form.html +++ b/content/site/apidocs/serialized-form.html @@ -4,7 +4,7 @@ <head> <!-- Generated by javadoc --> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> -<title>Serialized Form (Apache Juneau (incubating) 6.0.0-incubating-SNAPSHOT)</title> +<title>Serialized Form (Apache Juneau (incubating) 6.0.1-incubating-SNAPSHOT)</title> <link rel="stylesheet" type="text/css" href="javadoc.css" title="Style"> <script type="text/javascript" src="script.js"></script> </head> @@ -12,7 +12,7 @@ <script type="text/javascript"><!-- try { if (location.href.indexOf('is-external=true') == -1) { - parent.document.title="Serialized Form (Apache Juneau (incubating) 6.0.0-incubating-SNAPSHOT)"; + parent.document.title="Serialized Form (Apache Juneau (incubating) 6.0.1-incubating-SNAPSHOT)"; } } catch(err) { @@ -672,7 +672,7 @@ </li> <li class="blockList"> <h4>swaggers</h4> -<pre><a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true"; title="class or interface in java.util">Map</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true"; title="class or interface in java.util">K</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true"; title="class or interface in java.util">V</a>> swaggers</pre> +<pre><a href="http://docs.oracle.com/javase/7/docs/api/java/util/concurrent/ConcurrentHashMap.html?is-external=true"; title="class or interface in java.util.concurrent">ConcurrentHashMap</a><<a href="http://docs.oracle.com/javase/7/docs/api/java/util/concurrent/ConcurrentHashMap.html?is-external=true"; title="class or interface in java.util.concurrent">K</a>,<a href="http://docs.oracle.com/javase/7/docs/api/java/util/concurrent/ConcurrentHashMap.html?is-external=true"; title="class or interface in java.util.concurrent">V</a>> swaggers</pre> </li> <li class="blockList"> <h4>context</h4> http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/02c10736/content/site/apidocs/src-html/org/apache/juneau/BeanContext.html ---------------------------------------------------------------------- diff --git a/content/site/apidocs/src-html/org/apache/juneau/BeanContext.html b/content/site/apidocs/src-html/org/apache/juneau/BeanContext.html index b23337e..628b710 100644 --- a/content/site/apidocs/src-html/org/apache/juneau/BeanContext.html +++ b/content/site/apidocs/src-html/org/apache/juneau/BeanContext.html @@ -1675,7 +1675,7 @@ <span class="sourceLineNo">1667</span> * <h6 class='topic'>Example:</h6><a name="line.1667"></a> <span class="sourceLineNo">1668</span> * <ul><a name="line.1668"></a> <span class="sourceLineNo">1669</span> * <li><js>"java.lang.String"</js><a name="line.1669"></a> -<span class="sourceLineNo">1670</span> * <li><js>"com.ibm.sample.MyBean[]"</js><a name="line.1670"></a> +<span class="sourceLineNo">1670</span> * <li><js>"com.foo.sample.MyBean[]"</js><a name="line.1670"></a> <span class="sourceLineNo">1671</span> * <li><js>"java.util.HashMap<java.lang.String,java.lang.Integer>"</js><a name="line.1671"></a> <span class="sourceLineNo">1672</span> * <li><js>"[Ljava.lang.String;"</js> (i.e. the value of <code>String[].<jk>class</jk>.getName()</code>)<a name="line.1672"></a> <span class="sourceLineNo">1673</span> * </ul><a name="line.1673"></a> http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/02c10736/content/site/apidocs/src-html/org/apache/juneau/ObjectMap.html ---------------------------------------------------------------------- diff --git a/content/site/apidocs/src-html/org/apache/juneau/ObjectMap.html b/content/site/apidocs/src-html/org/apache/juneau/ObjectMap.html index a792889..230bf5a 100644 --- a/content/site/apidocs/src-html/org/apache/juneau/ObjectMap.html +++ b/content/site/apidocs/src-html/org/apache/juneau/ObjectMap.html @@ -1082,7 +1082,7 @@ <span class="sourceLineNo">1074</span> * </p><a name="line.1074"></a> <span class="sourceLineNo">1075</span> * <p class='bcode'><a name="line.1075"></a> <span class="sourceLineNo">1076</span> * {<a name="line.1076"></a> -<span class="sourceLineNo">1077</span> * _type: <js>'com.ibm.sample.addressBook.Person'</js>,<a name="line.1077"></a> +<span class="sourceLineNo">1077</span> * _type: <js>'org.apache.juneau.samples.addressbook.Person'</js>,<a name="line.1077"></a> <span class="sourceLineNo">1078</span> * name: <js>'John Smith'</js>,<a name="line.1078"></a> <span class="sourceLineNo">1079</span> * ...<a name="line.1079"></a> <span class="sourceLineNo">1080</span> * }<a name="line.1080"></a> @@ -1115,7 +1115,7 @@ <span class="sourceLineNo">1107</span> * }<a name="line.1107"></a> <span class="sourceLineNo">1108</span> * <jc>// LinkedList of beans</jc><a name="line.1108"></a> <span class="sourceLineNo">1109</span> * {<a name="line.1109"></a> -<span class="sourceLineNo">1110</span> * _type: <js>'java.util.LinkedList&lt;com.ibm.sample.addressBook.Person&gt;'</js>,<a name="line.1110"></a> +<span class="sourceLineNo">1110</span> * _type: <js>'java.util.LinkedList&lt;org.apache.juneau.samples.addressbook.Person&gt;'</js>,<a name="line.1110"></a> <span class="sourceLineNo">1111</span> * items: [ { name: <js>'John Smith'</js>, ... }, ... ]<a name="line.1111"></a> <span class="sourceLineNo">1112</span> * }<a name="line.1112"></a> <span class="sourceLineNo">1113</span> * </p><a name="line.1113"></a> @@ -1130,7 +1130,7 @@ <span class="sourceLineNo">1122</span> * }<a name="line.1122"></a> <span class="sourceLineNo">1123</span> * <jc>// Array of beans</jc><a name="line.1123"></a> <span class="sourceLineNo">1124</span> * {<a name="line.1124"></a> -<span class="sourceLineNo">1125</span> * _type: <js>'com.ibm.sample.addressBook.Person[]'</js>,<a name="line.1125"></a> +<span class="sourceLineNo">1125</span> * _type: <js>'org.apache.juneau.samples.addressbook.Person[]'</js>,<a name="line.1125"></a> <span class="sourceLineNo">1126</span> * items: [ { name: <js>'John Smith'</js>, ... }, ... ]<a name="line.1126"></a> <span class="sourceLineNo">1127</span> * }<a name="line.1127"></a> <span class="sourceLineNo">1128</span> * </p><a name="line.1128"></a> http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/02c10736/content/site/apidocs/src-html/org/apache/juneau/client/SSLOpts.CertValidate.html ---------------------------------------------------------------------- diff --git a/content/site/apidocs/src-html/org/apache/juneau/client/SSLOpts.CertValidate.html b/content/site/apidocs/src-html/org/apache/juneau/client/SSLOpts.CertValidate.html index 2440051..1dca3a6 100644 --- a/content/site/apidocs/src-html/org/apache/juneau/client/SSLOpts.CertValidate.html +++ b/content/site/apidocs/src-html/org/apache/juneau/client/SSLOpts.CertValidate.html @@ -70,131 +70,128 @@ <span class="sourceLineNo">062</span> * The default value is <jk>"SSL_TLS,TLS,SSL"</js> unless overridden by one of the following<a name="line.62"></a> <span class="sourceLineNo">063</span> * system properties:<a name="line.63"></a> <span class="sourceLineNo">064</span> * <ul><a name="line.64"></a> -<span class="sourceLineNo">065</span> * <li><js>"com.ibm.team.repository.transport.client.protocol"</js><a name="line.65"></a> -<span class="sourceLineNo">066</span> * <li><js>"transport.client.protocol"</js><a name="line.66"></a> -<span class="sourceLineNo">067</span> * </ul><a name="line.67"></a> -<span class="sourceLineNo">068</span> * <p><a name="line.68"></a> -<span class="sourceLineNo">069</span> * Subclasses can override this method to provide their own logic for determining default supported protocols.<a name="line.69"></a> -<span class="sourceLineNo">070</span> *<a name="line.70"></a> -<span class="sourceLineNo">071</span> * @return The comma-delimited list of supported protocols.<a name="line.71"></a> -<span class="sourceLineNo">072</span> */<a name="line.72"></a> -<span class="sourceLineNo">073</span> protected String getDefaultProtocols() {<a name="line.73"></a> -<span class="sourceLineNo">074</span> String sp = System.getProperty("com.ibm.team.repository.transport.client.protocol");<a name="line.74"></a> -<span class="sourceLineNo">075</span> if (StringUtils.isEmpty(sp))<a name="line.75"></a> -<span class="sourceLineNo">076</span> sp = System.getProperty("transport.client.protocol");<a name="line.76"></a> -<span class="sourceLineNo">077</span> if (StringUtils.isEmpty(sp))<a name="line.77"></a> -<span class="sourceLineNo">078</span> sp = "SSL_TLS,TLS,SSL";<a name="line.78"></a> -<span class="sourceLineNo">079</span> return sp;<a name="line.79"></a> -<span class="sourceLineNo">080</span> }<a name="line.80"></a> -<span class="sourceLineNo">081</span><a name="line.81"></a> -<span class="sourceLineNo">082</span><a name="line.82"></a> -<span class="sourceLineNo">083</span> //--------------------------------------------------------------------------------<a name="line.83"></a> -<span class="sourceLineNo">084</span> // Bean properties<a name="line.84"></a> -<span class="sourceLineNo">085</span> //--------------------------------------------------------------------------------<a name="line.85"></a> -<span class="sourceLineNo">086</span><a name="line.86"></a> -<span class="sourceLineNo">087</span> /**<a name="line.87"></a> -<span class="sourceLineNo">088</span> * Bean property getter: <property>protocols</property>.<a name="line.88"></a> -<span class="sourceLineNo">089</span> *<a name="line.89"></a> -<span class="sourceLineNo">090</span> * @return The value of the <property>protocols</property> property on this bean, or <jk>null</jk> if it is not set.<a name="line.90"></a> -<span class="sourceLineNo">091</span> */<a name="line.91"></a> -<span class="sourceLineNo">092</span> public String getProtocols() {<a name="line.92"></a> -<span class="sourceLineNo">093</span> return protocols;<a name="line.93"></a> -<span class="sourceLineNo">094</span> }<a name="line.94"></a> -<span class="sourceLineNo">095</span><a name="line.95"></a> -<span class="sourceLineNo">096</span> /**<a name="line.96"></a> -<span class="sourceLineNo">097</span> * Bean property setter: <property>protocols</property>.<a name="line.97"></a> -<span class="sourceLineNo">098</span> *<a name="line.98"></a> -<span class="sourceLineNo">099</span> * @param protocols The new value for the <property>properties</property> property on this bean.<a name="line.99"></a> -<span class="sourceLineNo">100</span> * @return This object (for method chaining).<a name="line.100"></a> -<span class="sourceLineNo">101</span> */<a name="line.101"></a> -<span class="sourceLineNo">102</span> public SSLOpts setProtocols(String protocols) {<a name="line.102"></a> -<span class="sourceLineNo">103</span> this.protocols = protocols;<a name="line.103"></a> -<span class="sourceLineNo">104</span> return this;<a name="line.104"></a> -<span class="sourceLineNo">105</span> }<a name="line.105"></a> -<span class="sourceLineNo">106</span><a name="line.106"></a> -<span class="sourceLineNo">107</span> /**<a name="line.107"></a> -<span class="sourceLineNo">108</span> * Bean property getter: <property>certValidate</property>.<a name="line.108"></a> -<span class="sourceLineNo">109</span> *<a name="line.109"></a> -<span class="sourceLineNo">110</span> * @return The value of the <property>certValidate</property> property on this bean, or <jk>null</jk> if it is not set.<a name="line.110"></a> -<span class="sourceLineNo">111</span> */<a name="line.111"></a> -<span class="sourceLineNo">112</span> public CertValidate getCertValidate() {<a name="line.112"></a> -<span class="sourceLineNo">113</span> return certValidate;<a name="line.113"></a> -<span class="sourceLineNo">114</span> }<a name="line.114"></a> -<span class="sourceLineNo">115</span><a name="line.115"></a> -<span class="sourceLineNo">116</span> /**<a name="line.116"></a> -<span class="sourceLineNo">117</span> * Bean property setter: <property>certValidate</property>.<a name="line.117"></a> -<span class="sourceLineNo">118</span> *<a name="line.118"></a> -<span class="sourceLineNo">119</span> * @param certValidate The new value for the <property>properties</property> property on this bean.<a name="line.119"></a> -<span class="sourceLineNo">120</span> * @return This object (for method chaining).<a name="line.120"></a> -<span class="sourceLineNo">121</span> */<a name="line.121"></a> -<span class="sourceLineNo">122</span> public SSLOpts setCertValidate(CertValidate certValidate) {<a name="line.122"></a> -<span class="sourceLineNo">123</span> this.certValidate = certValidate;<a name="line.123"></a> -<span class="sourceLineNo">124</span> return this;<a name="line.124"></a> -<span class="sourceLineNo">125</span> }<a name="line.125"></a> -<span class="sourceLineNo">126</span><a name="line.126"></a> -<span class="sourceLineNo">127</span> /**<a name="line.127"></a> -<span class="sourceLineNo">128</span> * Bean property getter: <property>hostVerify</property>.<a name="line.128"></a> -<span class="sourceLineNo">129</span> *<a name="line.129"></a> -<span class="sourceLineNo">130</span> * @return The value of the <property>hostVerify</property> property on this bean, or <jk>null</jk> if it is not set.<a name="line.130"></a> -<span class="sourceLineNo">131</span> */<a name="line.131"></a> -<span class="sourceLineNo">132</span> public HostVerify getHostVerify() {<a name="line.132"></a> -<span class="sourceLineNo">133</span> return hostVerify;<a name="line.133"></a> -<span class="sourceLineNo">134</span> }<a name="line.134"></a> -<span class="sourceLineNo">135</span><a name="line.135"></a> -<span class="sourceLineNo">136</span> /**<a name="line.136"></a> -<span class="sourceLineNo">137</span> * Bean property setter: <property>hostVerify</property>.<a name="line.137"></a> -<span class="sourceLineNo">138</span> *<a name="line.138"></a> -<span class="sourceLineNo">139</span> * @param hostVerify The new value for the <property>properties</property> property on this bean.<a name="line.139"></a> -<span class="sourceLineNo">140</span> * @return This object (for method chaining).<a name="line.140"></a> -<span class="sourceLineNo">141</span> */<a name="line.141"></a> -<span class="sourceLineNo">142</span> public SSLOpts setHostVerify(HostVerify hostVerify) {<a name="line.142"></a> -<span class="sourceLineNo">143</span> this.hostVerify = hostVerify;<a name="line.143"></a> -<span class="sourceLineNo">144</span> return this;<a name="line.144"></a> -<span class="sourceLineNo">145</span> }<a name="line.145"></a> -<span class="sourceLineNo">146</span><a name="line.146"></a> -<span class="sourceLineNo">147</span><a name="line.147"></a> -<span class="sourceLineNo">148</span> //--------------------------------------------------------------------------------<a name="line.148"></a> -<span class="sourceLineNo">149</span> // Enums<a name="line.149"></a> -<span class="sourceLineNo">150</span> //--------------------------------------------------------------------------------<a name="line.150"></a> -<span class="sourceLineNo">151</span><a name="line.151"></a> -<span class="sourceLineNo">152</span> /**<a name="line.152"></a> -<span class="sourceLineNo">153</span> * Certificate validation options.<a name="line.153"></a> -<span class="sourceLineNo">154</span> * <p><a name="line.154"></a> -<span class="sourceLineNo">155</span> * Used as enum for {@link SSLOpts#getCertValidate()} property.<a name="line.155"></a> -<span class="sourceLineNo">156</span> */<a name="line.156"></a> -<span class="sourceLineNo">157</span> @SuppressWarnings("hiding")<a name="line.157"></a> -<span class="sourceLineNo">158</span> public static enum CertValidate {<a name="line.158"></a> -<span class="sourceLineNo">159</span><a name="line.159"></a> -<span class="sourceLineNo">160</span> /**<a name="line.160"></a> -<span class="sourceLineNo">161</span> * Verify that the certificate is valid, but allow for self-signed certificates.<a name="line.161"></a> -<span class="sourceLineNo">162</span> */<a name="line.162"></a> -<span class="sourceLineNo">163</span> LAX,<a name="line.163"></a> -<span class="sourceLineNo">164</span><a name="line.164"></a> -<span class="sourceLineNo">165</span> /**<a name="line.165"></a> -<span class="sourceLineNo">166</span> * Do normal certificate chain validation.<a name="line.166"></a> -<span class="sourceLineNo">167</span> */<a name="line.167"></a> -<span class="sourceLineNo">168</span> DEFAULT<a name="line.168"></a> -<span class="sourceLineNo">169</span> }<a name="line.169"></a> -<span class="sourceLineNo">170</span><a name="line.170"></a> -<span class="sourceLineNo">171</span> /**<a name="line.171"></a> -<span class="sourceLineNo">172</span> * Certificate host verification options.<a name="line.172"></a> -<span class="sourceLineNo">173</span> * <p><a name="line.173"></a> -<span class="sourceLineNo">174</span> * Used as enum for {@link SSLOpts#getHostVerify()} property.<a name="line.174"></a> -<span class="sourceLineNo">175</span> */<a name="line.175"></a> -<span class="sourceLineNo">176</span> @SuppressWarnings("hiding")<a name="line.176"></a> -<span class="sourceLineNo">177</span> public enum HostVerify {<a name="line.177"></a> -<span class="sourceLineNo">178</span><a name="line.178"></a> -<span class="sourceLineNo">179</span> /**<a name="line.179"></a> -<span class="sourceLineNo">180</span> * Don't verify the hostname in the certificate.<a name="line.180"></a> -<span class="sourceLineNo">181</span> */<a name="line.181"></a> -<span class="sourceLineNo">182</span> LAX,<a name="line.182"></a> -<span class="sourceLineNo">183</span><a name="line.183"></a> -<span class="sourceLineNo">184</span> /**<a name="line.184"></a> -<span class="sourceLineNo">185</span> * Do normal hostname verification.<a name="line.185"></a> -<span class="sourceLineNo">186</span> */<a name="line.186"></a> -<span class="sourceLineNo">187</span> DEFAULT<a name="line.187"></a> -<span class="sourceLineNo">188</span> }<a name="line.188"></a> -<span class="sourceLineNo">189</span>}<a name="line.189"></a> +<span class="sourceLineNo">065</span> * <li><js>"transport.client.protocol"</js><a name="line.65"></a> +<span class="sourceLineNo">066</span> * </ul><a name="line.66"></a> +<span class="sourceLineNo">067</span> * <p><a name="line.67"></a> +<span class="sourceLineNo">068</span> * Subclasses can override this method to provide their own logic for determining default supported protocols.<a name="line.68"></a> +<span class="sourceLineNo">069</span> *<a name="line.69"></a> +<span class="sourceLineNo">070</span> * @return The comma-delimited list of supported protocols.<a name="line.70"></a> +<span class="sourceLineNo">071</span> */<a name="line.71"></a> +<span class="sourceLineNo">072</span> protected String getDefaultProtocols() {<a name="line.72"></a> +<span class="sourceLineNo">073</span> String sp = System.getProperty("transport.client.protocol");<a name="line.73"></a> +<span class="sourceLineNo">074</span> if (StringUtils.isEmpty(sp))<a name="line.74"></a> +<span class="sourceLineNo">075</span> sp = "SSL_TLS,TLS,SSL";<a name="line.75"></a> +<span class="sourceLineNo">076</span> return sp;<a name="line.76"></a> +<span class="sourceLineNo">077</span> }<a name="line.77"></a> +<span class="sourceLineNo">078</span><a name="line.78"></a> +<span class="sourceLineNo">079</span><a name="line.79"></a> +<span class="sourceLineNo">080</span> //--------------------------------------------------------------------------------<a name="line.80"></a> +<span class="sourceLineNo">081</span> // Bean properties<a name="line.81"></a> +<span class="sourceLineNo">082</span> //--------------------------------------------------------------------------------<a name="line.82"></a> +<span class="sourceLineNo">083</span><a name="line.83"></a> +<span class="sourceLineNo">084</span> /**<a name="line.84"></a> +<span class="sourceLineNo">085</span> * Bean property getter: <property>protocols</property>.<a name="line.85"></a> +<span class="sourceLineNo">086</span> *<a name="line.86"></a> +<span class="sourceLineNo">087</span> * @return The value of the <property>protocols</property> property on this bean, or <jk>null</jk> if it is not set.<a name="line.87"></a> +<span class="sourceLineNo">088</span> */<a name="line.88"></a> +<span class="sourceLineNo">089</span> public String getProtocols() {<a name="line.89"></a> +<span class="sourceLineNo">090</span> return protocols;<a name="line.90"></a> +<span class="sourceLineNo">091</span> }<a name="line.91"></a> +<span class="sourceLineNo">092</span><a name="line.92"></a> +<span class="sourceLineNo">093</span> /**<a name="line.93"></a> +<span class="sourceLineNo">094</span> * Bean property setter: <property>protocols</property>.<a name="line.94"></a> +<span class="sourceLineNo">095</span> *<a name="line.95"></a> +<span class="sourceLineNo">096</span> * @param protocols The new value for the <property>properties</property> property on this bean.<a name="line.96"></a> +<span class="sourceLineNo">097</span> * @return This object (for method chaining).<a name="line.97"></a> +<span class="sourceLineNo">098</span> */<a name="line.98"></a> +<span class="sourceLineNo">099</span> public SSLOpts setProtocols(String protocols) {<a name="line.99"></a> +<span class="sourceLineNo">100</span> this.protocols = protocols;<a name="line.100"></a> +<span class="sourceLineNo">101</span> return this;<a name="line.101"></a> +<span class="sourceLineNo">102</span> }<a name="line.102"></a> +<span class="sourceLineNo">103</span><a name="line.103"></a> +<span class="sourceLineNo">104</span> /**<a name="line.104"></a> +<span class="sourceLineNo">105</span> * Bean property getter: <property>certValidate</property>.<a name="line.105"></a> +<span class="sourceLineNo">106</span> *<a name="line.106"></a> +<span class="sourceLineNo">107</span> * @return The value of the <property>certValidate</property> property on this bean, or <jk>null</jk> if it is not set.<a name="line.107"></a> +<span class="sourceLineNo">108</span> */<a name="line.108"></a> +<span class="sourceLineNo">109</span> public CertValidate getCertValidate() {<a name="line.109"></a> +<span class="sourceLineNo">110</span> return certValidate;<a name="line.110"></a> +<span class="sourceLineNo">111</span> }<a name="line.111"></a> +<span class="sourceLineNo">112</span><a name="line.112"></a> +<span class="sourceLineNo">113</span> /**<a name="line.113"></a> +<span class="sourceLineNo">114</span> * Bean property setter: <property>certValidate</property>.<a name="line.114"></a> +<span class="sourceLineNo">115</span> *<a name="line.115"></a> +<span class="sourceLineNo">116</span> * @param certValidate The new value for the <property>properties</property> property on this bean.<a name="line.116"></a> +<span class="sourceLineNo">117</span> * @return This object (for method chaining).<a name="line.117"></a> +<span class="sourceLineNo">118</span> */<a name="line.118"></a> +<span class="sourceLineNo">119</span> public SSLOpts setCertValidate(CertValidate certValidate) {<a name="line.119"></a> +<span class="sourceLineNo">120</span> this.certValidate = certValidate;<a name="line.120"></a> +<span class="sourceLineNo">121</span> return this;<a name="line.121"></a> +<span class="sourceLineNo">122</span> }<a name="line.122"></a> +<span class="sourceLineNo">123</span><a name="line.123"></a> +<span class="sourceLineNo">124</span> /**<a name="line.124"></a> +<span class="sourceLineNo">125</span> * Bean property getter: <property>hostVerify</property>.<a name="line.125"></a> +<span class="sourceLineNo">126</span> *<a name="line.126"></a> +<span class="sourceLineNo">127</span> * @return The value of the <property>hostVerify</property> property on this bean, or <jk>null</jk> if it is not set.<a name="line.127"></a> +<span class="sourceLineNo">128</span> */<a name="line.128"></a> +<span class="sourceLineNo">129</span> public HostVerify getHostVerify() {<a name="line.129"></a> +<span class="sourceLineNo">130</span> return hostVerify;<a name="line.130"></a> +<span class="sourceLineNo">131</span> }<a name="line.131"></a> +<span class="sourceLineNo">132</span><a name="line.132"></a> +<span class="sourceLineNo">133</span> /**<a name="line.133"></a> +<span class="sourceLineNo">134</span> * Bean property setter: <property>hostVerify</property>.<a name="line.134"></a> +<span class="sourceLineNo">135</span> *<a name="line.135"></a> +<span class="sourceLineNo">136</span> * @param hostVerify The new value for the <property>properties</property> property on this bean.<a name="line.136"></a> +<span class="sourceLineNo">137</span> * @return This object (for method chaining).<a name="line.137"></a> +<span class="sourceLineNo">138</span> */<a name="line.138"></a> +<span class="sourceLineNo">139</span> public SSLOpts setHostVerify(HostVerify hostVerify) {<a name="line.139"></a> +<span class="sourceLineNo">140</span> this.hostVerify = hostVerify;<a name="line.140"></a> +<span class="sourceLineNo">141</span> return this;<a name="line.141"></a> +<span class="sourceLineNo">142</span> }<a name="line.142"></a> +<span class="sourceLineNo">143</span><a name="line.143"></a> +<span class="sourceLineNo">144</span><a name="line.144"></a> +<span class="sourceLineNo">145</span> //--------------------------------------------------------------------------------<a name="line.145"></a> +<span class="sourceLineNo">146</span> // Enums<a name="line.146"></a> +<span class="sourceLineNo">147</span> //--------------------------------------------------------------------------------<a name="line.147"></a> +<span class="sourceLineNo">148</span><a name="line.148"></a> +<span class="sourceLineNo">149</span> /**<a name="line.149"></a> +<span class="sourceLineNo">150</span> * Certificate validation options.<a name="line.150"></a> +<span class="sourceLineNo">151</span> * <p><a name="line.151"></a> +<span class="sourceLineNo">152</span> * Used as enum for {@link SSLOpts#getCertValidate()} property.<a name="line.152"></a> +<span class="sourceLineNo">153</span> */<a name="line.153"></a> +<span class="sourceLineNo">154</span> @SuppressWarnings("hiding")<a name="line.154"></a> +<span class="sourceLineNo">155</span> public static enum CertValidate {<a name="line.155"></a> +<span class="sourceLineNo">156</span><a name="line.156"></a> +<span class="sourceLineNo">157</span> /**<a name="line.157"></a> +<span class="sourceLineNo">158</span> * Verify that the certificate is valid, but allow for self-signed certificates.<a name="line.158"></a> +<span class="sourceLineNo">159</span> */<a name="line.159"></a> +<span class="sourceLineNo">160</span> LAX,<a name="line.160"></a> +<span class="sourceLineNo">161</span><a name="line.161"></a> +<span class="sourceLineNo">162</span> /**<a name="line.162"></a> +<span class="sourceLineNo">163</span> * Do normal certificate chain validation.<a name="line.163"></a> +<span class="sourceLineNo">164</span> */<a name="line.164"></a> +<span class="sourceLineNo">165</span> DEFAULT<a name="line.165"></a> +<span class="sourceLineNo">166</span> }<a name="line.166"></a> +<span class="sourceLineNo">167</span><a name="line.167"></a> +<span class="sourceLineNo">168</span> /**<a name="line.168"></a> +<span class="sourceLineNo">169</span> * Certificate host verification options.<a name="line.169"></a> +<span class="sourceLineNo">170</span> * <p><a name="line.170"></a> +<span class="sourceLineNo">171</span> * Used as enum for {@link SSLOpts#getHostVerify()} property.<a name="line.171"></a> +<span class="sourceLineNo">172</span> */<a name="line.172"></a> +<span class="sourceLineNo">173</span> @SuppressWarnings("hiding")<a name="line.173"></a> +<span class="sourceLineNo">174</span> public enum HostVerify {<a name="line.174"></a> +<span class="sourceLineNo">175</span><a name="line.175"></a> +<span class="sourceLineNo">176</span> /**<a name="line.176"></a> +<span class="sourceLineNo">177</span> * Don't verify the hostname in the certificate.<a name="line.177"></a> +<span class="sourceLineNo">178</span> */<a name="line.178"></a> +<span class="sourceLineNo">179</span> LAX,<a name="line.179"></a> +<span class="sourceLineNo">180</span><a name="line.180"></a> +<span class="sourceLineNo">181</span> /**<a name="line.181"></a> +<span class="sourceLineNo">182</span> * Do normal hostname verification.<a name="line.182"></a> +<span class="sourceLineNo">183</span> */<a name="line.183"></a> +<span class="sourceLineNo">184</span> DEFAULT<a name="line.184"></a> +<span class="sourceLineNo">185</span> }<a name="line.185"></a> +<span class="sourceLineNo">186</span>}<a name="line.186"></a>
