You are viewing a plain text version of this content. The canonical link for it is here.
Posted to pluto-scm@portals.apache.org by ms...@apache.org on 2014/08/22 15:14:09 UTC

[31/35] git commit: Added new dispatcher tests:

Added new dispatcher tests:

* Test that wrappered requests / responses can be used with the
  PortletRequestDispatcher
* Test that the portlet can include multiple servlets during the same
  lifecycle method
* Test that atributes and query string parameters are correctly handled
  during a multi-level include (when an included servlet includes another
  servlet, for example)


Project: http://git-wip-us.apache.org/repos/asf/portals-pluto/repo
Commit: http://git-wip-us.apache.org/repos/asf/portals-pluto/commit/2a619ecc
Tree: http://git-wip-us.apache.org/repos/asf/portals-pluto/tree/2a619ecc
Diff: http://git-wip-us.apache.org/repos/asf/portals-pluto/diff/2a619ecc

Branch: refs/heads/master
Commit: 2a619ecc3418cb6a33110615c5c22676002cd0e0
Parents: 6c3b59c
Author: Scott Nicklous <ms...@apache.org>
Authored: Fri Aug 22 12:11:56 2014 +0200
Committer: Scott Nicklous <ms...@apache.org>
Committed: Fri Aug 22 12:11:56 2014 +0200

----------------------------------------------------------------------
 ...cherTests_SPEC2_19_ForwardServletAction.java |    4 +-
 ...tcherTests_SPEC2_19_ForwardServletEvent.java |    4 +-
 ...cherTests_SPEC2_19_IncludeServletAction.java |    4 +-
 ...tcherTests_SPEC2_19_IncludeServletEvent.java |    4 +-
 ...s_SPEC2_19_ForwardServletAction_servlet.java |    4 +-
 ...ts_SPEC2_19_ForwardServletEvent_servlet.java |    4 +-
 ...s_SPEC2_19_ForwardServletRender_servlet.java |    4 +-
 ...SPEC2_19_ForwardServletResource_servlet.java |    4 +-
 ...s_SPEC2_19_IncludeServletAction_servlet.java |    4 +-
 ...ts_SPEC2_19_IncludeServletEvent_servlet.java |    4 +-
 ...s_SPEC2_19_IncludeServletRender_servlet.java |    4 +-
 ...SPEC2_19_IncludeServletResource_servlet.java |    4 +-
 ...patcherTests2_SPEC2_19_ForwardJSPAction.java |    4 +-
 ...spatcherTests2_SPEC2_19_ForwardJSPEvent.java |    4 +-
 ...patcherTests2_SPEC2_19_IncludeJSPAction.java |    4 +-
 ...spatcherTests2_SPEC2_19_IncludeJSPEvent.java |    4 +-
 ...spatcherTests2_SPEC2_19_ForwardJSPAction.jsp |    4 +-
 ...ispatcherTests2_SPEC2_19_ForwardJSPEvent.jsp |    4 +-
 ...spatcherTests2_SPEC2_19_ForwardJSPRender.jsp |    4 +-
 ...atcherTests2_SPEC2_19_ForwardJSPResource.jsp |    4 +-
 ...spatcherTests2_SPEC2_19_IncludeJSPAction.jsp |    4 +-
 ...ispatcherTests2_SPEC2_19_IncludeJSPEvent.jsp |    4 +-
 ...spatcherTests2_SPEC2_19_IncludeJSPRender.jsp |    4 +-
 ...atcherTests2_SPEC2_19_IncludeJSPResource.jsp |    4 +-
 portlet-tck_3.0/V2DispatcherTests5/pom.xml      |  127 +++
 ...s5_SPEC2_19_IncThenForwardServletAction.java |  461 ++++++++
 ...ts5_SPEC2_19_IncThenForwardServletEvent.java |  447 ++++++++
 ...EC2_19_IncThenForwardServletEvent_event.java |  112 ++
 ...s5_SPEC2_19_IncThenForwardServletRender.java |  111 ++
 ..._SPEC2_19_IncThenForwardServletResource.java |  126 +++
 ...s5_SPEC2_19_IncThenIncludeServletAction.java |  458 ++++++++
 ...ts5_SPEC2_19_IncThenIncludeServletEvent.java |  444 ++++++++
 ...EC2_19_IncThenIncludeServletEvent_event.java |  112 ++
 ...s5_SPEC2_19_IncThenIncludeServletRender.java |  111 ++
 ..._SPEC2_19_IncThenIncludeServletResource.java |  126 +++
 ..._19_IncThenForwardServletAction_servlet.java |  484 +++++++++
 ...2_19_IncThenForwardServletEvent_servlet.java |  484 +++++++++
 ..._19_IncThenForwardServletRender_servlet.java |  481 +++++++++
 ...9_IncThenForwardServletResource_servlet.java |  481 +++++++++
 ..._19_IncThenIncludeServletAction_servlet.java |  481 +++++++++
 ...2_19_IncThenIncludeServletEvent_servlet.java |  481 +++++++++
 ..._19_IncThenIncludeServletRender_servlet.java |  488 +++++++++
 ...9_IncThenIncludeServletResource_servlet.java |  488 +++++++++
 .../resources/xml-resources/additionalTCs.xml   |  257 +++++
 .../src/main/webapp/WEB-INF/portlet.xml         |  246 +++++
 .../src/main/webapp/WEB-INF/web.xml             |  136 +++
 portlet-tck_3.0/V2DispatcherTests6/pom.xml      |  127 +++
 ...s6_SPEC2_19_FwdThenForwardServletAction.java |  461 ++++++++
 ...ts6_SPEC2_19_FwdThenForwardServletEvent.java |  447 ++++++++
 ...EC2_19_FwdThenForwardServletEvent_event.java |  112 ++
 ...s6_SPEC2_19_FwdThenForwardServletRender.java |  111 ++
 ..._SPEC2_19_FwdThenForwardServletResource.java |  126 +++
 ...s6_SPEC2_19_FwdThenIncludeServletAction.java |  458 ++++++++
 ...ts6_SPEC2_19_FwdThenIncludeServletEvent.java |  444 ++++++++
 ...EC2_19_FwdThenIncludeServletEvent_event.java |  112 ++
 ...s6_SPEC2_19_FwdThenIncludeServletRender.java |  111 ++
 ..._SPEC2_19_FwdThenIncludeServletResource.java |  126 +++
 ..._19_FwdThenForwardServletAction_servlet.java |  484 +++++++++
 ...2_19_FwdThenForwardServletEvent_servlet.java |  484 +++++++++
 ..._19_FwdThenForwardServletRender_servlet.java |  481 +++++++++
 ...9_FwdThenForwardServletResource_servlet.java |  481 +++++++++
 ..._19_FwdThenIncludeServletAction_servlet.java |  481 +++++++++
 ...2_19_FwdThenIncludeServletEvent_servlet.java |  481 +++++++++
 ..._19_FwdThenIncludeServletRender_servlet.java |  488 +++++++++
 ...9_FwdThenIncludeServletResource_servlet.java |  488 +++++++++
 .../resources/xml-resources/additionalTCs.xml   |  257 +++++
 .../src/main/webapp/WEB-INF/portlet.xml         |  256 +++++
 .../src/main/webapp/WEB-INF/web.xml             |  136 +++
 .../beans/JSR286DispatcherTestCaseDetails.java  | 1000 +++++++++++++++++-
 .../javax/portlet/tck/constants/Constants.java  |    9 +-
 .../tck/servlets/IncluderForwarderServlet.java  |  108 ++
 portlet-tck_3.0/deploy/pom.xml                  |   12 +
 portlet-tck_3.0/driver/pom.xml                  |   20 +-
 .../main/resources/xml-resources/pageFiles.xml  |    2 +
 .../main/resources/xml-resources/testFiles.xml  |    2 +
 portlet-tck_3.0/pom.xml                         |    6 +
 76 files changed, 15467 insertions(+), 82 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/2a619ecc/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/portlets/DispatcherTests_SPEC2_19_ForwardServletAction.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/portlets/DispatcherTests_SPEC2_19_ForwardServletAction.java b/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/portlets/DispatcherTests_SPEC2_19_ForwardServletAction.java
index b4f678b..f7b1d8c 100644
--- a/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/portlets/DispatcherTests_SPEC2_19_ForwardServletAction.java
+++ b/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/portlets/DispatcherTests_SPEC2_19_ForwardServletAction.java
@@ -235,7 +235,7 @@ public class DispatcherTests_SPEC2_19_ForwardServletAction implements Portlet, R
       /* Details: "If the request dispatcher is obtained through the          */
       /* getRequestDispatcher method, the portlet request attribute           */
       /* javax.servlet.forward.context_path will be set, and equals the       */
