Change @HtmlDoc.links() to @HtmlDoc.navlinks(). Project: http://git-wip-us.apache.org/repos/asf/incubator-juneau/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-juneau/commit/2c59a4f0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-juneau/tree/2c59a4f0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-juneau/diff/2c59a4f0
Branch: refs/heads/master Commit: 2c59a4f09ddc5968a69a000a32fc607fae40baa3 Parents: 4d121af Author: JamesBognar <jamesbog...@apache.org> Authored: Fri Oct 6 11:30:47 2017 -0400 Committer: JamesBognar <jamesbog...@apache.org> Committed: Fri Oct 6 11:30:47 2017 -0400 ---------------------------------------------------------------------- .../apache/juneau/dto/jsonschema/package.html | 2 +- .../juneau/html/HtmlDocSerializerContext.java | 26 ++++---- .../juneau/html/HtmlDocSerializerSession.java | 14 ++-- .../juneau/html/HtmlDocTemplateBasic.java | 4 +- juneau-doc/src/main/javadoc/overview.html | 68 ++++++++++++-------- .../juneau/examples/rest/AtomFeedResource.java | 2 +- .../examples/rest/CodeFormatterResource.java | 2 +- .../juneau/examples/rest/DirectoryResource.java | 2 +- .../examples/rest/DockerRegistryResource.java | 2 +- .../examples/rest/HelloWorldResource.java | 2 +- .../examples/rest/JsonSchemaResource.java | 2 +- .../examples/rest/MethodExampleResource.java | 2 +- .../juneau/examples/rest/PetStoreResource.java | 4 +- .../juneau/examples/rest/PhotosResource.java | 2 +- .../examples/rest/RequestEchoResource.java | 2 +- .../juneau/examples/rest/RootResources.java | 2 +- .../examples/rest/SampleRemoteableServlet.java | 2 +- .../juneau/examples/rest/SqlQueryResource.java | 2 +- .../examples/rest/SystemPropertiesResource.java | 2 +- .../juneau/examples/rest/TempDirResource.java | 2 +- .../examples/rest/TumblrParserResource.java | 2 +- .../examples/rest/UrlEncodedFormResource.java | 2 +- .../rest/addressbook/AddressBookResource.java | 8 +-- .../apache/juneau/microservice/Resource.java | 2 +- .../juneau/microservice/ResourceGroup.java | 2 +- .../juneau/microservice/ResourceJena.java | 2 +- .../juneau/microservice/ResourceJenaGroup.java | 2 +- .../org/apache/juneau/microservice/package.html | 4 +- .../microservice/resources/ConfigResource.java | 2 +- .../microservice/resources/DebugResource.java | 2 +- .../resources/DirectoryResource.java | 2 +- .../microservice/resources/LogsResource.java | 2 +- .../microservice/sample/RootResources.java | 2 +- .../juneau/rest/test/HtmlDocLinksResource.java | 46 ++++++------- .../juneau/rest/test/HtmlDocLinksTest.java | 46 ++++++------- .../java/org/apache/juneau/rest/CallMethod.java | 8 +-- .../java/org/apache/juneau/rest/RestConfig.java | 12 ++-- .../org/apache/juneau/rest/RestContext.java | 16 ++--- .../org/apache/juneau/rest/RestRequest.java | 15 ++--- .../org/apache/juneau/rest/RestResponse.java | 8 +-- .../apache/juneau/rest/RestServletDefault.java | 2 +- .../apache/juneau/rest/annotation/HtmlDoc.java | 8 +-- .../juneau/rest/annotation/RestResource.java | 2 +- .../java/org/apache/juneau/rest/package.html | 10 +-- .../rest/remoteable/RemoteableServlet.java | 2 +- .../juneau/rest/widget/ContentTypeMenuItem.java | 2 +- .../juneau/rest/widget/QueryMenuItem.java | 2 +- .../juneau/rest/widget/StyleMenuItem.java | 2 +- .../org/apache/juneau/rest/widget/Widget.java | 2 +- 49 files changed, 188 insertions(+), 175 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/2c59a4f0/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/package.html ---------------------------------------------------------------------- diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/package.html b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/package.html index 92a023f..2b4cc12 100644 --- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/package.html +++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/package.html @@ -423,7 +423,7 @@ messages=<js>"nls/JsonSchemaResource"</js>, title=<js>"Sample JSON-Schema document"</js>, htmldoc=<ja>@HtmlDoc</ja>( - links={ + navlinks={ <js>"options: ?method=OPTIONS"</js> } ) http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/2c59a4f0/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializerContext.java ---------------------------------------------------------------------- diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializerContext.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializerContext.java index 46fbd21..55f2274 100644 --- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializerContext.java +++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializerContext.java @@ -28,7 +28,7 @@ import org.apache.juneau.*; * properties={ * <ja>@Property</ja>(name=HtmlDocSerializerContext.<jsf>HTMLDOC_title</jsf>, value=<js>"$L{title}"</js>), * <ja>@Property</ja>(name=HtmlDocSerializerContext.<jsf>HTMLDOC_description</jsf>, value=<js>"$L{description}"</js>), - * <ja>@Property</ja>(name=HtmlDocSerializerContext.<jsf>HTMLDOC_links</jsf>, value=<js>"{options:'?method=OPTIONS',doc:'doc'}"</js>) + * <ja>@Property</ja>(name=HtmlDocSerializerContext.<jsf>HTMLDOC_navlinks</jsf>, value=<js>"{options:'?method=OPTIONS',doc:'doc'}"</js>) * } * ) * <jk>public class</jk> AddressBookResource <jk>extends</jk> RestServletJenaDefault { @@ -42,7 +42,7 @@ import org.apache.juneau.*; * htmldoc=<ja>@HtmlDoc</ja>( * title=<js>"$L{title}"</js>, * description=<js>"$L{description}"</js>, - * links={ + * navlinks={ * <js>"options: ?method=OPTIONS"</js>, * <js>"doc: doc"</js> * } @@ -108,10 +108,10 @@ public final class HtmlDocSerializerContext extends HtmlSerializerContext { public static final String HTMLDOC_header = "HtmlDocSerializer.header"; /** - * <b>Configuration property:</b> Page links. + * <b>Configuration property:</b> Page navigation links. * * <ul> - * <li><b>Name:</b> <js>"HtmlDocSerializer.links.list"</js> + * <li><b>Name:</b> <js>"HtmlDocSerializer.navlinks.list"</js> * <li><b>Data type:</b> <code>String[]</code> * <li><b>Default:</b> empty array * <li><b>Session-overridable:</b> <jk>true</jk> @@ -145,7 +145,7 @@ public final class HtmlDocSerializerContext extends HtmlSerializerContext { * <p class='bcode'> * <ja>@RestResource</ja>( * properties={ - * <ja>@Property</ja>(name=HtmlDocSerializerContext.<jsf>HTMLDOC_links</jsf>, + * <ja>@Property</ja>(name=HtmlDocSerializerContext.<jsf>HTMLDOC_navlinks</jsf>, * value=<js>"['options: ?method=OPTIONS', 'doc: doc']"</js>) * } * ) @@ -161,7 +161,7 @@ public final class HtmlDocSerializerContext extends HtmlSerializerContext { * <p class='bcode'> * <ja>@RestResource</ja>( * htmldoc=@HtmlDoc( - * links={ + * navlinks={ * <js>"options: ?method=OPTIONS"</js>, * <js>"doc: doc"</js> * } @@ -170,12 +170,12 @@ public final class HtmlDocSerializerContext extends HtmlSerializerContext { * <jk>public class</jk> AddressBookResource <jk>extends</jk> RestServletJenaDefault { * </p> */ - public static final String HTMLDOC_links = "HtmlDocSerializer.links.list"; + public static final String HTMLDOC_navlinks = "HtmlDocSerializer.navlinks.list"; /** - * <b>Configuration property:</b> Add to the {@link #HTMLDOC_links} property. + * <b>Configuration property:</b> Add to the {@link #HTMLDOC_navlinks} property. */ - public static final String HTMLDOC_links_add = "HtmlDocSerializer.links.list.add"; + public static final String HTMLDOC_navlinks_add = "HtmlDocSerializer.navlinks.list.add"; /** * <b>Configuration property:</b> Nav section contents. @@ -203,7 +203,7 @@ public final class HtmlDocSerializerContext extends HtmlSerializerContext { * </p> * * <p> - * When this property is specified, the {@link #HTMLDOC_links} property is ignored. + * When this property is specified, the {@link #HTMLDOC_navlinks} property is ignored. * * <p> * A value of <js>"NONE"</js> can be used to represent no value to differentiate it from an empty string. @@ -462,7 +462,7 @@ public final class HtmlDocSerializerContext extends HtmlSerializerContext { public static final String HTMLDOC_template = "HtmlDocSerializer.template"; - final String[] style, stylesheet, script, links; + final String[] style, stylesheet, script, navlinks; final String header, nav, aside, footer, noResultsMessage; final boolean nowrap; final HtmlDocTemplate template; @@ -485,7 +485,7 @@ public final class HtmlDocSerializerContext extends HtmlSerializerContext { aside = ps.getProperty(HTMLDOC_aside, String.class, null); footer = ps.getProperty(HTMLDOC_footer, String.class, null); nowrap = ps.getProperty(HTMLDOC_nowrap, boolean.class, false); - links = ps.getProperty(HTMLDOC_links, String[].class, new String[0]); + navlinks = ps.getProperty(HTMLDOC_navlinks, String[].class, new String[0]); noResultsMessage = ps.getProperty(HTMLDOC_noResultsMessage, String.class, "<p>no results</p>"); template = ps.getTypedProperty(HTMLDOC_template, HtmlDocTemplate.class, HtmlDocTemplateBasic.class); } @@ -496,7 +496,7 @@ public final class HtmlDocSerializerContext extends HtmlSerializerContext { .append("HtmlDocSerializerContext", new ObjectMap() .append("header", header) .append("nav", nav) - .append("links", links) + .append("navlinks", navlinks) .append("aside", aside) .append("footer", footer) .append("style", style) http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/2c59a4f0/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializerSession.java ---------------------------------------------------------------------- diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializerSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializerSession.java index 501de02..d56040d 100644 --- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializerSession.java +++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializerSession.java @@ -30,7 +30,7 @@ import org.apache.juneau.serializer.*; public class HtmlDocSerializerSession extends HtmlStrippedDocSerializerSession { private final String header, nav, aside, footer, noResultsMessage; - private final String[] style, stylesheet, script, links; + private final String[] style, stylesheet, script, navlinks; private final boolean nowrap; private final HtmlDocTemplate template; @@ -51,7 +51,7 @@ public class HtmlDocSerializerSession extends HtmlStrippedDocSerializerSession { nav = ctx.nav; aside = ctx.aside; footer = ctx.footer; - links = ctx.links; + navlinks = ctx.navlinks; style = ctx.style; stylesheet = ctx.stylesheet; script = ctx.script; @@ -63,7 +63,7 @@ public class HtmlDocSerializerSession extends HtmlStrippedDocSerializerSession { nav = p.getString(HTMLDOC_nav, ctx.nav); aside = p.getString(HTMLDOC_aside, ctx.aside); footer = p.getString(HTMLDOC_footer, ctx.footer); - links = p.getStringArray(HTMLDOC_links, ctx.links); + navlinks = p.getStringArray(HTMLDOC_navlinks, ctx.navlinks); style = p.getStringArray(HTMLDOC_style, ctx.style); stylesheet = p.getStringArray(HTMLDOC_stylesheet, ctx.stylesheet); script = p.getStringArray(HTMLDOC_script, ctx.script); @@ -131,15 +131,15 @@ public class HtmlDocSerializerSession extends HtmlStrippedDocSerializerSession { } /** - * Returns the {@link HtmlDocSerializerContext#HTMLDOC_links} setting value in this context. + * Returns the {@link HtmlDocSerializerContext#HTMLDOC_navlinks} setting value in this context. * * @return - * The {@link HtmlDocSerializerContext#HTMLDOC_links} setting value in this context. + * The {@link HtmlDocSerializerContext#HTMLDOC_navlinks} setting value in this context. * <jk>null</jk> if not specified. * Never an empty map. */ - public final String[] getLinks() { - return links; + public final String[] getNavLinks() { + return navlinks; } /** http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/2c59a4f0/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocTemplateBasic.java ---------------------------------------------------------------------- diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocTemplateBasic.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocTemplateBasic.java index 06a4ccb..be06ac1 100644 --- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocTemplateBasic.java +++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocTemplateBasic.java @@ -112,7 +112,7 @@ public class HtmlDocTemplateBasic implements HtmlDocTemplate { if (exists(nav)) w.append(3, nav).nl(3); } else { - String[] links = session.getLinks(); + String[] links = session.getNavLinks(); if (links.length > 0) { w.sTag(3, "ol").nl(3); for (String l : links) { @@ -190,7 +190,7 @@ public class HtmlDocTemplateBasic implements HtmlDocTemplate { @Override /* HtmlDocTemplate */ public boolean hasNav(HtmlDocSerializerSession session) { - return exists(session.getNav()) || session.getLinks().length > 0; + return exists(session.getNav()) || session.getNavLinks().length > 0; } @Override /* HtmlDocTemplate */ http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/2c59a4f0/juneau-doc/src/main/javadoc/overview.html ---------------------------------------------------------------------- diff --git a/juneau-doc/src/main/javadoc/overview.html b/juneau-doc/src/main/javadoc/overview.html index 333a410..bd03c71 100644 --- a/juneau-doc/src/main/javadoc/overview.html +++ b/juneau-doc/src/main/javadoc/overview.html @@ -16,6 +16,12 @@ <html> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> + <link rel="icon" type="image/png" href="http://www.apache.org/favicons/favicon-32x32.png"; sizes="32x32"> + <link rel="icon" type="image/png" href="http://www.apache.org/favicons/favicon-194x194.png"; sizes="194x194"> + <link rel="icon" type="image/png" href="http://www.apache.org/favicons/favicon-96x96.png"; sizes="96x96"> + <link rel="icon" type="image/png" href="http://www.apache.org/favicons/android-chrome-192x192.png"; sizes="192x192"> + <link rel="icon" type="image/png" href="http://www.apache.org/favicons/favicon-16x16.png"; sizes="16x16"> + <link rel="shortcut icon" href="http://www.apache.org/favicons/favicon.ico";> <style type="text/css"> /* For viewing in file system and page designer */ @IMPORT url("../../../../juneau-core/java/src/main/javadoc/javadoc.css"); @@ -3077,7 +3083,7 @@ // "request:/..." URIs are relative to the request URI. // "servlet:/..." URIs are relative to the servlet URI.</jc> htmldoc=<ja>@HtmlDoc</ja>( - links={ + navlinks={ <js>"up: request:/.."</js>, <js>"options: servlet:/?method=OPTIONS"</js> } @@ -4187,7 +4193,7 @@ path=<js>"/"</js>, messages=<js>"nls/RootResources"</js>, htmldoc=<ja>@HtmlDoc</ja>( - links={ + navlinks={ <js>"options: ?method=OPTIONS"</js> } ), @@ -4295,7 +4301,7 @@ messages=<js>"nls/HelloWorldResource"</js>, path=<js>"/helloWorld"</js>, htmldoc=<ja>@HtmlDoc</ja>( - links={ + navlinks={ <js>"up: request:/.."</js>, <js>"options: servlet:/?method=OPTIONS"</js> } @@ -4388,7 +4394,7 @@ path=<js>"/methodExample"</js>, messages=<js>"nls/MethodExampleResource"</js>, htmldoc=<ja>@HtmlDoc</ja>( - links={ + navlinks={ <js>"up: request:/.."</js>, <js>"options: servlet:/?method=OPTIONS"</js> } @@ -4620,7 +4626,7 @@ <p class='bcode'> <ja>@RestResource</ja>( htmldoc=<ja>@HtmlDoc</ja>( - links={ + navlinks={ <js>"options: servlet:/?method=OPTIONS"</js> } ) @@ -4908,7 +4914,7 @@ path=<js>"/echo"</js>, messages=<js>"nls/RequestEchoResource"</js>, htmldoc=<ja>@HtmlDoc</ja>( - links={ + navlinks={ <js>"up: request:/.."</js>, <js>"options: servlet:/?method=OPTIONS"</js> } @@ -5432,7 +5438,7 @@ // "servlet:/..." URIs are relative to the servlet URI. // "$C{...}" variables are pulled from the config file.</jc> htmldoc=<ja>@HtmlDoc</ja>( - links={ + navlinks={ <js>"up: request:/.."</js>, <js>"options: servlet:/?method=OPTIONS"</js>, <js>"source: $C{Source/gitHub}/org/apache/juneau/examples/rest/addressbook/AddressBookResource.java"</js> @@ -6158,7 +6164,7 @@ description=<js>"Sample class showing how to use remoteable proxies. The list below are exposed services that can be retrieved using RestClient.getProxyInterface(Class)."</js>, htmldoc=<ja>@HtmlDoc</ja>( - links={ + navlinks={ <js>"up: request:/.."</js>, <js>"options: servlet:/?method=OPTIONS"</js> } @@ -6279,7 +6285,7 @@ path=<js>"/tempDir"</js>, messages=<js>"nls/TempDirResource"</js>, htmldoc=<ja>@HtmlDoc</ja>( - links={ + navlinks={ <js>"up: request:/.."</js>, <js>"options: servlet:/?method=OPTIONS"</js>, <js>"upload: servlet:/upload"</js> @@ -6411,7 +6417,7 @@ path=<js>"/atom"</js>, messages=<js>"nls/AtomFeedResource"</js>, htmldoc=<ja>@HtmlDoc</ja>( - links={ + navlinks={ <js>"up: request:/.."</js>, <js>"options: servlet:/?method=OPTIONS"</js> } @@ -6533,7 +6539,7 @@ path=<js>"/docker"</js>, title=<js>"Sample Docker resource"</js>, htmldoc=<ja>@HtmlDoc</ja>( - links={ + navlinks={ <js>"up: request:/.."</js>, <js>"options: servlet:/?method=OPTIONS"</js> } @@ -6626,7 +6632,7 @@ title=<js>"Tumblr parser service"</js>, description=<js>"Specify a URL to a Tumblr blog and parse the results."</js>, htmldoc=<ja>@HtmlDoc</ja>( - links={ + navlinks={ <js>"up: request:/.."</js>, <js>"options: servlet:/?method=OPTIONS"</js> } @@ -6715,7 +6721,7 @@ title=<js>"Photo REST service"</js>, description=<js>"Use a tool like Poster to upload and retrieve jpeg and png images."</js>, htmldoc=<ja>@HtmlDoc</ja>( - links={ + navlinks={ <js>"options: servlet:/?method=OPTIONS"</js> } ) @@ -6861,7 +6867,7 @@ messages=<js>"nls/JsonSchemaResource"</js>, title=<js>"Sample JSON-Schema document"</js>, htmldoc=<ja>@HtmlDoc</ja>( - links={ + navlinks={ <js>"up: request:/.."</js>, <js>"options: servlet:/?method=OPTIONS"</js> } @@ -6952,7 +6958,7 @@ title=<js>"SQL query service"</js>, description=<js>"Executes queries against the local derby '$C{SqlQueryResource/connectionUrl}' database"</js>, htmldoc=<ja>@HtmlDoc</ja>( - links={ + navlinks={ <js>"up: request:/.."</js>, <js>"options: servlet:/?method=OPTIONS"</js> } @@ -7147,7 +7153,7 @@ title=<js>"Configuration"</js>, description=<js>"Contents of configuration file."</js>, htmldoc=<ja>@HtmlDoc</ja>( - links={ + navlinks={ <js>"up: request:/.."</js>, <js>"options: servlet:/?method=OPTIONS"</js>, <js>"edit: servlet:/edit"</js> @@ -7368,8 +7374,8 @@ <h5 class='toc'>What's new in each release</h5> <ul class='toc'> - <li><p><a class='doclink' href='#6.4.1'>6.4.1 (TBD)</a></p> - <li><p><a class='doclink' href='#6.4.0'>6.4.0 (TBD)</a></p> + <li><p><a class='doclink' href='#6.5.0'>6.5.0 (TBD)</a></p> + <li><p><a class='doclink' href='#6.4.0'>6.4.0 (Oct 5, 2017)</a></p> <li><p><a class='doclink' href='#6.3.1'>6.3.1 (Aug 1, 2017)</a></p> <li><p><a class='doclink' href='#6.3.0'>6.3.0 (Jun 30, 2017)</a></p> <li><p><a class='doclink' href='#6.2.0'>6.2.0 (Apr 28, 2017)</a></p> @@ -7439,24 +7445,32 @@ </ul> <!-- =========================================================================================================== --> - <a id="6.4.1"></a> - <h3 class='topic' onclick='toggle(this)'>6.4.1 (TBD)</h3> + <a id="6.5.0"></a> + <h3 class='topic' onclick='toggle(this)'>6.5.0 (TBD)</h3> <div class='topic'> - + <p> + This release ups the Java prerequisite to Java 7. + </p> + <h6 class='topic'>juneau-marshall</h6> <ul class='spaced-list'> <li> New class {@link org.apache.juneau.http.HttpMethodName} with valid static string HTTP method names. </ul> + <h6 class='topic'>juneau-rest-server</h6> + <ul class='spaced-list'> + <li> + Annotation <code><ja>@HtmlDoc</ja>(links)</code> renamed to {@link org.apache.juneau.rest.annotation.HtmlDoc#navlinks() navlinks}. + </ul> </div> <!-- =========================================================================================================== --> <a id="6.4.0"></a> - <h3 class='topic' onclick='toggle(this)'>6.4.0 (TBD)</h3> + <h3 class='topic' onclick='toggle(this)'>6.4.0 (Oct 5, 2017)</h3> <div class='topic'> <p> - The major change in this release is the project structure + The major change in this release is the project structure. </p> <p> The library now consists of the following artifacts found in the Maven group <code>"org.apache.juneau"</code>: @@ -8013,7 +8027,7 @@ <jc>// New syntax</jc> htmldoc=<ja>@HtmlDoc</ja>( - links={ + navlinks={ <js>"up: request:/.."</js>, <js>"options: servlet:/?method=OPTIONS"</js>, <js>"$W{ContentTypeMenuItem}"</js>, @@ -8728,7 +8742,7 @@ properties={ <ja>@Property</ja>(name=<jsf>HTMLDOC_title</jsf>, value=<js>"System properties resource"</js>), <ja>@Property</ja>(name=<jsf>HTMLDOC_description</jsf>, value=<js>"REST interface for performing CRUD operations on system properties."</js>), - <ja>@Property</ja>(name=<jsf>HTMLDOC_links</jsf>, value=<js>"{up:'$R{requestParentURI}',options:'?method=OPTIONS'}"</js>) + <ja>@Property</ja>(name=<jsf>HTMLDOC_navlinks</jsf>, value=<js>"{up:'$R{requestParentURI}',options:'?method=OPTIONS'}"</js>) } ) @@ -10027,7 +10041,7 @@ <li>Options pages on {@link org.apache.juneau.rest.RestServletDefault} and <code><del>RestServletJenaDefault</del></code> now provide default descriptions and back links: and descriptions: <p class='bcode'> - <ja>@Property</ja>(name=<jsf>HTMLDOC_links</jsf>, value=<js>"{back:'$R{servletURI}"</js>), + <ja>@Property</ja>(name=<jsf>HTMLDOC_navlinks</jsf>, value=<js>"{back:'$R{servletURI}"</js>), <ja>@Property</ja>(name=<jsf>HTMLDOC_description</jsf>, value=<js>"Resource options"</js>) </p> <li>New {@link org.apache.juneau.rest.RestServletGroupDefault} class. @@ -11247,7 +11261,7 @@ <h6 class='topic'>Core API changes</h6> <ul class='spaced-list'> <li> - New {@link org.apache.juneau.html.HtmlDocSerializerContext#HTMLDOC_links} annotation for addint links to HTML page views. + New <code><del>HtmlDocSerializerContext.HTMLDOC_navlinks</del></code> annotation for addint links to HTML page views. </li> <li> Renamed the properties in {@link org.apache.juneau.html.HtmlDocSerializerContext} for clarity. http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/2c59a4f0/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/AtomFeedResource.java ---------------------------------------------------------------------- diff --git a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/AtomFeedResource.java b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/AtomFeedResource.java index 2b15e50..dc0decd 100644 --- a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/AtomFeedResource.java +++ b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/AtomFeedResource.java @@ -38,7 +38,7 @@ import org.apache.juneau.rest.widget.*; ContentTypeMenuItem.class, StyleMenuItem.class }, - links={ + navlinks={ "up: request:/..", "options: servlet:/?method=OPTIONS", "$W{ContentTypeMenuItem}", http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/2c59a4f0/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/CodeFormatterResource.java ---------------------------------------------------------------------- diff --git a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/CodeFormatterResource.java b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/CodeFormatterResource.java index a019683..72b77e9 100644 --- a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/CodeFormatterResource.java +++ b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/CodeFormatterResource.java @@ -30,7 +30,7 @@ import org.apache.juneau.rest.annotation.*; title="Code Formatter", description="Utility for generating HTML code-formatted source code", htmldoc=@HtmlDoc( - links={ + navlinks={ "up: servlet:/..", "options: servlet:/?method=OPTIONS", "source: $C{Source/gitHub}/org/apache/juneau/examples/rest/$R{servletClassSimple}.java" http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/2c59a4f0/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/DirectoryResource.java ---------------------------------------------------------------------- diff --git a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/DirectoryResource.java b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/DirectoryResource.java index f96d4d5..fcb6bb0 100644 --- a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/DirectoryResource.java +++ b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/DirectoryResource.java @@ -42,7 +42,7 @@ import org.apache.juneau.utils.*; ContentTypeMenuItem.class, StyleMenuItem.class }, - links={ + navlinks={ "up: request:/..", "options: servlet:/?method=OPTIONS", "$W{ContentTypeMenuItem}", http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/2c59a4f0/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/DockerRegistryResource.java ---------------------------------------------------------------------- diff --git a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/DockerRegistryResource.java b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/DockerRegistryResource.java index 49373fd..cfc9cc3 100644 --- a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/DockerRegistryResource.java +++ b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/DockerRegistryResource.java @@ -32,7 +32,7 @@ import org.apache.juneau.rest.labels.*; title="Sample Docker resource", description="Docker registry explorer", htmldoc=@HtmlDoc( - links={ + navlinks={ "up: request:/..", "options: servlet:/?method=OPTIONS", "source: $C{Source/gitHub}/org/apache/juneau/examples/rest/$R{servletClassSimple}.java" http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/2c59a4f0/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/HelloWorldResource.java ---------------------------------------------------------------------- diff --git a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/HelloWorldResource.java b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/HelloWorldResource.java index 833c3e4..33236fb 100644 --- a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/HelloWorldResource.java +++ b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/HelloWorldResource.java @@ -26,7 +26,7 @@ import org.apache.juneau.rest.annotation.*; description="An example of the simplest-possible resource", path="/helloWorld", htmldoc=@HtmlDoc( - links={ + navlinks={ "up: request:/..", "options: servlet:/?method=OPTIONS", "source: $C{Source/gitHub}/org/apache/juneau/examples/rest/$R{servletClassSimple}.java" http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/2c59a4f0/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/JsonSchemaResource.java ---------------------------------------------------------------------- diff --git a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/JsonSchemaResource.java b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/JsonSchemaResource.java index c5506b9..c6be826 100644 --- a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/JsonSchemaResource.java +++ b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/JsonSchemaResource.java @@ -32,7 +32,7 @@ import org.apache.juneau.rest.widget.*; ContentTypeMenuItem.class, StyleMenuItem.class }, - links={ + navlinks={ "up: request:/..", "options: servlet:/?method=OPTIONS", "$W{ContentTypeMenuItem}", http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/2c59a4f0/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/MethodExampleResource.java ---------------------------------------------------------------------- diff --git a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/MethodExampleResource.java b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/MethodExampleResource.java index 4b84154..28b5532 100644 --- a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/MethodExampleResource.java +++ b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/MethodExampleResource.java @@ -31,7 +31,7 @@ import org.apache.juneau.utils.*; path="/methodExample", messages="nls/MethodExampleResource", htmldoc=@HtmlDoc( - links={ + navlinks={ "up: servlet:/..", "options: servlet:/?method=OPTIONS", "source: $C{Source/gitHub}/org/apache/juneau/examples/rest/$R{servletClassSimple}.java" http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/2c59a4f0/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/PetStoreResource.java ---------------------------------------------------------------------- diff --git a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/PetStoreResource.java b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/PetStoreResource.java index 458d25e..c351b52 100644 --- a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/PetStoreResource.java +++ b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/PetStoreResource.java @@ -46,7 +46,7 @@ import org.apache.juneau.transforms.*; StyleMenuItem.class, PetStoreResource.AddPet.class }, - links={ + navlinks={ "up: request:/..", "options: servlet:/?method=OPTIONS", "$W{ContentTypeMenuItem}", @@ -101,7 +101,7 @@ public class PetStoreResource extends ResourceJena { StyleMenuItem.class }, - links={ + navlinks={ "INHERIT", // Inherit links from class. "[2]:$W{QueryMenuItem}" // Insert QUERY link in position 2. } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/2c59a4f0/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/PhotosResource.java ---------------------------------------------------------------------- diff --git a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/PhotosResource.java b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/PhotosResource.java index 9939840..1252700 100644 --- a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/PhotosResource.java +++ b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/PhotosResource.java @@ -40,7 +40,7 @@ import org.apache.juneau.serializer.*; title="Photo REST service", description="Sample resource that allows images to be uploaded and retrieved.", htmldoc=@HtmlDoc( - links={ + navlinks={ "up: request:/..", "options: servlet:/?method=OPTIONS", "source: $C{Source/gitHub}/org/apache/juneau/examples/rest/$R{servletClassSimple}.java" http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/2c59a4f0/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/RequestEchoResource.java ---------------------------------------------------------------------- diff --git a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/RequestEchoResource.java b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/RequestEchoResource.java index 82a6a4c..be758ae 100644 --- a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/RequestEchoResource.java +++ b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/RequestEchoResource.java @@ -37,7 +37,7 @@ import org.apache.juneau.transforms.*; ContentTypeMenuItem.class, StyleMenuItem.class }, - links={ + navlinks={ "up: request:/..", "options: servlet:/?method=OPTIONS", "$W{ContentTypeMenuItem}", http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/2c59a4f0/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/RootResources.java ---------------------------------------------------------------------- diff --git a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/RootResources.java b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/RootResources.java index 5520b5b..a2d618e 100644 --- a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/RootResources.java +++ b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/RootResources.java @@ -31,7 +31,7 @@ import org.apache.juneau.rest.widget.*; ContentTypeMenuItem.class, StyleMenuItem.class }, - links={ + navlinks={ "options: ?method=OPTIONS", "$W{ContentTypeMenuItem}", "$W{StyleMenuItem}", http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/2c59a4f0/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/SampleRemoteableServlet.java ---------------------------------------------------------------------- diff --git a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/SampleRemoteableServlet.java b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/SampleRemoteableServlet.java index a5b0aa0..0c70ce2 100644 --- a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/SampleRemoteableServlet.java +++ b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/SampleRemoteableServlet.java @@ -28,7 +28,7 @@ import org.apache.juneau.rest.remoteable.*; title="Remoteable Service Proxy API", description="Sample class showing how to use remoteable proxies.", htmldoc=@HtmlDoc( - links={ + navlinks={ "up: request:/..", "options: servlet:/?method=OPTIONS", "source: $C{Source/gitHub}/org/apache/juneau/examples/rest/$R{servletClassSimple}.java" http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/2c59a4f0/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/SqlQueryResource.java ---------------------------------------------------------------------- diff --git a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/SqlQueryResource.java b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/SqlQueryResource.java index c8a7ff4..d65fada 100644 --- a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/SqlQueryResource.java +++ b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/SqlQueryResource.java @@ -42,7 +42,7 @@ import org.apache.juneau.rest.widget.*; widgets={ StyleMenuItem.class }, - links={ + navlinks={ "up: request:/..", "options: servlet:/..", "$W{StyleMenuItem}", http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/2c59a4f0/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/SystemPropertiesResource.java ---------------------------------------------------------------------- diff --git a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/SystemPropertiesResource.java b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/SystemPropertiesResource.java index a22a68b..20a48a6 100644 --- a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/SystemPropertiesResource.java +++ b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/SystemPropertiesResource.java @@ -47,7 +47,7 @@ import org.apache.juneau.rest.widget.*; // "request:/..." URIs are relative to the request URI. // "servlet:/..." URIs are relative to the servlet URI. // "$C{...}" variables are pulled from the config file. - links={ + navlinks={ "up: request:/..", "options: servlet:/?method=OPTIONS", "form: servlet:/formPage", http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/2c59a4f0/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/TempDirResource.java ---------------------------------------------------------------------- diff --git a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/TempDirResource.java b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/TempDirResource.java index ba298c3..c37f4c3 100644 --- a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/TempDirResource.java +++ b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/TempDirResource.java @@ -37,7 +37,7 @@ import org.apache.juneau.utils.*; ContentTypeMenuItem.class, StyleMenuItem.class }, - links={ + navlinks={ "up: request:/..", "options: servlet:/?method=OPTIONS", "upload: servlet:/upload", http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/2c59a4f0/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/TumblrParserResource.java ---------------------------------------------------------------------- diff --git a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/TumblrParserResource.java b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/TumblrParserResource.java index c971f2f..3cc7853 100644 --- a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/TumblrParserResource.java +++ b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/TumblrParserResource.java @@ -27,7 +27,7 @@ import org.apache.juneau.rest.client.*; title="Tumblr parser service", description="Specify a URL to a Tumblr blog and parse the results.", htmldoc=@HtmlDoc( - links={ + navlinks={ "up: request:/..", "options: servlet:/?method=OPTIONS", "source: $C{Source/gitHub}/org/apache/juneau/examples/rest/$R{servletClassSimple}.java" http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/2c59a4f0/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/UrlEncodedFormResource.java ---------------------------------------------------------------------- diff --git a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/UrlEncodedFormResource.java b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/UrlEncodedFormResource.java index 9cc6aa4..0544a24 100644 --- a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/UrlEncodedFormResource.java +++ b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/UrlEncodedFormResource.java @@ -37,7 +37,7 @@ import org.apache.juneau.transforms.*; widgets={ StyleMenuItem.class }, - links={ + navlinks={ "up: request:/..", "$W{StyleMenuItem}", "source: $C{Source/gitHub}/org/apache/juneau/examples/rest/$R{servletClassSimple}.java" http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/2c59a4f0/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/addressbook/AddressBookResource.java ---------------------------------------------------------------------- diff --git a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/addressbook/AddressBookResource.java b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/addressbook/AddressBookResource.java index fac02f4..2cc0212 100644 --- a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/addressbook/AddressBookResource.java +++ b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/addressbook/AddressBookResource.java @@ -21,7 +21,7 @@ import static org.apache.juneau.http.HttpMethodName.*; import java.util.*; import org.apache.juneau.*; -import org.apache.juneau.dto.*; +import org.apache.juneau.dto.Link; import org.apache.juneau.dto.cognos.*; import org.apache.juneau.encoders.*; import org.apache.juneau.examples.addressbook.*; @@ -57,7 +57,7 @@ import org.apache.juneau.utils.*; // "request:/..." URIs are relative to the request URI. // "servlet:/..." URIs are relative to the servlet URI. // "$C{...}" variables are pulled from the config file. - links={ + navlinks={ "up: request:/..", "options: servlet:/?method=OPTIONS", "$W{ContentTypeMenuItem}", @@ -159,7 +159,7 @@ public class AddressBookResource extends ResourceJena { @RestMethod(name=GET, path="/people/*", converters={Traversable.class,Queryable.class,Introspectable.class}, htmldoc=@HtmlDoc( - links={ + navlinks={ "INHERIT", // Inherit links from class. "[2]:$W{QueryMenuItem}" // Insert QUERY link in position 2. } @@ -189,7 +189,7 @@ public class AddressBookResource extends ResourceJena { @RestMethod(name=GET, path="/addresses/*", converters={Traversable.class,Queryable.class}, htmldoc=@HtmlDoc( - links={ + navlinks={ "INHERIT", // Inherit links from class. "[2]:$W{QueryMenuItem}" // Insert QUERY link in position 2. } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/2c59a4f0/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/Resource.java ---------------------------------------------------------------------- diff --git a/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/Resource.java b/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/Resource.java index 2bb1632..2ee99e9 100755 --- a/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/Resource.java +++ b/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/Resource.java @@ -45,7 +45,7 @@ import org.apache.juneau.svl.vars.*; @SuppressWarnings("serial") @RestResource( htmldoc=@HtmlDoc( - links={ + navlinks={ "up: request:/..", "options: servlet:/?method=OPTIONS" }, http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/2c59a4f0/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/ResourceGroup.java ---------------------------------------------------------------------- diff --git a/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/ResourceGroup.java b/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/ResourceGroup.java index eab4048..de45c57 100755 --- a/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/ResourceGroup.java +++ b/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/ResourceGroup.java @@ -46,7 +46,7 @@ import org.apache.juneau.svl.vars.*; @SuppressWarnings("serial") @RestResource( htmldoc=@HtmlDoc( - links={ + navlinks={ "up: request:/..", "options: servlet:/?method=OPTIONS" }, http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/2c59a4f0/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/ResourceJena.java ---------------------------------------------------------------------- diff --git a/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/ResourceJena.java b/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/ResourceJena.java index fdbddde..0a76948 100755 --- a/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/ResourceJena.java +++ b/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/ResourceJena.java @@ -22,7 +22,7 @@ import org.apache.juneau.rest.annotation.*; @SuppressWarnings("serial") @RestResource( htmldoc=@HtmlDoc( - links={ + navlinks={ "up: request:/..", "options: servlet:/?method=OPTIONS" }, http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/2c59a4f0/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/ResourceJenaGroup.java ---------------------------------------------------------------------- diff --git a/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/ResourceJenaGroup.java b/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/ResourceJenaGroup.java index 80e31f8..77511c7 100644 --- a/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/ResourceJenaGroup.java +++ b/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/ResourceJenaGroup.java @@ -47,7 +47,7 @@ import org.apache.juneau.svl.vars.*; @SuppressWarnings("serial") @RestResource( htmldoc=@HtmlDoc( - links={ + navlinks={ "up: request:/..", "options: servlet:/?method=OPTIONS" }, http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/2c59a4f0/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/package.html ---------------------------------------------------------------------- diff --git a/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/package.html b/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/package.html index a97f1a3..628b6eb 100755 --- a/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/package.html +++ b/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/package.html @@ -188,7 +188,7 @@ title=<js>"Juneau Microservice Template"</js>, description=<js>"Template for creating REST microservices"</js>, properties={ - <ja>@Property</ja>(name=<jsf>HTMLDOC_links</jsf>, value=<js>"{options:'?method=OPTIONS'}"</js>) + <ja>@Property</ja>(name=<jsf>HTMLDOC_navlinks</jsf>, value=<js>"{options:'?method=OPTIONS'}"</js>) }, children={ HelloWorldResource.<jk>class</jk>, @@ -821,7 +821,7 @@ title=<js>"Juneau Microservice Template"</js>, description=<js>"Template for creating REST microservices"</js>, properties={ - <ja>@Property</ja>(name=<jsf>HTMLDOC_links</jsf>, value=<js>"{options:'?method=OPTIONS'}"</js>) + <ja>@Property</ja>(name=<jsf>HTMLDOC_navlinks</jsf>, value=<js>"{options:'?method=OPTIONS'}"</js>) }, children={ HelloWorldResource.<jk>class</jk>, http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/2c59a4f0/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/resources/ConfigResource.java ---------------------------------------------------------------------- diff --git a/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/resources/ConfigResource.java b/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/resources/ConfigResource.java index 3a67695..ef020af 100755 --- a/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/resources/ConfigResource.java +++ b/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/resources/ConfigResource.java @@ -35,7 +35,7 @@ import org.apache.juneau.rest.annotation.Body; title="Configuration", description="Contents of configuration file.", htmldoc=@HtmlDoc( - links={ + navlinks={ "up: request:/..", "options: servlet:/?method=OPTIONS", "edit: servlet:/edit" http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/2c59a4f0/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/resources/DebugResource.java ---------------------------------------------------------------------- diff --git a/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/resources/DebugResource.java b/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/resources/DebugResource.java index 0ab3364..5be0212 100644 --- a/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/resources/DebugResource.java +++ b/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/resources/DebugResource.java @@ -30,7 +30,7 @@ import org.apache.juneau.rest.labels.*; title="Debug", description="Debug Utilities.", htmldoc=@HtmlDoc( - links={ + navlinks={ "up: request:/..", "jetty-thread-dump: servlet:/jetty/dump?method=POST", "options: servlet:/?method=OPTIONS" http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/2c59a4f0/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/resources/DirectoryResource.java ---------------------------------------------------------------------- diff --git a/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/resources/DirectoryResource.java b/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/resources/DirectoryResource.java index fc10699..0e9890c 100755 --- a/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/resources/DirectoryResource.java +++ b/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/resources/DirectoryResource.java @@ -64,7 +64,7 @@ import org.apache.juneau.utils.*; description="Contents of $R{attribute.path}", messages="nls/DirectoryResource", htmldoc=@HtmlDoc( - links={ + navlinks={ "up: request:/..", "options: servlet:/?method=OPTIONS" } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/2c59a4f0/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/resources/LogsResource.java ---------------------------------------------------------------------- diff --git a/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/resources/LogsResource.java b/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/resources/LogsResource.java index e9c54c6..4605757 100755 --- a/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/resources/LogsResource.java +++ b/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/resources/LogsResource.java @@ -25,7 +25,7 @@ import java.util.*; import org.apache.juneau.*; import org.apache.juneau.annotation.*; -import org.apache.juneau.dto.*; +import org.apache.juneau.dto.Link; import org.apache.juneau.ini.*; import org.apache.juneau.microservice.*; import org.apache.juneau.rest.*; http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/2c59a4f0/juneau-microservice/juneau-microservice-template/src/main/java/org/apache/juneau/microservice/sample/RootResources.java ---------------------------------------------------------------------- diff --git a/juneau-microservice/juneau-microservice-template/src/main/java/org/apache/juneau/microservice/sample/RootResources.java b/juneau-microservice/juneau-microservice-template/src/main/java/org/apache/juneau/microservice/sample/RootResources.java index 0551978..41fa4fd 100755 --- a/juneau-microservice/juneau-microservice-template/src/main/java/org/apache/juneau/microservice/sample/RootResources.java +++ b/juneau-microservice/juneau-microservice-template/src/main/java/org/apache/juneau/microservice/sample/RootResources.java @@ -32,7 +32,7 @@ import org.apache.juneau.rest.widget.StyleMenuItem; ContentTypeMenuItem.class, StyleMenuItem.class }, - links={ + navlinks={ "options: servlet:/?method=OPTIONS" } ), http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/2c59a4f0/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/HtmlDocLinksResource.java ---------------------------------------------------------------------- diff --git a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/HtmlDocLinksResource.java b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/HtmlDocLinksResource.java index 26e1b02..57c1a71 100644 --- a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/HtmlDocLinksResource.java +++ b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/HtmlDocLinksResource.java @@ -16,12 +16,12 @@ import org.apache.juneau.rest.*; import org.apache.juneau.rest.annotation.*; /** - * Validates inheritance on the @HtmlDoc.links() annotation. + * Validates inheritance on the @HtmlDoc.navlinks() annotation. */ @RestResource( path="/testHtmlDocLinks", htmldoc=@HtmlDoc( - links={"links1a","links1b"} + navlinks={"links1a","links1b"} ), children={ HtmlDocLinksResource.HtmlDocLinksResource2.class @@ -38,7 +38,7 @@ public class HtmlDocLinksResource extends RestServletDefault { @RestMethod( path="/test2", htmldoc=@HtmlDoc( - links={"links2a","links2b"} + navlinks={"links2a","links2b"} ) ) public Object test2() { @@ -48,7 +48,7 @@ public class HtmlDocLinksResource extends RestServletDefault { @RestMethod( path="/test3", htmldoc=@HtmlDoc( - links={"INHERIT","links3a","links3b"} + navlinks={"INHERIT","links3a","links3b"} ) ) public Object test3() { @@ -58,7 +58,7 @@ public class HtmlDocLinksResource extends RestServletDefault { @RestMethod( path="/test4", htmldoc=@HtmlDoc( - links={"links4a","INHERIT","links4b"} + navlinks={"links4a","INHERIT","links4b"} ) ) public Object test4() { @@ -68,7 +68,7 @@ public class HtmlDocLinksResource extends RestServletDefault { @RestMethod( path="/test5", htmldoc=@HtmlDoc( - links={"links5a","links5b","INHERIT"} + navlinks={"links5a","links5b","INHERIT"} ) ) public Object test5() { @@ -78,7 +78,7 @@ public class HtmlDocLinksResource extends RestServletDefault { @RestMethod( path="/test6a", htmldoc=@HtmlDoc( - links={"INHERIT","[0]:links6a","[3]:links6b"} + navlinks={"INHERIT","[0]:links6a","[3]:links6b"} ) ) public Object test6a() { @@ -88,7 +88,7 @@ public class HtmlDocLinksResource extends RestServletDefault { @RestMethod( path="/test6b", htmldoc=@HtmlDoc( - links={"[1]:links6a","[2]:links6b","INHERIT"} + navlinks={"[1]:links6a","[2]:links6b","INHERIT"} ) ) public Object test6b() { @@ -98,7 +98,7 @@ public class HtmlDocLinksResource extends RestServletDefault { @RestMethod( path="/test6c", htmldoc=@HtmlDoc( - links={"[1]:links6a","[0]:links6b"} + navlinks={"[1]:links6a","[0]:links6b"} ) ) public Object test6c() { @@ -108,7 +108,7 @@ public class HtmlDocLinksResource extends RestServletDefault { @RestMethod( path="/test6d", htmldoc=@HtmlDoc( - links={"INHERIT","foo[0]:links6a","bar[3]:links6b"} + navlinks={"INHERIT","foo[0]:links6a","bar[3]:links6b"} ) ) public Object test6d() { @@ -118,7 +118,7 @@ public class HtmlDocLinksResource extends RestServletDefault { @RestMethod( path="/test6e", htmldoc=@HtmlDoc( - links={"foo[1]:links6a","bar[2]:links6b","INHERIT"} + navlinks={"foo[1]:links6a","bar[2]:links6b","INHERIT"} ) ) public Object test6e() { @@ -128,7 +128,7 @@ public class HtmlDocLinksResource extends RestServletDefault { @RestMethod( path="/test6f", htmldoc=@HtmlDoc( - links={"foo[1]:links6a","bar[0]:links6b"} + navlinks={"foo[1]:links6a","bar[0]:links6b"} ) ) public Object test6f() { @@ -138,7 +138,7 @@ public class HtmlDocLinksResource extends RestServletDefault { @RestResource( path="/testHtmlDocLinks2", htmldoc=@HtmlDoc( - links={"INHERIT","links11a","links11b"} + navlinks={"INHERIT","links11a","links11b"} ) ) public static class HtmlDocLinksResource2 extends HtmlDocLinksResource { @@ -155,7 +155,7 @@ public class HtmlDocLinksResource extends RestServletDefault { @RestMethod( path="/test12", htmldoc=@HtmlDoc( - links={"links12a","links12b"} + navlinks={"links12a","links12b"} ) ) public Object test12() { @@ -165,7 +165,7 @@ public class HtmlDocLinksResource extends RestServletDefault { @RestMethod( path="/test13", htmldoc=@HtmlDoc( - links={"INHERIT","links13a","links13b"} + navlinks={"INHERIT","links13a","links13b"} ) ) public Object test13() { @@ -175,7 +175,7 @@ public class HtmlDocLinksResource extends RestServletDefault { @RestMethod( path="/test14", htmldoc=@HtmlDoc( - links={"links14a","INHERIT","links14b"} + navlinks={"links14a","INHERIT","links14b"} ) ) public Object test14() { @@ -185,7 +185,7 @@ public class HtmlDocLinksResource extends RestServletDefault { @RestMethod( path="/test15", htmldoc=@HtmlDoc( - links={"links15a","links15b","INHERIT"} + navlinks={"links15a","links15b","INHERIT"} ) ) public Object test15() { @@ -195,7 +195,7 @@ public class HtmlDocLinksResource extends RestServletDefault { @RestMethod( path="/test16a", htmldoc=@HtmlDoc( - links={"INHERIT","[0]:links16a","[3]:links16b"} + navlinks={"INHERIT","[0]:links16a","[3]:links16b"} ) ) public Object test16a() { @@ -205,7 +205,7 @@ public class HtmlDocLinksResource extends RestServletDefault { @RestMethod( path="/test16b", htmldoc=@HtmlDoc( - links={"[1]:links16a","[2]:links16b","INHERIT"} + navlinks={"[1]:links16a","[2]:links16b","INHERIT"} ) ) public Object test16b() { @@ -215,7 +215,7 @@ public class HtmlDocLinksResource extends RestServletDefault { @RestMethod( path="/test16c", htmldoc=@HtmlDoc( - links={"[1]:links16a","[0]:links16b"} + navlinks={"[1]:links16a","[0]:links16b"} ) ) public Object test16c() { @@ -225,7 +225,7 @@ public class HtmlDocLinksResource extends RestServletDefault { @RestMethod( path="/test16d", htmldoc=@HtmlDoc( - links={"INHERIT","foo[0]:links16a","bar[3]:links16b"} + navlinks={"INHERIT","foo[0]:links16a","bar[3]:links16b"} ) ) public Object test16d() { @@ -235,7 +235,7 @@ public class HtmlDocLinksResource extends RestServletDefault { @RestMethod( path="/test16e", htmldoc=@HtmlDoc( - links={"foo[1]:links16a","bar[2]:links16b","INHERIT"} + navlinks={"foo[1]:links16a","bar[2]:links16b","INHERIT"} ) ) public Object test16e() { @@ -245,7 +245,7 @@ public class HtmlDocLinksResource extends RestServletDefault { @RestMethod( path="/test16f", htmldoc=@HtmlDoc( - links={"foo[1]:links16a","bar[0]:links16b"} + navlinks={"foo[1]:links16a","bar[0]:links16b"} ) ) public Object test16f() { http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/2c59a4f0/juneau-microservice/juneau-microservice-test/src/test/java/org/apache/juneau/rest/test/HtmlDocLinksTest.java ---------------------------------------------------------------------- diff --git a/juneau-microservice/juneau-microservice-test/src/test/java/org/apache/juneau/rest/test/HtmlDocLinksTest.java b/juneau-microservice/juneau-microservice-test/src/test/java/org/apache/juneau/rest/test/HtmlDocLinksTest.java index 5e88c08..f21e84f 100644 --- a/juneau-microservice/juneau-microservice-test/src/test/java/org/apache/juneau/rest/test/HtmlDocLinksTest.java +++ b/juneau-microservice/juneau-microservice-test/src/test/java/org/apache/juneau/rest/test/HtmlDocLinksTest.java @@ -18,7 +18,7 @@ import org.apache.juneau.rest.client.*; import org.junit.*; /** - * Validates inheritance on the @HtmlDoc.links() annotation. + * Validates inheritance on the @HtmlDoc.navlinks() annotation. */ public class HtmlDocLinksTest extends RestTestcase { private RestClient client = TestMicroservice.DEFAULT_CLIENT; @@ -31,7 +31,7 @@ public class HtmlDocLinksTest extends RestTestcase { * @RestResource( * path="/testHtmlDocLinks", * htmldoc=@HtmlDoc( - * links={"links1a","links1b"} + * navlinks={"links1a","links1b"} * ) * ) */ @@ -45,7 +45,7 @@ public class HtmlDocLinksTest extends RestTestcase { * @RestMethod( * path="/test2", * htmldoc=@HtmlDoc( - * links={"links2a","links2b"} + * navlinks={"links2a","links2b"} * ) * ) */ @@ -59,7 +59,7 @@ public class HtmlDocLinksTest extends RestTestcase { * @RestMethod( * path="/test3", * htmldoc=@HtmlDoc( - * links={"INHERIT","links3a","links3b"} + * navlinks={"INHERIT","links3a","links3b"} * ) * ) */ @@ -73,7 +73,7 @@ public class HtmlDocLinksTest extends RestTestcase { * @RestMethod( * path="/test4", * htmldoc=@HtmlDoc( - * links={"links4a","INHERIT","links4b"} + * navlinks={"links4a","INHERIT","links4b"} * ) * ) */ @@ -87,7 +87,7 @@ public class HtmlDocLinksTest extends RestTestcase { * @RestMethod( * path="/test5", * htmldoc=@HtmlDoc( - * links={"links5a","links5b","INHERIT"} + * navlinks={"links5a","links5b","INHERIT"} * ) * ) */ @@ -101,7 +101,7 @@ public class HtmlDocLinksTest extends RestTestcase { * @RestMethod( * path="/test6a", * htmldoc=@HtmlDoc( - * links={"INHERIT","[0]:links6a","[3]:links6b"} + * navlinks={"INHERIT","[0]:links6a","[3]:links6b"} * ) * ) */ @@ -115,7 +115,7 @@ public class HtmlDocLinksTest extends RestTestcase { * @RestMethod( * path="/test6b", * htmldoc=@HtmlDoc( - * links={"[1]:links6a","[2]:links6b","INHERIT"} + * navlinks={"[1]:links6a","[2]:links6b","INHERIT"} * ) * ) */ @@ -129,7 +129,7 @@ public class HtmlDocLinksTest extends RestTestcase { * @RestMethod( * path="/test6c", * htmldoc=@HtmlDoc( - * links={"[1]:links6a","[0]:links6b"} + * navlinks={"[1]:links6a","[0]:links6b"} * ) * ) */ @@ -143,7 +143,7 @@ public class HtmlDocLinksTest extends RestTestcase { * @RestMethod( * path="/test6d", * htmldoc=@HtmlDoc( - * links={"INHERIT","foo[0]:links6a","bar[3]:links6b"} + * navlinks={"INHERIT","foo[0]:links6a","bar[3]:links6b"} * ) * ) */ @@ -157,7 +157,7 @@ public class HtmlDocLinksTest extends RestTestcase { * @RestMethod( * path="/test6e", * htmldoc=@HtmlDoc( - * links={"foo[1]:links6a","bar[2]:links6b","INHERIT"} + * navlinks={"foo[1]:links6a","bar[2]:links6b","INHERIT"} * ) * ) */ @@ -171,7 +171,7 @@ public class HtmlDocLinksTest extends RestTestcase { * @RestMethod( * path="/test6f", * htmldoc=@HtmlDoc( - * links={"foo[1]:links6a","bar[0]:links6b"} + * navlinks={"foo[1]:links6a","bar[0]:links6b"} * ) * ) */ @@ -185,7 +185,7 @@ public class HtmlDocLinksTest extends RestTestcase { * @RestResource( * path="/testHtmlDocLinks2", * htmldoc=@HtmlDoc( - * links={"INHERIT","links11a","links11b"} + * navlinks={"INHERIT","links11a","links11b"} * ) * ) */ @@ -199,7 +199,7 @@ public class HtmlDocLinksTest extends RestTestcase { * @RestMethod( * path="/test12", * htmldoc=@HtmlDoc( - * links={"links12a","links12b"} + * navlinks={"links12a","links12b"} * ) * ) */ @@ -213,7 +213,7 @@ public class HtmlDocLinksTest extends RestTestcase { * @RestMethod( * path="/test13", * htmldoc=@HtmlDoc( - * links={"INHERIT","links13a","links13b"} + * navlinks={"INHERIT","links13a","links13b"} * ) * ) */ @@ -227,7 +227,7 @@ public class HtmlDocLinksTest extends RestTestcase { * @RestMethod( * path="/test14", * htmldoc=@HtmlDoc( - * links={"links14a","INHERIT","links14b"} + * navlinks={"links14a","INHERIT","links14b"} * ) * ) */ @@ -241,7 +241,7 @@ public class HtmlDocLinksTest extends RestTestcase { * @RestMethod( * path="/test15", * htmldoc=@HtmlDoc( - * links={"links15a","links15b","INHERIT"} + * navlinks={"links15a","links15b","INHERIT"} * ) * ) */ @@ -255,7 +255,7 @@ public class HtmlDocLinksTest extends RestTestcase { * @RestMethod( * path="/test16a", * htmldoc=@HtmlDoc( - * links={"INHERIT","[0]:links16a","[3]:links16b"} + * navlinks={"INHERIT","[0]:links16a","[3]:links16b"} * ) * ) */ @@ -269,7 +269,7 @@ public class HtmlDocLinksTest extends RestTestcase { * @RestMethod( * path="/test16b", * htmldoc=@HtmlDoc( - * links={"[1]:links16a","[2]:links16b","INHERIT"} + * navlinks={"[1]:links16a","[2]:links16b","INHERIT"} * ) * ) */ @@ -283,7 +283,7 @@ public class HtmlDocLinksTest extends RestTestcase { * @RestMethod( * path="/test16c", * htmldoc=@HtmlDoc( - * links={"[1]:links16a","[0]:links16b"} + * navlinks={"[1]:links16a","[0]:links16b"} * ) * ) */ @@ -297,7 +297,7 @@ public class HtmlDocLinksTest extends RestTestcase { * @RestMethod( * path="/test16d", * htmldoc=@HtmlDoc( - * links={"INHERIT","foo[0]:links16a","bar[3]:links16b"} + * navlinks={"INHERIT","foo[0]:links16a","bar[3]:links16b"} * ) * ) */ @@ -311,7 +311,7 @@ public class HtmlDocLinksTest extends RestTestcase { * @RestMethod( * path="/test16e", * htmldoc=@HtmlDoc( - * links={"foo[1]:links16a","bar[2]:links16b","INHERIT"} + * navlinks={"foo[1]:links16a","bar[2]:links16b","INHERIT"} * ) * ) */ @@ -325,7 +325,7 @@ public class HtmlDocLinksTest extends RestTestcase { * @RestMethod( * path="/test16f", * htmldoc=@HtmlDoc( - * links={"foo[1]:links16a","bar[0]:links16b"} + * navlinks={"foo[1]:links16a","bar[0]:links16b"} * ) * ) */ http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/2c59a4f0/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/CallMethod.java ---------------------------------------------------------------------- diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/CallMethod.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/CallMethod.java index 705fde4..192af23 100644 --- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/CallMethod.java +++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/CallMethod.java @@ -68,7 +68,7 @@ class CallMethod implements Comparable<CallMethod> { private final RestContext context; private final BeanContext beanContext; final String htmlHeader, htmlNav, htmlAside, htmlFooter, htmlStyle, htmlStylesheet, htmlScript, htmlNoResultsMessage; - final String[] htmlLinks; + final String[] htmlNavLinks; final boolean htmlNoWrap; final HtmlDocTemplate htmlTemplate; private final Map<String,Widget> widgets; @@ -104,7 +104,7 @@ class CallMethod implements Comparable<CallMethod> { this.parameters = b.parameters; this.responses = b.responses; this.htmlHeader = b.htmlHeader; - this.htmlLinks = b.htmlLinks; + this.htmlNavLinks = b.htmlNavLinks; this.htmlNav = b.htmlNav; this.htmlAside = b.htmlAside; this.htmlFooter = b.htmlFooter; @@ -120,7 +120,7 @@ class CallMethod implements Comparable<CallMethod> { private static class Builder { private String httpMethod, defaultCharset, description, tags, summary, externalDocs, htmlNav, htmlAside, htmlFooter, htmlStyle, htmlStylesheet, htmlScript, htmlHeader, htmlNoResultsMessage; - private String[] htmlLinks; + private String[] htmlNavLinks; private boolean htmlNoWrap; private HtmlDocTemplate htmlTemplate; private UrlPathPattern pathPattern; @@ -191,7 +191,7 @@ class CallMethod implements Comparable<CallMethod> { htmlFooter = resolveNewlineSeparatedAnnotation(hd.footer(), context.getHtmlFooter()); htmlStyle = resolveNewlineSeparatedAnnotation(hd.style(), context.getHtmlStyle()); htmlScript = resolveNewlineSeparatedAnnotation(hd.script(), context.getHtmlScript()); - htmlLinks = resolveLinks(hd.links(), context.getHtmlLinks()); + htmlNavLinks = resolveLinks(hd.navlinks(), context.getHtmlNavLinks()); htmlStylesheet = hd.stylesheet().isEmpty() ? context.getHtmlStylesheet() : hd.stylesheet(); htmlNoWrap = hd.nowrap() ? hd.nowrap() : context.getHtmlNoWrap(); htmlNoResultsMessage = hd.noResultsMessage().isEmpty() ? context.getHtmlNoResultsMessage() : hd.noResultsMessage(); http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/2c59a4f0/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestConfig.java ---------------------------------------------------------------------- diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestConfig.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestConfig.java index 3708e53..8d969f3 100644 --- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestConfig.java +++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestConfig.java @@ -116,7 +116,7 @@ public class RestConfig implements ServletConfig { List<Object> staticFiles; RestContext parentContext; String path, htmlHeader, htmlNav, htmlAside, htmlFooter, htmlStyle, htmlStylesheet, htmlScript, htmlNoResultsMessage; - String[] htmlLinks; + String[] htmlNavLinks; String clientVersionHeader = "X-Client-Version"; String contextPath; @@ -265,7 +265,7 @@ public class RestConfig implements ServletConfig { setHtmlFooter(resolveNewlineSeparatedAnnotation(hd.footer(), htmlFooter)); setHtmlStyle(resolveNewlineSeparatedAnnotation(hd.style(), htmlStyle)); setHtmlScript(resolveNewlineSeparatedAnnotation(hd.script(), htmlScript)); - setHtmlLinks(resolveLinks(hd.links(), htmlLinks)); + setHtmlNavLinks(resolveLinks(hd.navlinks(), htmlNavLinks)); if (! hd.stylesheet().isEmpty()) setHtmlStylesheet(hd.stylesheet()); @@ -1295,13 +1295,13 @@ public class RestConfig implements ServletConfig { * This field can also use URIs of any support type in {@link UriResolver}. * * <p> - * This is the programmatic equivalent to the {@link HtmlDoc#links() @HtmlDoc.links()} annotation. + * This is the programmatic equivalent to the {@link HtmlDoc#navlinks() @HtmlDoc.navlinks()} annotation. * * @param value The HTML nav section links links. * @return This object (for method chaining). */ - public RestConfig setHtmlLinks(String[] value) { - this.htmlLinks = value; + public RestConfig setHtmlNavLinks(String[] value) { + this.htmlNavLinks = value; return this; } @@ -1318,7 +1318,7 @@ public class RestConfig implements ServletConfig { * The format of this value is HTML. * * <p> - * When a value is specified, the {@link #setHtmlLinks(String[])} value will be ignored. + * When a value is specified, the {@link #setHtmlNavLinks(String[])} value will be ignored. * * <p> * This field can contain variables (e.g. <js>"$L{my.localized.variable}"</js>). http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/2c59a4f0/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java ---------------------------------------------------------------------- diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java index b8f5e78..bd23730 100644 --- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java +++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java @@ -79,7 +79,7 @@ public final class RestContext extends Context { htmlFooter, htmlNoResultsMessage; private final String[] - htmlLinks; + htmlNavLinks; private final boolean htmlNoWrap; private final HtmlDocTemplate htmlTemplate; private final Map<String,Widget> htmlWidgets; @@ -208,7 +208,7 @@ public final class RestContext extends Context { this.htmlWidgets = Collections.unmodifiableMap(b.htmlWidgets); this.htmlHeader = b.htmlHeader; - this.htmlLinks = b.htmlLinks; + this.htmlNavLinks = b.htmlNavLinks; this.htmlNav = b.htmlNav; this.htmlAside = b.htmlAside; this.htmlStyle = b.htmlStyle; @@ -484,7 +484,7 @@ public final class RestContext extends Context { EncoderGroup encoders; String clientVersionHeader = "", defaultCharset, paramFormat, htmlHeader, htmlNav, htmlAside, htmlStyle, htmlStylesheet, htmlScript, htmlFooter, htmlNoResultsMessage; - String[] htmlLinks; + String[] htmlNavLinks; boolean htmlNoWrap; HtmlDocTemplate htmlTemplate; @@ -627,7 +627,7 @@ public final class RestContext extends Context { } htmlHeader = sc.htmlHeader; - htmlLinks = sc.htmlLinks; + htmlNavLinks = sc.htmlNavLinks; htmlNav = sc.htmlNav; htmlAside = sc.htmlAside; htmlStyle = sc.htmlStyle; @@ -700,7 +700,7 @@ public final class RestContext extends Context { * <ja>@RestMethod</ja>( * name=<jsf>GET</jsf>, path=<js>"/{name}/*"</js>, * htmldoc=@HtmlDoc( - * links={ + * navlinks={ * <js>"up: $R{requestParentURI}"</js>, * <js>"options: servlet:/?method=OPTIONS"</js>, * <js>"editLevel: servlet:/editLevel?logger=$A{attribute.name, OFF}"</js> @@ -917,12 +917,12 @@ public final class RestContext extends Context { * The HTML page nav section links. * * <p> - * Defined by the {@link HtmlDoc#links()} annotation or {@link RestConfig#setHtmlLinks(String[])} method. + * Defined by the {@link HtmlDoc#navlinks()} annotation or {@link RestConfig#setHtmlNavLinks(String[])} method. * * @return The HTML page nav section links. */ - public String[] getHtmlLinks() { - return htmlLinks; + public String[] getHtmlNavLinks() { + return htmlNavLinks; } /** http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/2c59a4f0/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestRequest.java ---------------------------------------------------------------------- diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestRequest.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestRequest.java index 6c55405..bdb0e4a 100644 --- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestRequest.java +++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestRequest.java @@ -266,7 +266,7 @@ public final class RestRequest extends HttpServletRequestWrapper { * <li><js>"aside"</js> - See {@link HtmlDocSerializerContext#HTMLDOC_aside} * <li><js>"footer"</js> - See {@link HtmlDocSerializerContext#HTMLDOC_footer} * <li><js>"header"</js> - See {@link HtmlDocSerializerContext#HTMLDOC_header} - * <li><js>"links.list"</js> - See {@link HtmlDocSerializerContext#HTMLDOC_links} + * <li><js>"navlinks.list"</js> - See {@link HtmlDocSerializerContext#HTMLDOC_navlinks} * <li><js>"nav"</js> - See {@link HtmlDocSerializerContext#HTMLDOC_nav} * <li><js>"noResultsMessage"</js> - See {@link HtmlDocSerializerContext#HTMLDOC_noResultsMessage} * <li><js>"nowrap"</js> - See {@link HtmlDocSerializerContext#HTMLDOC_nowrap} @@ -325,13 +325,15 @@ public final class RestRequest extends HttpServletRequestWrapper { } else if (c2 == 'h') { if ("header".equals(name)) return cm.htmlHeader == null ? null : resolveVars(cm.htmlHeader); - } else if (c2 == 'l') { - if ("links.list".equals(name)) { - if (cm.htmlLinks == null || cm.htmlLinks.length == 0) + } else if (c2 == 'n') { + if ("nav".equals(name)) + return cm.htmlNav == null ? null : resolveVars(cm.htmlNav); + if ("navlinks.list".equals(name)) { + if (cm.htmlNavLinks == null || cm.htmlNavLinks.length == 0) return null; try { List<String> la = new ArrayList<String>(); - for (String l : cm.htmlLinks) { + for (String l : cm.htmlNavLinks) { // Temporary backwards compatibility with JSON object format. if (l.startsWith("{")) { ObjectMap m = new ObjectMap(l); @@ -346,9 +348,6 @@ public final class RestRequest extends HttpServletRequestWrapper { throw new RuntimeException(e); } } - } else if (c2 == 'n') { - if ("nav".equals(name)) - return cm.htmlNav == null ? null : resolveVars(cm.htmlNav); if ("noResultsMessage".equals(name)) return cm.htmlNoResultsMessage == null ? null : resolveVars(cm.htmlNoResultsMessage); if ("nowrap".equals(name)) http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/2c59a4f0/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestResponse.java ---------------------------------------------------------------------- diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestResponse.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestResponse.java index e70b5e2..0da444f 100644 --- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestResponse.java +++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestResponse.java @@ -499,7 +499,7 @@ public final class RestResponse extends HttpServletResponseWrapper { * This field can also use URIs of any support type in {@link UriResolver}. * * <p> - * This is the programmatic equivalent to the {@link HtmlDoc#links() @HtmlDoc.links()} annotation. + * This is the programmatic equivalent to the {@link HtmlDoc#navlinks() @HtmlDoc.navlinks()} annotation. * * @param value * The HTML nav section links links. @@ -511,8 +511,8 @@ public final class RestResponse extends HttpServletResponseWrapper { * </ul> * @return This object (for method chaining). */ - public RestResponse setHtmlLinks(String[] value) { - properties.put(HtmlDocSerializerContext.HTMLDOC_links, value); + public RestResponse setHtmlNavLinks(String[] value) { + properties.put(HtmlDocSerializerContext.HTMLDOC_navlinks, value); return this; } @@ -529,7 +529,7 @@ public final class RestResponse extends HttpServletResponseWrapper { * The format of this value is HTML. * * <p> - * When a value is specified, the {@link #setHtmlLinks(String[])} value will be ignored. + * When a value is specified, the {@link #setHtmlNavLinks(String[])} value will be ignored. * * <p> * This field can contain variables (e.g. <js>"$L{my.localized.variable}"</js>). http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/2c59a4f0/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestServletDefault.java ---------------------------------------------------------------------- diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestServletDefault.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestServletDefault.java index 900d1ad..5751caa 100644 --- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestServletDefault.java +++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestServletDefault.java @@ -212,7 +212,7 @@ public abstract class RestServletDefault extends RestServlet { */ @RestMethod(name=OPTIONS, path="/*", htmldoc=@HtmlDoc( - links={ + navlinks={ "back: servlet:/", "json: servlet:/?method=OPTIONS&Accept=text/json&plainText=true" }, http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/2c59a4f0/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/HtmlDoc.java ---------------------------------------------------------------------- diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/HtmlDoc.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/HtmlDoc.java index c100dc6..61ab2f6 100644 --- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/HtmlDoc.java +++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/HtmlDoc.java @@ -138,7 +138,7 @@ public @interface HtmlDoc { * <p class='bcode'> * <ja>@RestResource</ja>( * htmldoc=<ja>@HtmlDoc</ja>( - * links={ + * navlinks={ * <js>"up: request:/.."</js>, * <js>"options: servlet:/?method=OPTIONS"</js> * } @@ -157,7 +157,7 @@ public @interface HtmlDoc { * This field can also use URIs of any support type in {@link UriResolver}. * <li> * The programmatic equivalent to this annotation are the - * {@link RestConfig#setHtmlLinks(String[])} and {@link RestResponse#setHtmlLinks(String[])} methods. + * {@link RestConfig#setHtmlNavLinks(String[])} and {@link RestResponse#setHtmlNavLinks(String[])} methods. * <li> * On methods, this value is inherited from the <ja>@HtmlDoc</ja> annotation on the servlet/resource class. * <li> @@ -169,7 +169,7 @@ public @interface HtmlDoc { * to place a link inside the list of parent links. * </ul> */ - String[] links() default {}; + String[] navlinks() default {}; /** * Sets the HTML nav section contents. @@ -197,7 +197,7 @@ public @interface HtmlDoc { * <h6 class='topic'>Other Notes</h6> * <ul class='spaced-list'> * <li> - * When a value is specified, the {@link #links()} value will be ignored. + * When a value is specified, the {@link #navlinks()} value will be ignored. * <li> * This field can contain variables (e.g. <js>"$L{my.localized.variable}"</js>). * <br>See {@link RestContext#getVarResolver()} for the list of supported variables. http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/2c59a4f0/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestResource.java ---------------------------------------------------------------------- diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestResource.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestResource.java index 2f64f92..76e6123 100644 --- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestResource.java +++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestResource.java @@ -723,7 +723,7 @@ public @interface RestResource { * PoweredByJuneau.<jk>class</jk>, * ContentTypeLinks.<jk>class</jk> * } - * links={ + * navlinks={ * <js>"up: request:/.."</js>, * <js>"options: servlet:/?method=OPTIONS"</js>, * <js>"source: $C{Source/gitHub}/org/apache/juneau/examples/rest/addressbook/AddressBookResource.java"</js>, http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/2c59a4f0/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/package.html ---------------------------------------------------------------------- diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/package.html b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/package.html index fa775d0..eed626a 100644 --- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/package.html +++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/package.html @@ -243,7 +243,7 @@ <ja>@RestResource</ja>( messages=<js>"nls/HelloWorldResource"</js>, htmldoc=<ja>@HtmlDoc</ja>( - links={ + navlinks={ <js>"up: request:/.."</js>, <js>"options: servlet:/?method=OPTIONS"</js> } @@ -1243,7 +1243,7 @@ <ja>@RestMethod</ja>(name=<jsf>OPTIONS</jsf>, path=<js>"/*"</js>, summary=<js>"Resource options"</js>, htmldoc=<ja>@HtmlDoc</ja>( - links={ + navlinks={ <js>"back: servlet:/,"</js>, <js>"json: servlet:/?method=OPTIONS&Accept=text/json&plainText=true"</js> } @@ -2426,7 +2426,7 @@ title=<js>"URL-encoded Form Post Resource"</js>, description=<js>"Shows how form posts are converted into beans."</js>, htmldoc=<ja>@HtmlDoc</ja>( - links={ + navlinks={ <js>"up: request:/.."</js>, <js>"options: servlet:/?method=OPTIONS"</js> } @@ -3167,7 +3167,7 @@ title=<js>"Photo REST service"</js>, description=<js>"Use a tool like Poster to upload and retrieve jpeg and png images."</js>, htmldoc=<ja>@HtmlDoc</ja>( - links={ + navlinks={ <js>"options: ?method=OPTIONS"</js> } ) @@ -3479,7 +3479,7 @@ // "servlet:/..." URIs are relative to the servlet URI. // "$C{...}" variables are pulled from the config file.</jc> htmldoc=<ja>@HtmlDoc</ja>( - links={ + navlinks={ <js>"up: request:/.."</js>, <js>"options: servlet:/?method=OPTIONS"</js>, <js>"source: $C{Source/gitHub}/org/apache/juneau/examples/rest/addressbook/AddressBookResource.java"</js> http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/2c59a4f0/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/remoteable/RemoteableServlet.java ---------------------------------------------------------------------- diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/remoteable/RemoteableServlet.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/remoteable/RemoteableServlet.java index 4254a83..6e27cd6 100644 --- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/remoteable/RemoteableServlet.java +++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/remoteable/RemoteableServlet.java @@ -19,7 +19,7 @@ import java.util.*; import java.util.concurrent.*; import org.apache.juneau.*; -import org.apache.juneau.dto.*; +import org.apache.juneau.dto.Link; import org.apache.juneau.parser.*; import org.apache.juneau.rest.*; import org.apache.juneau.rest.annotation.*; http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/2c59a4f0/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/widget/ContentTypeMenuItem.java ---------------------------------------------------------------------- diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/widget/ContentTypeMenuItem.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/widget/ContentTypeMenuItem.java index 36498ec..c5f0d8f 100644 --- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/widget/ContentTypeMenuItem.java +++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/widget/ContentTypeMenuItem.java @@ -40,7 +40,7 @@ import org.apache.juneau.utils.*; * ContentTypeMenuItem.<jk>class</jk>, * }, * htmldoc=<ja>@HtmlDoc</ja>( - * links={ + * navlinks={ * <js>"up: ..."</js>, * <js>"options: ..."</js>, * <js>"$W{QueryMenuItem}"</js>,
![http://www.apache.org/favicons/favicon-32x32.png"](http://www.apache.org/favicons/favicon-32x32.png"){kind=link}
![http://www.apache.org/favicons/favicon-194x194.png"](http://www.apache.org/favicons/favicon-194x194.png"){kind=link}
![http://www.apache.org/favicons/favicon-96x96.png"](http://www.apache.org/favicons/favicon-96x96.png"){kind=link}
![http://www.apache.org/favicons/android-chrome-192x192.png"](http://www.apache.org/favicons/android-chrome-192x192.png"){kind=link}
![http://www.apache.org/favicons/favicon-16x16.png"](http://www.apache.org/favicons/favicon-16x16.png"){kind=link}