http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/d35b70d1/content/site/apidocs/org/apache/juneau/xml/XmlParserSession.html ---------------------------------------------------------------------- diff --git a/content/site/apidocs/org/apache/juneau/xml/XmlParserSession.html b/content/site/apidocs/org/apache/juneau/xml/XmlParserSession.html index 38848ca..d8e589a 100644 --- a/content/site/apidocs/org/apache/juneau/xml/XmlParserSession.html +++ b/content/site/apidocs/org/apache/juneau/xml/XmlParserSession.html @@ -392,7 +392,7 @@ extends <a href="../../../../org/apache/juneau/parser/ParserSession.html" title= <ul class="blockList"> <li class="blockList"> <h4>decodeString</h4> -<pre>public final <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true"; title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/juneau/xml/XmlParserSession.html#line.145">decodeString</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true"; title="class or interface in java.lang">String</a> s)</pre> +<pre>public final <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true"; title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/juneau/xml/XmlParserSession.html#line.148">decodeString</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true"; title="class or interface in java.lang">String</a> s)</pre> <div class="block">Decodes and trims the specified string. <p> @@ -411,7 +411,7 @@ extends <a href="../../../../org/apache/juneau/parser/ParserSession.html" title= <ul class="blockList"> <li class="blockList"> <h4>getElementName</h4> -<pre>public final <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true"; title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/juneau/xml/XmlParserSession.html#line.165">getElementName</a>(<a href="http://docs.oracle.com/javase/7/docs/api/javax/xml/stream/XMLStreamReader.html?is-external=true"; title="class or interface in javax.xml.stream">XMLStreamReader</a> r) +<pre>public final <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true"; title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/juneau/xml/XmlParserSession.html#line.168">getElementName</a>(<a href="http://docs.oracle.com/javase/7/docs/api/javax/xml/stream/XMLStreamReader.html?is-external=true"; title="class or interface in javax.xml.stream">XMLStreamReader</a> r) throws <a href="http://docs.oracle.com/javase/7/docs/api/javax/xml/stream/XMLStreamException.html?is-external=true"; title="class or interface in javax.xml.stream">XMLStreamException</a></pre> <div class="block">Returns the name of the current XML element. @@ -433,7 +433,7 @@ extends <a href="../../../../org/apache/juneau/parser/ParserSession.html" title= <ul class="blockList"> <li class="blockList"> <h4>getAttributeName</h4> -<pre>public final <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true"; title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/juneau/xml/XmlParserSession.html#line.180">getAttributeName</a>(<a href="http://docs.oracle.com/javase/7/docs/api/javax/xml/stream/XMLStreamReader.html?is-external=true"; title="class or interface in javax.xml.stream">XMLStreamReader</a> r, +<pre>public final <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true"; title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/juneau/xml/XmlParserSession.html#line.183">getAttributeName</a>(<a href="http://docs.oracle.com/javase/7/docs/api/javax/xml/stream/XMLStreamReader.html?is-external=true"; title="class or interface in javax.xml.stream">XMLStreamReader</a> r, int i) throws <a href="http://docs.oracle.com/javase/7/docs/api/javax/xml/stream/XMLStreamException.html?is-external=true"; title="class or interface in javax.xml.stream">XMLStreamException</a></pre> <div class="block">Returns the name of the specified attribute on the current XML element. @@ -457,7 +457,7 @@ extends <a href="../../../../org/apache/juneau/parser/ParserSession.html" title= <ul class="blockList"> <li class="blockList"> <h4>getAttributeValue</h4> -<pre>public final <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true"; title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/juneau/xml/XmlParserSession.html#line.195">getAttributeValue</a>(<a href="http://docs.oracle.com/javase/7/docs/api/javax/xml/stream/XMLStreamReader.html?is-external=true"; title="class or interface in javax.xml.stream">XMLStreamReader</a> r, +<pre>public final <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true"; title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/juneau/xml/XmlParserSession.html#line.198">getAttributeValue</a>(<a href="http://docs.oracle.com/javase/7/docs/api/javax/xml/stream/XMLStreamReader.html?is-external=true"; title="class or interface in javax.xml.stream">XMLStreamReader</a> r, int i) throws <a href="http://docs.oracle.com/javase/7/docs/api/javax/xml/stream/XMLStreamException.html?is-external=true"; title="class or interface in javax.xml.stream">XMLStreamException</a></pre> <div class="block">Returns the value of the specified attribute on the current XML element. @@ -481,8 +481,8 @@ extends <a href="../../../../org/apache/juneau/parser/ParserSession.html" title= <ul class="blockList"> <li class="blockList"> <h4>getElementText</h4> -<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true"; title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/juneau/xml/XmlParserSession.html#line.212">getElementText</a>(<a href="http://docs.oracle.com/javase/7/docs/api/javax/xml/stream/XMLStreamReader.html?is-external=true"; title="class or interface in javax.xml.stream">XMLStreamReader</a> r) - throws <a href="http://docs.oracle.com/javase/7/docs/api/javax/xml/stream/XMLStreamException.html?is-external=true"; title="class or interface in javax.xml.stream">XMLStreamException</a></pre> +<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true"; title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/juneau/xml/XmlParserSession.html#line.215">getElementText</a>(<a href="http://docs.oracle.com/javase/7/docs/api/javax/xml/stream/XMLStreamReader.html?is-external=true"; title="class or interface in javax.xml.stream">XMLStreamReader</a> r) + throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true"; title="class or interface in java.lang">Exception</a></pre> <div class="block">Returns the text content of the current XML element. <p> @@ -496,7 +496,7 @@ extends <a href="../../../../org/apache/juneau/parser/ParserSession.html" title= <dt><span class="returnLabel">Returns:</span></dt> <dd>The decoded text. <jk>null</jk> if the text consists of the sequence <js>'_x0000_'</js>.</dd> <dt><span class="throwsLabel">Throws:</span></dt> -<dd><code><a href="http://docs.oracle.com/javase/7/docs/api/javax/xml/stream/XMLStreamException.html?is-external=true"; title="class or interface in javax.xml.stream">XMLStreamException</a></code></dd> +<dd><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true"; title="class or interface in java.lang">Exception</a></code></dd> </dl> </li> </ul> @@ -506,7 +506,7 @@ extends <a href="../../../../org/apache/juneau/parser/ParserSession.html" title= <ul class="blockList"> <li class="blockList"> <h4>getText</h4> -<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true"; title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/juneau/xml/XmlParserSession.html#line.233">getText</a>(<a href="http://docs.oracle.com/javase/7/docs/api/javax/xml/stream/XMLStreamReader.html?is-external=true"; title="class or interface in javax.xml.stream">XMLStreamReader</a> r, +<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true"; title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/juneau/xml/XmlParserSession.html#line.236">getText</a>(<a href="http://docs.oracle.com/javase/7/docs/api/javax/xml/stream/XMLStreamReader.html?is-external=true"; title="class or interface in javax.xml.stream">XMLStreamReader</a> r, boolean trim) throws <a href="http://docs.oracle.com/javase/7/docs/api/javax/xml/stream/XMLStreamException.html?is-external=true"; title="class or interface in javax.xml.stream">XMLStreamException</a></pre> <div class="block">Returns the content of the current CHARACTERS node. @@ -534,7 +534,7 @@ extends <a href="../../../../org/apache/juneau/parser/ParserSession.html" title= <ul class="blockList"> <li class="blockList"> <h4>getText</h4> -<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true"; title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/juneau/xml/XmlParserSession.html#line.249">getText</a>(<a href="http://docs.oracle.com/javase/7/docs/api/javax/xml/stream/XMLStreamReader.html?is-external=true"; title="class or interface in javax.xml.stream">XMLStreamReader</a> r) +<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true"; title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/juneau/xml/XmlParserSession.html#line.252">getText</a>(<a href="http://docs.oracle.com/javase/7/docs/api/javax/xml/stream/XMLStreamReader.html?is-external=true"; title="class or interface in javax.xml.stream">XMLStreamReader</a> r) throws <a href="http://docs.oracle.com/javase/7/docs/api/javax/xml/stream/XMLStreamException.html?is-external=true"; title="class or interface in javax.xml.stream">XMLStreamException</a></pre> <div class="block">Shortcut for calling <code>getText(r, <jk>true</jk>);</code>.</div> <dl> @@ -553,7 +553,7 @@ extends <a href="../../../../org/apache/juneau/parser/ParserSession.html" title= <ul class="blockList"> <li class="blockList"> <h4>getElementAsString</h4> -<pre>public final <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true"; title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/juneau/xml/XmlParserSession.html#line.263">getElementAsString</a>(<a href="http://docs.oracle.com/javase/7/docs/api/javax/xml/stream/XMLStreamReader.html?is-external=true"; title="class or interface in javax.xml.stream">XMLStreamReader</a> r)</pre> +<pre>public final <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true"; title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/juneau/xml/XmlParserSession.html#line.266">getElementAsString</a>(<a href="http://docs.oracle.com/javase/7/docs/api/javax/xml/stream/XMLStreamReader.html?is-external=true"; title="class or interface in javax.xml.stream">XMLStreamReader</a> r)</pre> <div class="block">Takes the element being read from the XML stream reader and reconstructs it as XML. <p> @@ -574,8 +574,8 @@ extends <a href="../../../../org/apache/juneau/parser/ParserSession.html" title= <ul class="blockList"> <li class="blockList"> <h4>parseText</h4> -<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true"; title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/juneau/xml/XmlParserSession.html#line.287">parseText</a>(<a href="http://docs.oracle.com/javase/7/docs/api/javax/xml/stream/XMLStreamReader.html?is-external=true"; title="class or interface in javax.xml.stream">XMLStreamReader</a> r) - throws <a href="http://docs.oracle.com/javase/7/docs/api/javax/xml/stream/XMLStreamException.html?is-external=true"; title="class or interface in javax.xml.stream">XMLStreamException</a></pre> +<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true"; title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/juneau/xml/XmlParserSession.html#line.290">parseText</a>(<a href="http://docs.oracle.com/javase/7/docs/api/javax/xml/stream/XMLStreamReader.html?is-external=true"; title="class or interface in javax.xml.stream">XMLStreamReader</a> r) + throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true"; title="class or interface in java.lang">Exception</a></pre> <div class="block">Parses the current element as text. <p> @@ -587,7 +587,7 @@ extends <a href="../../../../org/apache/juneau/parser/ParserSession.html" title= <dt><span class="returnLabel">Returns:</span></dt> <dd>The parsed text.</dd> <dt><span class="throwsLabel">Throws:</span></dt> -<dd><code><a href="http://docs.oracle.com/javase/7/docs/api/javax/xml/stream/XMLStreamException.html?is-external=true"; title="class or interface in javax.xml.stream">XMLStreamException</a></code></dd> +<dd><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true"; title="class or interface in java.lang">Exception</a></code></dd> </dl> </li> </ul> @@ -597,7 +597,7 @@ extends <a href="../../../../org/apache/juneau/parser/ParserSession.html" title= <ul class="blockList"> <li class="blockList"> <h4>isWhitespaceElement</h4> -<pre>public boolean <a href="../../../../src-html/org/apache/juneau/xml/XmlParserSession.html#line.321">isWhitespaceElement</a>(<a href="http://docs.oracle.com/javase/7/docs/api/javax/xml/stream/XMLStreamReader.html?is-external=true"; title="class or interface in javax.xml.stream">XMLStreamReader</a> r)</pre> +<pre>public boolean <a href="../../../../src-html/org/apache/juneau/xml/XmlParserSession.html#line.324">isWhitespaceElement</a>(<a href="http://docs.oracle.com/javase/7/docs/api/javax/xml/stream/XMLStreamReader.html?is-external=true"; title="class or interface in javax.xml.stream">XMLStreamReader</a> r)</pre> <div class="block">Returns <jk>true</jk> if the current element is a whitespace element. <p> @@ -617,8 +617,8 @@ extends <a href="../../../../org/apache/juneau/parser/ParserSession.html" title= <ul class="blockList"> <li class="blockList"> <h4>parseWhitespaceElement</h4> -<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true"; title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/juneau/xml/XmlParserSession.html#line.336">parseWhitespaceElement</a>(<a href="http://docs.oracle.com/javase/7/docs/api/javax/xml/stream/XMLStreamReader.html?is-external=true"; title="class or interface in javax.xml.stream">XMLStreamReader</a> r) - throws <a href="http://docs.oracle.com/javase/7/docs/api/javax/xml/stream/XMLStreamException.html?is-external=true"; title="class or interface in javax.xml.stream">XMLStreamException</a></pre> +<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true"; title="class or interface in java.lang">String</a> <a href="../../../../src-html/org/apache/juneau/xml/XmlParserSession.html#line.340">parseWhitespaceElement</a>(<a href="http://docs.oracle.com/javase/7/docs/api/javax/xml/stream/XMLStreamReader.html?is-external=true"; title="class or interface in javax.xml.stream">XMLStreamReader</a> r) + throws <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true"; title="class or interface in java.lang">Exception</a></pre> <div class="block">Parses the current whitespace element. <p> @@ -631,6 +631,7 @@ extends <a href="../../../../org/apache/juneau/parser/ParserSession.html" title= <dd>The whitespace character or characters.</dd> <dt><span class="throwsLabel">Throws:</span></dt> <dd><code><a href="http://docs.oracle.com/javase/7/docs/api/javax/xml/stream/XMLStreamException.html?is-external=true"; title="class or interface in javax.xml.stream">XMLStreamException</a></code></dd> +<dd><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true"; title="class or interface in java.lang">Exception</a></code></dd> </dl> </li> </ul> @@ -640,7 +641,7 @@ extends <a href="../../../../org/apache/juneau/parser/ParserSession.html" title= <ul class="blockListLast"> <li class="blockList"> <h4>close</h4> -<pre>public boolean <a href="../../../../src-html/org/apache/juneau/xml/XmlParserSession.html#line.344">close</a>()</pre> +<pre>public boolean <a href="../../../../src-html/org/apache/juneau/xml/XmlParserSession.html#line.348">close</a>()</pre> <div class="block">Silently closes the XML stream.</div> <dl> <dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/d35b70d1/content/site/apidocs/org/apache/juneau/xml/package-frame.html ---------------------------------------------------------------------- diff --git a/content/site/apidocs/org/apache/juneau/xml/package-frame.html b/content/site/apidocs/org/apache/juneau/xml/package-frame.html index 75cdbef..4ec12a4 100644 --- a/content/site/apidocs/org/apache/juneau/xml/package-frame.html +++ b/content/site/apidocs/org/apache/juneau/xml/package-frame.html @@ -39,6 +39,10 @@ <li><a href="XmlUtils.html" title="class in org.apache.juneau.xml" target="classFrame">XmlUtils</a></li> <li><a href="XmlWriter.html" title="class in org.apache.juneau.xml" target="classFrame">XmlWriter</a></li> </ul> +<h2 title="Exceptions">Exceptions</h2> +<ul title="Exceptions"> +<li><a href="XmlParseException.html" title="class in org.apache.juneau.xml" target="classFrame">XmlParseException</a></li> +</ul> </div> </body> </html> http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/d35b70d1/content/site/apidocs/org/apache/juneau/xml/package-summary.html ---------------------------------------------------------------------- diff --git a/content/site/apidocs/org/apache/juneau/xml/package-summary.html b/content/site/apidocs/org/apache/juneau/xml/package-summary.html index 0b59333..c6b2183 100644 --- a/content/site/apidocs/org/apache/juneau/xml/package-summary.html +++ b/content/site/apidocs/org/apache/juneau/xml/package-summary.html @@ -241,6 +241,23 @@ </tbody> </table> </li> +<li class="blockList"> +<table class="typeSummary" border="0" cellpadding="3" cellspacing="0" summary="Exception Summary table, listing exceptions, and an explanation"> +<caption><span>Exception Summary</span><span class="tabEnd"> </span></caption> +<tr> +<th class="colFirst" scope="col">Exception</th> +<th class="colLast" scope="col">Description</th> +</tr> +<tbody> +<tr class="altColor"> +<td class="colFirst"><a href="../../../../org/apache/juneau/xml/XmlParseException.html" title="class in org.apache.juneau.xml">XmlParseException</a></td> +<td class="colLast"> +<div class="block">Exception that indicates invalid syntax encountered during XML parsing.</div> +</td> +</tr> +</tbody> +</table> +</li> </ul> <a name="package.description"> <!-- --> http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/d35b70d1/content/site/apidocs/org/apache/juneau/xml/package-tree.html ---------------------------------------------------------------------- diff --git a/content/site/apidocs/org/apache/juneau/xml/package-tree.html b/content/site/apidocs/org/apache/juneau/xml/package-tree.html index 65792ca..b3a16af 100644 --- a/content/site/apidocs/org/apache/juneau/xml/package-tree.html +++ b/content/site/apidocs/org/apache/juneau/xml/package-tree.html @@ -191,6 +191,23 @@ </li> </ul> </li> +<li type="circle">java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Throwable.html?is-external=true"; title="class or interface in java.lang"><span class="typeNameLink">Throwable</span></a> (implements java.io.<a href="http://docs.oracle.com/javase/7/docs/api/java/io/Serializable.html?is-external=true"; title="class or interface in java.io">Serializable</a>) +<ul> +<li type="circle">java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true"; title="class or interface in java.lang"><span class="typeNameLink">Exception</span></a> +<ul> +<li type="circle">org.apache.juneau.<a href="../../../../org/apache/juneau/FormattedException.html" title="class in org.apache.juneau"><span class="typeNameLink">FormattedException</span></a> +<ul> +<li type="circle">org.apache.juneau.parser.<a href="../../../../org/apache/juneau/parser/ParseException.html" title="class in org.apache.juneau.parser"><span class="typeNameLink">ParseException</span></a> +<ul> +<li type="circle">org.apache.juneau.xml.<a href="../../../../org/apache/juneau/xml/XmlParseException.html" title="class in org.apache.juneau.xml"><span class="typeNameLink">XmlParseException</span></a></li> +</ul> +</li> +</ul> +</li> +</ul> +</li> +</ul> +</li> <li type="circle">java.io.<a href="http://docs.oracle.com/javase/7/docs/api/java/io/Writer.html?is-external=true"; title="class or interface in java.io"><span class="typeNameLink">Writer</span></a> (implements java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Appendable.html?is-external=true"; title="class or interface in java.lang">Appendable</a>, java.io.<a href="http://docs.oracle.com/javase/7/docs/api/java/io/Closeable.html?is-external=true"; title="class or interface in java.io">Closeable</a>, java.io.<a href="http://docs.oracle.com/javase/7/docs/api/java/io/Flushable.html?is-external=true"; title="class or interface in java.io">Flushable</a>) <ul> <li type="circle">org.apache.juneau.serializer.<a href="../../../../org/apache/juneau/serializer/SerializerWriter.html" title="class in org.apache.juneau.serializer"><span class="typeNameLink">SerializerWriter</span></a> http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/d35b70d1/content/site/apidocs/overview-summary.html ---------------------------------------------------------------------- diff --git a/content/site/apidocs/overview-summary.html b/content/site/apidocs/overview-summary.html index 05af654..86780e6 100644 --- a/content/site/apidocs/overview-summary.html +++ b/content/site/apidocs/overview-summary.html @@ -932,10 +932,16 @@ <a href="org/apache/juneau/ObjectList.html#serializeTo-java.io.Writer-"><code>ObjectList.serializeTo(java.io.Writer)</code></a> methods. <li> Passing them to one of the <a href="org/apache/juneau/serializer/Serializer.html" title="class in org.apache.juneau.serializer"><code>Serializer</code></a> serialize methods. + <li> + Simply calling the <a href="org/apache/juneau/ObjectMap.html#toString--"><code>ObjectMap.toString()</code></a> or <a href="org/apache/juneau/ObjectList.html#toString--"><code>ObjectList.toString()</code></a> + methods which will serialize it as Simplified JSON. </ol> <p> Any valid JSON can be parsed into an unstructured model consisting of generic - <a href="org/apache/juneau/ObjectMap.html" title="class in org.apache.juneau"><code>ObjectMap</code></a> and <a href="org/apache/juneau/ObjectList.html" title="class in org.apache.juneau"><code>ObjectList</code></a> objects. + <a href="org/apache/juneau/ObjectMap.html" title="class in org.apache.juneau"><code>ObjectMap</code></a> and <a href="org/apache/juneau/ObjectList.html" title="class in org.apache.juneau"><code>ObjectList</code></a> objects. + <br> + (In theory, any valid XML can also be parsed into an unstructured model, although this has not been + officially 'tested') </p> <p class='bcode'> <jc>// Parse an arbitrary JSON document into an unstructered data model @@ -952,6 +958,9 @@ <jc>// Or convert it to XML.</jc> String xml = XmlSerializer.<jsf>DEFAULT</jsf>.serialize(m); + + <jc>// Or just use toString().</jc> + json = m.toString(); </p> <ul class='doctree'> <li class='info'> @@ -2543,7 +2552,7 @@ <jsm>link</jsm>(<js>"alternate"</js>, <js>"text/html"</js>, <js>"http://juneau.apache.org";</js>).hreflang(<js>"en"</js>), <jsm>link</jsm>(<js>"self"</js>, <js>"application/atom+xml"</js>, <js>"http://juneau.apache.org/feed.atom";</js>) ) - .rights(<js>"Copyright (c) 2016, Apache Foundation"</js>) + .rights(<js>"Copyright (c) ..."</js>) .generator( <jsm>generator</jsm>(<js>"Juneau"</js>).uri(<js>"http://juneau.apache.org/";</js>).version(<js>"1.0"</js>) ) @@ -2592,7 +2601,7 @@ <xt><link</xt> <xa>href</xa>=<xs>'http://juneau.apache.org/feed.atom'</xs> <xa>rel</xa>=<xs>'self'</xs> <xa>type</xa>=<xs>'application/atom+xml'</xs>/<xt>></xt> <xt><rights></xt> - Copyright (c) 2016, Apache Foundation + Copyright (c) ... <xt></rights></xt> <xt><title</xt> <xa>type</xa>=<xs>'text'</xs>></xt> Juneau ATOM specification @@ -2837,7 +2846,7 @@ }, <jc>// Our stylesheet for the HTML rendition.</jc> - styleImport=<js>"styles/devops.css"</js>, + stylesheet=<js>"styles/devops.css"</js>, <jc>// Support GZIP encoding on Accept-Encoding header.</jc> encoders=GzipEncoder.<jk>class</jk>, @@ -5039,7 +5048,7 @@ }, <jc>// Our stylesheet for the HTML rendition.</jc> - styleImport=<js>"styles/devops.css"</js>, + stylesheet=<js>"styles/devops.css"</js>, <jc>// Support GZIP encoding on Accept-Encoding header.</jc> encoders=GzipEncoder.<jk>class</jk>, @@ -5862,7 +5871,7 @@ <ja>@Property</ja>(name=<js>"DirectoryResource.allowDeletes"</js>, value=<js>"true"</js>), <ja>@Property</ja>(name=<js>"DirectoryResource.allowPuts"</js>, value=<js>"false"</js>) }, - styleImport=<js>"styles/devops.css"</js> + stylesheet=<js>"styles/devops.css"</js> ) <jk>public class</jk> TempDirResource <jk>extends</jk> DirectoryResource { <jk>private static final long</jk> <jsf>serialVersionUID</jsf> = 1L; @@ -6008,7 +6017,7 @@ <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) 2016, Apache Foundation"</js>)) + .setRights(<jk>new</jk> Text(<js>"Copyright (c) ..."</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() @@ -7200,7 +7209,7 @@ <ul> <li><a href="org/apache/juneau/html/HtmlDocSerializerContext.html#HTMLDOC_script"><code>HTMLDOC_script</code></a> <li><a href="org/apache/juneau/html/HtmlDocSerializerContext.html#HTMLDOC_style"><code>HTMLDOC_style</code></a> - Was <jsf>HTMLDOC_css</jsf>. - <li><a href="org/apache/juneau/html/HtmlDocSerializerContext.html#HTMLDOC_styleImport"><code>HTMLDOC_styleImport</code></a> - Was <jsf>HTMLDOC_cssUrl</jsf>. Now an array. + <li><a href="org/apache/juneau/html/HtmlDocSerializerContext.html#HTMLDOC_stylesheet"><code>HTMLDOC_stylesheet</code></a> - Was <jsf>HTMLDOC_cssUrl</jsf>. Now an array. </ul> <li> New <a href="org/apache/juneau/utils/ResourceFinder.html" title="class in org.apache.juneau.utils"><code>ResourceFinder</code></a> utility class. @@ -7211,6 +7220,13 @@ <h6 class='topic'>org.apache.juneau.rest</h6> <ul class='spaced-list'> <li> + New 'light' stylesheet: + <br><img src='doc-files/ReleaseNotes_631_LightStyle.png'> + <br>Compared with previous 'devops': + <br><img src='doc-files/ReleaseNotes_631_DevopsStyle.png'> + <br>For those nolstalgic for old times, there's also 'original': + <br><img src='doc-files/ReleaseNotes_631_OriginalStyle.png'> + <li> Improvements made to the <a href="org/apache/juneau/rest/widget/Widget.html" title="class in org.apache.juneau.rest.widget"><code>Widget</code></a> API. <ul> <li> @@ -7232,12 +7248,16 @@ of a search/view/order-by/page form: <br><img src='doc-files/ReleaseNotes_631_QueryMenuItem.png'> <br>Fields are now pre-filled with current query parameters. + <li> + New <a href="org/apache/juneau/rest/widget/StyleMenuItem.html" title="class in org.apache.juneau.rest.widget"><code>StyleMenuItem</code></a> widget that provides a pull-down menu + with hyperlinks to show the content in the default stylesheets: + <br><img src='doc-files/ReleaseNotes_631_StyleMenuItem.png'> </ul> <li> New/modified annotations on <a href="org/apache/juneau/rest/annotation/HtmlDoc.html" title="annotation in org.apache.juneau.rest.annotation"><code>@HtmlDoc</code></a>: <ul> <li><a href="org/apache/juneau/rest/annotation/HtmlDoc.html#style--"><code>style()</code></a> - Renamed from <code>css()</code>. - <li><a href="org/apache/juneau/rest/annotation/HtmlDoc.html#styleImport--"><code>styleImport()</code></a> - Renamed from <code>cssUrl()</code>. + <li><a href="org/apache/juneau/rest/annotation/HtmlDoc.html#stylesheet--"><code>stylesheet()</code></a> - Renamed from <code>cssUrl()</code>. <br>Can now be a comma-delimited list of URLs. <li><a href="org/apache/juneau/rest/annotation/HtmlDoc.html#script--"><code>script()</code></a> - Add arbitrary Javascript to page header. </ul> http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/d35b70d1/content/site/apidocs/overview-tree.html ---------------------------------------------------------------------- diff --git a/content/site/apidocs/overview-tree.html b/content/site/apidocs/overview-tree.html index 60b4b1f..7148839 100644 --- a/content/site/apidocs/overview-tree.html +++ b/content/site/apidocs/overview-tree.html @@ -1200,7 +1200,11 @@ <ul> <li type="circle">org.apache.juneau.<a href="org/apache/juneau/FormattedException.html" title="class in org.apache.juneau"><span class="typeNameLink">FormattedException</span></a> <ul> -<li type="circle">org.apache.juneau.parser.<a href="org/apache/juneau/parser/ParseException.html" title="class in org.apache.juneau.parser"><span class="typeNameLink">ParseException</span></a></li> +<li type="circle">org.apache.juneau.parser.<a href="org/apache/juneau/parser/ParseException.html" title="class in org.apache.juneau.parser"><span class="typeNameLink">ParseException</span></a> +<ul> +<li type="circle">org.apache.juneau.xml.<a href="org/apache/juneau/xml/XmlParseException.html" title="class in org.apache.juneau.xml"><span class="typeNameLink">XmlParseException</span></a></li> +</ul> +</li> <li type="circle">org.apache.juneau.serializer.<a href="org/apache/juneau/serializer/SerializeException.html" title="class in org.apache.juneau.serializer"><span class="typeNameLink">SerializeException</span></a></li> </ul> </li> @@ -1295,6 +1299,7 @@ <ul> <li type="circle">org.apache.juneau.rest.widget.<a href="org/apache/juneau/rest/widget/ContentTypeMenuItem.html" title="class in org.apache.juneau.rest.widget"><span class="typeNameLink">ContentTypeMenuItem</span></a></li> <li type="circle">org.apache.juneau.rest.widget.<a href="org/apache/juneau/rest/widget/QueryMenuItem.html" title="class in org.apache.juneau.rest.widget"><span class="typeNameLink">QueryMenuItem</span></a></li> +<li type="circle">org.apache.juneau.rest.widget.<a href="org/apache/juneau/rest/widget/StyleMenuItem.html" title="class in org.apache.juneau.rest.widget"><span class="typeNameLink">StyleMenuItem</span></a></li> </ul> </li> <li type="circle">org.apache.juneau.rest.widget.<a href="org/apache/juneau/rest/widget/PoweredByApacheWidget.html" title="class in org.apache.juneau.rest.widget"><span class="typeNameLink">PoweredByApacheWidget</span></a></li> http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/d35b70d1/content/site/apidocs/serialized-form.html ---------------------------------------------------------------------- diff --git a/content/site/apidocs/serialized-form.html b/content/site/apidocs/serialized-form.html index 7988153..bee289e 100644 --- a/content/site/apidocs/serialized-form.html +++ b/content/site/apidocs/serialized-form.html @@ -846,6 +846,16 @@ </li> </ul> </li> +<li class="blockList"> +<h2 title="Package">Package org.apache.juneau.xml</h2> +<ul class="blockList"> +<li class="blockList"><a name="org.apache.juneau.xml.XmlParseException"> +<!-- --> +</a> +<h3>Class <a href="org/apache/juneau/xml/XmlParseException.html" title="class in org.apache.juneau.xml">org.apache.juneau.xml.XmlParseException</a> extends <a href="org/apache/juneau/parser/ParseException.html" title="class in org.apache.juneau.parser">ParseException</a> implements Serializable</h3> +</li> +</ul> +</li> </ul> </div> <!-- ======= START OF BOTTOM NAVBAR ====== --> http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/d35b70d1/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 842eb84..1a0691d 100644 --- a/content/site/apidocs/src-html/org/apache/juneau/BeanContext.html +++ b/content/site/apidocs/src-html/org/apache/juneau/BeanContext.html @@ -1504,7 +1504,7 @@ <span class="sourceLineNo">1496</span> if (cm2.isMap()) {<a name="line.1496"></a> <span class="sourceLineNo">1497</span> Class<?>[] pParams = (p.params().length == 0 ? new Class[]{Object.class, Object.class} : p.params());<a name="line.1497"></a> <span class="sourceLineNo">1498</span> if (pParams.length != 2)<a name="line.1498"></a> -<span class="sourceLineNo">1499</span> throw new RuntimeException("Invalid number of parameters specified for Map (must be 2): " + pParams.length);<a name="line.1499"></a> +<span class="sourceLineNo">1499</span> throw new FormattedRuntimeException("Invalid number of parameters specified for Map (must be 2): {0}", pParams.length);<a name="line.1499"></a> <span class="sourceLineNo">1500</span> ClassMeta<?> keyType = resolveType(pParams[0], cm2.getKeyType(), cm.getKeyType());<a name="line.1500"></a> <span class="sourceLineNo">1501</span> ClassMeta<?> valueType = resolveType(pParams[1], cm2.getValueType(), cm.getValueType());<a name="line.1501"></a> <span class="sourceLineNo">1502</span> if (keyType.isObject() && valueType.isObject())<a name="line.1502"></a> @@ -1515,7 +1515,7 @@ <span class="sourceLineNo">1507</span> if (cm2.isCollection()) {<a name="line.1507"></a> <span class="sourceLineNo">1508</span> Class<?>[] pParams = (p.params().length == 0 ? new Class[]{Object.class} : p.params());<a name="line.1508"></a> <span class="sourceLineNo">1509</span> if (pParams.length != 1)<a name="line.1509"></a> -<span class="sourceLineNo">1510</span> throw new RuntimeException("Invalid number of parameters specified for Collection (must be 1): " + pParams.length);<a name="line.1510"></a> +<span class="sourceLineNo">1510</span> throw new FormattedRuntimeException("Invalid number of parameters specified for Collection (must be 1): {0}", pParams.length);<a name="line.1510"></a> <span class="sourceLineNo">1511</span> ClassMeta<?> elementType = resolveType(pParams[0], cm2.getElementType(), cm.getElementType());<a name="line.1511"></a> <span class="sourceLineNo">1512</span> if (elementType.isObject())<a name="line.1512"></a> <span class="sourceLineNo">1513</span> return cm2;<a name="line.1513"></a> http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/d35b70d1/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 bc1daba..f02d7d8 100644 --- a/content/site/apidocs/src-html/org/apache/juneau/ObjectMap.html +++ b/content/site/apidocs/src-html/org/apache/juneau/ObjectMap.html @@ -575,7 +575,7 @@ <span class="sourceLineNo">567</span> }<a name="line.567"></a> <span class="sourceLineNo">568</span><a name="line.568"></a> <span class="sourceLineNo">569</span> /**<a name="line.569"></a> -<span class="sourceLineNo">570</span> * Similar to {@link #remove(Object) remove(Object)},but the key is a slash-delimited path used to traverse entries<a name="line.570"></a> +<span class="sourceLineNo">570</span> * Similar to {@link #remove(Object) remove(Object)}, but the key is a slash-delimited path used to traverse entries<a name="line.570"></a> <span class="sourceLineNo">571</span> * in this POJO.<a name="line.571"></a> <span class="sourceLineNo">572</span> *<a name="line.572"></a> <span class="sourceLineNo">573</span> * <p><a name="line.573"></a> @@ -585,7 +585,7 @@ <span class="sourceLineNo">577</span> * ObjectMap m = getObjectMap();<a name="line.577"></a> <span class="sourceLineNo">578</span> *<a name="line.578"></a> <span class="sourceLineNo">579</span> * <jc>// Long way</jc><a name="line.579"></a> -<span class="sourceLineNo">580</span> * m.getObjectMap(<js>"foo"</js>).getObjectList(<js>"bar"</js>).getObjectMap(1).remove(<js>"baz"</js>);<a name="line.580"></a> +<span class="sourceLineNo">580</span> * m.getObjectMap(<js>"foo"</js>).getObjectList(<js>"bar"</js>).getObjectMap(0).remove(<js>"baz"</js>);<a name="line.580"></a> <span class="sourceLineNo">581</span> *<a name="line.581"></a> <span class="sourceLineNo">582</span> * <jc>// Using this method</jc><a name="line.582"></a> <span class="sourceLineNo">583</span> * m.deleteAt(<js>"foo/bar/0/baz"</js>);<a name="line.583"></a> @@ -631,7 +631,7 @@ <span class="sourceLineNo">623</span><a name="line.623"></a> <span class="sourceLineNo">624</span> /**<a name="line.624"></a> <span class="sourceLineNo">625</span> * Specialized method that calls {@link #getString(String)} and splits the results as a simple comma-delimited list.<a name="line.625"></a> -<span class="sourceLineNo">626</span> * <a name="line.626"></a> +<span class="sourceLineNo">626</span> *<a name="line.626"></a> <span class="sourceLineNo">627</span> * <p><a name="line.627"></a> <span class="sourceLineNo">628</span> * If the value is already a collection, the individual entries are converted to strings using {@link #toString()}.<a name="line.628"></a> <span class="sourceLineNo">629</span> *<a name="line.629"></a> @@ -645,7 +645,7 @@ <span class="sourceLineNo">637</span> Object s = get(Object.class, key);<a name="line.637"></a> <span class="sourceLineNo">638</span> if (s == null)<a name="line.638"></a> <span class="sourceLineNo">639</span> return new String[0];<a name="line.639"></a> -<span class="sourceLineNo">640</span> if (s instanceof Collection) <a name="line.640"></a> +<span class="sourceLineNo">640</span> if (s instanceof Collection)<a name="line.640"></a> <span class="sourceLineNo">641</span> return ArrayUtils.toStringArray((Collection<?>)s);<a name="line.641"></a> <span class="sourceLineNo">642</span> String[] r = split(StringUtils.toString(s));<a name="line.642"></a> <span class="sourceLineNo">643</span> return r;<a name="line.643"></a> @@ -662,7 +662,7 @@ <span class="sourceLineNo">654</span> Object s = get(Object.class, key);<a name="line.654"></a> <span class="sourceLineNo">655</span> if (s == null)<a name="line.655"></a> <span class="sourceLineNo">656</span> return def;<a name="line.656"></a> -<span class="sourceLineNo">657</span> if (s instanceof Collection) <a name="line.657"></a> +<span class="sourceLineNo">657</span> if (s instanceof Collection)<a name="line.657"></a> <span class="sourceLineNo">658</span> return ArrayUtils.toStringArray((Collection<?>)s);<a name="line.658"></a> <span class="sourceLineNo">659</span> String[] r = split(StringUtils.toString(s));<a name="line.659"></a> <span class="sourceLineNo">660</span> return (r.length == 0 ? def : r);<a name="line.660"></a>