-      /* value from HTTPServletRequest.getContestPath for the first servlet   */
+      /* value from HTTPServletRequest.getContextPath for the first servlet   */
       /* in the forward chain"                                                */
       {
          PortletURL aurl = portletResp.createActionURL();
@@ -248,7 +248,7 @@ public class DispatcherTests_SPEC2_19_ForwardServletAction implements Portlet, R
       /* Details: "If the request dispatcher is obtained through the          */
       /* getRequestDispatcher method, the servlet request attribute           */
       /* javax.servlet.forward.context_path will be set, and equals the       */
-      /* value from HTTPServletRequest.getContestPath for the first servlet   */
+      /* value from HTTPServletRequest.getContextPath for the first servlet   */
       /* in the forward chain"                                                */
       {
          PortletURL aurl = portletResp.createActionURL();

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/2a619ecc/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/portlets/DispatcherTests_SPEC2_19_ForwardServletEvent.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/portlets/DispatcherTests_SPEC2_19_ForwardServletEvent.java b/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/portlets/DispatcherTests_SPEC2_19_ForwardServletEvent.java
index cb22a30..c56a724 100644
--- a/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/portlets/DispatcherTests_SPEC2_19_ForwardServletEvent.java
+++ b/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/portlets/DispatcherTests_SPEC2_19_ForwardServletEvent.java
@@ -226,7 +226,7 @@ public class DispatcherTests_SPEC2_19_ForwardServletEvent implements Portlet, Re
       /* Details: "If the request dispatcher is obtained through the          */
       /* getRequestDispatcher method, the portlet request attribute           */
       /* javax.servlet.forward.context_path will be set, and equals the       */
-      /* value from HTTPServletRequest.getContestPath for the first servlet   */
+      /* value from HTTPServletRequest.getContextPath for the first servlet   */
       /* in the forward chain"                                                */
       {
          PortletURL aurl = portletResp.createActionURL();
@@ -239,7 +239,7 @@ public class DispatcherTests_SPEC2_19_ForwardServletEvent implements Portlet, Re
       /* Details: "If the request dispatcher is obtained through the          */
       /* getRequestDispatcher method, the servlet request attribute           */
       /* javax.servlet.forward.context_path will be set, and equals the       */
-      /* value from HTTPServletRequest.getContestPath for the first servlet   */
+      /* value from HTTPServletRequest.getContextPath for the first servlet   */
       /* in the forward chain"                                                */
       {
          PortletURL aurl = portletResp.createActionURL();

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/2a619ecc/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/portlets/DispatcherTests_SPEC2_19_IncludeServletAction.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/portlets/DispatcherTests_SPEC2_19_IncludeServletAction.java b/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/portlets/DispatcherTests_SPEC2_19_IncludeServletAction.java
index 0b97eb1..46e340d 100644
--- a/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/portlets/DispatcherTests_SPEC2_19_IncludeServletAction.java
+++ b/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/portlets/DispatcherTests_SPEC2_19_IncludeServletAction.java
@@ -235,7 +235,7 @@ public class DispatcherTests_SPEC2_19_IncludeServletAction implements Portlet, R
       /* Details: "If the request dispatcher is obtained through the          */
       /* getRequestDispatcher method, the portlet request attribute           */
       /* javax.servlet.include.context_path will be set, and equals the       */
-      /* value from HTTPServletRequest.getContestPath for the first servlet   */
+      /* value from HTTPServletRequest.getContextPath for the first servlet   */
       /* in the include chain"                                                */
       {
          PortletURL aurl = portletResp.createActionURL();
@@ -248,7 +248,7 @@ public class DispatcherTests_SPEC2_19_IncludeServletAction implements Portlet, R
       /* Details: "If the request dispatcher is obtained through the          */
       /* getRequestDispatcher method, the servlet request attribute           */
       /* javax.servlet.include.context_path will be set, and equals the       */
-      /* value from HTTPServletRequest.getContestPath for the first servlet   */
+      /* value from HTTPServletRequest.getContextPath for the first servlet   */
       /* in the include chain"                                                */
       {
          PortletURL aurl = portletResp.createActionURL();

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/2a619ecc/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/portlets/DispatcherTests_SPEC2_19_IncludeServletEvent.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/portlets/DispatcherTests_SPEC2_19_IncludeServletEvent.java b/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/portlets/DispatcherTests_SPEC2_19_IncludeServletEvent.java
index 3c03e5c..8f02073 100644
--- a/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/portlets/DispatcherTests_SPEC2_19_IncludeServletEvent.java
+++ b/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/portlets/DispatcherTests_SPEC2_19_IncludeServletEvent.java
@@ -226,7 +226,7 @@ public class DispatcherTests_SPEC2_19_IncludeServletEvent implements Portlet, Re
       /* Details: "If the request dispatcher is obtained through the          */
       /* getRequestDispatcher method, the portlet request attribute           */
       /* javax.servlet.include.context_path will be set, and equals the       */
-      /* value from HTTPServletRequest.getContestPath for the first servlet   */
+      /* value from HTTPServletRequest.getContextPath for the first servlet   */
       /* in the include chain"                                                */
       {
          PortletURL aurl = portletResp.createActionURL();
@@ -239,7 +239,7 @@ public class DispatcherTests_SPEC2_19_IncludeServletEvent implements Portlet, Re
       /* Details: "If the request dispatcher is obtained through the          */
       /* getRequestDispatcher method, the servlet request attribute           */
       /* javax.servlet.include.context_path will be set, and equals the       */
-      /* value from HTTPServletRequest.getContestPath for the first servlet   */
+      /* value from HTTPServletRequest.getContextPath for the first servlet   */
       /* in the include chain"                                                */
       {
          PortletURL aurl = portletResp.createActionURL();

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/2a619ecc/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/servlets/DispatcherTests_SPEC2_19_ForwardServletAction_servlet.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/servlets/DispatcherTests_SPEC2_19_ForwardServletAction_servlet.java b/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/servlets/DispatcherTests_SPEC2_19_ForwardServletAction_servlet.java
index 2bf8b89..b9a6394 100644
--- a/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/servlets/DispatcherTests_SPEC2_19_ForwardServletAction_servlet.java
+++ b/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/servlets/DispatcherTests_SPEC2_19_ForwardServletAction_servlet.java
@@ -218,7 +218,7 @@ public class DispatcherTests_SPEC2_19_ForwardServletAction_servlet extends HttpS
       /* Details: "If the request dispatcher is obtained through the          */
       /* getRequestDispatcher method, the portlet request attribute           */
       /* javax.servlet.forward.context_path will be set, and equals the       */
-      /* value from HTTPServletRequest.getContestPath for the first servlet   */
+      /* value from HTTPServletRequest.getContextPath for the first servlet   */
       /* in the forward chain"                                                */
       TestResult tr11 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_FORWARDSERVLETACTION_ATTRIBUTES2);
       try {
@@ -233,7 +233,7 @@ public class DispatcherTests_SPEC2_19_ForwardServletAction_servlet extends HttpS
       /* Details: "If the request dispatcher is obtained through the          */
       /* getRequestDispatcher method, the servlet request attribute           */
       /* javax.servlet.forward.context_path will be set, and equals the       */
-      /* value from HTTPServletRequest.getContestPath for the first servlet   */
+      /* value from HTTPServletRequest.getContextPath for the first servlet   */
       /* in the forward chain"                                                */
       TestResult tr12 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_FORWARDSERVLETACTION_ATTRIBUTES2A);
       try {

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/2a619ecc/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/servlets/DispatcherTests_SPEC2_19_ForwardServletEvent_servlet.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/servlets/DispatcherTests_SPEC2_19_ForwardServletEvent_servlet.java b/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/servlets/DispatcherTests_SPEC2_19_ForwardServletEvent_servlet.java
index 577137d..2691d5b 100644
--- a/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/servlets/DispatcherTests_SPEC2_19_ForwardServletEvent_servlet.java
+++ b/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/servlets/DispatcherTests_SPEC2_19_ForwardServletEvent_servlet.java
@@ -218,7 +218,7 @@ public class DispatcherTests_SPEC2_19_ForwardServletEvent_servlet extends HttpSe
       /* Details: "If the request dispatcher is obtained through the          */
       /* getRequestDispatcher method, the portlet request attribute           */
       /* javax.servlet.forward.context_path will be set, and equals the       */
-      /* value from HTTPServletRequest.getContestPath for the first servlet   */
+      /* value from HTTPServletRequest.getContextPath for the first servlet   */
       /* in the forward chain"                                                */
       TestResult tr11 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_FORWARDSERVLETEVENT_ATTRIBUTES2);
       try {
@@ -233,7 +233,7 @@ public class DispatcherTests_SPEC2_19_ForwardServletEvent_servlet extends HttpSe
       /* Details: "If the request dispatcher is obtained through the          */
       /* getRequestDispatcher method, the servlet request attribute           */
       /* javax.servlet.forward.context_path will be set, and equals the       */
-      /* value from HTTPServletRequest.getContestPath for the first servlet   */
+      /* value from HTTPServletRequest.getContextPath for the first servlet   */
       /* in the forward chain"                                                */
       TestResult tr12 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_FORWARDSERVLETEVENT_ATTRIBUTES2A);
       try {

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/2a619ecc/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/servlets/DispatcherTests_SPEC2_19_ForwardServletRender_servlet.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/servlets/DispatcherTests_SPEC2_19_ForwardServletRender_servlet.java b/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/servlets/DispatcherTests_SPEC2_19_ForwardServletRender_servlet.java
index a082ccc..22f552f 100644
--- a/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/servlets/DispatcherTests_SPEC2_19_ForwardServletRender_servlet.java
+++ b/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/servlets/DispatcherTests_SPEC2_19_ForwardServletRender_servlet.java
@@ -218,7 +218,7 @@ public class DispatcherTests_SPEC2_19_ForwardServletRender_servlet extends HttpS
       /* Details: "If the request dispatcher is obtained through the          */
       /* getRequestDispatcher method, the portlet request attribute           */
       /* javax.servlet.forward.context_path will be set, and equals the       */
-      /* value from HTTPServletRequest.getContestPath for the first servlet   */
+      /* value from HTTPServletRequest.getContextPath for the first servlet   */
       /* in the forward chain"                                                */
       TestResult tr11 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_FORWARDSERVLETRENDER_ATTRIBUTES2);
       try {
@@ -233,7 +233,7 @@ public class DispatcherTests_SPEC2_19_ForwardServletRender_servlet extends HttpS
       /* Details: "If the request dispatcher is obtained through the          */
       /* getRequestDispatcher method, the servlet request attribute           */
       /* javax.servlet.forward.context_path will be set, and equals the       */
-      /* value from HTTPServletRequest.getContestPath for the first servlet   */
+      /* value from HTTPServletRequest.getContextPath for the first servlet   */
       /* in the forward chain"                                                */
       TestResult tr12 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_FORWARDSERVLETRENDER_ATTRIBUTES2A);
       try {

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/2a619ecc/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/servlets/DispatcherTests_SPEC2_19_ForwardServletResource_servlet.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/servlets/DispatcherTests_SPEC2_19_ForwardServletResource_servlet.java b/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/servlets/DispatcherTests_SPEC2_19_ForwardServletResource_servlet.java
index 8c460b8..18ef5ac 100644
--- a/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/servlets/DispatcherTests_SPEC2_19_ForwardServletResource_servlet.java
+++ b/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/servlets/DispatcherTests_SPEC2_19_ForwardServletResource_servlet.java
@@ -218,7 +218,7 @@ public class DispatcherTests_SPEC2_19_ForwardServletResource_servlet extends Htt
       /* Details: "If the request dispatcher is obtained through the          */
       /* getRequestDispatcher method, the portlet request attribute           */
       /* javax.servlet.forward.context_path will be set, and equals the       */
-      /* value from HTTPServletRequest.getContestPath for the first servlet   */
+      /* value from HTTPServletRequest.getContextPath for the first servlet   */
       /* in the forward chain"                                                */
       TestResult tr11 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_FORWARDSERVLETRESOURCE_ATTRIBUTES2);
       try {
@@ -233,7 +233,7 @@ public class DispatcherTests_SPEC2_19_ForwardServletResource_servlet extends Htt
       /* Details: "If the request dispatcher is obtained through the          */
       /* getRequestDispatcher method, the servlet request attribute           */
       /* javax.servlet.forward.context_path will be set, and equals the       */
-      /* value from HTTPServletRequest.getContestPath for the first servlet   */
+      /* value from HTTPServletRequest.getContextPath for the first servlet   */
       /* in the forward chain"                                                */
       TestResult tr12 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_FORWARDSERVLETRESOURCE_ATTRIBUTES2A);
       try {

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/2a619ecc/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/servlets/DispatcherTests_SPEC2_19_IncludeServletAction_servlet.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/servlets/DispatcherTests_SPEC2_19_IncludeServletAction_servlet.java b/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/servlets/DispatcherTests_SPEC2_19_IncludeServletAction_servlet.java
index 8857ab2..7196264 100644
--- a/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/servlets/DispatcherTests_SPEC2_19_IncludeServletAction_servlet.java
+++ b/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/servlets/DispatcherTests_SPEC2_19_IncludeServletAction_servlet.java
@@ -218,7 +218,7 @@ public class DispatcherTests_SPEC2_19_IncludeServletAction_servlet extends HttpS
       /* Details: "If the request dispatcher is obtained through the          */
       /* getRequestDispatcher method, the portlet request attribute           */
       /* javax.servlet.include.context_path will be set, and equals the       */
-      /* value from HTTPServletRequest.getContestPath for the first servlet   */
+      /* value from HTTPServletRequest.getContextPath for the first servlet   */
       /* in the include chain"                                                */
       TestResult tr11 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETACTION_ATTRIBUTES2);
       try {
@@ -233,7 +233,7 @@ public class DispatcherTests_SPEC2_19_IncludeServletAction_servlet extends HttpS
       /* Details: "If the request dispatcher is obtained through the          */
       /* getRequestDispatcher method, the servlet request attribute           */
       /* javax.servlet.include.context_path will be set, and equals the       */
-      /* value from HTTPServletRequest.getContestPath for the first servlet   */
+      /* value from HTTPServletRequest.getContextPath for the first servlet   */
       /* in the include chain"                                                */
       TestResult tr12 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETACTION_ATTRIBUTES2A);
       try {

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/2a619ecc/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/servlets/DispatcherTests_SPEC2_19_IncludeServletEvent_servlet.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/servlets/DispatcherTests_SPEC2_19_IncludeServletEvent_servlet.java b/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/servlets/DispatcherTests_SPEC2_19_IncludeServletEvent_servlet.java
index 97032c9..eeb7410 100644
--- a/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/servlets/DispatcherTests_SPEC2_19_IncludeServletEvent_servlet.java
+++ b/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/servlets/DispatcherTests_SPEC2_19_IncludeServletEvent_servlet.java
@@ -218,7 +218,7 @@ public class DispatcherTests_SPEC2_19_IncludeServletEvent_servlet extends HttpSe
       /* Details: "If the request dispatcher is obtained through the          */
       /* getRequestDispatcher method, the portlet request attribute           */
       /* javax.servlet.include.context_path will be set, and equals the       */
-      /* value from HTTPServletRequest.getContestPath for the first servlet   */
+      /* value from HTTPServletRequest.getContextPath for the first servlet   */
       /* in the include chain"                                                */
       TestResult tr11 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETEVENT_ATTRIBUTES2);
       try {
@@ -233,7 +233,7 @@ public class DispatcherTests_SPEC2_19_IncludeServletEvent_servlet extends HttpSe
       /* Details: "If the request dispatcher is obtained through the          */
       /* getRequestDispatcher method, the servlet request attribute           */
       /* javax.servlet.include.context_path will be set, and equals the       */
-      /* value from HTTPServletRequest.getContestPath for the first servlet   */
+      /* value from HTTPServletRequest.getContextPath for the first servlet   */
       /* in the include chain"                                                */
       TestResult tr12 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETEVENT_ATTRIBUTES2A);
       try {

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/2a619ecc/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/servlets/DispatcherTests_SPEC2_19_IncludeServletRender_servlet.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/servlets/DispatcherTests_SPEC2_19_IncludeServletRender_servlet.java b/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/servlets/DispatcherTests_SPEC2_19_IncludeServletRender_servlet.java
index 084842c..d648425 100644
--- a/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/servlets/DispatcherTests_SPEC2_19_IncludeServletRender_servlet.java
+++ b/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/servlets/DispatcherTests_SPEC2_19_IncludeServletRender_servlet.java
@@ -228,7 +228,7 @@ public class DispatcherTests_SPEC2_19_IncludeServletRender_servlet extends HttpS
       /* Details: "If the request dispatcher is obtained through the          */
       /* getRequestDispatcher method, the portlet request attribute           */
       /* javax.servlet.include.context_path will be set, and equals the       */
-      /* value from HTTPServletRequest.getContestPath for the first servlet   */
+      /* value from HTTPServletRequest.getContextPath for the first servlet   */
       /* in the include chain"                                                */
       TestResult tr12 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETRENDER_ATTRIBUTES2);
       try {
@@ -243,7 +243,7 @@ public class DispatcherTests_SPEC2_19_IncludeServletRender_servlet extends HttpS
       /* Details: "If the request dispatcher is obtained through the          */
       /* getRequestDispatcher method, the servlet request attribute           */
       /* javax.servlet.include.context_path will be set, and equals the       */
-      /* value from HTTPServletRequest.getContestPath for the first servlet   */
+      /* value from HTTPServletRequest.getContextPath for the first servlet   */
       /* in the include chain"                                                */
       TestResult tr13 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETRENDER_ATTRIBUTES2A);
       try {

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/2a619ecc/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/servlets/DispatcherTests_SPEC2_19_IncludeServletResource_servlet.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/servlets/DispatcherTests_SPEC2_19_IncludeServletResource_servlet.java b/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/servlets/DispatcherTests_SPEC2_19_IncludeServletResource_servlet.java
index f19f271..1184b1d 100644
--- a/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/servlets/DispatcherTests_SPEC2_19_IncludeServletResource_servlet.java
+++ b/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/servlets/DispatcherTests_SPEC2_19_IncludeServletResource_servlet.java
@@ -228,7 +228,7 @@ public class DispatcherTests_SPEC2_19_IncludeServletResource_servlet extends Htt
       /* Details: "If the request dispatcher is obtained through the          */
       /* getRequestDispatcher method, the portlet request attribute           */
       /* javax.servlet.include.context_path will be set, and equals the       */
-      /* value from HTTPServletRequest.getContestPath for the first servlet   */
+      /* value from HTTPServletRequest.getContextPath for the first servlet   */
       /* in the include chain"                                                */
       TestResult tr12 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETRESOURCE_ATTRIBUTES2);
       try {
@@ -243,7 +243,7 @@ public class DispatcherTests_SPEC2_19_IncludeServletResource_servlet extends Htt
       /* Details: "If the request dispatcher is obtained through the          */
       /* getRequestDispatcher method, the servlet request attribute           */
       /* javax.servlet.include.context_path will be set, and equals the       */
-      /* value from HTTPServletRequest.getContestPath for the first servlet   */
+      /* value from HTTPServletRequest.getContextPath for the first servlet   */
       /* in the include chain"                                                */
       TestResult tr13 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETRESOURCE_ATTRIBUTES2A);
       try {

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/2a619ecc/portlet-tck_3.0/V2DispatcherTests2/src/main/java/javax/portlet/tck/portlets/DispatcherTests2_SPEC2_19_ForwardJSPAction.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests2/src/main/java/javax/portlet/tck/portlets/DispatcherTests2_SPEC2_19_ForwardJSPAction.java b/portlet-tck_3.0/V2DispatcherTests2/src/main/java/javax/portlet/tck/portlets/DispatcherTests2_SPEC2_19_ForwardJSPAction.java
index cb6b68e..c6fc47f 100644
--- a/portlet-tck_3.0/V2DispatcherTests2/src/main/java/javax/portlet/tck/portlets/DispatcherTests2_SPEC2_19_ForwardJSPAction.java
+++ b/portlet-tck_3.0/V2DispatcherTests2/src/main/java/javax/portlet/tck/portlets/DispatcherTests2_SPEC2_19_ForwardJSPAction.java
@@ -235,7 +235,7 @@ public class DispatcherTests2_SPEC2_19_ForwardJSPAction implements Portlet, Reso
       /* Details: "If the request dispatcher is obtained through the          */
       /* getRequestDispatcher method, the portlet request attribute           */
       /* javax.servlet.forward.context_path will be set, and equals the       */
-      /* value from HTTPServletRequest.getContestPath for the first servlet   */
+      /* value from HTTPServletRequest.getContextPath for the first servlet   */
       /* in the forward chain"                                                */
       {
          PortletURL aurl = portletResp.createActionURL();
@@ -248,7 +248,7 @@ public class DispatcherTests2_SPEC2_19_ForwardJSPAction implements Portlet, Reso
       /* Details: "If the request dispatcher is obtained through the          */
       /* getRequestDispatcher method, the servlet request attribute           */
       /* javax.servlet.forward.context_path will be set, and equals the       */
-      /* value from HTTPServletRequest.getContestPath for the first servlet   */
+      /* value from HTTPServletRequest.getContextPath for the first servlet   */
       /* in the forward chain"                                                */
       {
          PortletURL aurl = portletResp.createActionURL();

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/2a619ecc/portlet-tck_3.0/V2DispatcherTests2/src/main/java/javax/portlet/tck/portlets/DispatcherTests2_SPEC2_19_ForwardJSPEvent.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests2/src/main/java/javax/portlet/tck/portlets/DispatcherTests2_SPEC2_19_ForwardJSPEvent.java b/portlet-tck_3.0/V2DispatcherTests2/src/main/java/javax/portlet/tck/portlets/DispatcherTests2_SPEC2_19_ForwardJSPEvent.java
index 8c9ac81..b1a2db8 100644
--- a/portlet-tck_3.0/V2DispatcherTests2/src/main/java/javax/portlet/tck/portlets/DispatcherTests2_SPEC2_19_ForwardJSPEvent.java
+++ b/portlet-tck_3.0/V2DispatcherTests2/src/main/java/javax/portlet/tck/portlets/DispatcherTests2_SPEC2_19_ForwardJSPEvent.java
@@ -226,7 +226,7 @@ public class DispatcherTests2_SPEC2_19_ForwardJSPEvent implements Portlet, Resou
       /* Details: "If the request dispatcher is obtained through the          */
       /* getRequestDispatcher method, the portlet request attribute           */
       /* javax.servlet.forward.context_path will be set, and equals the       */
-      /* value from HTTPServletRequest.getContestPath for the first servlet   */
+      /* value from HTTPServletRequest.getContextPath for the first servlet   */
       /* in the forward chain"                                                */
       {
          PortletURL aurl = portletResp.createActionURL();
@@ -239,7 +239,7 @@ public class DispatcherTests2_SPEC2_19_ForwardJSPEvent implements Portlet, Resou
       /* Details: "If the request dispatcher is obtained through the          */
       /* getRequestDispatcher method, the servlet request attribute           */
       /* javax.servlet.forward.context_path will be set, and equals the       */
-      /* value from HTTPServletRequest.getContestPath for the first servlet   */
+      /* value from HTTPServletRequest.getContextPath for the first servlet   */
       /* in the forward chain"                                                */
       {
          PortletURL aurl = portletResp.createActionURL();

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/2a619ecc/portlet-tck_3.0/V2DispatcherTests2/src/main/java/javax/portlet/tck/portlets/DispatcherTests2_SPEC2_19_IncludeJSPAction.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests2/src/main/java/javax/portlet/tck/portlets/DispatcherTests2_SPEC2_19_IncludeJSPAction.java b/portlet-tck_3.0/V2DispatcherTests2/src/main/java/javax/portlet/tck/portlets/DispatcherTests2_SPEC2_19_IncludeJSPAction.java
index 0631071..ff7369c 100644
--- a/portlet-tck_3.0/V2DispatcherTests2/src/main/java/javax/portlet/tck/portlets/DispatcherTests2_SPEC2_19_IncludeJSPAction.java
+++ b/portlet-tck_3.0/V2DispatcherTests2/src/main/java/javax/portlet/tck/portlets/DispatcherTests2_SPEC2_19_IncludeJSPAction.java
@@ -235,7 +235,7 @@ public class DispatcherTests2_SPEC2_19_IncludeJSPAction implements Portlet, Reso
       /* Details: "If the request dispatcher is obtained through the          */
       /* getRequestDispatcher method, the portlet request attribute           */
       /* javax.servlet.include.context_path will be set, and equals the       */
-      /* value from HTTPServletRequest.getContestPath for the first servlet   */
+      /* value from HTTPServletRequest.getContextPath for the first servlet   */
       /* in the include chain"                                                */
       {
          PortletURL aurl = portletResp.createActionURL();
@@ -248,7 +248,7 @@ public class DispatcherTests2_SPEC2_19_IncludeJSPAction implements Portlet, Reso
       /* Details: "If the request dispatcher is obtained through the          */
       /* getRequestDispatcher method, the servlet request attribute           */
       /* javax.servlet.include.context_path will be set, and equals the       */
-      /* value from HTTPServletRequest.getContestPath for the first servlet   */
+      /* value from HTTPServletRequest.getContextPath for the first servlet   */
       /* in the include chain"                                                */
       {
          PortletURL aurl = portletResp.createActionURL();

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/2a619ecc/portlet-tck_3.0/V2DispatcherTests2/src/main/java/javax/portlet/tck/portlets/DispatcherTests2_SPEC2_19_IncludeJSPEvent.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests2/src/main/java/javax/portlet/tck/portlets/DispatcherTests2_SPEC2_19_IncludeJSPEvent.java b/portlet-tck_3.0/V2DispatcherTests2/src/main/java/javax/portlet/tck/portlets/DispatcherTests2_SPEC2_19_IncludeJSPEvent.java
index 279bad2..cd7ab8d 100644
--- a/portlet-tck_3.0/V2DispatcherTests2/src/main/java/javax/portlet/tck/portlets/DispatcherTests2_SPEC2_19_IncludeJSPEvent.java
+++ b/portlet-tck_3.0/V2DispatcherTests2/src/main/java/javax/portlet/tck/portlets/DispatcherTests2_SPEC2_19_IncludeJSPEvent.java
@@ -226,7 +226,7 @@ public class DispatcherTests2_SPEC2_19_IncludeJSPEvent implements Portlet, Resou
       /* Details: "If the request dispatcher is obtained through the          */
       /* getRequestDispatcher method, the portlet request attribute           */
       /* javax.servlet.include.context_path will be set, and equals the       */
-      /* value from HTTPServletRequest.getContestPath for the first servlet   */
+      /* value from HTTPServletRequest.getContextPath for the first servlet   */
       /* in the include chain"                                                */
       {
          PortletURL aurl = portletResp.createActionURL();
@@ -239,7 +239,7 @@ public class DispatcherTests2_SPEC2_19_IncludeJSPEvent implements Portlet, Resou
       /* Details: "If the request dispatcher is obtained through the          */
       /* getRequestDispatcher method, the servlet request attribute           */
       /* javax.servlet.include.context_path will be set, and equals the       */
-      /* value from HTTPServletRequest.getContestPath for the first servlet   */
+      /* value from HTTPServletRequest.getContextPath for the first servlet   */
       /* in the include chain"                                                */
       {
          PortletURL aurl = portletResp.createActionURL();

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/2a619ecc/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_ForwardJSPAction.jsp
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_ForwardJSPAction.jsp b/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_ForwardJSPAction.jsp
index 33cda74..6b95a58 100644
--- a/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_ForwardJSPAction.jsp
+++ b/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_ForwardJSPAction.jsp
@@ -167,7 +167,7 @@
       /* Details: "If the request dispatcher is obtained through the          */
       /* getRequestDispatcher method, the portlet request attribute           */
       /* javax.servlet.forward.context_path will be set, and equals the       */
-      /* value from HTTPServletRequest.getContestPath for the first servlet   */
+      /* value from HTTPServletRequest.getContextPath for the first servlet   */
       /* in the forward chain"                                                */
       TestResult tr11 = tcd.getTestResultFailed(V2DISPATCHERTESTS2_SPEC2_19_FORWARDJSPACTION_ATTRIBUTES2);
       try {
@@ -182,7 +182,7 @@
       /* Details: "If the request dispatcher is obtained through the          */
       /* getRequestDispatcher method, the servlet request attribute           */
       /* javax.servlet.forward.context_path will be set, and equals the       */
-      /* value from HTTPServletRequest.getContestPath for the first servlet   */
+      /* value from HTTPServletRequest.getContextPath for the first servlet   */
       /* in the forward chain"                                                */
       TestResult tr12 = tcd.getTestResultFailed(V2DISPATCHERTESTS2_SPEC2_19_FORWARDJSPACTION_ATTRIBUTES2A);
       try {

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/2a619ecc/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_ForwardJSPEvent.jsp
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_ForwardJSPEvent.jsp b/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_ForwardJSPEvent.jsp
index 91162dc..02f9bec 100644
--- a/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_ForwardJSPEvent.jsp
+++ b/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_ForwardJSPEvent.jsp
@@ -167,7 +167,7 @@
       /* Details: "If the request dispatcher is obtained through the          */
       /* getRequestDispatcher method, the portlet request attribute           */
       /* javax.servlet.forward.context_path will be set, and equals the       */
-      /* value from HTTPServletRequest.getContestPath for the first servlet   */
+      /* value from HTTPServletRequest.getContextPath for the first servlet   */
       /* in the forward chain"                                                */
       TestResult tr11 = tcd.getTestResultFailed(V2DISPATCHERTESTS2_SPEC2_19_FORWARDJSPEVENT_ATTRIBUTES2);
       try {
@@ -182,7 +182,7 @@
       /* Details: "If the request dispatcher is obtained through the          */
       /* getRequestDispatcher method, the servlet request attribute           */
       /* javax.servlet.forward.context_path will be set, and equals the       */
-      /* value from HTTPServletRequest.getContestPath for the first servlet   */
+      /* value from HTTPServletRequest.getContextPath for the first servlet   */
       /* in the forward chain"                                                */
       TestResult tr12 = tcd.getTestResultFailed(V2DISPATCHERTESTS2_SPEC2_19_FORWARDJSPEVENT_ATTRIBUTES2A);
       try {

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/2a619ecc/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_ForwardJSPRender.jsp
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_ForwardJSPRender.jsp b/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_ForwardJSPRender.jsp
index 76bb886..06eb046 100644
--- a/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_ForwardJSPRender.jsp
+++ b/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_ForwardJSPRender.jsp
@@ -167,7 +167,7 @@
       /* Details: "If the request dispatcher is obtained through the          */
       /* getRequestDispatcher method, the portlet request attribute           */
       /* javax.servlet.forward.context_path will be set, and equals the       */
-      /* value from HTTPServletRequest.getContestPath for the first servlet   */
+      /* value from HTTPServletRequest.getContextPath for the first servlet   */
       /* in the forward chain"                                                */
       TestResult tr11 = tcd.getTestResultFailed(V2DISPATCHERTESTS2_SPEC2_19_FORWARDJSPRENDER_ATTRIBUTES2);
       try {
@@ -182,7 +182,7 @@
       /* Details: "If the request dispatcher is obtained through the          */
       /* getRequestDispatcher method, the servlet request attribute           */
       /* javax.servlet.forward.context_path will be set, and equals the       */
-      /* value from HTTPServletRequest.getContestPath for the first servlet   */
+      /* value from HTTPServletRequest.getContextPath for the first servlet   */
       /* in the forward chain"                                                */
       TestResult tr12 = tcd.getTestResultFailed(V2DISPATCHERTESTS2_SPEC2_19_FORWARDJSPRENDER_ATTRIBUTES2A);
       try {

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/2a619ecc/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_ForwardJSPResource.jsp
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_ForwardJSPResource.jsp b/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_ForwardJSPResource.jsp
index 72de7c5..842c2e3 100644
--- a/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_ForwardJSPResource.jsp
+++ b/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_ForwardJSPResource.jsp
@@ -167,7 +167,7 @@
       /* Details: "If the request dispatcher is obtained through the          */
       /* getRequestDispatcher method, the portlet request attribute           */
       /* javax.servlet.forward.context_path will be set, and equals the       */
-      /* value from HTTPServletRequest.getContestPath for the first servlet   */
+      /* value from HTTPServletRequest.getContextPath for the first servlet   */
       /* in the forward chain"                                                */
       TestResult tr11 = tcd.getTestResultFailed(V2DISPATCHERTESTS2_SPEC2_19_FORWARDJSPRESOURCE_ATTRIBUTES2);
       try {
@@ -182,7 +182,7 @@
       /* Details: "If the request dispatcher is obtained through the          */
       /* getRequestDispatcher method, the servlet request attribute           */
       /* javax.servlet.forward.context_path will be set, and equals the       */
-      /* value from HTTPServletRequest.getContestPath for the first servlet   */
+      /* value from HTTPServletRequest.getContextPath for the first servlet   */
       /* in the forward chain"                                                */
       TestResult tr12 = tcd.getTestResultFailed(V2DISPATCHERTESTS2_SPEC2_19_FORWARDJSPRESOURCE_ATTRIBUTES2A);
       try {

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/2a619ecc/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_IncludeJSPAction.jsp
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_IncludeJSPAction.jsp b/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_IncludeJSPAction.jsp
index b3c56f8..eac8fa8 100644
--- a/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_IncludeJSPAction.jsp
+++ b/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_IncludeJSPAction.jsp
@@ -167,7 +167,7 @@
       /* Details: "If the request dispatcher is obtained through the          */
       /* getRequestDispatcher method, the portlet request attribute           */
       /* javax.servlet.include.context_path will be set, and equals the       */
-      /* value from HTTPServletRequest.getContestPath for the first servlet   */
+      /* value from HTTPServletRequest.getContextPath for the first servlet   */
       /* in the include chain"                                                */
       TestResult tr11 = tcd.getTestResultFailed(V2DISPATCHERTESTS2_SPEC2_19_INCLUDEJSPACTION_ATTRIBUTES2);
       try {
@@ -182,7 +182,7 @@
       /* Details: "If the request dispatcher is obtained through the          */
       /* getRequestDispatcher method, the servlet request attribute           */
       /* javax.servlet.include.context_path will be set, and equals the       */
-      /* value from HTTPServletRequest.getContestPath for the first servlet   */
+      /* value from HTTPServletRequest.getContextPath for the first servlet   */
       /* in the include chain"                                                */
       TestResult tr12 = tcd.getTestResultFailed(V2DISPATCHERTESTS2_SPEC2_19_INCLUDEJSPACTION_ATTRIBUTES2A);
       try {

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/2a619ecc/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_IncludeJSPEvent.jsp
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_IncludeJSPEvent.jsp b/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_IncludeJSPEvent.jsp
index 7c7c40c..b2bd9bc 100644
--- a/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_IncludeJSPEvent.jsp
+++ b/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_IncludeJSPEvent.jsp
@@ -167,7 +167,7 @@
       /* Details: "If the request dispatcher is obtained through the          */
       /* getRequestDispatcher method, the portlet request attribute           */
       /* javax.servlet.include.context_path will be set, and equals the       */
-      /* value from HTTPServletRequest.getContestPath for the first servlet   */
+      /* value from HTTPServletRequest.getContextPath for the first servlet   */
       /* in the include chain"                                                */
       TestResult tr11 = tcd.getTestResultFailed(V2DISPATCHERTESTS2_SPEC2_19_INCLUDEJSPEVENT_ATTRIBUTES2);
       try {
@@ -182,7 +182,7 @@
       /* Details: "If the request dispatcher is obtained through the          */
       /* getRequestDispatcher method, the servlet request attribute           */
       /* javax.servlet.include.context_path will be set, and equals the       */
-      /* value from HTTPServletRequest.getContestPath for the first servlet   */
+      /* value from HTTPServletRequest.getContextPath for the first servlet   */
       /* in the include chain"                                                */
       TestResult tr12 = tcd.getTestResultFailed(V2DISPATCHERTESTS2_SPEC2_19_INCLUDEJSPEVENT_ATTRIBUTES2A);
       try {

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/2a619ecc/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_IncludeJSPRender.jsp
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_IncludeJSPRender.jsp b/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_IncludeJSPRender.jsp
index ff23c07..3f5eea8 100644
--- a/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_IncludeJSPRender.jsp
+++ b/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_IncludeJSPRender.jsp
@@ -177,7 +177,7 @@
       /* Details: "If the request dispatcher is obtained through the          */
       /* getRequestDispatcher method, the portlet request attribute           */
       /* javax.servlet.include.context_path will be set, and equals the       */
-      /* value from HTTPServletRequest.getContestPath for the first servlet   */
+      /* value from HTTPServletRequest.getContextPath for the first servlet   */
       /* in the include chain"                                                */
       TestResult tr12 = tcd.getTestResultFailed(V2DISPATCHERTESTS2_SPEC2_19_INCLUDEJSPRENDER_ATTRIBUTES2);
       try {
@@ -192,7 +192,7 @@
       /* Details: "If the request dispatcher is obtained through the          */
       /* getRequestDispatcher method, the servlet request attribute           */
       /* javax.servlet.include.context_path will be set, and equals the       */
-      /* value from HTTPServletRequest.getContestPath for the first servlet   */
+      /* value from HTTPServletRequest.getContextPath for the first servlet   */
       /* in the include chain"                                                */
       TestResult tr13 = tcd.getTestResultFailed(V2DISPATCHERTESTS2_SPEC2_19_INCLUDEJSPRENDER_ATTRIBUTES2A);
       try {

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/2a619ecc/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_IncludeJSPResource.jsp
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_IncludeJSPResource.jsp b/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_IncludeJSPResource.jsp
index 1cee02d..ee8f23b 100644
--- a/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_IncludeJSPResource.jsp
+++ b/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_IncludeJSPResource.jsp
@@ -177,7 +177,7 @@
       /* Details: "If the request dispatcher is obtained through the          */
       /* getRequestDispatcher method, the portlet request attribute           */
       /* javax.servlet.include.context_path will be set, and equals the       */
-      /* value from HTTPServletRequest.getContestPath for the first servlet   */
+      /* value from HTTPServletRequest.getContextPath for the first servlet   */
       /* in the include chain"                                                */
       TestResult tr12 = tcd.getTestResultFailed(V2DISPATCHERTESTS2_SPEC2_19_INCLUDEJSPRESOURCE_ATTRIBUTES2);
       try {
@@ -192,7 +192,7 @@
       /* Details: "If the request dispatcher is obtained through the          */
       /* getRequestDispatcher method, the servlet request attribute           */
       /* javax.servlet.include.context_path will be set, and equals the       */
-      /* value from HTTPServletRequest.getContestPath for the first servlet   */
+      /* value from HTTPServletRequest.getContextPath for the first servlet   */
       /* in the include chain"                                                */
       TestResult tr13 = tcd.getTestResultFailed(V2DISPATCHERTESTS2_SPEC2_19_INCLUDEJSPRESOURCE_ATTRIBUTES2A);
       try {

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/2a619ecc/portlet-tck_3.0/V2DispatcherTests5/pom.xml
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests5/pom.xml b/portlet-tck_3.0/V2DispatcherTests5/pom.xml
new file mode 100644
index 0000000..3ab6443
--- /dev/null
+++ b/portlet-tck_3.0/V2DispatcherTests5/pom.xml
@@ -0,0 +1,127 @@
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.     
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+   <modelVersion>4.0.0</modelVersion>
+
+   <parent>
+      <groupId>javax.portlet</groupId>
+      <artifactId>tck</artifactId>
+      <version>3.0-SNAPSHOT</version>
+   </parent>
+
+   <artifactId>tck-V2DispatcherTests5</artifactId>
+   <packaging>war</packaging>
+
+   <dependencies>
+      <dependency>
+         <groupId>javax.portlet</groupId>
+         <artifactId>portlet-api</artifactId>
+      </dependency>
+      <dependency>
+         <groupId>javax.servlet</groupId>
+         <artifactId>servlet-api</artifactId>
+      </dependency>
+      <dependency>
+         <groupId>javax.portlet</groupId>
+         <artifactId>tck-common</artifactId>
+         <version>${project.version}</version>
+         <scope>compile</scope>
+      </dependency>
+   </dependencies>
+
+   <properties>
+
+      <!-- This project contains additional test cases to run with the portlets -->
+      <additional.testcase.uri>file:///${basedir}/src/main/resources/xml-resources/additionalTCs.xml</additional.testcase.uri>
+
+      <!-- Set to true for modules that define all test cases in a file (TCs are not generated from the portlet.xml) -->
+      <additional.testcases.only>true</additional.testcases.only>
+
+      <!-- put all portlets from this module on the same page -->
+      <page.file.xsl>plutoMultiPortletPage.xsl</page.file.xsl>
+
+   </properties>
+
+   <build>
+      <finalName>${project.artifactId}</finalName>
+      <plugins>
+         <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-compiler-plugin</artifactId>
+         </plugin>
+         <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-war-plugin</artifactId>
+         </plugin>
+         <!-- Transform the portlet XML into test properties XML file -->
+         <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-dependency-plugin</artifactId>
+         </plugin>
+         <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>xml-maven-plugin</artifactId>
+         </plugin>
+      </plugins>
+   </build>
+
+
+   <profiles>
+      <profile>
+         <id>pluto</id>
+
+         <dependencies>
+            <dependency>
+               <groupId>javax.servlet</groupId>
+               <artifactId>jstl</artifactId>
+            </dependency>
+            <dependency>
+               <groupId>taglibs</groupId>
+               <artifactId>standard</artifactId>
+            </dependency>
+         </dependencies>
+
+         <build>
+            <plugins>
+               <plugin>
+                  <artifactId>maven-war-plugin</artifactId>
+                  <configuration>
+                     <webXml>${project.build.directory}/pluto-resources/web.xml</webXml>
+                  </configuration>
+               </plugin>
+               <!-- bind 'pluto:assemble' goal to 'generate-resources' lifecycle -->
+               <plugin>
+                  <groupId>org.apache.portals.pluto</groupId>
+                  <artifactId>maven-pluto-plugin</artifactId>
+                  <executions>
+                     <execution>
+                        <phase>generate-resources</phase>
+                        <goals>
+                           <goal>assemble</goal>
+                        </goals>
+                     </execution>
+                  </executions>
+               </plugin>
+            </plugins>
+         </build>
+      </profile>
+   </profiles>
+
+</project>

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/2a619ecc/portlet-tck_3.0/V2DispatcherTests5/src/main/java/javax/portlet/tck/portlets/DispatcherTests5_SPEC2_19_IncThenForwardServletAction.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests5/src/main/java/javax/portlet/tck/portlets/DispatcherTests5_SPEC2_19_IncThenForwardServletAction.java b/portlet-tck_3.0/V2DispatcherTests5/src/main/java/javax/portlet/tck/portlets/DispatcherTests5_SPEC2_19_IncThenForwardServletAction.java
new file mode 100644
index 0000000..76fa04b
--- /dev/null
+++ b/portlet-tck_3.0/V2DispatcherTests5/src/main/java/javax/portlet/tck/portlets/DispatcherTests5_SPEC2_19_IncThenForwardServletAction.java
@@ -0,0 +1,461 @@
+/*  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+
+package javax.portlet.tck.portlets;
+
+import java.io.*;
+import java.util.*;
+import java.util.logging.*;
+import static java.util.logging.Logger.*;
+import javax.xml.namespace.QName;
+import javax.portlet.*;
+import javax.portlet.filter.*;
+import javax.servlet.*;
+import javax.servlet.http.*;
+import javax.portlet.tck.beans.*;
+import javax.portlet.tck.constants.*;
+import static javax.portlet.tck.beans.JSR286DispatcherTestCaseDetails.*;
+import static javax.portlet.tck.constants.Constants.*;
+import static javax.portlet.PortletSession.*;
+import static javax.portlet.ResourceURL.*;
+
+/**
+ * This portlet implements several test cases for the JSR 362 TCK. The test case names
+ * are defined in the /src/main/resources/xml-resources/additionalTCs.xml
+ * file. The build process will integrate the test case names defined in the 
+ * additionalTCs.xml file into the complete list of test case names for execution by the driver.
+ *
+ * This is the main portlet for the test cases. If the test cases call for events, this portlet
+ * will initiate the events, but not process them. The processing is done in the companion 
+ * portlet DispatcherTests5_SPEC2_19_IncThenForwardServletAction_event
+ *
+ */
+public class DispatcherTests5_SPEC2_19_IncThenForwardServletAction implements Portlet, ResourceServingPortlet {
+   private static final String LOG_CLASS = 
+         DispatcherTests5_SPEC2_19_IncThenForwardServletAction.class.getName();
+   private final Logger LOGGER = Logger.getLogger(LOG_CLASS);
+   
+   private PortletConfig portletConfig = null;
+
+   @Override
+   public void init(PortletConfig config) throws PortletException {
+      this.portletConfig = config;
+   }
+
+   @Override
+   public void destroy() {
+   }
+
+   @Override
+   public void processAction(ActionRequest portletReq, ActionResponse portletResp)
+         throws PortletException, IOException {
+      LOGGER.entering(LOG_CLASS, "main portlet processAction entry");
+
+      portletResp.setRenderParameters(portletReq.getParameterMap());
+      long tid = Thread.currentThread().getId();
+      portletReq.setAttribute(THREADID_ATTR, tid);
+
+      StringWriter writer = new StringWriter();
+
+      // Multilevel forward / include
+      portletReq.setAttribute(ATTR_DISPATCH_ACTION, "forward");
+      String targ = SERVLET_PREFIX + "DispatcherTests5_SPEC2_19_IncThenForwardServletAction_servlet" + SERVLET_SUFFIX + "?" + QUERY_STRING;
+      portletReq.setAttribute(ATTR_DISPATCH_TARGET, targ);
+
+      // Now do the actual dispatch
+      String target = "/IncluderForwarderServlet" + "?" + QUERY_STRING;
+      PortletRequestDispatcher rd = portletConfig.getPortletContext()
+            .getRequestDispatcher(target);
+      rd.include(portletReq, portletResp);
+   }
+
+   @Override
+   public void serveResource(ResourceRequest portletReq, ResourceResponse portletResp)
+         throws PortletException, IOException {
+      LOGGER.entering(LOG_CLASS, "main portlet serveResource entry");
+
+      long tid = Thread.currentThread().getId();
+      portletReq.setAttribute(THREADID_ATTR, tid);
+
+      PrintWriter writer = portletResp.getWriter();
+
+   }
+
+   @Override
+   public void render(RenderRequest portletReq, RenderResponse portletResp)
+         throws PortletException, IOException {
+      LOGGER.entering(LOG_CLASS, "main portlet render entry");
+
+      long tid = Thread.currentThread().getId();
+      portletReq.setAttribute(THREADID_ATTR, tid);
+
+      PrintWriter writer = portletResp.getWriter();
+
+      PortletSession ps = portletReq.getPortletSession();
+      String msg = (String) ps.getAttribute(RESULT_ATTR_PREFIX + "DispatcherTests5_SPEC2_19_IncThenForwardServletAction", APPLICATION_SCOPE);
+      if (msg != null) {
+         writer.write("<p>" + msg + "</p><br/>\n");
+         ps.removeAttribute(RESULT_ATTR_PREFIX + "DispatcherTests5_SPEC2_19_IncThenForwardServletAction", APPLICATION_SCOPE);
+      }
+
+      /* TestCase: V2DispatcherTests5_SPEC2_19_IncThenForwardServletAction_dispatch1 */
+      /* Details: "In a servlet forwarded to by the target of an include,     */
+      /* if the path provided to getRequestDispatcher method contains query   */
+      /* strings, parameters specified in the query strings must be passed    */
+      /* to the target servlet during an forward"                             */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2DispatcherTests5_SPEC2_19_IncThenForwardServletAction_dispatch1", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2DispatcherTests5_SPEC2_19_IncThenForwardServletAction_dispatch2 */
+      /* Details: "In a servlet forwarded to by the target of an include,     */
+      /* parameters specified in the query strings must be aggregated with    */
+      /* the portlet render parameters"                                       */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2DispatcherTests5_SPEC2_19_IncThenForwardServletAction_dispatch2", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2DispatcherTests5_SPEC2_19_IncThenForwardServletAction_dispatch3 */
+      /* Details: "In a servlet forwarded to by the target of an include,     */
+      /* if query string parameters have the same names as render parameter   */
+      /* names, the query string parameters appear in the parameter values    */
+      /* array before the render parameter values"                            */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2DispatcherTests5_SPEC2_19_IncThenForwardServletAction_dispatch3", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2DispatcherTests5_SPEC2_19_IncThenForwardServletAction_invoke2 */
+      /* Details: "In a servlet forwarded to by the target of an include,     */
+      /* parameters to the forward method for a target servlet can be the     */
+      /* request and response classes from the portlet lifecyle method        */
+      /* initiating the include"                                              */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2DispatcherTests5_SPEC2_19_IncThenForwardServletAction_invoke2", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2DispatcherTests5_SPEC2_19_IncThenForwardServletAction_invoke4 */
+      /* Details: "In a servlet forwarded to by the target of an include,     */
+      /* the portlet container must invoke the target servlet in the same     */
+      /* thread as the PortletRequestDispatcher include invocation"           */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2DispatcherTests5_SPEC2_19_IncThenForwardServletAction_invoke4", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2DispatcherTests5_SPEC2_19_IncThenForwardServletAction_invoke7 */
+      /* Details: "In a servlet forwarded to by the target of an include,     */
+      /* the path elements of the request object exposed to the target        */
+      /* servlet must reflect the path used to obtain the                     */
+      /* RequestDispatcher"                                                   */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2DispatcherTests5_SPEC2_19_IncThenForwardServletAction_invoke7", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2DispatcherTests5_SPEC2_19_IncThenForwardServletAction_attributes1 */
+      /* Details: "In a servlet forwarded to by the target of an include,     */
+      /* the portlet request attribute javax.servlet.forward.request_uri      */
+      /* will be set, and equals the value from                               */
+      /* HTTPServletRequest.getRequestURI for the first servlet in the        */
+      /* forward chain"                                                       */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2DispatcherTests5_SPEC2_19_IncThenForwardServletAction_attributes1", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2DispatcherTests5_SPEC2_19_IncThenForwardServletAction_attributes1a */
+      /* Details: "In a servlet forwarded to by the target of an include,     */
+      /* the servlet request attribute javax.servlet.forward.request_uri      */
+      /* will be set, and equals the value from                               */
+      /* HTTPServletRequest.getRequestURI for the first servlet in the        */
+      /* forward chain"                                                       */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2DispatcherTests5_SPEC2_19_IncThenForwardServletAction_attributes1a", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2DispatcherTests5_SPEC2_19_IncThenForwardServletAction_attributes1b */
+      /* Details: "In a servlet forwarded to by the target of an include,     */
+      /* the portlet request attribute javax.servlet.include.request_uri      */
+      /* will not be set"                                                     */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2DispatcherTests5_SPEC2_19_IncThenForwardServletAction_attributes1b", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2DispatcherTests5_SPEC2_19_IncThenForwardServletAction_attributes1c */
+      /* Details: "In a servlet forwarded to by the target of an include,     */
+      /* the servlet request attribute javax.servlet.include.request_uri      */
+      /* will not be set"                                                     */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2DispatcherTests5_SPEC2_19_IncThenForwardServletAction_attributes1c", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2DispatcherTests5_SPEC2_19_IncThenForwardServletAction_attributes2 */
+      /* Details: "In a servlet forwarded to by the target of an include,     */
+      /* the portlet request attribute javax.servlet.forward.context_path     */
+      /* will be set, and equals the value from                               */
+      /* HTTPServletRequest.getContextPath for the first servlet in the       */
+      /* forward chain"                                                       */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2DispatcherTests5_SPEC2_19_IncThenForwardServletAction_attributes2", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2DispatcherTests5_SPEC2_19_IncThenForwardServletAction_attributes2a */
+      /* Details: "In a servlet forwarded to by the target of an include,     */
+      /* the servlet request attribute javax.servlet.forward.context_path     */
+      /* will be set, and equals the value from                               */
+      /* HTTPServletRequest.getContextPath for the first servlet in the       */
+      /* forward chain"                                                       */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2DispatcherTests5_SPEC2_19_IncThenForwardServletAction_attributes2a", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2DispatcherTests5_SPEC2_19_IncThenForwardServletAction_attributes2b */
+      /* Details: "In a servlet forwarded to by the target of an include,     */
+      /* the portlet request attribute javax.servlet.include.context_path     */
+      /* will not be set"                                                     */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2DispatcherTests5_SPEC2_19_IncThenForwardServletAction_attributes2b", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2DispatcherTests5_SPEC2_19_IncThenForwardServletAction_attributes2c */
+      /* Details: "In a servlet forwarded to by the target of an include,     */
+      /* the servlet request attribute javax.servlet.include.context_path     */
+      /* will not be set"                                                     */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2DispatcherTests5_SPEC2_19_IncThenForwardServletAction_attributes2c", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2DispatcherTests5_SPEC2_19_IncThenForwardServletAction_attributes3 */
+      /* Details: "In a servlet forwarded to by the target of an include,     */
+      /* the portlet request attribute javax.servlet.forward.servlet_path     */
+      /* will be set, and equals the value from                               */
+      /* HTTPServletRequest.getServletPath for the first servlet in the       */
+      /* forward chain"                                                       */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2DispatcherTests5_SPEC2_19_IncThenForwardServletAction_attributes3", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2DispatcherTests5_SPEC2_19_IncThenForwardServletAction_attributes3a */
+      /* Details: "In a servlet forwarded to by the target of an include,     */
+      /* the servlet request attribute javax.servlet.forward.servlet_path     */
+      /* will be set, and equals the value from                               */
+      /* HTTPServletRequest.getServletPath for the first servlet in the       */
+      /* forward chain"                                                       */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2DispatcherTests5_SPEC2_19_IncThenForwardServletAction_attributes3a", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2DispatcherTests5_SPEC2_19_IncThenForwardServletAction_attributes3b */
+      /* Details: "In a servlet forwarded to by the target of an include,     */
+      /* the portlet request attribute javax.servlet.include.servlet_path     */
+      /* will not be set"                                                     */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2DispatcherTests5_SPEC2_19_IncThenForwardServletAction_attributes3b", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2DispatcherTests5_SPEC2_19_IncThenForwardServletAction_attributes3c */
+      /* Details: "In a servlet forwarded to by the target of an include,     */
+      /* the servlet request attribute javax.servlet.include.servlet_path     */
+      /* will not be set"                                                     */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2DispatcherTests5_SPEC2_19_IncThenForwardServletAction_attributes3c", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2DispatcherTests5_SPEC2_19_IncThenForwardServletAction_attributes4 */
+      /* Details: "In a servlet forwarded to by the target of an include,     */
+      /* the portlet request attribute javax.servlet.forward.path_info will   */
+      /* be set, and equals the value from HTTPServletRequest.getPathInfo     */
+      /* for the first servlet in the forward chain"                          */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2DispatcherTests5_SPEC2_19_IncThenForwardServletAction_attributes4", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2DispatcherTests5_SPEC2_19_IncThenForwardServletAction_attributes4a */
+      /* Details: "In a servlet forwarded to by the target of an include,     */
+      /* the servlet request attribute javax.servlet.forward.path_info will   */
+      /* be set, and equals the value from HTTPServletRequest.getPathInfo     */
+      /* for the first servlet in the forward chain"                          */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2DispatcherTests5_SPEC2_19_IncThenForwardServletAction_attributes4a", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2DispatcherTests5_SPEC2_19_IncThenForwardServletAction_attributes4b */
+      /* Details: "In a servlet forwarded to by the target of an include,     */
+      /* the portlet request attribute javax.servlet.include.path_info will   */
+      /* not be set"                                                          */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2DispatcherTests5_SPEC2_19_IncThenForwardServletAction_attributes4b", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2DispatcherTests5_SPEC2_19_IncThenForwardServletAction_attributes4c */
+      /* Details: "In a servlet forwarded to by the target of an include,     */
+      /* the servlet request attribute javax.servlet.include.path_info will   */
+      /* not be set"                                                          */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2DispatcherTests5_SPEC2_19_IncThenForwardServletAction_attributes4c", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2DispatcherTests5_SPEC2_19_IncThenForwardServletAction_attributes5 */
+      /* Details: "In a servlet forwarded to by the target of an include,     */
+      /* the portlet request attribute javax.servlet.forward.query_string     */
+      /* will be set, and equals the value from                               */
+      /* HTTPServletRequest.getQueryString for the first servlet in the       */
+      /* forward chain"                                                       */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2DispatcherTests5_SPEC2_19_IncThenForwardServletAction_attributes5", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2DispatcherTests5_SPEC2_19_IncThenForwardServletAction_attributes5a */
+      /* Details: "In a servlet forwarded to by the target of an include,     */
+      /* the servlet request attribute javax.servlet.forward.query_string     */
+      /* will be set, and equals the value from                               */
+      /* HTTPServletRequest.getQueryString for the first servlet in the       */
+      /* forward chain"                                                       */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2DispatcherTests5_SPEC2_19_IncThenForwardServletAction_attributes5a", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2DispatcherTests5_SPEC2_19_IncThenForwardServletAction_attributes5b */
+      /* Details: "In a servlet forwarded to by the target of an include,     */
+      /* the portlet request attribute javax.servlet.include.query_string     */
+      /* will not be set"                                                     */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2DispatcherTests5_SPEC2_19_IncThenForwardServletAction_attributes5b", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2DispatcherTests5_SPEC2_19_IncThenForwardServletAction_attributes5c */
+      /* Details: "In a servlet forwarded to by the target of an include,     */
+      /* the servlet request attribute javax.servlet.include.query_string     */
+      /* will not be set"                                                     */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2DispatcherTests5_SPEC2_19_IncThenForwardServletAction_attributes5c", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2DispatcherTests5_SPEC2_19_IncThenForwardServletAction_attributes6 */
+      /* Details: "In a servlet forwarded to by the target of an include,     */
+      /* the request attribute javax.portlet.config must be set to the        */
+      /* javax.portlet.PortletConfig object"                                  */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2DispatcherTests5_SPEC2_19_IncThenForwardServletAction_attributes6", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2DispatcherTests5_SPEC2_19_IncThenForwardServletAction_attributes7 */
+      /* Details: "In a servlet forwarded to by the target of an include,     */
+      /* for forwards from the processAction method, The request attribute    */
+      /* javax.portlet.request must be set to the                             */
+      /* javax.portlet.ActionRequest object"                                  */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2DispatcherTests5_SPEC2_19_IncThenForwardServletAction_attributes7", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2DispatcherTests5_SPEC2_19_IncThenForwardServletAction_attributes8 */
+      /* Details: "In a servlet forwarded to by the target of an include,     */
+      /* for forwards from the processAction method, The request attribute    */
+      /* javax.portlet.response must be set to the                            */
+      /* javax.portlet.ActionResponse object"                                 */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2DispatcherTests5_SPEC2_19_IncThenForwardServletAction_attributes8", aurl);
+         tb.writeTo(writer);
+      }
+
+   }
+
+}