You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juneau.apache.org by ja...@apache.org on 2017/07/12 13:14:26 UTC
incubator-juneau git commit: Add support for
$R{servletClass}/$R{servletClassSimple} variables.
Repository: incubator-juneau
Updated Branches:
refs/heads/master fb8d004cd -> 6635559f8
Add support for $R{servletClass}/$R{servletClassSimple} variables.
Project: http://git-wip-us.apache.org/repos/asf/incubator-juneau/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-juneau/commit/6635559f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-juneau/tree/6635559f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-juneau/diff/6635559f
Branch: refs/heads/master
Commit: 6635559f8fa2dc8bd60d567af757b8339504a911
Parents: fb8d004
Author: JamesBognar <ja...@apache.org>
Authored: Wed Jul 12 09:14:25 2017 -0400
Committer: JamesBognar <ja...@apache.org>
Committed: Wed Jul 12 09:14:25 2017 -0400
----------------------------------------------------------------------
.../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 | 10 +++-------
.../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 | 20 ++++++--------------
.../org/apache/juneau/rest/RestRequest.java | 6 ++++++
19 files changed, 31 insertions(+), 37 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/6635559f/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/AtomFeedResource.java
----------------------------------------------------------------------
diff --git a/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/AtomFeedResource.java b/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/AtomFeedResource.java
index 89da0d9..7d7eebe 100644
--- a/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/AtomFeedResource.java
+++ b/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/AtomFeedResource.java
@@ -42,7 +42,7 @@ import org.apache.juneau.rest.widget.*;
"options: servlet:/?method=OPTIONS",
"$W{ContentTypeMenuItem}",
"$W{StyleMenuItem}",
- "source: $C{Source/gitHub}/org/apache/juneau/examples/rest/AtomFeedResource.java"
+ "source: $C{Source/gitHub}/org/apache/juneau/examples/rest/$R{servletClassSimple}.java"
}
),
properties={
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/6635559f/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/CodeFormatterResource.java
----------------------------------------------------------------------
diff --git a/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/CodeFormatterResource.java b/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/CodeFormatterResource.java
index 33e895e..cc7ca69 100644
--- a/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/CodeFormatterResource.java
+++ b/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/CodeFormatterResource.java
@@ -32,7 +32,7 @@ import org.apache.juneau.rest.annotation.*;
links={
"up: servlet:/..",
"options: servlet:/?method=OPTIONS",
- "source: $C{Source/gitHub}/org/apache/juneau/examples/rest/CodeFormatterResource.java"
+ "source: $C{Source/gitHub}/org/apache/juneau/examples/rest/$R{servletClassSimple}.java"
},
aside={
"<div style='min-width:200px' class='text'>",
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/6635559f/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/DirectoryResource.java
----------------------------------------------------------------------
diff --git a/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/DirectoryResource.java b/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/DirectoryResource.java
index a7ea144..d333bb7 100644
--- a/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/DirectoryResource.java
+++ b/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/DirectoryResource.java
@@ -46,7 +46,7 @@ import org.apache.juneau.utils.*;
"options: servlet:/?method=OPTIONS",
"$W{ContentTypeMenuItem}",
"$W{StyleMenuItem}",
- "source: $C{Source/gitHub}/org/apache/juneau/examples/rest/DirectoryResource.java"
+ "source: $C{Source/gitHub}/org/apache/juneau/examples/rest/$R{servletClassSimple}.java"
}
),
properties={
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/6635559f/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/DockerRegistryResource.java
----------------------------------------------------------------------
diff --git a/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/DockerRegistryResource.java b/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/DockerRegistryResource.java
index 1ec291d..4b20b7c 100644
--- a/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/DockerRegistryResource.java
+++ b/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/DockerRegistryResource.java
@@ -32,7 +32,7 @@ import org.apache.juneau.rest.labels.*;
links={
"up: request:/..",
"options: servlet:/?method=OPTIONS",
- "source: $C{Source/gitHub}/org/apache/juneau/examples/rest/DockerRegistryResource.java"
+ "source: $C{Source/gitHub}/org/apache/juneau/examples/rest/$R{servletClassSimple}.java"
},
// Pull in aside contents from file.
aside="$F{resources/DockerRegistryResourceAside.html}"
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/6635559f/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/HelloWorldResource.java
----------------------------------------------------------------------
diff --git a/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/HelloWorldResource.java b/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/HelloWorldResource.java
index 38d7916..dcf3b08 100644
--- a/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/HelloWorldResource.java
+++ b/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/HelloWorldResource.java
@@ -27,7 +27,7 @@ import org.apache.juneau.rest.annotation.*;
links={
"up: request:/..",
"options: servlet:/?method=OPTIONS",
- "source: $C{Source/gitHub}/org/apache/juneau/examples/rest/HelloWorldResource.java"
+ "source: $C{Source/gitHub}/org/apache/juneau/examples/rest/$R{servletClassSimple}.java"
},
aside={
"<div style='max-width:400px' class='text'>",
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/6635559f/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/JsonSchemaResource.java
----------------------------------------------------------------------
diff --git a/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/JsonSchemaResource.java b/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/JsonSchemaResource.java
index e0dd71b..5a201b8 100644
--- a/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/JsonSchemaResource.java
+++ b/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/JsonSchemaResource.java
@@ -35,7 +35,7 @@ import org.apache.juneau.rest.widget.*;
"options: servlet:/?method=OPTIONS",
"$W{ContentTypeMenuItem}",
"$W{StyleMenuItem}",
- "source: $C{Source/gitHub}/org/apache/juneau/examples/rest/JsonSchemaResource.java"
+ "source: $C{Source/gitHub}/org/apache/juneau/examples/rest/$R{servletClassSimple}.java"
},
aside={
"<div style='min-width:200px' class='text'>",
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/6635559f/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/MethodExampleResource.java
----------------------------------------------------------------------
diff --git a/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/MethodExampleResource.java b/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/MethodExampleResource.java
index 0c714dd..a0c7d44 100644
--- a/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/MethodExampleResource.java
+++ b/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/MethodExampleResource.java
@@ -32,7 +32,7 @@ import org.apache.juneau.utils.*;
links={
"up: servlet:/..",
"options: servlet:/?method=OPTIONS",
- "source: $C{Source/gitHub}/org/apache/juneau/examples/rest/MethodExampleResource.java"
+ "source: $C{Source/gitHub}/org/apache/juneau/examples/rest/$R{servletClassSimple}.java"
},
aside={
"<div style='max-width:400px' class='text'>",
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/6635559f/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/PetStoreResource.java
----------------------------------------------------------------------
diff --git a/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/PetStoreResource.java b/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/PetStoreResource.java
index 42101cc..c67371e 100644
--- a/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/PetStoreResource.java
+++ b/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/PetStoreResource.java
@@ -45,7 +45,7 @@ import org.apache.juneau.transforms.*;
"options: servlet:/?method=OPTIONS",
"$W{ContentTypeMenuItem}",
"$W{StyleMenuItem}",
- "source: $C{Source/gitHub}/org/apache/juneau/examples/rest/PetStoreResource.java"
+ "source: $C{Source/gitHub}/org/apache/juneau/examples/rest/$R{servletClassSimple}.java"
},
aside={
"<div style='max-width:400px' class='text'>",
@@ -90,12 +90,8 @@ public class PetStoreResource extends ResourceJena {
},
links={
- "up: request:/..",
- "options: servlet:/?method=OPTIONS",
- "$W{QueryMenuItem}",
- "$W{ContentTypeMenuItem}",
- "$W{StyleMenuItem}",
- "source: $C{Source/gitHub}/org/apache/juneau/examples/rest/PetStoreResource.java"
+ "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/6635559f/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/PhotosResource.java
----------------------------------------------------------------------
diff --git a/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/PhotosResource.java b/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/PhotosResource.java
index 4309d11..b7018f3 100644
--- a/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/PhotosResource.java
+++ b/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/PhotosResource.java
@@ -43,7 +43,7 @@ import org.apache.juneau.serializer.*;
links={
"up: request:/..",
"options: servlet:/?method=OPTIONS",
- "source: $C{Source/gitHub}/org/apache/juneau/examples/rest/PhotosResource.java"
+ "source: $C{Source/gitHub}/org/apache/juneau/examples/rest/$R{servletClassSimple}.java"
},
aside={
"<div style='max-width:400px;min-width:200px' class='text'>",
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/6635559f/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/RequestEchoResource.java
----------------------------------------------------------------------
diff --git a/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/RequestEchoResource.java b/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/RequestEchoResource.java
index 71adf97..82a6a4c 100644
--- a/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/RequestEchoResource.java
+++ b/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/RequestEchoResource.java
@@ -42,7 +42,7 @@ import org.apache.juneau.transforms.*;
"options: servlet:/?method=OPTIONS",
"$W{ContentTypeMenuItem}",
"$W{StyleMenuItem}",
- "source: $C{Source/gitHub}/org/apache/juneau/examples/rest/RequestEchoResource.java"
+ "source: $C{Source/gitHub}/org/apache/juneau/examples/rest/$R{servletClassSimple}.java"
},
aside={
"<div style='max-width:400px;min-width:200px' class='text'>",
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/6635559f/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/RootResources.java
----------------------------------------------------------------------
diff --git a/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/RootResources.java b/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/RootResources.java
index 4c64913..9ee9abe 100644
--- a/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/RootResources.java
+++ b/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/RootResources.java
@@ -35,7 +35,7 @@ import org.apache.juneau.rest.widget.*;
"options: ?method=OPTIONS",
"$W{ContentTypeMenuItem}",
"$W{StyleMenuItem}",
- "source: $C{Source/gitHub}/org/apache/juneau/examples/rest/RootResources.java"
+ "source: $C{Source/gitHub}/org/apache/juneau/examples/rest/$R{servletClassSimple}.java"
},
aside={
"<div style='max-width:400px' class='text'>",
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/6635559f/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/SampleRemoteableServlet.java
----------------------------------------------------------------------
diff --git a/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/SampleRemoteableServlet.java b/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/SampleRemoteableServlet.java
index d7de0de..1306d97 100644
--- a/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/SampleRemoteableServlet.java
+++ b/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/SampleRemoteableServlet.java
@@ -33,7 +33,7 @@ import org.apache.juneau.rest.remoteable.*;
links={
"up: request:/..",
"options: servlet:/?method=OPTIONS",
- "source: $C{Source/gitHub}/org/apache/juneau/examples/rest/SampleRemoteableServlet.java"
+ "source: $C{Source/gitHub}/org/apache/juneau/examples/rest/$R{servletClassSimple}.java"
},
aside={
"<div style='max-width:400px;min-width:200px' class='text'>",
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/6635559f/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/SqlQueryResource.java
----------------------------------------------------------------------
diff --git a/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/SqlQueryResource.java b/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/SqlQueryResource.java
index e0f4435..a6c0d3e 100644
--- a/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/SqlQueryResource.java
+++ b/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/SqlQueryResource.java
@@ -44,7 +44,7 @@ import org.apache.juneau.rest.widget.*;
"up: request:/..",
"options: servlet:/..",
"$W{StyleMenuItem}",
- "source: $C{Source/gitHub}/org/apache/juneau/examples/rest/SqlQueryResource.java"
+ "source: $C{Source/gitHub}/org/apache/juneau/examples/rest/$R{servletClassSimple}.java"
},
aside={
"<div style='min-width:200px' class='text'>",
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/6635559f/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/SystemPropertiesResource.java
----------------------------------------------------------------------
diff --git a/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/SystemPropertiesResource.java b/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/SystemPropertiesResource.java
index 103dec9..b191358 100644
--- a/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/SystemPropertiesResource.java
+++ b/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/SystemPropertiesResource.java
@@ -52,7 +52,7 @@ import org.apache.juneau.rest.widget.*;
"form: servlet:/formPage",
"$W{ContentTypeMenuItem}",
"$W{StyleMenuItem}",
- "source: $C{Source/gitHub}/org/apache/juneau/examples/rest/SystemPropertiesResource.java"
+ "source: $C{Source/gitHub}/org/apache/juneau/examples/rest/$R{servletClassSimple}.java"
},
// Custom page text in aside section.
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/6635559f/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/TempDirResource.java
----------------------------------------------------------------------
diff --git a/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/TempDirResource.java b/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/TempDirResource.java
index 4818ba0..6d164d6 100644
--- a/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/TempDirResource.java
+++ b/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/TempDirResource.java
@@ -42,7 +42,7 @@ import org.apache.juneau.utils.*;
"upload: servlet:/upload",
"$W{ContentTypeMenuItem}",
"$W{StyleMenuItem}",
- "source: $C{Source/gitHub}/org/apache/juneau/examples/rest/TempDirResource.java"
+ "source: $C{Source/gitHub}/org/apache/juneau/examples/rest/$R{servletClassSimple}.java"
},
aside={
"<div style='max-width:400px' class='text'>",
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/6635559f/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/TumblrParserResource.java
----------------------------------------------------------------------
diff --git a/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/TumblrParserResource.java b/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/TumblrParserResource.java
index 20d4ac6..1fbdca0 100644
--- a/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/TumblrParserResource.java
+++ b/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/TumblrParserResource.java
@@ -28,7 +28,7 @@ import org.apache.juneau.rest.client.*;
links={
"up: request:/..",
"options: servlet:/?method=OPTIONS",
- "source: $C{Source/gitHub}/org/apache/juneau/examples/rest/TumblrParserResource.java"
+ "source: $C{Source/gitHub}/org/apache/juneau/examples/rest/$R{servletClassSimple}.java"
},
aside={
"<div style='min-width:200px' class='text'>",
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/6635559f/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/UrlEncodedFormResource.java
----------------------------------------------------------------------
diff --git a/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/UrlEncodedFormResource.java b/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/UrlEncodedFormResource.java
index 2ce350a..a6d98fe 100644
--- a/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/UrlEncodedFormResource.java
+++ b/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/UrlEncodedFormResource.java
@@ -39,7 +39,7 @@ import org.apache.juneau.transforms.*;
links={
"up: request:/..",
"$W{StyleMenuItem}",
- "source: $C{Source/gitHub}/org/apache/juneau/examples/rest/UrlEncodedFormResource.java"
+ "source: $C{Source/gitHub}/org/apache/juneau/examples/rest/$R{servletClassSimple}.java"
},
aside={
"<div style='min-width:200px' class='text'>",
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/6635559f/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/addressbook/AddressBookResource.java
----------------------------------------------------------------------
diff --git a/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/addressbook/AddressBookResource.java b/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/addressbook/AddressBookResource.java
index 61325ec..5569388 100644
--- a/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/addressbook/AddressBookResource.java
+++ b/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/addressbook/AddressBookResource.java
@@ -60,9 +60,9 @@ import org.apache.juneau.utils.*;
links={
"up: request:/..",
"options: servlet:/?method=OPTIONS",
- "source: $C{Source/gitHub}/org/apache/juneau/examples/rest/addressbook/AddressBookResource.java",
"$W{ContentTypeMenuItem}",
- "$W{StyleMenuItem}"
+ "$W{StyleMenuItem}",
+ "source: $C{Source/gitHub}/org/apache/juneau/examples/rest/addressbook/$R{servletClassSimple}.java"
},
// Arbitrary HTML message on the left side of the page.
@@ -160,12 +160,8 @@ public class AddressBookResource extends ResourceJena {
converters={Traversable.class,Queryable.class,Introspectable.class},
htmldoc=@HtmlDoc(
links={
- "up: request:/..",
- "options: servlet:/?method=OPTIONS",
- "$W{QueryMenuItem}",
- "$W{ContentTypeMenuItem}",
- "$W{StyleMenuItem}",
- "source: $C{Source/gitHub}/org/apache/juneau/examples/rest/addressbook/AddressBookResource.java"
+ "INHERIT", // Inherit links from class.
+ "[2]:$W{QueryMenuItem}" // Insert QUERY link in position 2.
}
)
)
@@ -194,12 +190,8 @@ public class AddressBookResource extends ResourceJena {
converters={Traversable.class,Queryable.class},
htmldoc=@HtmlDoc(
links={
- "up: request:/..",
- "options: servlet:/?method=OPTIONS",
- "$W{QueryMenuItem}",
- "$W{ContentTypeMenuItem}",
- "$W{StyleMenuItem}",
- "source: $C{Source/gitHub}/org/apache/juneau/examples/rest/addressbook/AddressBookResource.java"
+ "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/6635559f/juneau-rest/src/main/java/org/apache/juneau/rest/RestRequest.java
----------------------------------------------------------------------
diff --git a/juneau-rest/src/main/java/org/apache/juneau/rest/RestRequest.java b/juneau-rest/src/main/java/org/apache/juneau/rest/RestRequest.java
index b98ec6d..1d21176 100644
--- a/juneau-rest/src/main/java/org/apache/juneau/rest/RestRequest.java
+++ b/juneau-rest/src/main/java/org/apache/juneau/rest/RestRequest.java
@@ -284,6 +284,8 @@ public final class RestRequest extends HttpServletRequestWrapper {
* <li><js>"pathInfo"</js> - Value returned by {@link RestRequest#getPathInfo()}
* <li><js>"requestParentURI"</js> - Value returned by {@link UriContext#getRootRelativePathInfoParent()}
* <li><js>"requestURI"</js> - Value returned by {@link RestRequest#getRequestURI()}
+ * <li><js>"servletClass"</js> - The class name of the servlet
+ * <li><js>"servletClassSimple"</js> - The simple class name of the servlet.
* <li><js>"servletDescription"</js> - Value returned by {@link RestRequest#getServletDescription()}
* <li><js>"servletParentURI"</js> - Value returned by {@link UriContext#getRootRelativeServletPathParent()}
* <li><js>"servletPath"</js> - See {@link RestRequest#getServletPath()}
@@ -418,6 +420,10 @@ public final class RestRequest extends HttpServletRequestWrapper {
if ("requestURI".equals(name))
return getRequestURI();
} else if (c2 == 's') {
+ if ("servletClass".equals(name))
+ return getContext().getResource().getClass().getName();
+ if ("servletClassSimple".equals(name))
+ return getContext().getResource().getClass().getSimpleName();
if ("servletDescription".equals(name))
return getServletDescription();
if ("servletParentURI".equals(name))