Repository: incubator-juneau Updated Branches: refs/heads/master baf2ba990 -> 18feb6740
Fix HTML validation warnings. Project: http://git-wip-us.apache.org/repos/asf/incubator-juneau/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-juneau/commit/3a385346 Tree: http://git-wip-us.apache.org/repos/asf/incubator-juneau/tree/3a385346 Diff: http://git-wip-us.apache.org/repos/asf/incubator-juneau/diff/3a385346 Branch: refs/heads/master Commit: 3a38534696c2c46d7360ef821e9e9c45fcd9fd09 Parents: 385a6a0 Author: jamesbognar <[email protected]> Authored: Wed Aug 10 21:28:04 2016 -0400 Committer: jamesbognar <[email protected]> Committed: Wed Aug 10 21:28:51 2016 -0400 ---------------------------------------------------------------------- .../.settings/org.eclipse.wst.html.core.prefs | 43 +++++++++ .../.settings/org.eclipse.wst.xml.core.prefs | 18 ++++ .../org/apache/juneau/dto/cognos/package.html | 2 +- .../apache/juneau/dto/jsonschema/package.html | 1 + .../java/org/apache/juneau/ini/package.html | 36 +++---- .../java/org/apache/juneau/jena/package.html | 7 +- .../java/org/apache/juneau/json/package.html | 3 +- .../java/org/apache/juneau/svl/package.html | 1 + .../org/apache/juneau/transform/package.html | 13 ++- .../org/apache/juneau/urlencoding/package.html | 34 +++---- .../java/org/apache/juneau/xml/package.html | 8 +- juneau-core/src/main/java/overview.html | 98 ++++++++++---------- 12 files changed, 163 insertions(+), 101 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/3a385346/juneau-core/.settings/org.eclipse.wst.html.core.prefs ---------------------------------------------------------------------- diff --git a/juneau-core/.settings/org.eclipse.wst.html.core.prefs b/juneau-core/.settings/org.eclipse.wst.html.core.prefs new file mode 100644 index 0000000..ee1e1ce --- /dev/null +++ b/juneau-core/.settings/org.eclipse.wst.html.core.prefs @@ -0,0 +1,43 @@ +attrDuplicate=2 +attrInvalidName=2 +attrInvalidValue=2 +attrNameMismatch=2 +attrNamesToIgnore= +attrUndefName=2 +attrUndefValue=2 +attrValueEqualsMissing=2 +attrValueMismatch=1 +attrValueUnclosed=2 +cdataInvalidContent=2 +cdataUnclosed=1 +commentInvalidContent=2 +commentUnclosed=1 +docDoctypeUnclosed=1 +docDuplicateTag=1 +docInvalidChar=2 +docInvalidContent=2 +eclipse.preferences.version=1 +elemCoexistence=2 +elemDuplicate=2 +elemEndInvalidCase=1 +elemInvalidContent=2 +elemInvalidDirective=1 +elemInvalidEmptyTag=2 +elemInvalidName=1 +elemInvalidText=2 +elemMissingEnd=2 +elemMissingStart=2 +elemStartInvalidCase=2 +elemUnclosedEndTag=1 +elemUnclosedStartTag=1 +elemUnknownName=2 +elemUnnecessaryEnd=2 +elementNamesToIgnore=jc,jd,jt,jk,js,jf,jsf,jsm,ja,xt,xa,xc,xs,mk,mv,cc,cs,ck,ce,cv,l,properties +ignoreAttrNames=false +ignoreElementNames=true +piInvalidContent=2 +piUnclosed=1 +piUndefined=2 +refInvalidContent=2 +resourceNotFound=2 +use-project-settings=true http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/3a385346/juneau-core/.settings/org.eclipse.wst.xml.core.prefs ---------------------------------------------------------------------- diff --git a/juneau-core/.settings/org.eclipse.wst.xml.core.prefs b/juneau-core/.settings/org.eclipse.wst.xml.core.prefs new file mode 100644 index 0000000..f4c656f --- /dev/null +++ b/juneau-core/.settings/org.eclipse.wst.xml.core.prefs @@ -0,0 +1,18 @@ +attributeHasNoValue=2 +eclipse.preferences.version=1 +endTagWithAttributes=2 +honourAllSchemaLocations=true +indicateNoGrammar=-1 +indiciateNoDocumentElement=-1 +markupValidation=false +missingClosingBracket=2 +missingClosingQuote=2 +missingEndTag=2 +missingQuotes=2 +missingStartTag=2 +missingTagName=2 +namespaceInPITarget=2 +use-project-settings=true +whitespaceAtStart=2 +whitespaceBeforeTagName=2 +xinclude=false http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/3a385346/juneau-core/src/main/java/org/apache/juneau/dto/cognos/package.html ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/cognos/package.html b/juneau-core/src/main/java/org/apache/juneau/dto/cognos/package.html index b0c9e83..354fe8d 100644 --- a/juneau-core/src/main/java/org/apache/juneau/dto/cognos/package.html +++ b/juneau-core/src/main/java/org/apache/juneau/dto/cognos/package.html @@ -108,7 +108,7 @@ <jk>new</jk> Column(<js>"age"</js>, <js>"xs:int"</js>), <jk>new</jk> Column(<js>"numAddresses"</js>, <js>"xs:int"</js>) .addTransform( - <jk>new</jk> PojoTransform<Person,Integer>() { + <jk>new</jk> PojoTransform<Person,Integer>() { <ja>@Override</ja> <jk>public</jk> Integer transform(Person p) { <jk>return</jk> p.<jf>addresses</jf>.size(); http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/3a385346/juneau-core/src/main/java/org/apache/juneau/dto/jsonschema/package.html ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/jsonschema/package.html b/juneau-core/src/main/java/org/apache/juneau/dto/jsonschema/package.html index 51977bf..7eebc86 100644 --- a/juneau-core/src/main/java/org/apache/juneau/dto/jsonschema/package.html +++ b/juneau-core/src/main/java/org/apache/juneau/dto/jsonschema/package.html @@ -495,6 +495,7 @@ <h6 class='figure'>Resource Options</h6> <img class='bordered' src="doc-files/Example_Options.png"> </div> + </div> <!-- ======================================================================================================== --> <a id="Parse"></a> http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/3a385346/juneau-core/src/main/java/org/apache/juneau/ini/package.html ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/ini/package.html b/juneau-core/src/main/java/org/apache/juneau/ini/package.html index b8b3509..b475434 100644 --- a/juneau-core/src/main/java/org/apache/juneau/ini/package.html +++ b/juneau-core/src/main/java/org/apache/juneau/ini/package.html @@ -224,11 +224,11 @@ </p> <p> Resolving config files can be retrieved through the following methods: - <ul class='spaced-list'> - <li>{@link org.apache.juneau.ini.ConfigFile#getResolving()} - Returns a config file that resolves a default set of variables. - <li>{@link org.apache.juneau.ini.ConfigFile#getResolving(VarResolver)} - Returns a config file that resolves a custom set of variables. - </ul> </p> + <ul class='spaced-list'> + <li>{@link org.apache.juneau.ini.ConfigFile#getResolving()} - Returns a config file that resolves a default set of variables. + <li>{@link org.apache.juneau.ini.ConfigFile#getResolving(VarResolver)} - Returns a config file that resolves a custom set of variables. + </ul> <p> The default {@link org.apache.juneau.ini.ConfigFile#getResolving()} method returns a config file that resolves the following variables: @@ -363,21 +363,21 @@ </p> <p> Arguments can be any of the following... - <ul class='spaced-list'> - <li>No arguments<br> - Prints usage message. - <li><code>createBatchEnvFile -configfile <configFile> -envfile <batchFile> [-verbose]</code><br> - Creates a batch file that will set each config file entry as an environment variable.<br> - Characters in the keys that are not valid as environment variable names (e.g. <js>'/'</js> and <js>'.'</js>) - will be converted to underscores. - <li><code>createShellEnvFile -configFile <configFile> -envFile <configFile> [-verbose]</code> - Creates a shell script that will set each config file entry as an environment variable.<br> - Characters in the keys that are not valid as environment variable names (e.g. <js>'/'</js> and <js>'.'</js>) - will be converted to underscores. - <li><code>setVals -configFile <configFile> -vals [var1=val1 [var2=val2...]] [-verbose]</code> - Sets values in config files. - </ul> </p> + <ul class='spaced-list'> + <li>No arguments<br> + Prints usage message. + <li><code>createBatchEnvFile -configfile <configFile> -envfile <batchFile> [-verbose]</code><br> + Creates a batch file that will set each config file entry as an environment variable.<br> + Characters in the keys that are not valid as environment variable names (e.g. <js>'/'</js> and <js>'.'</js>) + will be converted to underscores. + <li><code>createShellEnvFile -configFile <configFile> -envFile <configFile> [-verbose]</code> + Creates a shell script that will set each config file entry as an environment variable.<br> + Characters in the keys that are not valid as environment variable names (e.g. <js>'/'</js> and <js>'.'</js>) + will be converted to underscores. + <li><code>setVals -configFile <configFile> -vals [var1=val1 [var2=val2...]] [-verbose]</code> + Sets values in config files. + </ul> <p> For example, the following command will create the file <code>'MyConfig.bat'</code> from the contents of the file <code>'MyConfig.cfg'</code>. </p> http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/3a385346/juneau-core/src/main/java/org/apache/juneau/jena/package.html ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/jena/package.html b/juneau-core/src/main/java/org/apache/juneau/jena/package.html index 5561b47..5cf96e4 100644 --- a/juneau-core/src/main/java/org/apache/juneau/jena/package.html +++ b/juneau-core/src/main/java/org/apache/juneau/jena/package.html @@ -135,6 +135,7 @@ <p> Since Juneau is 100% pure IBM code, the Jena libraries must be provided on the classpath separately if you plan on making use of the RDF support. </p> + <p> The minimum list of required jars are: </p> <ul> @@ -161,7 +162,7 @@ </p> <img class='bordered' src="doc-files/Example_HTML.png"> <p> - By appending <code>?Accept=<i>mediaType</i>&plainText=true</code> to the URL, you can view the data in the various RDF supported formats. + By appending <code>?Accept=<i>mediaType</i>&plainText=true</code> to the URL, you can view the data in the various RDF supported formats. </p> <h6 class='figure'>RDF/XML</h6> @@ -404,7 +405,7 @@ <xa>xmlns:jp</xa>=<xs>"http://www.ibm.com/juneaubp/";</xs> <xa>xmlns:per</xa>=<xs>"http://www.ibm.com/person/";</xs><xt>></xt> <xt><rdf:Description <b><xa>rdf:about</xa>=<xs>"http://sample/addressBook/person/1";</xs></b>></xt> - <xt><b><per:addressBookUri</xt> <xa>rdf:resource</xa>=<xs>"http://sample/addressBook";</xs><xt>/></b></xt> + <xt><per:addressBookUri</xt> <xa>rdf:resource</xa>=<xs>"http://sample/addressBook";</xs><xt>/></xt> <xt><per:id></xt>1<xt></per:id></xt> <xt><per:name></xt>John Smith<xt></per:name></xt> <xt></rdf:Description></xt> @@ -508,7 +509,7 @@ <xt><per:addressBookUri</xt> <xa>rdf:resource</xa>=<xs>"http://sample/addressBook";</xs><xt>/></xt> <xt><per:id></xt>1<xt></per:id></xt> <xt><per:name></xt>John Smith<xt></per:name></xt> - <xt><b><per:birthDate></xt>1946-08-12T00:00:00Z<xt></per:birthDate></b></xt> + <xt><per:birthDate></xt>1946-08-12T00:00:00Z<xt></per:birthDate></xt> <xt></rdf:Description></xt> <xt></rdf:RDF></xt> </p> http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/3a385346/juneau-core/src/main/java/org/apache/juneau/json/package.html ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/json/package.html b/juneau-core/src/main/java/org/apache/juneau/json/package.html index c34a5c1..1c947cb 100644 --- a/juneau-core/src/main/java/org/apache/juneau/json/package.html +++ b/juneau-core/src/main/java/org/apache/juneau/json/package.html @@ -132,7 +132,7 @@ </p> <img class='bordered' src="doc-files/Example_HTML.png"> <p> - By appending <code>?Accept=<i>mediaType</i>&plainText=true</code> to the URL, you can view the data in the various supported JSON formats: + By appending <code>?Accept=<i>mediaType</i>&plainText=true</code> to the URL, you can view the data in the various supported JSON formats: </p> <h6 class='figure'>Normal JSON</h6> @@ -691,7 +691,6 @@ <li>{@link org.apache.juneau.BeanContext} - Bean context properties. <li>{@link org.apache.juneau.json.JsonSerializerContext} - Serializer context properties. </ul> - </table> </div> http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/3a385346/juneau-core/src/main/java/org/apache/juneau/svl/package.html ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/svl/package.html b/juneau-core/src/main/java/org/apache/juneau/svl/package.html index df73ef0..809f251 100644 --- a/juneau-core/src/main/java/org/apache/juneau/svl/package.html +++ b/juneau-core/src/main/java/org/apache/juneau/svl/package.html @@ -242,5 +242,6 @@ will simply be a no-op and return the same string. </ul> </div> +</div> </body> </html> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/3a385346/juneau-core/src/main/java/org/apache/juneau/transform/package.html ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/transform/package.html b/juneau-core/src/main/java/org/apache/juneau/transform/package.html index c9a953e..a94e213 100644 --- a/juneau-core/src/main/java/org/apache/juneau/transform/package.html +++ b/juneau-core/src/main/java/org/apache/juneau/transform/package.html @@ -128,7 +128,7 @@ <h6 class='topic'>Explicitly specify which properties are visible on a bean class</h6> <p class='bcode'> <jc>// Define transform that orders properties by "age" then "name"</jc> - <jk>public class</jk> MyTransform <jk>extends</jk> BeanTransform<Person> { + <jk>public class</jk> MyTransform <jk>extends</jk> BeanTransform<Person> { <jk>public</jk> MyTransform() { setProperties(<js>"age"</js>,<js>"name"</js>); } @@ -151,7 +151,7 @@ <h6 class='topic'>Exclude which properties are visible on a bean class</h6> <p class='bcode'> <jc>// Define transform that excludes "name"</jc> - <jk>public class</jk> MyTransform <jk>extends</jk> BeanTransform<Person> { + <jk>public class</jk> MyTransform <jk>extends</jk> BeanTransform<Person> { <jk>public</jk> MyTransform() { setExcludeProperties(<js>"name"</js>); } @@ -174,7 +174,7 @@ <h6 class='topic'>Define specialized property namers</h6> <p class='bcode'> <jc>// Define transform with our own property namer.</jc> - <jk>public class</jk> MyTransform <jk>extends</jk> BeanTransform<Person> { + <jk>public class</jk> MyTransform <jk>extends</jk> BeanTransform<Person> { <jk>public</jk> MyTransform() { setPropertyNamer(UpperCasePropertyNamer.<jk>class</jk>); } @@ -238,7 +238,7 @@ </p> <p class='bcode'> <jc>// Define transform with our own property namer.</jc> - <jk>public class</jk> MyClassTransform <jk>extends</jk> BeanTransform<MyClass> { + <jk>public class</jk> MyClassTransform <jk>extends</jk> BeanTransform<MyClass> { <jk>public</jk> MyClassTransform() { setSubTypeProperty(<js>"subType"</js>); addSubType(MyClassBar.<jk>class</jk>, <js>"BAR"</js>); @@ -312,7 +312,7 @@ </p> <p class='bcode'> <jc>// Define transform that limits properties to only those defined on MyClass</jc> - <jk>public class</jk> MyClassTransform <jk>extends</jk> BeanTransform<MyClass> { + <jk>public class</jk> MyClassTransform <jk>extends</jk> BeanTransform<MyClass> { <jk>public</jk> MyClassTransform() { setInterfaceClass(MyClass.<jk>class</jk>); } @@ -636,7 +636,7 @@ </p> <p class='bcode'> <jc>// Define transform that limits properties to only those defined on MyClass</jc> - <jk>public class</jk> MyClassTransform <jk>extends</jk> BeanTransform<MyClass> { + <jk>public class</jk> MyClassTransform <jk>extends</jk> BeanTransform<MyClass> { <jk>public</jk> MyClassTransform() { setInterfaceClass(MyClass.<jk>class</jk>); } @@ -740,7 +740,6 @@ <a id="ToObjectMaps"></a> <h3 class='topic' onclick='toggle(this)'>1.6 - Serializing to ObjectMaps</h3> <div class='topic'> - <div class='topic'> <p> A shortcut method for transforming is provided that can often be simpler than defining transforms. In this case, we add methods to our class to serialize to {@link org.apache.juneau.ObjectMap ObjectMaps} http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/3a385346/juneau-core/src/main/java/org/apache/juneau/urlencoding/package.html ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/urlencoding/package.html b/juneau-core/src/main/java/org/apache/juneau/urlencoding/package.html index 612f177..932c418 100644 --- a/juneau-core/src/main/java/org/apache/juneau/urlencoding/package.html +++ b/juneau-core/src/main/java/org/apache/juneau/urlencoding/package.html @@ -135,7 +135,7 @@ </p> <img class='bordered' src="doc-files/Example_HTML.png"> <p> - By appending <code>?Accept=application/x-www-form-urlencoded&plainText=true</code> to the URL, you can view the data as a URL-encoded string: + By appending <code>?Accept=application/x-www-form-urlencoded&plainText=true</code> to the URL, you can view the data as a URL-encoded string: </p> <img class='bordered' src="doc-files/Example_UrlEncoding.png"> @@ -143,17 +143,17 @@ Juneau supports two kinds of serialization: </p> <ul class='spaced-list'> - <li>Construction of full URL query parameter strings (e.g. <code>&key=value</code> pairs) from beans and maps. - <li>Construction of URL query parameter value strings (e.g. just the <code>value</code> portion of <code>&key=value</code> pairs) from any POJO. + <li>Construction of full URL query parameter strings (e.g. <code>&key=value</code> pairs) from beans and maps. + <li>Construction of URL query parameter value strings (e.g. just the <code>value</code> portion of <code>&key=value</code> pairs) from any POJO. </ul> <p> Top-level beans and maps can serialized as key/value pairs as shown below: </p> <h6 class='figure'>Example: A bean with 2 string properties, 'foo' and 'baz', serialized to a query string</h6> - <p class='bcode'> http://localhost/sample?<xa>foo</xa>=<xs>bar</xs>&<xa>baz</xa>=<xs>bing</xs></p> + <p class='bcode'> http://localhost/sample?<xa>foo</xa>=<xs>bar</xs>&<xa>baz</xa>=<xs>bing</xs></p> <p> Lower-level beans and maps are also serialized as key/value pairs, but are surrounded with a <js>"$o(...)"</js> construct to denote an object mapping, - and uses a comma as the parameter delimiter instead of <js>"&"</js>.<br> + and uses a comma as the parameter delimiter instead of <js>"&"</js>.<br> </p> <h6 class='figure'>Example: A bean serialized as a query parameter value.</h6> <p class='bcode'> http://localhost/sample?<xa>a1</xa>=$o(<xa>foo</xa>=<xs>bar</xs>,<xa>baz</xa>=<xs>bing</xs>)</p> @@ -181,14 +181,14 @@ <tr> <td>Booleans</td> <td>BOOLEAN</td> - <td class='code'><xa>a1</xa>=$b(<xs>true</xs>)&<xa>a2</xa>=$b(<xs>false</xs>)</td> - <td class='code'><xa>a1</xa>=<xs>true</xs>&<xa>a2</xa>=<xs>false</xs></td> + <td class='code'><xa>a1</xa>=$b(<xs>true</xs>)&<xa>a2</xa>=$b(<xs>false</xs>)</td> + <td class='code'><xa>a1</xa>=<xs>true</xs>&<xa>a2</xa>=<xs>false</xs></td> </tr> <tr> <td>int/float/double/...</td> <td>NUMBER</td> - <td class='code'><xa>a1</xa>=$n(<xs>123</xs>)&<xa>a2</xa>=$n(<xs>1.23e1</xs>)</td> - <td class='code'><xa>a1</xa>=<xs>123</xs>&<xa>a2</xa>=<xs>1.23e1</xs></td> + <td class='code'><xa>a1</xa>=$n(<xs>123</xs>)&<xa>a2</xa>=$n(<xs>1.23e1</xs>)</td> + <td class='code'><xa>a1</xa>=<xs>123</xs>&<xa>a2</xa>=<xs>1.23e1</xs></td> </tr> <tr> <td>null</td> @@ -324,7 +324,7 @@ The code above produces the following output: </p> <p class='bcode'> - <xa>id</xa>=$n(<xs>1</xs>)&<xa>name</xa>=<xs>John+Smith</xs> + <xa>id</xa>=$n(<xs>1</xs>)&<xa>name</xa>=<xs>John+Smith</xs> </p> <p> The general method guidelines are as follows: @@ -402,7 +402,7 @@ Using <code>UrlEncodingSerializer</code> instead would create the following: </p> <p class='bcode'> - <xa>id</xa>=$n(<xs>1</xs>)&<xa>name</xa>=<xs>John+Smith</xs>&<xa>uri</xa>=<xs>http://sample/addressBook/person/1</xs>&<xa>addressBookUri</xa>=<xs>http://sample/addressBook</xs>&<xa>birthDate</xa>=<xs>1946-08-12T00:00:00Z</xs> + <xa>id</xa>=$n(<xs>1</xs>)&<xa>name</xa>=<xs>John+Smith</xs>&<xa>uri</xa>=<xs>http://sample/addressBook/person/1</xs>&<xa>addressBookUri</xa>=<xs>http://sample/addressBook</xs>&<xa>birthDate</xa>=<xs>1946-08-12T00:00:00Z</xs> </p> <p> Another useful feature is the {@link org.apache.juneau.annotation.Bean#propertyNamer()} annotation that allows you to plug in your own @@ -529,11 +529,11 @@ If we were to use <code>UrlEncodingSerializer</code> instead, we would get the following: </p> <p class='bcode'> - <xa>id</xa>=$n(<xs>1</xs>)& - <xa>name</xa>=<xs>John+Smith</xs>& - <xa>uri</xa>=<xs>http://sample/addressBook/person/1</xs>& - <xa>addressBookUri</xa>=<xs>http://sample/addressBook</xs>& - <xa>birthDate</xa>=<xs>1946-08-12T00:00:00Z</xs>& + <xa>id</xa>=$n(<xs>1</xs>)& + <xa>name</xa>=<xs>John+Smith</xs>& + <xa>uri</xa>=<xs>http://sample/addressBook/person/1</xs>& + <xa>addressBookUri</xa>=<xs>http://sample/addressBook</xs>& + <xa>birthDate</xa>=<xs>1946-08-12T00:00:00Z</xs>& <xa>addresses</xa>=$a( $o( <xa>uri</xa>=<xs>http://sample/addressBook/address/1</xs>, @@ -549,7 +549,7 @@ </p> </div> <p> - Note how the top level <code>Person</code> bean is serialized using the standard <js>'&'</js> delimiter, whereas the lower-level <code>Address</code> + Note how the top level <code>Person</code> bean is serialized using the standard <js>'&'</js> delimiter, whereas the lower-level <code>Address</code> bean is serialized using the <js>','</js> character to prevent the <code>addresses</code> field from being incompletely parsed. </p> http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/3a385346/juneau-core/src/main/java/org/apache/juneau/xml/package.html ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/xml/package.html b/juneau-core/src/main/java/org/apache/juneau/xml/package.html index 16ea21d..bb0534f 100644 --- a/juneau-core/src/main/java/org/apache/juneau/xml/package.html +++ b/juneau-core/src/main/java/org/apache/juneau/xml/package.html @@ -157,7 +157,7 @@ </p> <img class='bordered' src="doc-files/Example_HTML.png"> <p> - By appending <code>?Accept=<i>mediaType</i>&plainText=true</code> to the URL, you can view the data in the various supported XML formats: + By appending <code>?Accept=<i>mediaType</i>&plainText=true</code> to the URL, you can view the data in the various supported XML formats: </p> <h6 class='figure'>Normal XML</h6> @@ -507,12 +507,12 @@ } <jc>// Converts the text to and from the appropriate media type.</jc> - <jk>public class</jk> TextContentHandler <jk>implements</jk> XmlContentHandler<Text> { + <jk>public class</jk> TextContentHandler <jk>implements</jk> XmlContentHandler<Text> { <ja>@Override</ja> <jk>public void</jk> parse(XMLStreamReader r, Text text) <jk>throws</jk> Exception { String type = text.<jf>type</jf>; - <jk>if</jk> (type != <jk>null</jk> && type.equals(<js>"xhtml"</js>)) + <jk>if</jk> (type != <jk>null</jk> && type.equals(<js>"xhtml"</js>)) text.<jf>text</jf> = <jsm>decode</jsm>(readXmlContents(r).trim()); <jk>else</jk> text.<jf>text</jf> = <jsm>decode</jsm>(r.getElementText().trim()); @@ -522,7 +522,7 @@ <jk>public void</jk> serialize(XmlSerializerWriter w, Text text) <jk>throws</jk> Exception { String type = text.<jf>type</jf>; String content = text.<jf>text</jf>; - <jk>if</jk> (type != <jk>null</jk> && type.equals(<js>"xhtml"</js>)) + <jk>if</jk> (type != <jk>null</jk> && type.equals(<js>"xhtml"</js>)) w.encodeTextInvalidChars(content); <jk>else</jk> w.encodeText(content); http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/3a385346/juneau-core/src/main/java/overview.html ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/overview.html b/juneau-core/src/main/java/overview.html index cc4d42b..b11e25d 100644 --- a/juneau-core/src/main/java/overview.html +++ b/juneau-core/src/main/java/overview.html @@ -362,8 +362,8 @@ </td> <td> <ul class='normal'> - <li>{@code HashSet<String,Integer>} - <li>{@code TreeMap<Integer,Bean>} + <li>{@code HashSet<String,Integer>} + <li>{@code TreeMap<Integer,Bean>} <li><code>List<<jk>int</jk>[][]></code> <li>{@code Bean[]} </ul> @@ -380,8 +380,8 @@ </td> <td> <ul class='normal'> - <li>{@code HashSet<Bean,Integer>} - <li>{@code TreeMap<Integer,Reader>} + <li>{@code HashSet<Bean,Integer>} + <li>{@code TreeMap<Integer,Reader>} </ul> </td> <td style='background-color:lightgreen;text-align:center'><b>yes</b></td> @@ -1263,7 +1263,7 @@ </p> <p> The framework allows you to override header values through GET parameters, so that you can specify the <l>ACCEPT</l> header to see each type. - Adding <l>&plainText=true</l> forces the response <l>Content-Type</l> to be <l>text/plain.</l> + Adding <l>&plainText=true</l> forces the response <l>Content-Type</l> to be <l>text/plain.</l> <h6 class='figure'>HTML</h6> <img class='bordered' src="doc-files/Server.Html.png"> <h6 class='figure'>JSON</h6> @@ -1385,11 +1385,11 @@ </p> <p> The requirements for a method to be callable through a remoteable service are: - <ul class='spaced-list'> - <li>The method must be public. - <li>The parameter and return types must be <a href='#Core.PojoCategories'><u>serializable and parsable</u></a>. - </ul> </p> + <ul class='spaced-list'> + <li>The method must be public. + <li>The parameter and return types must be <a href='#Core.PojoCategories'>serializable and parsable</a>. + </ul> <p> One significant feature is that the remoteable services servlet is a full-blown REST interface. Therefore, in cases where the interface classes are not available on the client side, @@ -1571,7 +1571,7 @@ </div> <!-- ======================================================================================================== --> - <a name="Samples.RestResource"></a> + <a id="Samples.RestResource"></a> <h3 class='topic' onclick='toggle(this)'>7.4 - MANIFEST.MF</h3> <div class='topic'> <p> @@ -1622,7 +1622,7 @@ </div> <!-- ======================================================================================================== --> - <a name="Samples.RootResources"></a> + <a id="Samples.RootResources"></a> <h3 class='topic' onclick='toggle(this)'>7.5 - RootResources</h3> <div class='topic'> <p> @@ -1761,7 +1761,7 @@ </div> <!-- ======================================================================================================== --> - <a name="Samples.HelloWorldResource"></a> + <a id="Samples.HelloWorldResource"></a> <h3 class='topic' onclick='toggle(this)'>7.6 - HelloWorldResource</h3> <div class='topic'> <p> @@ -1833,7 +1833,7 @@ </div> <!-- ======================================================================================================== --> - <a name="Samples.MethodExampleResource"></a> + <a id="Samples.MethodExampleResource"></a> <h3 class='topic' onclick='toggle(this)'>7.7 - MethodExampleResource</h3> <div class='topic'> <p> @@ -2046,7 +2046,7 @@ </div> <!-- ======================================================================================================== --> - <a name="Samples.UrlEncodedFormResource"></a> + <a id="Samples.UrlEncodedFormResource"></a> <h3 class='topic' onclick='toggle(this)'>7.8 - UrlEncodedFormResource</h3> <div class='topic'> <p> @@ -2182,7 +2182,7 @@ </div> <!-- ======================================================================================================== --> - <a name="Samples.RequestEchoResource"></a> + <a id="Samples.RequestEchoResource"></a> <h3 class='topic' onclick='toggle(this)'>7.9 - RequestEchoResource</h3> <div class='topic'> <p> @@ -2291,7 +2291,7 @@ </div> <!-- ======================================================================================================== --> - <a name="Samples.AddressBookResource"></a> + <a id="Samples.AddressBookResource"></a> <h3 class='topic' onclick='toggle(this)'>7.10 - AddressBookResource</h3> <div class='topic'> <p> @@ -2329,7 +2329,7 @@ <img class='bordered' src='doc-files/Samples.AddressBookResource.2.png'> <!-- ======================================================================================================== --> - <a name="Samples.AddressBookResource.Classes"></a> + <a id="Samples.AddressBookResource.Classes"></a> <h4 class='topic' onclick='toggle(this)'>7.10.1 - Classes</h4> <div class='topic'> <p> @@ -2523,7 +2523,7 @@ <jk>public</jk> String <jf>id</jf>; <jk>public</jk> String <jf>name</jf>; <ja>@BeanProperty</ja>(transform=CalendarTransform.Medium.<jk>class</jk>) <jk>public</jk> Calendar <jf>birthDate</jf>; - <jk>public</jk> LinkedList<Address> <jf>addresses</jf> = new LinkedList<Address>(); + <jk>public</jk> LinkedList<Address> <jf>addresses</jf> = new LinkedList<Address>(); <jd>/** Bean constructor - Needed for instantiating on server side */</jd> <jk>public</jk> Person() {} @@ -3037,12 +3037,12 @@ <ck>getCognosData</ck> = <cv>Get data in Cognos/XML format</cv> <ck>getCognosData.res.200.content</ck> = <cv>DataSet</cv> - <ck>otherNotes</ck> = <cv>GZip support enabled. Public methods can be invoked by using the &Method URL parameter. 'text/cognos+xml' support available under root resource only</cv> + <ck>otherNotes</ck> = <cv>GZip support enabled. Public methods can be invoked by using the &Method URL parameter. 'text/cognos+xml' support available under root resource only</cv> </p> </div> <!-- ======================================================================================================== --> - <a name="Samples.AddressBookResource.Demo"></a> + <a id="Samples.AddressBookResource.Demo"></a> <h4 class='topic' onclick='toggle(this)'>7.10.2 - Demo</h4> <div class='topic'> <p> @@ -3105,7 +3105,7 @@ </div> <!-- ======================================================================================================== --> - <a name="Samples.AddressBookResource.Traversable"></a> + <a id="Samples.AddressBookResource.Traversable"></a> <h4 class='topic' onclick='toggle(this)'>7.10.3 - Traversable</h4> <div class='topic'> <p> @@ -3118,7 +3118,7 @@ </div> <!-- ======================================================================================================== --> - <a name="Samples.AddressBookResource.Queryable"></a> + <a id="Samples.AddressBookResource.Queryable"></a> <h4 class='topic' onclick='toggle(this)'>7.10.4 - Queryable</h4> <div class='topic'> <p> @@ -3134,7 +3134,7 @@ </div> <!-- ======================================================================================================== --> - <a name="Samples.AddressBookResource.Introspectable"></a> + <a id="Samples.AddressBookResource.Introspectable"></a> <h4 class='topic' onclick='toggle(this)'>7.10.5 - Introspectable</h4> <div class='topic'> <p> @@ -3144,7 +3144,7 @@ </div> <!-- ======================================================================================================== --> - <a name="Samples.AddressBookResource.RestClient"></a> + <a id="Samples.AddressBookResource.RestClient"></a> <h4 class='topic' onclick='toggle(this)'>7.10.6 - ClientTest</h4> <div class='topic'> <p> @@ -3257,7 +3257,7 @@ </div> <!-- ======================================================================================================== --> - <a name="Samples.AddressBookResource.Browser"></a> + <a id="Samples.AddressBookResource.Browser"></a> <h4 class='topic' onclick='toggle(this)'>7.10.7 - Browser Tips</h4> <div class='topic'> <p> @@ -3288,7 +3288,7 @@ </div> <!-- ======================================================================================================== --> - <a name="Samples.SampleRemoteableServlet"></a> + <a id="Samples.SampleRemoteableServlet"></a> <h3 class='topic' onclick='toggle(this)'>7.11 - SampleRemoteableServlet</h3> <div class='topic'> <p> @@ -3387,7 +3387,7 @@ </div> <!-- ======================================================================================================== --> - <a name="Samples.TempDirResource"></a> + <a id="Samples.TempDirResource"></a> <h3 class='topic' onclick='toggle(this)'>7.12 - TempDirResource</h3> <div class='topic'> <p> @@ -3504,7 +3504,7 @@ </div> <!-- ======================================================================================================== --> - <a name="Samples.AtomFeedResource"></a> + <a id="Samples.AtomFeedResource"></a> <h3 class='topic' onclick='toggle(this)'>7.13 - AtomFeedResource</h3> <div class='topic'> <p> @@ -3614,7 +3614,7 @@ </div> <!-- ======================================================================================================== --> - <a name="Samples.DockerRegistryResource"></a> + <a id="Samples.DockerRegistryResource"></a> <h3 class='topic' onclick='toggle(this)'>7.14 - DockerRegistryResource</h3> <div class='topic'> <p> @@ -3701,7 +3701,7 @@ </div> <!-- ======================================================================================================== --> - <a name="Samples.TumblrParserResource"></a> + <a id="Samples.TumblrParserResource"></a> <h3 class='topic' onclick='toggle(this)'>7.15 - TumblrParserResource</h3> <div class='topic'> <p> @@ -3780,7 +3780,7 @@ </div> <!-- ======================================================================================================== --> - <a name="Samples.PhotosResource"></a> + <a id="Samples.PhotosResource"></a> <h3 class='topic' onclick='toggle(this)'>7.16 - PhotosResource</h3> <div class='topic'> <p> @@ -3922,7 +3922,7 @@ </div> <!-- ======================================================================================================== --> - <a name="Samples.JsonSchemaResource"></a> + <a id="Samples.JsonSchemaResource"></a> <h3 class='topic' onclick='toggle(this)'>7.17 - JsonSchemaResource</h3> <div class='topic'> <p> @@ -4000,7 +4000,7 @@ </div> <!-- ======================================================================================================== --> - <a name="Samples.SqlQueryResource"></a> + <a id="Samples.SqlQueryResource"></a> <h3 class='topic' onclick='toggle(this)'>7.18 - SqlQueryResource</h3> <div class='topic'> <p> @@ -4192,7 +4192,7 @@ <!-- ======================================================================================================== --> - <a name="Samples.ConfigResource"></a> + <a id="Samples.ConfigResource"></a> <h3 class='topic' onclick='toggle(this)'>7.19 - ConfigResource</h3> <div class='topic'> <p> @@ -4385,7 +4385,7 @@ <xt><head></xt> <xt><meta</xt> <xa>http-equiv</xa>=<xs>'Content-Type'</xs> <xa>content</xa>=<xs>'text/html; <xa>charset</xa>=UTF-8'</xs><xt>></xt> <xt><style</xt> <xa>type</xa>=<xs>'text/css'</xs><xt>></xt> - <xt>@import</xt> <xs>'$R{servletURI}/style.css'</; + <xt>@import</xt> <xs>'$R{servletURI}/style.css'</xs>; <xt></style></xt> <xt></head></xt> <xt><body></xt> @@ -4407,7 +4407,7 @@ </div> <!-- ======================================================================================================== --> - <a name="Samples.LogsResource"></a> + <a id="Samples.LogsResource"></a> <h3 class='topic' onclick='toggle(this)'>7.20 - LogsResource</h3> <div class='topic'> <p> @@ -4765,7 +4765,7 @@ <li>New properties on {@link org.apache.juneau.html.HtmlSerializer}: <ul> <li>{@link org.apache.juneau.html.HtmlSerializerContext#HTML_detectLinksInStrings} - Automatically detect hyperlinks in strings. - <li>{@link org.apache.juneau.html.HtmlSerializerContext#HTML_lookForLabelParameters} - Specify anchor text by appending <code>&label=MyLabel</code> to URL. + <li>{@link org.apache.juneau.html.HtmlSerializerContext#HTML_lookForLabelParameters} - Specify anchor text by appending <code>&label=MyLabel</code> to URL. <li>{@link org.apache.juneau.html.HtmlSerializerContext#HTML_labelParameter} - Specify what URL parameter to use as the anchor text label. <li>New {@link org.apache.juneau.html.HtmlSerializerContext#URI_ANCHOR} option for {@link org.apache.juneau.html.HtmlSerializerContext#HTML_uriAnchorText}. </ul> @@ -5034,7 +5034,7 @@ <li>{@link org.apache.juneau.html.HtmlDocSerializer} wraps output in two div tags instead of one (e.g. <code><div class='outerdata'><div class='data' id='data'>...</div></div></code>). Needed for supporting the new devops look-and-feel. <li>Fixed indentation inconsistencies in {@link org.apache.juneau.html.HtmlDocSerializer}. - <li>Renamed <code><s>HtmlSchemaSerializer</s></code> to {@link org.apache.juneau.html.HtmlSchemaDocSerializer}. + <li>Renamed <del>HtmlSchemaSerializer</del> to {@link org.apache.juneau.html.HtmlSchemaDocSerializer}. <li>RDF serializers and parsers now support <code>RdfProperties.RDF_looseCollection</code> loose collections. <li>RDF parser handles case where resources point to themselves (an unfortunate behavior in JFS RDF documents). <li>JSON parser with throw an exception in strict mode if it encounters numbers that are valid in Java but invalid in JSON (e.g. octal, hexadecimal numbers). @@ -5059,7 +5059,7 @@ <li>{@link org.apache.juneau.utils.MessageBundle} and <code>SafeResourceMultiBundle</code> moved from server component. <li>Several bug fixes and performance improvements in <del><code>StringVarResolver</code></del>. <li>Various enhancements to {@link org.apache.juneau.internal.TeeWriter} and {@link org.apache.juneau.internal.TeeOutputStream}. - <li>Renamed <code><s>CharSet</s></code> to {@link org.apache.juneau.internal.AsciiSet}. + <li>Renamed <del>CharSet</del> to {@link org.apache.juneau.internal.AsciiSet}. <li>{@link org.apache.juneau.serializer.SerializerGroup} and {@link org.apache.juneau.parser.ParserGroup} now ignores <code>NoClassDefFoundErrors</code> so that resources that include Jena support can continue to operate even if the Jena libraries are not present. <li>New {@link org.apache.juneau.internal.FileUtils#createTempFile(String)} method. @@ -5326,7 +5326,7 @@ <li>Fixed bug in {@link org.apache.juneau.html.HtmlStrippedDocSerializer} where exception was thrown when trying to serialize primitive arrays. <li>{@link org.apache.juneau.json.JsonParser} now handles parsing JSON boolean/numeric values as strings to bean properties of type boolean or number. <li>{@link org.apache.juneau.urlencoding.UrlEncodingSerializer} and {@link org.apache.juneau.urlencoding.UrlEncodingParser} now - represent arrays and collections as key-value pairs where the keys are numbers (e.g. <js>"?0=foo&1=bar"</js>). + represent arrays and collections as key-value pairs where the keys are numbers (e.g. <js>"?0=foo&1=bar"</js>). <li>Various internal improvements to {@link org.apache.juneau.utils.IOPipe}. <li>New {@link org.apache.juneau.internal.ReflectionUtils#getResource(Class,String)} method. <li>{@link org.apache.juneau.internal.StringUtils#parseNumber(String,Class)} now returns zero for empty strings. @@ -5697,7 +5697,7 @@ <ul class='spaced-list'> <li>Added a default OPTIONS page to {@link org.apache.juneau.server.RestServletDefault} and {@link org.apache.juneau.server.jena.RestServletJenaDefault}. <li><code>RestServletProperties.REST_allowMethodParam</code> has been enhanced to allow you to - explicitely specify which HTTP methods can be used in the <code>&method</code> parameter. + explicitely specify which HTTP methods can be used in the <code>&method</code> parameter. <li>New methods added to {@link org.apache.juneau.server.RestRequest}: <ul> <li>{@link org.apache.juneau.server.RestRequest#getParser()} @@ -5792,7 +5792,7 @@ <li>New {@link org.apache.juneau.urlencoding.UrlEncodingContext#URLENC_expandedParams} property for controlling whether arrays/Collections should be serialized/parsed as multi-part parameters. <li>New {@link org.apache.juneau.urlencoding.annotation.UrlEncoding#expandedParams() @UrlEncoding.expandedParams()} - annotation that specifies that bean properties of type array/Collection be serialized as multi-part parameters (e.g. <code>&key=val1&key=val2</code>). + annotation that specifies that bean properties of type array/Collection be serialized as multi-part parameters (e.g. <code>&key=val1&key=val2</code>). </ul> </li> <li>New {@link org.apache.juneau.json.JsonSerializerContext#JSON_escapeSolidus} property for controlling whether slash characters should be escaped. @@ -5814,11 +5814,11 @@ <li>GET parameters are now CASE-SENSITIVE per W3C standards. <ul> <li> - <li><code>&Content</code> must now be specified as <code>&content</code>. - <li><code>&Method</code> must now be specified as <code>&method</code>. - <li><code>&debug</code> must now be specified as <code>&debug=true</code>. - <li><code>&plainText</code> must now be specified as <code>&plainText=true</code>. - <li><code>¬race</code> must now be specified as <code>&noTrace=true</code>. + <li><code>&Content</code> must now be specified as <code>&content</code>. + <li><code>&Method</code> must now be specified as <code>&method</code>. + <li><code>&debug</code> must now be specified as <code>&debug=true</code>. + <li><code>&plainText</code> must now be specified as <code>&plainText=true</code>. + <li><code>&notrace</code> must now be specified as <code>&noTrace=true</code>. </ul> </li> <li>Performance improvements around query parameters. @@ -5830,7 +5830,7 @@ </li> <li>Fixed Jetty issue in {@link org.apache.juneau.server.RestResponse#setHeader(String,String)} where setting the <code>Content-Type</code> through this method was inconsistent with the behavior in WAS/Tomcat. - <li><code>&noTrace=true</code> now prevents any errors from being logged in log file. + <li><code>&noTrace=true</code> now prevents any errors from being logged in log file. <li>Workaround for Jetty issue where <code>ServletContext.getContextPath()</code> always ends with <js>"null"</js>. <li><code>RestServletProperties.REST_allowMethodParam</code> is now <jk>true</jk> by default on all subclasses of {@link org.apache.juneau.server.RestServletDefault} and {@link org.apache.juneau.server.jena.RestServletJenaDefault}. @@ -5944,7 +5944,7 @@ <li>Changed configuration names for consistency with Jazz Framework. <li>New {@link org.apache.juneau.client.RestClient#execute(HttpUriRequest)} method that allows subclasses to handle their own HTTP request execution. <li>Changes in <code>JazzRestClient</code> to handle introduction of SSO support in v6. - <li><code>&plainText</code> debug feature was broken. + <li><code>&plainText</code> debug feature was broken. <li>Removed double-buffering in <code>RestRequest</code>. <li>Metadata cleanup, Find Bug fixes. </ul>
