Repository: incubator-juneau Updated Branches: refs/heads/master 9a0c872f0 -> 744eab1a2
doc link fixes Project: http://git-wip-us.apache.org/repos/asf/incubator-juneau/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-juneau/commit/744eab1a Tree: http://git-wip-us.apache.org/repos/asf/incubator-juneau/tree/744eab1a Diff: http://git-wip-us.apache.org/repos/asf/incubator-juneau/diff/744eab1a Branch: refs/heads/master Commit: 744eab1a2887b2d8c942fab5fc36418b67c55165 Parents: 9a0c872 Author: JamesBognar <[email protected]> Authored: Fri Feb 24 14:37:23 2017 -0500 Committer: JamesBognar <[email protected]> Committed: Fri Feb 24 14:37:23 2017 -0500 ---------------------------------------------------------------------- .../src/main/java/org/apache/juneau/rest/RestServlet.java | 4 +++- .../main/java/org/apache/juneau/rest/annotation/RestMethod.java | 4 ++-- .../java/org/apache/juneau/rest/annotation/RestResource.java | 4 ++-- juneau-rest/src/main/java/org/apache/juneau/rest/package.html | 2 +- .../org/apache/juneau/rest/remoteable/RemoteableServlet.java | 2 +- 5 files changed, 9 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/744eab1a/juneau-rest/src/main/java/org/apache/juneau/rest/RestServlet.java ---------------------------------------------------------------------- diff --git a/juneau-rest/src/main/java/org/apache/juneau/rest/RestServlet.java b/juneau-rest/src/main/java/org/apache/juneau/rest/RestServlet.java index 52a3581..9ffb83b 100644 --- a/juneau-rest/src/main/java/org/apache/juneau/rest/RestServlet.java +++ b/juneau-rest/src/main/java/org/apache/juneau/rest/RestServlet.java @@ -2955,7 +2955,9 @@ public abstract class RestServlet extends HttpServlet { .addVars( SystemPropertiesVar.class, EnvVariablesVar.class, - ConfigFileVar.class + ConfigFileVar.class, + IfVar.class, + SwitchVar.class ); } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/744eab1a/juneau-rest/src/main/java/org/apache/juneau/rest/annotation/RestMethod.java ---------------------------------------------------------------------- diff --git a/juneau-rest/src/main/java/org/apache/juneau/rest/annotation/RestMethod.java b/juneau-rest/src/main/java/org/apache/juneau/rest/annotation/RestMethod.java index 530f563..3d1e941 100644 --- a/juneau-rest/src/main/java/org/apache/juneau/rest/annotation/RestMethod.java +++ b/juneau-rest/src/main/java/org/apache/juneau/rest/annotation/RestMethod.java @@ -25,7 +25,7 @@ import org.apache.juneau.serializer.*; /** * Identifies a REST Java method on a {@link RestServlet} implementation class. * <p> - * Refer to {@link org.apache.juneau.rest} doc for information on using this class. + * Refer to <a class='doclink' href='../package-summary.html#TOC'>org.apache.juneau.rest</a> doc for information on using this class. */ @Documented @Target(METHOD) @@ -87,7 +87,7 @@ public @interface RestMethod { * <p> * Can be used for performing post-processing on the response object before serialization. * <p> - * Default converters are available in the {@link org.apache.juneau.rest.converters} package. + * Default converters are available in the <a class='doclink' href='../converters/package-summary.html#TOC'>org.apache.juneau.rest.converters</a> package. */ Class<? extends RestConverter>[] converters() default {}; http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/744eab1a/juneau-rest/src/main/java/org/apache/juneau/rest/annotation/RestResource.java ---------------------------------------------------------------------- diff --git a/juneau-rest/src/main/java/org/apache/juneau/rest/annotation/RestResource.java b/juneau-rest/src/main/java/org/apache/juneau/rest/annotation/RestResource.java index f41bd53..014d838 100644 --- a/juneau-rest/src/main/java/org/apache/juneau/rest/annotation/RestResource.java +++ b/juneau-rest/src/main/java/org/apache/juneau/rest/annotation/RestResource.java @@ -33,7 +33,7 @@ import org.apache.juneau.xml.*; /** * Optionally used to associate metadata on an instance of {@link RestServlet}. * <p> - * Refer to {@link org.apache.juneau.rest} doc for information on using this class. + * Refer to <a class='doclink' href='../package-summary.html#TOC'>org.apache.juneau.rest</a> doc for information on using this class. */ @Documented @Target(TYPE) @@ -81,7 +81,7 @@ public @interface RestResource { * <p> * Can be used for performing post-processing on the response object before serialization. * <p> - * Default converter implementations are provided in the {@link org.apache.juneau.rest.converters} package. + * Default converter implementations are provided in the <a class='doclink' href='../converters/package-summary.html#TOC'>org.apache.juneau.rest.converters</a> package. */ Class<? extends RestConverter>[] converters() default {}; http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/744eab1a/juneau-rest/src/main/java/org/apache/juneau/rest/package.html ---------------------------------------------------------------------- diff --git a/juneau-rest/src/main/java/org/apache/juneau/rest/package.html b/juneau-rest/src/main/java/org/apache/juneau/rest/package.html index c608106..27fc8a5 100644 --- a/juneau-rest/src/main/java/org/apache/juneau/rest/package.html +++ b/juneau-rest/src/main/java/org/apache/juneau/rest/package.html @@ -2197,7 +2197,7 @@ <ul class='javahierarchy'> <li class='c'>{@link org.apache.juneau.rest.ReaderResource} <li class='m'>{@link org.apache.juneau.rest.RestRequest#getReaderResource(String,boolean)} - <li class='p'>{@link org.apache.juneau.svl} + <li class='p'><a class='doclink' href='../svl/package-summary.html#TOC'>org.apache.juneau.svl</a> </ul> </div> http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/744eab1a/juneau-rest/src/main/java/org/apache/juneau/rest/remoteable/RemoteableServlet.java ---------------------------------------------------------------------- diff --git a/juneau-rest/src/main/java/org/apache/juneau/rest/remoteable/RemoteableServlet.java b/juneau-rest/src/main/java/org/apache/juneau/rest/remoteable/RemoteableServlet.java index 611cc65..df1a7e3 100644 --- a/juneau-rest/src/main/java/org/apache/juneau/rest/remoteable/RemoteableServlet.java +++ b/juneau-rest/src/main/java/org/apache/juneau/rest/remoteable/RemoteableServlet.java @@ -31,7 +31,7 @@ import org.apache.juneau.rest.annotation.*; * To implement a remoteable service, developers must simply subclass from this class and implement the {@link #getServiceMap()} method that * maps java interfaces to POJO instances. * - * See {@link org.apache.juneau.rest.remoteable} for details. + * See <a class='doclink' href='package-summary.html#TOC'>org.apache.juneau.rest.remoteable</a> for details. */ @SuppressWarnings("serial") public abstract class RemoteableServlet extends RestServletDefault {
