portals-pluto-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From msnickl...@apache.org
Subject [50/50] [abbrv] git commit: Completed code generation for dispatcher request / response tests. Moved tests that need to be written manually into separate module - DispatcherReqRespTests5S.
Date Wed, 20 Aug 2014 06:43:03 GMT
Completed code generation for dispatcher request / response tests. Moved
tests that need to be written manually into separate module -
DispatcherReqRespTests5S.


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

Branch: refs/heads/master
Commit: 368fbd4dc1a015519984520b5ee23672cd84e81e
Parents: 6e60b5f
Author: Scott Nicklous <msnicklous@apache.org>
Authored: Wed Aug 20 08:32:12 2014 +0200
Committer: Scott Nicklous <msnicklous@apache.org>
Committed: Wed Aug 20 08:32:12 2014 +0200

----------------------------------------------------------------------
 ...Tests1_SPEC2_19_ForwardJSPActionRequest.java |   2 +-
 ...ests1_SPEC2_19_ForwardJSPActionResponse.java |   2 +-
 ...1_SPEC2_19_ForwardJSPEventRequest_event.java |   2 +-
 ..._SPEC2_19_ForwardJSPEventResponse_event.java |   2 +-
 ...Tests1_SPEC2_19_ForwardJSPRenderRequest.java |   2 +-
 ...ests1_SPEC2_19_ForwardJSPRenderResponse.java |   2 +-
 ...sts1_SPEC2_19_ForwardJSPResourceRequest.java |   2 +-
 ...ts1_SPEC2_19_ForwardJSPResourceResponse.java |   2 +-
 ...pTests1_SPEC2_19_ForwardJSPActionRequest.jsp |  13 +-
 ...spTests1_SPEC2_19_ForwardJSPEventRequest.jsp |  13 +-
 ...pTests1_SPEC2_19_ForwardJSPRenderRequest.jsp |  13 +-
 ...ests1_SPEC2_19_ForwardJSPResourceRequest.jsp |  13 +-
 ...s2_SPEC2_19_ForwardServletActionRequest.java |   2 +-
 ...2_SPEC2_19_ForwardServletActionResponse.java |   2 +-
 ...EC2_19_ForwardServletEventRequest_event.java |   2 +-
 ...C2_19_ForwardServletEventResponse_event.java |   2 +-
 ...s2_SPEC2_19_ForwardServletRenderRequest.java |   2 +-
 ...2_SPEC2_19_ForwardServletRenderResponse.java |   2 +-
 ..._SPEC2_19_ForwardServletResourceRequest.java |   2 +-
 ...SPEC2_19_ForwardServletResourceResponse.java |   2 +-
 ..._19_ForwardServletActionRequest_servlet.java |  13 +-
 ...2_19_ForwardServletEventRequest_servlet.java |  13 +-
 ..._19_ForwardServletRenderRequest_servlet.java |  13 +-
 ...9_ForwardServletResourceRequest_servlet.java |  13 +-
 ...Tests3_SPEC2_19_IncludeJSPActionRequest.java |   2 +-
 ...ests3_SPEC2_19_IncludeJSPActionResponse.java |   2 +-
 ...3_SPEC2_19_IncludeJSPEventRequest_event.java |   2 +-
 ..._SPEC2_19_IncludeJSPEventResponse_event.java |   2 +-
 ...Tests3_SPEC2_19_IncludeJSPRenderRequest.java |   2 +-
 ...ests3_SPEC2_19_IncludeJSPRenderResponse.java |   2 +-
 ...sts3_SPEC2_19_IncludeJSPResourceRequest.java |   2 +-
 ...ts3_SPEC2_19_IncludeJSPResourceResponse.java |   2 +-
 ...pTests3_SPEC2_19_IncludeJSPActionRequest.jsp |  13 +-
 ...spTests3_SPEC2_19_IncludeJSPEventRequest.jsp |  13 +-
 ...pTests3_SPEC2_19_IncludeJSPRenderRequest.jsp |  13 +-
 ...ests3_SPEC2_19_IncludeJSPResourceRequest.jsp |  13 +-
 ...s4_SPEC2_19_IncludeServletActionRequest.java |   2 +-
 ...4_SPEC2_19_IncludeServletActionResponse.java |   2 +-
 ...EC2_19_IncludeServletEventRequest_event.java |   2 +-
 ...C2_19_IncludeServletEventResponse_event.java |   2 +-
 ...s4_SPEC2_19_IncludeServletRenderRequest.java |   2 +-
 ...4_SPEC2_19_IncludeServletRenderResponse.java |   2 +-
 ..._SPEC2_19_IncludeServletResourceRequest.java |   2 +-
 ...SPEC2_19_IncludeServletResourceResponse.java |   2 +-
 ..._19_IncludeServletActionRequest_servlet.java |  13 +-
 ...2_19_IncludeServletEventRequest_servlet.java |  13 +-
 ..._19_IncludeServletRenderRequest_servlet.java |  13 +-
 ...9_IncludeServletResourceRequest_servlet.java |  13 +-
 .../V2DispatcherReqRespTests5S/pom.xml          | 127 +++++++
 ...ests5S_SPEC2_19_ForwardJSPActionRequest.java | 134 +++++++
 ...sts5S_SPEC2_19_ForwardJSPActionResponse.java | 123 +++++++
 ...ests5S_SPEC2_19_ForwardJSPRenderRequest.java | 105 ++++++
 ...sts5S_SPEC2_19_ForwardJSPRenderResponse.java | 105 ++++++
 ...ts5S_SPEC2_19_ForwardJSPResourceRequest.java | 120 +++++++
 ...s5S_SPEC2_19_ForwardJSPResourceResponse.java | 120 +++++++
 ...5S_SPEC2_19_ForwardServletActionRequest.java | 134 +++++++
 ...S_SPEC2_19_ForwardServletActionResponse.java | 123 +++++++
 ...5S_SPEC2_19_ForwardServletRenderRequest.java | 105 ++++++
 ...S_SPEC2_19_ForwardServletRenderResponse.java | 105 ++++++
 ..._SPEC2_19_ForwardServletResourceRequest.java | 120 +++++++
 ...SPEC2_19_ForwardServletResourceResponse.java | 120 +++++++
 ...ests5S_SPEC2_19_IncludeJSPActionRequest.java | 134 +++++++
 ...ests5S_SPEC2_19_IncludeJSPRenderRequest.java | 105 ++++++
 ...sts5S_SPEC2_19_IncludeJSPRenderResponse.java | 105 ++++++
 ...ts5S_SPEC2_19_IncludeJSPResourceRequest.java | 120 +++++++
 ...s5S_SPEC2_19_IncludeJSPResourceResponse.java | 120 +++++++
 ...5S_SPEC2_19_IncludeServletActionRequest.java | 134 +++++++
 ...5S_SPEC2_19_IncludeServletRenderRequest.java | 105 ++++++
 ...S_SPEC2_19_IncludeServletRenderResponse.java | 105 ++++++
 ..._SPEC2_19_IncludeServletResourceRequest.java | 120 +++++++
 ...SPEC2_19_IncludeServletResourceResponse.java | 120 +++++++
 ..._19_ForwardServletActionRequest_servlet.java |  99 ++++++
 ...19_ForwardServletActionResponse_servlet.java |  90 +++++
 ..._19_ForwardServletRenderRequest_servlet.java |  87 +++++
 ...19_ForwardServletRenderResponse_servlet.java | 150 ++++++++
 ...9_ForwardServletResourceRequest_servlet.java |  96 +++++
 ..._ForwardServletResourceResponse_servlet.java | 141 ++++++++
 ..._19_IncludeServletActionRequest_servlet.java |  99 ++++++
 ..._19_IncludeServletRenderRequest_servlet.java |  87 +++++
 ...19_IncludeServletRenderResponse_servlet.java | 150 ++++++++
 ...9_IncludeServletResourceRequest_servlet.java |  96 +++++
 ..._IncludeServletResourceResponse_servlet.java | 150 ++++++++
 .../resources/xml-resources/additionalTCs.xml   | 107 ++++++
 ...Tests5S_SPEC2_19_ForwardJSPActionRequest.jsp |  46 +++
 ...ests5S_SPEC2_19_ForwardJSPActionResponse.jsp |  37 ++
 ...Tests5S_SPEC2_19_ForwardJSPRenderRequest.jsp |  34 ++
 ...ests5S_SPEC2_19_ForwardJSPRenderResponse.jsp |  97 +++++
 ...sts5S_SPEC2_19_ForwardJSPResourceRequest.jsp |  43 +++
 ...ts5S_SPEC2_19_ForwardJSPResourceResponse.jsp |  88 +++++
 ...Tests5S_SPEC2_19_IncludeJSPActionRequest.jsp |  46 +++
 ...Tests5S_SPEC2_19_IncludeJSPRenderRequest.jsp |  34 ++
 ...ests5S_SPEC2_19_IncludeJSPRenderResponse.jsp |  97 +++++
 ...sts5S_SPEC2_19_IncludeJSPResourceRequest.jsp |  43 +++
 ...ts5S_SPEC2_19_IncludeJSPResourceResponse.jsp |  97 +++++
 .../src/main/webapp/WEB-INF/portlet.xml         | 355 +++++++++++++++++++
 .../src/main/webapp/WEB-INF/web.xml             | 166 +++++++++
 .../JSR286DispatcherReqRespTestCaseDetails.java | 168 +++++++++
 .../javax/portlet/tck/constants/Constants.java  |   4 +-
 portlet-tck_3.0/deploy/pom.xml                  |   6 +
 portlet-tck_3.0/driver/pom.xml                  |   8 +
 .../main/resources/xml-resources/pageFiles.xml  |   1 +
 .../main/resources/xml-resources/testFiles.xml  |   1 +
 portlet-tck_3.0/pom.xml                         |   1 +
 103 files changed, 5559 insertions(+), 146 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/368fbd4d/portlet-tck_3.0/V2DispatcherReqRespTests1/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests1_SPEC2_19_ForwardJSPActionRequest.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherReqRespTests1/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests1_SPEC2_19_ForwardJSPActionRequest.java b/portlet-tck_3.0/V2DispatcherReqRespTests1/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests1_SPEC2_19_ForwardJSPActionRequest.java
index ef6c8aa..7b80aa8 100644
--- a/portlet-tck_3.0/V2DispatcherReqRespTests1/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests1_SPEC2_19_ForwardJSPActionRequest.java
+++ b/portlet-tck_3.0/V2DispatcherReqRespTests1/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests1_SPEC2_19_ForwardJSPActionRequest.java
@@ -78,7 +78,7 @@ public class DispatcherReqRespTests1_SPEC2_19_ForwardJSPActionRequest implements
       // Prereq for: V2DispatcherReqRespTests1_SPEC2_19_ForwardJSPActionRequest_getAttributeNames
       portletReq.setAttribute(ATTR_PREFIX + "V2DispatcherReqRespTests1_SPEC2_19_ForwardJSPActionRequest_getAttributeNames", "Value1");
 
-      String target = JSP_PREFIX + "DispatcherReqRespTests1_SPEC2_19_ForwardJSPActionRequest" + JSP_SUFFIX + QUERY_STRING;
+      String target = JSP_PREFIX + "DispatcherReqRespTests1_SPEC2_19_ForwardJSPActionRequest" + JSP_SUFFIX + "?" + QUERY_STRING;
       PortletRequestDispatcher rd = portletConfig.getPortletContext()
             .getRequestDispatcher(target);
       rd.forward(portletReq, portletResp);

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/368fbd4d/portlet-tck_3.0/V2DispatcherReqRespTests1/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests1_SPEC2_19_ForwardJSPActionResponse.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherReqRespTests1/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests1_SPEC2_19_ForwardJSPActionResponse.java b/portlet-tck_3.0/V2DispatcherReqRespTests1/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests1_SPEC2_19_ForwardJSPActionResponse.java
index 7a2b557..c8cff4b 100644
--- a/portlet-tck_3.0/V2DispatcherReqRespTests1/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests1_SPEC2_19_ForwardJSPActionResponse.java
+++ b/portlet-tck_3.0/V2DispatcherReqRespTests1/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests1_SPEC2_19_ForwardJSPActionResponse.java
@@ -72,7 +72,7 @@ public class DispatcherReqRespTests1_SPEC2_19_ForwardJSPActionResponse implement
 
       StringWriter writer = new StringWriter();
 
-      String target = JSP_PREFIX + "DispatcherReqRespTests1_SPEC2_19_ForwardJSPActionResponse" + JSP_SUFFIX + QUERY_STRING;
+      String target = JSP_PREFIX + "DispatcherReqRespTests1_SPEC2_19_ForwardJSPActionResponse" + JSP_SUFFIX + "?" + QUERY_STRING;
       PortletRequestDispatcher rd = portletConfig.getPortletContext()
             .getRequestDispatcher(target);
       rd.forward(portletReq, portletResp);

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/368fbd4d/portlet-tck_3.0/V2DispatcherReqRespTests1/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests1_SPEC2_19_ForwardJSPEventRequest_event.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherReqRespTests1/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests1_SPEC2_19_ForwardJSPEventRequest_event.java b/portlet-tck_3.0/V2DispatcherReqRespTests1/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests1_SPEC2_19_ForwardJSPEventRequest_event.java
index 0d374b3..3c4eae6 100644
--- a/portlet-tck_3.0/V2DispatcherReqRespTests1/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests1_SPEC2_19_ForwardJSPEventRequest_event.java
+++ b/portlet-tck_3.0/V2DispatcherReqRespTests1/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests1_SPEC2_19_ForwardJSPEventRequest_event.java
@@ -84,7 +84,7 @@ public class DispatcherReqRespTests1_SPEC2_19_ForwardJSPEventRequest_event imple
       // Prereq for: V2DispatcherReqRespTests1_SPEC2_19_ForwardJSPEventRequest_getAttributeNames
       portletReq.setAttribute(ATTR_PREFIX + "V2DispatcherReqRespTests1_SPEC2_19_ForwardJSPEventRequest_getAttributeNames", "Value1");
 
-      String target = JSP_PREFIX + "DispatcherReqRespTests1_SPEC2_19_ForwardJSPEventRequest" + JSP_SUFFIX + QUERY_STRING;
+      String target = JSP_PREFIX + "DispatcherReqRespTests1_SPEC2_19_ForwardJSPEventRequest" + JSP_SUFFIX + "?" + QUERY_STRING;
       PortletRequestDispatcher rd = portletConfig.getPortletContext()
             .getRequestDispatcher(target);
       rd.forward(portletReq, portletResp);

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/368fbd4d/portlet-tck_3.0/V2DispatcherReqRespTests1/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests1_SPEC2_19_ForwardJSPEventResponse_event.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherReqRespTests1/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests1_SPEC2_19_ForwardJSPEventResponse_event.java b/portlet-tck_3.0/V2DispatcherReqRespTests1/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests1_SPEC2_19_ForwardJSPEventResponse_event.java
index 7148596..8b7dc6e 100644
--- a/portlet-tck_3.0/V2DispatcherReqRespTests1/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests1_SPEC2_19_ForwardJSPEventResponse_event.java
+++ b/portlet-tck_3.0/V2DispatcherReqRespTests1/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests1_SPEC2_19_ForwardJSPEventResponse_event.java
@@ -78,7 +78,7 @@ public class DispatcherReqRespTests1_SPEC2_19_ForwardJSPEventResponse_event impl
 
       StringWriter writer = new StringWriter();
 
-      String target = JSP_PREFIX + "DispatcherReqRespTests1_SPEC2_19_ForwardJSPEventResponse" + JSP_SUFFIX + QUERY_STRING;
+      String target = JSP_PREFIX + "DispatcherReqRespTests1_SPEC2_19_ForwardJSPEventResponse" + JSP_SUFFIX + "?" + QUERY_STRING;
       PortletRequestDispatcher rd = portletConfig.getPortletContext()
             .getRequestDispatcher(target);
       rd.forward(portletReq, portletResp);

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/368fbd4d/portlet-tck_3.0/V2DispatcherReqRespTests1/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests1_SPEC2_19_ForwardJSPRenderRequest.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherReqRespTests1/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests1_SPEC2_19_ForwardJSPRenderRequest.java b/portlet-tck_3.0/V2DispatcherReqRespTests1/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests1_SPEC2_19_ForwardJSPRenderRequest.java
index f1b88d5..eb9245c 100644
--- a/portlet-tck_3.0/V2DispatcherReqRespTests1/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests1_SPEC2_19_ForwardJSPRenderRequest.java
+++ b/portlet-tck_3.0/V2DispatcherReqRespTests1/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests1_SPEC2_19_ForwardJSPRenderRequest.java
@@ -102,7 +102,7 @@ public class DispatcherReqRespTests1_SPEC2_19_ForwardJSPRenderRequest implements
       // Prereq for: V2DispatcherReqRespTests1_SPEC2_19_ForwardJSPRenderRequest_getAttributeNames
       portletReq.setAttribute(ATTR_PREFIX + "V2DispatcherReqRespTests1_SPEC2_19_ForwardJSPRenderRequest_getAttributeNames", "Value1");
 
-      String target = JSP_PREFIX + "DispatcherReqRespTests1_SPEC2_19_ForwardJSPRenderRequest" + JSP_SUFFIX + QUERY_STRING;
+      String target = JSP_PREFIX + "DispatcherReqRespTests1_SPEC2_19_ForwardJSPRenderRequest" + JSP_SUFFIX + "?" + QUERY_STRING;
       PortletRequestDispatcher rd = portletConfig.getPortletContext()
             .getRequestDispatcher(target);
       rd.forward(portletReq, portletResp);

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/368fbd4d/portlet-tck_3.0/V2DispatcherReqRespTests1/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests1_SPEC2_19_ForwardJSPRenderResponse.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherReqRespTests1/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests1_SPEC2_19_ForwardJSPRenderResponse.java b/portlet-tck_3.0/V2DispatcherReqRespTests1/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests1_SPEC2_19_ForwardJSPRenderResponse.java
index a683568..a3c8031 100644
--- a/portlet-tck_3.0/V2DispatcherReqRespTests1/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests1_SPEC2_19_ForwardJSPRenderResponse.java
+++ b/portlet-tck_3.0/V2DispatcherReqRespTests1/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests1_SPEC2_19_ForwardJSPRenderResponse.java
@@ -96,7 +96,7 @@ public class DispatcherReqRespTests1_SPEC2_19_ForwardJSPRenderResponse implement
 
       PrintWriter writer = portletResp.getWriter();
 
-      String target = JSP_PREFIX + "DispatcherReqRespTests1_SPEC2_19_ForwardJSPRenderResponse" + JSP_SUFFIX + QUERY_STRING;
+      String target = JSP_PREFIX + "DispatcherReqRespTests1_SPEC2_19_ForwardJSPRenderResponse" + JSP_SUFFIX + "?" + QUERY_STRING;
       PortletRequestDispatcher rd = portletConfig.getPortletContext()
             .getRequestDispatcher(target);
       rd.forward(portletReq, portletResp);

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/368fbd4d/portlet-tck_3.0/V2DispatcherReqRespTests1/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests1_SPEC2_19_ForwardJSPResourceRequest.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherReqRespTests1/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests1_SPEC2_19_ForwardJSPResourceRequest.java b/portlet-tck_3.0/V2DispatcherReqRespTests1/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests1_SPEC2_19_ForwardJSPResourceRequest.java
index 702cc14..1645164 100644
--- a/portlet-tck_3.0/V2DispatcherReqRespTests1/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests1_SPEC2_19_ForwardJSPResourceRequest.java
+++ b/portlet-tck_3.0/V2DispatcherReqRespTests1/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests1_SPEC2_19_ForwardJSPResourceRequest.java
@@ -90,7 +90,7 @@ public class DispatcherReqRespTests1_SPEC2_19_ForwardJSPResourceRequest implemen
       // Prereq for: V2DispatcherReqRespTests1_SPEC2_19_ForwardJSPResourceRequest_getAttributeNames
       portletReq.setAttribute(ATTR_PREFIX + "V2DispatcherReqRespTests1_SPEC2_19_ForwardJSPResourceRequest_getAttributeNames", "Value1");
 
-      String target = JSP_PREFIX + "DispatcherReqRespTests1_SPEC2_19_ForwardJSPResourceRequest" + JSP_SUFFIX + QUERY_STRING;
+      String target = JSP_PREFIX + "DispatcherReqRespTests1_SPEC2_19_ForwardJSPResourceRequest" + JSP_SUFFIX + "?" + QUERY_STRING;
       PortletRequestDispatcher rd = portletConfig.getPortletContext()
             .getRequestDispatcher(target);
       rd.forward(portletReq, portletResp);

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/368fbd4d/portlet-tck_3.0/V2DispatcherReqRespTests1/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests1_SPEC2_19_ForwardJSPResourceResponse.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherReqRespTests1/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests1_SPEC2_19_ForwardJSPResourceResponse.java b/portlet-tck_3.0/V2DispatcherReqRespTests1/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests1_SPEC2_19_ForwardJSPResourceResponse.java
index 22585b2..7c2cc52 100644
--- a/portlet-tck_3.0/V2DispatcherReqRespTests1/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests1_SPEC2_19_ForwardJSPResourceResponse.java
+++ b/portlet-tck_3.0/V2DispatcherReqRespTests1/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests1_SPEC2_19_ForwardJSPResourceResponse.java
@@ -84,7 +84,7 @@ public class DispatcherReqRespTests1_SPEC2_19_ForwardJSPResourceResponse impleme
 
       PrintWriter writer = portletResp.getWriter();
 
-      String target = JSP_PREFIX + "DispatcherReqRespTests1_SPEC2_19_ForwardJSPResourceResponse" + JSP_SUFFIX + QUERY_STRING;
+      String target = JSP_PREFIX + "DispatcherReqRespTests1_SPEC2_19_ForwardJSPResourceResponse" + JSP_SUFFIX + "?" + QUERY_STRING;
       PortletRequestDispatcher rd = portletConfig.getPortletContext()
             .getRequestDispatcher(target);
       rd.forward(portletReq, portletResp);

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/368fbd4d/portlet-tck_3.0/V2DispatcherReqRespTests1/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests1_SPEC2_19_ForwardJSPActionRequest.jsp
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherReqRespTests1/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests1_SPEC2_19_ForwardJSPActionRequest.jsp b/portlet-tck_3.0/V2DispatcherReqRespTests1/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests1_SPEC2_19_ForwardJSPActionRequest.jsp
index 592fd83..aa27d9a 100644
--- a/portlet-tck_3.0/V2DispatcherReqRespTests1/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests1_SPEC2_19_ForwardJSPActionRequest.jsp
+++ b/portlet-tck_3.0/V2DispatcherReqRespTests1/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests1_SPEC2_19_ForwardJSPActionRequest.jsp
@@ -131,11 +131,12 @@
       /* the corresponding header name"                                       */
       TestResult tr8 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS1_SPEC2_19_FORWARDJSPACTIONREQUEST_GETDATEHEADER);
       try {
-         long hval = request.getDateHeader(MOD_HEADER);
-         long pval = Long.parseLong(portletReq.getProperty(MOD_HEADER));
+         long hval = request.getDateHeader(DATE_HEADER);
+         String pstr = portletReq.getProperty(DATE_HEADER);
+         long pval = (pstr == null) ? -1 : Long.parseLong(pstr);
          boolean ok = (hval == pval);
          if (!ok) {
-            String str = MOD_HEADER + " from HttpServletRequest: " + hval + ", did not equal " + pval + " from ActionRequest";
+            String str = DATE_HEADER + " from HttpServletRequest: " + hval + ", did not equal " + pval + " from ActionRequest";
             tr8.appendTcDetail(str);
          }
          tr8.setTcSuccess(ok);
@@ -207,7 +208,8 @@
       TestResult tr12 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS1_SPEC2_19_FORWARDJSPACTIONREQUEST_GETINTHEADER);
       try {
          int hval = request.getIntHeader(CONTENT_LENGTH_HEADER);
-         int pval = Integer.parseInt(portletReq.getProperty(CONTENT_LENGTH_HEADER));
+         String pstr = portletReq.getProperty(CONTENT_LENGTH_HEADER);
+         int pval = (pstr == null) ? -1 : Integer.parseInt(pstr);
          boolean ok = (hval == pval);
          if (!ok) {
             String str = CONTENT_LENGTH_HEADER + " from HttpServletRequest: " + hval + ", did not equal " + pval + " from ActionRequest";
@@ -358,7 +360,6 @@
       /* to the path used to obtain the PortletRequestDispatcher"             */
       TestResult tr23 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS1_SPEC2_19_FORWARDJSPACTIONREQUEST_GETPATHINFO);
       try {
-         String sname = JSP_PREFIX + "DispatcherReqRespTests1_SPEC2_19_ForwardJSPActionRequest" + JSP_SUFFIX;
          String hval = request.getPathInfo();
          String pval = null;
          CompareUtils.stringsEqual("HttpServletRequest", hval, " defined: ", pval, tr23);
@@ -372,7 +373,6 @@
       /* PortletRequestDispatcher"                                            */
       TestResult tr24 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS1_SPEC2_19_FORWARDJSPACTIONREQUEST_GETPATHTRANSLATED);
       try {
-         String sname = JSP_PREFIX + "DispatcherReqRespTests1_SPEC2_19_ForwardJSPActionRequest" + JSP_SUFFIX;
          String hval = request.getPathTranslated();
          String pval = null;
          CompareUtils.stringsEqual("HttpServletRequest", hval, " defined: ", pval, tr24);
@@ -396,7 +396,6 @@
       /* PortletRequestDispatcher"                                            */
       TestResult tr26 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS1_SPEC2_19_FORWARDJSPACTIONREQUEST_GETQUERYSTRING);
       try {
-         String sname = JSP_PREFIX + "DispatcherReqRespTests1_SPEC2_19_ForwardJSPActionRequest" + JSP_SUFFIX;
          String hval = request.getQueryString();
          String pval = QUERY_STRING;
          CompareUtils.stringsEqual("HttpServletRequest", hval, " defined: ", pval, tr26);

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/368fbd4d/portlet-tck_3.0/V2DispatcherReqRespTests1/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests1_SPEC2_19_ForwardJSPEventRequest.jsp
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherReqRespTests1/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests1_SPEC2_19_ForwardJSPEventRequest.jsp b/portlet-tck_3.0/V2DispatcherReqRespTests1/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests1_SPEC2_19_ForwardJSPEventRequest.jsp
index 96be965..3d8f7ce 100644
--- a/portlet-tck_3.0/V2DispatcherReqRespTests1/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests1_SPEC2_19_ForwardJSPEventRequest.jsp
+++ b/portlet-tck_3.0/V2DispatcherReqRespTests1/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests1_SPEC2_19_ForwardJSPEventRequest.jsp
@@ -122,11 +122,12 @@
       /* corresponding header name"                                           */
       TestResult tr8 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS1_SPEC2_19_FORWARDJSPEVENTREQUEST_GETDATEHEADER);
       try {
-         long hval = request.getDateHeader(MOD_HEADER);
-         long pval = Long.parseLong(portletReq.getProperty(MOD_HEADER));
+         long hval = request.getDateHeader(DATE_HEADER);
+         String pstr = portletReq.getProperty(DATE_HEADER);
+         long pval = (pstr == null) ? -1 : Long.parseLong(pstr);
          boolean ok = (hval == pval);
          if (!ok) {
-            String str = MOD_HEADER + " from HttpServletRequest: " + hval + ", did not equal " + pval + " from EventRequest";
+            String str = DATE_HEADER + " from HttpServletRequest: " + hval + ", did not equal " + pval + " from EventRequest";
             tr8.appendTcDetail(str);
          }
          tr8.setTcSuccess(ok);
@@ -208,7 +209,8 @@
       TestResult tr13 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS1_SPEC2_19_FORWARDJSPEVENTREQUEST_GETINTHEADER);
       try {
          int hval = request.getIntHeader(CONTENT_LENGTH_HEADER);
-         int pval = Integer.parseInt(portletReq.getProperty(CONTENT_LENGTH_HEADER));
+         String pstr = portletReq.getProperty(CONTENT_LENGTH_HEADER);
+         int pval = (pstr == null) ? -1 : Integer.parseInt(pstr);
          boolean ok = (hval == pval);
          if (!ok) {
             String str = CONTENT_LENGTH_HEADER + " from HttpServletRequest: " + hval + ", did not equal " + pval + " from EventRequest";
@@ -359,7 +361,6 @@
       /* to the path used to obtain the PortletRequestDispatcher"             */
       TestResult tr24 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS1_SPEC2_19_FORWARDJSPEVENTREQUEST_GETPATHINFO);
       try {
-         String sname = JSP_PREFIX + "DispatcherReqRespTests1_SPEC2_19_ForwardJSPEventRequest" + JSP_SUFFIX;
          String hval = request.getPathInfo();
          String pval = null;
          CompareUtils.stringsEqual("HttpServletRequest", hval, " defined: ", pval, tr24);
@@ -373,7 +374,6 @@
       /* PortletRequestDispatcher"                                            */
       TestResult tr25 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS1_SPEC2_19_FORWARDJSPEVENTREQUEST_GETPATHTRANSLATED);
       try {
-         String sname = JSP_PREFIX + "DispatcherReqRespTests1_SPEC2_19_ForwardJSPEventRequest" + JSP_SUFFIX;
          String hval = request.getPathTranslated();
          String pval = null;
          CompareUtils.stringsEqual("HttpServletRequest", hval, " defined: ", pval, tr25);
@@ -397,7 +397,6 @@
       /* PortletRequestDispatcher"                                            */
       TestResult tr27 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS1_SPEC2_19_FORWARDJSPEVENTREQUEST_GETQUERYSTRING);
       try {
-         String sname = JSP_PREFIX + "DispatcherReqRespTests1_SPEC2_19_ForwardJSPEventRequest" + JSP_SUFFIX;
          String hval = request.getQueryString();
          String pval = QUERY_STRING;
          CompareUtils.stringsEqual("HttpServletRequest", hval, " defined: ", pval, tr27);

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/368fbd4d/portlet-tck_3.0/V2DispatcherReqRespTests1/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests1_SPEC2_19_ForwardJSPRenderRequest.jsp
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherReqRespTests1/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests1_SPEC2_19_ForwardJSPRenderRequest.jsp b/portlet-tck_3.0/V2DispatcherReqRespTests1/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests1_SPEC2_19_ForwardJSPRenderRequest.jsp
index 855f73e..1fd8e00 100644
--- a/portlet-tck_3.0/V2DispatcherReqRespTests1/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests1_SPEC2_19_ForwardJSPRenderRequest.jsp
+++ b/portlet-tck_3.0/V2DispatcherReqRespTests1/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests1_SPEC2_19_ForwardJSPRenderRequest.jsp
@@ -122,11 +122,12 @@
       /* the corresponding header name"                                       */
       TestResult tr8 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS1_SPEC2_19_FORWARDJSPRENDERREQUEST_GETDATEHEADER);
       try {
-         long hval = request.getDateHeader(MOD_HEADER);
-         long pval = Long.parseLong(portletReq.getProperty(MOD_HEADER));
+         long hval = request.getDateHeader(DATE_HEADER);
+         String pstr = portletReq.getProperty(DATE_HEADER);
+         long pval = (pstr == null) ? -1 : Long.parseLong(pstr);
          boolean ok = (hval == pval);
          if (!ok) {
-            String str = MOD_HEADER + " from HttpServletRequest: " + hval + ", did not equal " + pval + " from RenderRequest";
+            String str = DATE_HEADER + " from HttpServletRequest: " + hval + ", did not equal " + pval + " from RenderRequest";
             tr8.appendTcDetail(str);
          }
          tr8.setTcSuccess(ok);
@@ -208,7 +209,8 @@
       TestResult tr13 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS1_SPEC2_19_FORWARDJSPRENDERREQUEST_GETINTHEADER);
       try {
          int hval = request.getIntHeader(CONTENT_LENGTH_HEADER);
-         int pval = Integer.parseInt(portletReq.getProperty(CONTENT_LENGTH_HEADER));
+         String pstr = portletReq.getProperty(CONTENT_LENGTH_HEADER);
+         int pval = (pstr == null) ? -1 : Integer.parseInt(pstr);
          boolean ok = (hval == pval);
          if (!ok) {
             String str = CONTENT_LENGTH_HEADER + " from HttpServletRequest: " + hval + ", did not equal " + pval + " from RenderRequest";
@@ -357,7 +359,6 @@
       /* to the path used to obtain the PortletRequestDispatcher"             */
       TestResult tr24 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS1_SPEC2_19_FORWARDJSPRENDERREQUEST_GETPATHINFO);
       try {
-         String sname = JSP_PREFIX + "DispatcherReqRespTests1_SPEC2_19_ForwardJSPRenderRequest" + JSP_SUFFIX;
          String hval = request.getPathInfo();
          String pval = null;
          CompareUtils.stringsEqual("HttpServletRequest", hval, " defined: ", pval, tr24);
@@ -371,7 +372,6 @@
       /* PortletRequestDispatcher"                                            */
       TestResult tr25 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS1_SPEC2_19_FORWARDJSPRENDERREQUEST_GETPATHTRANSLATED);
       try {
-         String sname = JSP_PREFIX + "DispatcherReqRespTests1_SPEC2_19_ForwardJSPRenderRequest" + JSP_SUFFIX;
          String hval = request.getPathTranslated();
          String pval = null;
          CompareUtils.stringsEqual("HttpServletRequest", hval, " defined: ", pval, tr25);
@@ -395,7 +395,6 @@
       /* PortletRequestDispatcher"                                            */
       TestResult tr27 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS1_SPEC2_19_FORWARDJSPRENDERREQUEST_GETQUERYSTRING);
       try {
-         String sname = JSP_PREFIX + "DispatcherReqRespTests1_SPEC2_19_ForwardJSPRenderRequest" + JSP_SUFFIX;
          String hval = request.getQueryString();
          String pval = QUERY_STRING;
          CompareUtils.stringsEqual("HttpServletRequest", hval, " defined: ", pval, tr27);

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/368fbd4d/portlet-tck_3.0/V2DispatcherReqRespTests1/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests1_SPEC2_19_ForwardJSPResourceRequest.jsp
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherReqRespTests1/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests1_SPEC2_19_ForwardJSPResourceRequest.jsp b/portlet-tck_3.0/V2DispatcherReqRespTests1/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests1_SPEC2_19_ForwardJSPResourceRequest.jsp
index 36347a4..ad870cb 100644
--- a/portlet-tck_3.0/V2DispatcherReqRespTests1/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests1_SPEC2_19_ForwardJSPResourceRequest.jsp
+++ b/portlet-tck_3.0/V2DispatcherReqRespTests1/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests1_SPEC2_19_ForwardJSPResourceRequest.jsp
@@ -131,11 +131,12 @@
       /* the corresponding header name"                                       */
       TestResult tr8 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS1_SPEC2_19_FORWARDJSPRESOURCEREQUEST_GETDATEHEADER);
       try {
-         long hval = request.getDateHeader(MOD_HEADER);
-         long pval = Long.parseLong(portletReq.getProperty(MOD_HEADER));
+         long hval = request.getDateHeader(DATE_HEADER);
+         String pstr = portletReq.getProperty(DATE_HEADER);
+         long pval = (pstr == null) ? -1 : Long.parseLong(pstr);
          boolean ok = (hval == pval);
          if (!ok) {
-            String str = MOD_HEADER + " from HttpServletRequest: " + hval + ", did not equal " + pval + " from ResourceRequest";
+            String str = DATE_HEADER + " from HttpServletRequest: " + hval + ", did not equal " + pval + " from ResourceRequest";
             tr8.appendTcDetail(str);
          }
          tr8.setTcSuccess(ok);
@@ -207,7 +208,8 @@
       TestResult tr12 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS1_SPEC2_19_FORWARDJSPRESOURCEREQUEST_GETINTHEADER);
       try {
          int hval = request.getIntHeader(CONTENT_LENGTH_HEADER);
-         int pval = Integer.parseInt(portletReq.getProperty(CONTENT_LENGTH_HEADER));
+         String pstr = portletReq.getProperty(CONTENT_LENGTH_HEADER);
+         int pval = (pstr == null) ? -1 : Integer.parseInt(pstr);
          boolean ok = (hval == pval);
          if (!ok) {
             String str = CONTENT_LENGTH_HEADER + " from HttpServletRequest: " + hval + ", did not equal " + pval + " from ResourceRequest";
@@ -358,7 +360,6 @@
       /* to the path used to obtain the PortletRequestDispatcher"             */
       TestResult tr23 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS1_SPEC2_19_FORWARDJSPRESOURCEREQUEST_GETPATHINFO);
       try {
-         String sname = JSP_PREFIX + "DispatcherReqRespTests1_SPEC2_19_ForwardJSPResourceRequest" + JSP_SUFFIX;
          String hval = request.getPathInfo();
          String pval = null;
          CompareUtils.stringsEqual("HttpServletRequest", hval, " defined: ", pval, tr23);
@@ -372,7 +373,6 @@
       /* PortletRequestDispatcher"                                            */
       TestResult tr24 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS1_SPEC2_19_FORWARDJSPRESOURCEREQUEST_GETPATHTRANSLATED);
       try {
-         String sname = JSP_PREFIX + "DispatcherReqRespTests1_SPEC2_19_ForwardJSPResourceRequest" + JSP_SUFFIX;
          String hval = request.getPathTranslated();
          String pval = null;
          CompareUtils.stringsEqual("HttpServletRequest", hval, " defined: ", pval, tr24);
@@ -396,7 +396,6 @@
       /* PortletRequestDispatcher"                                            */
       TestResult tr26 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS1_SPEC2_19_FORWARDJSPRESOURCEREQUEST_GETQUERYSTRING);
       try {
-         String sname = JSP_PREFIX + "DispatcherReqRespTests1_SPEC2_19_ForwardJSPResourceRequest" + JSP_SUFFIX;
          String hval = request.getQueryString();
          String pval = QUERY_STRING;
          CompareUtils.stringsEqual("HttpServletRequest", hval, " defined: ", pval, tr26);

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/368fbd4d/portlet-tck_3.0/V2DispatcherReqRespTests2/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests2_SPEC2_19_ForwardServletActionRequest.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherReqRespTests2/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests2_SPEC2_19_ForwardServletActionRequest.java b/portlet-tck_3.0/V2DispatcherReqRespTests2/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests2_SPEC2_19_ForwardServletActionRequest.java
index 3c878f8..21c6350 100644
--- a/portlet-tck_3.0/V2DispatcherReqRespTests2/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests2_SPEC2_19_ForwardServletActionRequest.java
+++ b/portlet-tck_3.0/V2DispatcherReqRespTests2/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests2_SPEC2_19_ForwardServletActionRequest.java
@@ -78,7 +78,7 @@ public class DispatcherReqRespTests2_SPEC2_19_ForwardServletActionRequest implem
       // Prereq for: V2DispatcherReqRespTests2_SPEC2_19_ForwardServletActionRequest_getAttributeNames
       portletReq.setAttribute(ATTR_PREFIX + "V2DispatcherReqRespTests2_SPEC2_19_ForwardServletActionRequest_getAttributeNames", "Value1");
 
-      String target = SERVLET_PREFIX + "DispatcherReqRespTests2_SPEC2_19_ForwardServletActionRequest_servlet" + SERVLET_SUFFIX + QUERY_STRING;
+      String target = SERVLET_PREFIX + "DispatcherReqRespTests2_SPEC2_19_ForwardServletActionRequest_servlet" + SERVLET_SUFFIX + "?" + QUERY_STRING;
       PortletRequestDispatcher rd = portletConfig.getPortletContext()
             .getRequestDispatcher(target);
       rd.forward(portletReq, portletResp);

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/368fbd4d/portlet-tck_3.0/V2DispatcherReqRespTests2/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests2_SPEC2_19_ForwardServletActionResponse.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherReqRespTests2/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests2_SPEC2_19_ForwardServletActionResponse.java b/portlet-tck_3.0/V2DispatcherReqRespTests2/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests2_SPEC2_19_ForwardServletActionResponse.java
index 7d7ce62..4ae099d 100644
--- a/portlet-tck_3.0/V2DispatcherReqRespTests2/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests2_SPEC2_19_ForwardServletActionResponse.java
+++ b/portlet-tck_3.0/V2DispatcherReqRespTests2/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests2_SPEC2_19_ForwardServletActionResponse.java
@@ -72,7 +72,7 @@ public class DispatcherReqRespTests2_SPEC2_19_ForwardServletActionResponse imple
 
       StringWriter writer = new StringWriter();
 
-      String target = SERVLET_PREFIX + "DispatcherReqRespTests2_SPEC2_19_ForwardServletActionResponse_servlet" + SERVLET_SUFFIX + QUERY_STRING;
+      String target = SERVLET_PREFIX + "DispatcherReqRespTests2_SPEC2_19_ForwardServletActionResponse_servlet" + SERVLET_SUFFIX + "?" + QUERY_STRING;
       PortletRequestDispatcher rd = portletConfig.getPortletContext()
             .getRequestDispatcher(target);
       rd.forward(portletReq, portletResp);

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/368fbd4d/portlet-tck_3.0/V2DispatcherReqRespTests2/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests2_SPEC2_19_ForwardServletEventRequest_event.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherReqRespTests2/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests2_SPEC2_19_ForwardServletEventRequest_event.java b/portlet-tck_3.0/V2DispatcherReqRespTests2/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests2_SPEC2_19_ForwardServletEventRequest_event.java
index 3fc5f58..4bd1714 100644
--- a/portlet-tck_3.0/V2DispatcherReqRespTests2/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests2_SPEC2_19_ForwardServletEventRequest_event.java
+++ b/portlet-tck_3.0/V2DispatcherReqRespTests2/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests2_SPEC2_19_ForwardServletEventRequest_event.java
@@ -84,7 +84,7 @@ public class DispatcherReqRespTests2_SPEC2_19_ForwardServletEventRequest_event i
       // Prereq for: V2DispatcherReqRespTests2_SPEC2_19_ForwardServletEventRequest_getAttributeNames
       portletReq.setAttribute(ATTR_PREFIX + "V2DispatcherReqRespTests2_SPEC2_19_ForwardServletEventRequest_getAttributeNames", "Value1");
 
-      String target = SERVLET_PREFIX + "DispatcherReqRespTests2_SPEC2_19_ForwardServletEventRequest_servlet" + SERVLET_SUFFIX + QUERY_STRING;
+      String target = SERVLET_PREFIX + "DispatcherReqRespTests2_SPEC2_19_ForwardServletEventRequest_servlet" + SERVLET_SUFFIX + "?" + QUERY_STRING;
       PortletRequestDispatcher rd = portletConfig.getPortletContext()
             .getRequestDispatcher(target);
       rd.forward(portletReq, portletResp);

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/368fbd4d/portlet-tck_3.0/V2DispatcherReqRespTests2/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests2_SPEC2_19_ForwardServletEventResponse_event.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherReqRespTests2/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests2_SPEC2_19_ForwardServletEventResponse_event.java b/portlet-tck_3.0/V2DispatcherReqRespTests2/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests2_SPEC2_19_ForwardServletEventResponse_event.java
index 14edd64..2421c7a 100644
--- a/portlet-tck_3.0/V2DispatcherReqRespTests2/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests2_SPEC2_19_ForwardServletEventResponse_event.java
+++ b/portlet-tck_3.0/V2DispatcherReqRespTests2/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests2_SPEC2_19_ForwardServletEventResponse_event.java
@@ -78,7 +78,7 @@ public class DispatcherReqRespTests2_SPEC2_19_ForwardServletEventResponse_event
 
       StringWriter writer = new StringWriter();
 
-      String target = SERVLET_PREFIX + "DispatcherReqRespTests2_SPEC2_19_ForwardServletEventResponse_servlet" + SERVLET_SUFFIX + QUERY_STRING;
+      String target = SERVLET_PREFIX + "DispatcherReqRespTests2_SPEC2_19_ForwardServletEventResponse_servlet" + SERVLET_SUFFIX + "?" + QUERY_STRING;
       PortletRequestDispatcher rd = portletConfig.getPortletContext()
             .getRequestDispatcher(target);
       rd.forward(portletReq, portletResp);

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/368fbd4d/portlet-tck_3.0/V2DispatcherReqRespTests2/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests2_SPEC2_19_ForwardServletRenderRequest.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherReqRespTests2/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests2_SPEC2_19_ForwardServletRenderRequest.java b/portlet-tck_3.0/V2DispatcherReqRespTests2/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests2_SPEC2_19_ForwardServletRenderRequest.java
index 36bbaff..2894f3c 100644
--- a/portlet-tck_3.0/V2DispatcherReqRespTests2/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests2_SPEC2_19_ForwardServletRenderRequest.java
+++ b/portlet-tck_3.0/V2DispatcherReqRespTests2/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests2_SPEC2_19_ForwardServletRenderRequest.java
@@ -102,7 +102,7 @@ public class DispatcherReqRespTests2_SPEC2_19_ForwardServletRenderRequest implem
       // Prereq for: V2DispatcherReqRespTests2_SPEC2_19_ForwardServletRenderRequest_getAttributeNames
       portletReq.setAttribute(ATTR_PREFIX + "V2DispatcherReqRespTests2_SPEC2_19_ForwardServletRenderRequest_getAttributeNames", "Value1");
 
-      String target = SERVLET_PREFIX + "DispatcherReqRespTests2_SPEC2_19_ForwardServletRenderRequest_servlet" + SERVLET_SUFFIX + QUERY_STRING;
+      String target = SERVLET_PREFIX + "DispatcherReqRespTests2_SPEC2_19_ForwardServletRenderRequest_servlet" + SERVLET_SUFFIX + "?" + QUERY_STRING;
       PortletRequestDispatcher rd = portletConfig.getPortletContext()
             .getRequestDispatcher(target);
       rd.forward(portletReq, portletResp);

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/368fbd4d/portlet-tck_3.0/V2DispatcherReqRespTests2/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests2_SPEC2_19_ForwardServletRenderResponse.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherReqRespTests2/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests2_SPEC2_19_ForwardServletRenderResponse.java b/portlet-tck_3.0/V2DispatcherReqRespTests2/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests2_SPEC2_19_ForwardServletRenderResponse.java
index 0e8a1e0..eb28a3c 100644
--- a/portlet-tck_3.0/V2DispatcherReqRespTests2/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests2_SPEC2_19_ForwardServletRenderResponse.java
+++ b/portlet-tck_3.0/V2DispatcherReqRespTests2/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests2_SPEC2_19_ForwardServletRenderResponse.java
@@ -96,7 +96,7 @@ public class DispatcherReqRespTests2_SPEC2_19_ForwardServletRenderResponse imple
 
       PrintWriter writer = portletResp.getWriter();
 
-      String target = SERVLET_PREFIX + "DispatcherReqRespTests2_SPEC2_19_ForwardServletRenderResponse_servlet" + SERVLET_SUFFIX + QUERY_STRING;
+      String target = SERVLET_PREFIX + "DispatcherReqRespTests2_SPEC2_19_ForwardServletRenderResponse_servlet" + SERVLET_SUFFIX + "?" + QUERY_STRING;
       PortletRequestDispatcher rd = portletConfig.getPortletContext()
             .getRequestDispatcher(target);
       rd.forward(portletReq, portletResp);

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/368fbd4d/portlet-tck_3.0/V2DispatcherReqRespTests2/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests2_SPEC2_19_ForwardServletResourceRequest.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherReqRespTests2/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests2_SPEC2_19_ForwardServletResourceRequest.java b/portlet-tck_3.0/V2DispatcherReqRespTests2/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests2_SPEC2_19_ForwardServletResourceRequest.java
index 3809b3c..7103677 100644
--- a/portlet-tck_3.0/V2DispatcherReqRespTests2/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests2_SPEC2_19_ForwardServletResourceRequest.java
+++ b/portlet-tck_3.0/V2DispatcherReqRespTests2/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests2_SPEC2_19_ForwardServletResourceRequest.java
@@ -90,7 +90,7 @@ public class DispatcherReqRespTests2_SPEC2_19_ForwardServletResourceRequest impl
       // Prereq for: V2DispatcherReqRespTests2_SPEC2_19_ForwardServletResourceRequest_getAttributeNames
       portletReq.setAttribute(ATTR_PREFIX + "V2DispatcherReqRespTests2_SPEC2_19_ForwardServletResourceRequest_getAttributeNames", "Value1");
 
-      String target = SERVLET_PREFIX + "DispatcherReqRespTests2_SPEC2_19_ForwardServletResourceRequest_servlet" + SERVLET_SUFFIX + QUERY_STRING;
+      String target = SERVLET_PREFIX + "DispatcherReqRespTests2_SPEC2_19_ForwardServletResourceRequest_servlet" + SERVLET_SUFFIX + "?" + QUERY_STRING;
       PortletRequestDispatcher rd = portletConfig.getPortletContext()
             .getRequestDispatcher(target);
       rd.forward(portletReq, portletResp);

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/368fbd4d/portlet-tck_3.0/V2DispatcherReqRespTests2/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests2_SPEC2_19_ForwardServletResourceResponse.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherReqRespTests2/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests2_SPEC2_19_ForwardServletResourceResponse.java b/portlet-tck_3.0/V2DispatcherReqRespTests2/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests2_SPEC2_19_ForwardServletResourceResponse.java
index a6ac35e..9186447 100644
--- a/portlet-tck_3.0/V2DispatcherReqRespTests2/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests2_SPEC2_19_ForwardServletResourceResponse.java
+++ b/portlet-tck_3.0/V2DispatcherReqRespTests2/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests2_SPEC2_19_ForwardServletResourceResponse.java
@@ -84,7 +84,7 @@ public class DispatcherReqRespTests2_SPEC2_19_ForwardServletResourceResponse imp
 
       PrintWriter writer = portletResp.getWriter();
 
-      String target = SERVLET_PREFIX + "DispatcherReqRespTests2_SPEC2_19_ForwardServletResourceResponse_servlet" + SERVLET_SUFFIX + QUERY_STRING;
+      String target = SERVLET_PREFIX + "DispatcherReqRespTests2_SPEC2_19_ForwardServletResourceResponse_servlet" + SERVLET_SUFFIX + "?" + QUERY_STRING;
       PortletRequestDispatcher rd = portletConfig.getPortletContext()
             .getRequestDispatcher(target);
       rd.forward(portletReq, portletResp);

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/368fbd4d/portlet-tck_3.0/V2DispatcherReqRespTests2/src/main/java/javax/portlet/tck/servlets/DispatcherReqRespTests2_SPEC2_19_ForwardServletActionRequest_servlet.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherReqRespTests2/src/main/java/javax/portlet/tck/servlets/DispatcherReqRespTests2_SPEC2_19_ForwardServletActionRequest_servlet.java b/portlet-tck_3.0/V2DispatcherReqRespTests2/src/main/java/javax/portlet/tck/servlets/DispatcherReqRespTests2_SPEC2_19_ForwardServletActionRequest_servlet.java
index 425f06c..79b757b 100644
--- a/portlet-tck_3.0/V2DispatcherReqRespTests2/src/main/java/javax/portlet/tck/servlets/DispatcherReqRespTests2_SPEC2_19_ForwardServletActionRequest_servlet.java
+++ b/portlet-tck_3.0/V2DispatcherReqRespTests2/src/main/java/javax/portlet/tck/servlets/DispatcherReqRespTests2_SPEC2_19_ForwardServletActionRequest_servlet.java
@@ -182,11 +182,12 @@ public class DispatcherReqRespTests2_SPEC2_19_ForwardServletActionRequest_servle
       /* the corresponding header name"                                       */
       TestResult tr8 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS2_SPEC2_19_FORWARDSERVLETACTIONREQUEST_GETDATEHEADER);
       try {
-         long hval = request.getDateHeader(MOD_HEADER);
-         long pval = Long.parseLong(portletReq.getProperty(MOD_HEADER));
+         long hval = request.getDateHeader(DATE_HEADER);
+         String pstr = portletReq.getProperty(DATE_HEADER);
+         long pval = (pstr == null) ? -1 : Long.parseLong(pstr);
          boolean ok = (hval == pval);
          if (!ok) {
-            String str = MOD_HEADER + " from HttpServletRequest: " + hval + ", did not equal " + pval + " from ActionRequest";
+            String str = DATE_HEADER + " from HttpServletRequest: " + hval + ", did not equal " + pval + " from ActionRequest";
             tr8.appendTcDetail(str);
          }
          tr8.setTcSuccess(ok);
@@ -258,7 +259,8 @@ public class DispatcherReqRespTests2_SPEC2_19_ForwardServletActionRequest_servle
       TestResult tr12 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS2_SPEC2_19_FORWARDSERVLETACTIONREQUEST_GETINTHEADER);
       try {
          int hval = request.getIntHeader(CONTENT_LENGTH_HEADER);
-         int pval = Integer.parseInt(portletReq.getProperty(CONTENT_LENGTH_HEADER));
+         String pstr = portletReq.getProperty(CONTENT_LENGTH_HEADER);
+         int pval = (pstr == null) ? -1 : Integer.parseInt(pstr);
          boolean ok = (hval == pval);
          if (!ok) {
             String str = CONTENT_LENGTH_HEADER + " from HttpServletRequest: " + hval + ", did not equal " + pval + " from ActionRequest";
@@ -410,7 +412,6 @@ public class DispatcherReqRespTests2_SPEC2_19_ForwardServletActionRequest_servle
       /* PortletRequestDispatcher"                                            */
       TestResult tr23 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS2_SPEC2_19_FORWARDSERVLETACTIONREQUEST_GETPATHINFO);
       try {
-         String sname = SERVLET_PREFIX + "DispatcherReqRespTests2_SPEC2_19_ForwardServletActionRequest_servlet" + SERVLET_SUFFIX;
          String hval = request.getPathInfo();
          String pval = null;
          CompareUtils.stringsEqual("HttpServletRequest", hval, " defined: ", pval, tr23);
@@ -424,7 +425,6 @@ public class DispatcherReqRespTests2_SPEC2_19_ForwardServletActionRequest_servle
       /* PortletRequestDispatcher"                                            */
       TestResult tr24 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS2_SPEC2_19_FORWARDSERVLETACTIONREQUEST_GETPATHTRANSLATED);
       try {
-         String sname = SERVLET_PREFIX + "DispatcherReqRespTests2_SPEC2_19_ForwardServletActionRequest_servlet" + SERVLET_SUFFIX;
          String hval = request.getPathTranslated();
          String pval = null;
          CompareUtils.stringsEqual("HttpServletRequest", hval, " defined: ", pval, tr24);
@@ -449,7 +449,6 @@ public class DispatcherReqRespTests2_SPEC2_19_ForwardServletActionRequest_servle
       /* PortletRequestDispatcher"                                            */
       TestResult tr26 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS2_SPEC2_19_FORWARDSERVLETACTIONREQUEST_GETQUERYSTRING);
       try {
-         String sname = SERVLET_PREFIX + "DispatcherReqRespTests2_SPEC2_19_ForwardServletActionRequest_servlet" + SERVLET_SUFFIX;
          String hval = request.getQueryString();
          String pval = QUERY_STRING;
          CompareUtils.stringsEqual("HttpServletRequest", hval, " defined: ", pval, tr26);

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/368fbd4d/portlet-tck_3.0/V2DispatcherReqRespTests2/src/main/java/javax/portlet/tck/servlets/DispatcherReqRespTests2_SPEC2_19_ForwardServletEventRequest_servlet.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherReqRespTests2/src/main/java/javax/portlet/tck/servlets/DispatcherReqRespTests2_SPEC2_19_ForwardServletEventRequest_servlet.java b/portlet-tck_3.0/V2DispatcherReqRespTests2/src/main/java/javax/portlet/tck/servlets/DispatcherReqRespTests2_SPEC2_19_ForwardServletEventRequest_servlet.java
index e5b56f2..fe3a998 100644
--- a/portlet-tck_3.0/V2DispatcherReqRespTests2/src/main/java/javax/portlet/tck/servlets/DispatcherReqRespTests2_SPEC2_19_ForwardServletEventRequest_servlet.java
+++ b/portlet-tck_3.0/V2DispatcherReqRespTests2/src/main/java/javax/portlet/tck/servlets/DispatcherReqRespTests2_SPEC2_19_ForwardServletEventRequest_servlet.java
@@ -173,11 +173,12 @@ public class DispatcherReqRespTests2_SPEC2_19_ForwardServletEventRequest_servlet
       /* corresponding header name"                                           */
       TestResult tr8 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS2_SPEC2_19_FORWARDSERVLETEVENTREQUEST_GETDATEHEADER);
       try {
-         long hval = request.getDateHeader(MOD_HEADER);
-         long pval = Long.parseLong(portletReq.getProperty(MOD_HEADER));
+         long hval = request.getDateHeader(DATE_HEADER);
+         String pstr = portletReq.getProperty(DATE_HEADER);
+         long pval = (pstr == null) ? -1 : Long.parseLong(pstr);
          boolean ok = (hval == pval);
          if (!ok) {
-            String str = MOD_HEADER + " from HttpServletRequest: " + hval + ", did not equal " + pval + " from EventRequest";
+            String str = DATE_HEADER + " from HttpServletRequest: " + hval + ", did not equal " + pval + " from EventRequest";
             tr8.appendTcDetail(str);
          }
          tr8.setTcSuccess(ok);
@@ -259,7 +260,8 @@ public class DispatcherReqRespTests2_SPEC2_19_ForwardServletEventRequest_servlet
       TestResult tr13 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS2_SPEC2_19_FORWARDSERVLETEVENTREQUEST_GETINTHEADER);
       try {
          int hval = request.getIntHeader(CONTENT_LENGTH_HEADER);
-         int pval = Integer.parseInt(portletReq.getProperty(CONTENT_LENGTH_HEADER));
+         String pstr = portletReq.getProperty(CONTENT_LENGTH_HEADER);
+         int pval = (pstr == null) ? -1 : Integer.parseInt(pstr);
          boolean ok = (hval == pval);
          if (!ok) {
             String str = CONTENT_LENGTH_HEADER + " from HttpServletRequest: " + hval + ", did not equal " + pval + " from EventRequest";
@@ -410,7 +412,6 @@ public class DispatcherReqRespTests2_SPEC2_19_ForwardServletEventRequest_servlet
       /* to the path used to obtain the PortletRequestDispatcher"             */
       TestResult tr24 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS2_SPEC2_19_FORWARDSERVLETEVENTREQUEST_GETPATHINFO);
       try {
-         String sname = SERVLET_PREFIX + "DispatcherReqRespTests2_SPEC2_19_ForwardServletEventRequest_servlet" + SERVLET_SUFFIX;
          String hval = request.getPathInfo();
          String pval = null;
          CompareUtils.stringsEqual("HttpServletRequest", hval, " defined: ", pval, tr24);
@@ -424,7 +425,6 @@ public class DispatcherReqRespTests2_SPEC2_19_ForwardServletEventRequest_servlet
       /* PortletRequestDispatcher"                                            */
       TestResult tr25 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS2_SPEC2_19_FORWARDSERVLETEVENTREQUEST_GETPATHTRANSLATED);
       try {
-         String sname = SERVLET_PREFIX + "DispatcherReqRespTests2_SPEC2_19_ForwardServletEventRequest_servlet" + SERVLET_SUFFIX;
          String hval = request.getPathTranslated();
          String pval = null;
          CompareUtils.stringsEqual("HttpServletRequest", hval, " defined: ", pval, tr25);
@@ -448,7 +448,6 @@ public class DispatcherReqRespTests2_SPEC2_19_ForwardServletEventRequest_servlet
       /* PortletRequestDispatcher"                                            */
       TestResult tr27 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS2_SPEC2_19_FORWARDSERVLETEVENTREQUEST_GETQUERYSTRING);
       try {
-         String sname = SERVLET_PREFIX + "DispatcherReqRespTests2_SPEC2_19_ForwardServletEventRequest_servlet" + SERVLET_SUFFIX;
          String hval = request.getQueryString();
          String pval = QUERY_STRING;
          CompareUtils.stringsEqual("HttpServletRequest", hval, " defined: ", pval, tr27);

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/368fbd4d/portlet-tck_3.0/V2DispatcherReqRespTests2/src/main/java/javax/portlet/tck/servlets/DispatcherReqRespTests2_SPEC2_19_ForwardServletRenderRequest_servlet.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherReqRespTests2/src/main/java/javax/portlet/tck/servlets/DispatcherReqRespTests2_SPEC2_19_ForwardServletRenderRequest_servlet.java b/portlet-tck_3.0/V2DispatcherReqRespTests2/src/main/java/javax/portlet/tck/servlets/DispatcherReqRespTests2_SPEC2_19_ForwardServletRenderRequest_servlet.java
index ab5ae90..3101cf1 100644
--- a/portlet-tck_3.0/V2DispatcherReqRespTests2/src/main/java/javax/portlet/tck/servlets/DispatcherReqRespTests2_SPEC2_19_ForwardServletRenderRequest_servlet.java
+++ b/portlet-tck_3.0/V2DispatcherReqRespTests2/src/main/java/javax/portlet/tck/servlets/DispatcherReqRespTests2_SPEC2_19_ForwardServletRenderRequest_servlet.java
@@ -174,11 +174,12 @@ public class DispatcherReqRespTests2_SPEC2_19_ForwardServletRenderRequest_servle
       /* the corresponding header name"                                       */
       TestResult tr8 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS2_SPEC2_19_FORWARDSERVLETRENDERREQUEST_GETDATEHEADER);
       try {
-         long hval = request.getDateHeader(MOD_HEADER);
-         long pval = Long.parseLong(portletReq.getProperty(MOD_HEADER));
+         long hval = request.getDateHeader(DATE_HEADER);
+         String pstr = portletReq.getProperty(DATE_HEADER);
+         long pval = (pstr == null) ? -1 : Long.parseLong(pstr);
          boolean ok = (hval == pval);
          if (!ok) {
-            String str = MOD_HEADER + " from HttpServletRequest: " + hval + ", did not equal " + pval + " from RenderRequest";
+            String str = DATE_HEADER + " from HttpServletRequest: " + hval + ", did not equal " + pval + " from RenderRequest";
             tr8.appendTcDetail(str);
          }
          tr8.setTcSuccess(ok);
@@ -260,7 +261,8 @@ public class DispatcherReqRespTests2_SPEC2_19_ForwardServletRenderRequest_servle
       TestResult tr13 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS2_SPEC2_19_FORWARDSERVLETRENDERREQUEST_GETINTHEADER);
       try {
          int hval = request.getIntHeader(CONTENT_LENGTH_HEADER);
-         int pval = Integer.parseInt(portletReq.getProperty(CONTENT_LENGTH_HEADER));
+         String pstr = portletReq.getProperty(CONTENT_LENGTH_HEADER);
+         int pval = (pstr == null) ? -1 : Integer.parseInt(pstr);
          boolean ok = (hval == pval);
          if (!ok) {
             String str = CONTENT_LENGTH_HEADER + " from HttpServletRequest: " + hval + ", did not equal " + pval + " from RenderRequest";
@@ -410,7 +412,6 @@ public class DispatcherReqRespTests2_SPEC2_19_ForwardServletRenderRequest_servle
       /* PortletRequestDispatcher"                                            */
       TestResult tr24 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS2_SPEC2_19_FORWARDSERVLETRENDERREQUEST_GETPATHINFO);
       try {
-         String sname = SERVLET_PREFIX + "DispatcherReqRespTests2_SPEC2_19_ForwardServletRenderRequest_servlet" + SERVLET_SUFFIX;
          String hval = request.getPathInfo();
          String pval = null;
          CompareUtils.stringsEqual("HttpServletRequest", hval, " defined: ", pval, tr24);
@@ -424,7 +425,6 @@ public class DispatcherReqRespTests2_SPEC2_19_ForwardServletRenderRequest_servle
       /* PortletRequestDispatcher"                                            */
       TestResult tr25 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS2_SPEC2_19_FORWARDSERVLETRENDERREQUEST_GETPATHTRANSLATED);
       try {
-         String sname = SERVLET_PREFIX + "DispatcherReqRespTests2_SPEC2_19_ForwardServletRenderRequest_servlet" + SERVLET_SUFFIX;
          String hval = request.getPathTranslated();
          String pval = null;
          CompareUtils.stringsEqual("HttpServletRequest", hval, " defined: ", pval, tr25);
@@ -449,7 +449,6 @@ public class DispatcherReqRespTests2_SPEC2_19_ForwardServletRenderRequest_servle
       /* PortletRequestDispatcher"                                            */
       TestResult tr27 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS2_SPEC2_19_FORWARDSERVLETRENDERREQUEST_GETQUERYSTRING);
       try {
-         String sname = SERVLET_PREFIX + "DispatcherReqRespTests2_SPEC2_19_ForwardServletRenderRequest_servlet" + SERVLET_SUFFIX;
          String hval = request.getQueryString();
          String pval = QUERY_STRING;
          CompareUtils.stringsEqual("HttpServletRequest", hval, " defined: ", pval, tr27);

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/368fbd4d/portlet-tck_3.0/V2DispatcherReqRespTests2/src/main/java/javax/portlet/tck/servlets/DispatcherReqRespTests2_SPEC2_19_ForwardServletResourceRequest_servlet.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherReqRespTests2/src/main/java/javax/portlet/tck/servlets/DispatcherReqRespTests2_SPEC2_19_ForwardServletResourceRequest_servlet.java b/portlet-tck_3.0/V2DispatcherReqRespTests2/src/main/java/javax/portlet/tck/servlets/DispatcherReqRespTests2_SPEC2_19_ForwardServletResourceRequest_servlet.java
index 3bb8dec..82d9160 100644
--- a/portlet-tck_3.0/V2DispatcherReqRespTests2/src/main/java/javax/portlet/tck/servlets/DispatcherReqRespTests2_SPEC2_19_ForwardServletResourceRequest_servlet.java
+++ b/portlet-tck_3.0/V2DispatcherReqRespTests2/src/main/java/javax/portlet/tck/servlets/DispatcherReqRespTests2_SPEC2_19_ForwardServletResourceRequest_servlet.java
@@ -182,11 +182,12 @@ public class DispatcherReqRespTests2_SPEC2_19_ForwardServletResourceRequest_serv
       /* the corresponding header name"                                       */
       TestResult tr8 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS2_SPEC2_19_FORWARDSERVLETRESOURCEREQUEST_GETDATEHEADER);
       try {
-         long hval = request.getDateHeader(MOD_HEADER);
-         long pval = Long.parseLong(portletReq.getProperty(MOD_HEADER));
+         long hval = request.getDateHeader(DATE_HEADER);
+         String pstr = portletReq.getProperty(DATE_HEADER);
+         long pval = (pstr == null) ? -1 : Long.parseLong(pstr);
          boolean ok = (hval == pval);
          if (!ok) {
-            String str = MOD_HEADER + " from HttpServletRequest: " + hval + ", did not equal " + pval + " from ResourceRequest";
+            String str = DATE_HEADER + " from HttpServletRequest: " + hval + ", did not equal " + pval + " from ResourceRequest";
             tr8.appendTcDetail(str);
          }
          tr8.setTcSuccess(ok);
@@ -258,7 +259,8 @@ public class DispatcherReqRespTests2_SPEC2_19_ForwardServletResourceRequest_serv
       TestResult tr12 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS2_SPEC2_19_FORWARDSERVLETRESOURCEREQUEST_GETINTHEADER);
       try {
          int hval = request.getIntHeader(CONTENT_LENGTH_HEADER);
-         int pval = Integer.parseInt(portletReq.getProperty(CONTENT_LENGTH_HEADER));
+         String pstr = portletReq.getProperty(CONTENT_LENGTH_HEADER);
+         int pval = (pstr == null) ? -1 : Integer.parseInt(pstr);
          boolean ok = (hval == pval);
          if (!ok) {
             String str = CONTENT_LENGTH_HEADER + " from HttpServletRequest: " + hval + ", did not equal " + pval + " from ResourceRequest";
@@ -410,7 +412,6 @@ public class DispatcherReqRespTests2_SPEC2_19_ForwardServletResourceRequest_serv
       /* PortletRequestDispatcher"                                            */
       TestResult tr23 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS2_SPEC2_19_FORWARDSERVLETRESOURCEREQUEST_GETPATHINFO);
       try {
-         String sname = SERVLET_PREFIX + "DispatcherReqRespTests2_SPEC2_19_ForwardServletResourceRequest_servlet" + SERVLET_SUFFIX;
          String hval = request.getPathInfo();
          String pval = null;
          CompareUtils.stringsEqual("HttpServletRequest", hval, " defined: ", pval, tr23);
@@ -424,7 +425,6 @@ public class DispatcherReqRespTests2_SPEC2_19_ForwardServletResourceRequest_serv
       /* PortletRequestDispatcher"                                            */
       TestResult tr24 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS2_SPEC2_19_FORWARDSERVLETRESOURCEREQUEST_GETPATHTRANSLATED);
       try {
-         String sname = SERVLET_PREFIX + "DispatcherReqRespTests2_SPEC2_19_ForwardServletResourceRequest_servlet" + SERVLET_SUFFIX;
          String hval = request.getPathTranslated();
          String pval = null;
          CompareUtils.stringsEqual("HttpServletRequest", hval, " defined: ", pval, tr24);
@@ -449,7 +449,6 @@ public class DispatcherReqRespTests2_SPEC2_19_ForwardServletResourceRequest_serv
       /* PortletRequestDispatcher"                                            */
       TestResult tr26 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS2_SPEC2_19_FORWARDSERVLETRESOURCEREQUEST_GETQUERYSTRING);
       try {
-         String sname = SERVLET_PREFIX + "DispatcherReqRespTests2_SPEC2_19_ForwardServletResourceRequest_servlet" + SERVLET_SUFFIX;
          String hval = request.getQueryString();
          String pval = QUERY_STRING;
          CompareUtils.stringsEqual("HttpServletRequest", hval, " defined: ", pval, tr26);

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/368fbd4d/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests3_SPEC2_19_IncludeJSPActionRequest.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests3_SPEC2_19_IncludeJSPActionRequest.java b/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests3_SPEC2_19_IncludeJSPActionRequest.java
index e1cd402..febf8f4 100644
--- a/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests3_SPEC2_19_IncludeJSPActionRequest.java
+++ b/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests3_SPEC2_19_IncludeJSPActionRequest.java
@@ -78,7 +78,7 @@ public class DispatcherReqRespTests3_SPEC2_19_IncludeJSPActionRequest implements
       // Prereq for: V2DispatcherReqRespTests3_SPEC2_19_IncludeJSPActionRequest_getAttributeNames
       portletReq.setAttribute(ATTR_PREFIX + "V2DispatcherReqRespTests3_SPEC2_19_IncludeJSPActionRequest_getAttributeNames", "Value1");
 
-      String target = JSP_PREFIX + "DispatcherReqRespTests3_SPEC2_19_IncludeJSPActionRequest" + JSP_SUFFIX + QUERY_STRING;
+      String target = JSP_PREFIX + "DispatcherReqRespTests3_SPEC2_19_IncludeJSPActionRequest" + JSP_SUFFIX + "?" + QUERY_STRING;
       PortletRequestDispatcher rd = portletConfig.getPortletContext()
             .getRequestDispatcher(target);
       rd.include(portletReq, portletResp);

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/368fbd4d/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests3_SPEC2_19_IncludeJSPActionResponse.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests3_SPEC2_19_IncludeJSPActionResponse.java b/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests3_SPEC2_19_IncludeJSPActionResponse.java
index 551dec2..04fb806 100644
--- a/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests3_SPEC2_19_IncludeJSPActionResponse.java
+++ b/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests3_SPEC2_19_IncludeJSPActionResponse.java
@@ -72,7 +72,7 @@ public class DispatcherReqRespTests3_SPEC2_19_IncludeJSPActionResponse implement
 
       StringWriter writer = new StringWriter();
 
-      String target = JSP_PREFIX + "DispatcherReqRespTests3_SPEC2_19_IncludeJSPActionResponse" + JSP_SUFFIX + QUERY_STRING;
+      String target = JSP_PREFIX + "DispatcherReqRespTests3_SPEC2_19_IncludeJSPActionResponse" + JSP_SUFFIX + "?" + QUERY_STRING;
       PortletRequestDispatcher rd = portletConfig.getPortletContext()
             .getRequestDispatcher(target);
       rd.include(portletReq, portletResp);

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/368fbd4d/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests3_SPEC2_19_IncludeJSPEventRequest_event.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests3_SPEC2_19_IncludeJSPEventRequest_event.java b/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests3_SPEC2_19_IncludeJSPEventRequest_event.java
index aed47e4..43ee042 100644
--- a/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests3_SPEC2_19_IncludeJSPEventRequest_event.java
+++ b/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests3_SPEC2_19_IncludeJSPEventRequest_event.java
@@ -84,7 +84,7 @@ public class DispatcherReqRespTests3_SPEC2_19_IncludeJSPEventRequest_event imple
       // Prereq for: V2DispatcherReqRespTests3_SPEC2_19_IncludeJSPEventRequest_getAttributeNames
       portletReq.setAttribute(ATTR_PREFIX + "V2DispatcherReqRespTests3_SPEC2_19_IncludeJSPEventRequest_getAttributeNames", "Value1");
 
-      String target = JSP_PREFIX + "DispatcherReqRespTests3_SPEC2_19_IncludeJSPEventRequest" + JSP_SUFFIX + QUERY_STRING;
+      String target = JSP_PREFIX + "DispatcherReqRespTests3_SPEC2_19_IncludeJSPEventRequest" + JSP_SUFFIX + "?" + QUERY_STRING;
       PortletRequestDispatcher rd = portletConfig.getPortletContext()
             .getRequestDispatcher(target);
       rd.include(portletReq, portletResp);

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/368fbd4d/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests3_SPEC2_19_IncludeJSPEventResponse_event.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests3_SPEC2_19_IncludeJSPEventResponse_event.java b/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests3_SPEC2_19_IncludeJSPEventResponse_event.java
index b12fe23..0dcf6e0 100644
--- a/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests3_SPEC2_19_IncludeJSPEventResponse_event.java
+++ b/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests3_SPEC2_19_IncludeJSPEventResponse_event.java
@@ -78,7 +78,7 @@ public class DispatcherReqRespTests3_SPEC2_19_IncludeJSPEventResponse_event impl
 
       StringWriter writer = new StringWriter();
 
-      String target = JSP_PREFIX + "DispatcherReqRespTests3_SPEC2_19_IncludeJSPEventResponse" + JSP_SUFFIX + QUERY_STRING;
+      String target = JSP_PREFIX + "DispatcherReqRespTests3_SPEC2_19_IncludeJSPEventResponse" + JSP_SUFFIX + "?" + QUERY_STRING;
       PortletRequestDispatcher rd = portletConfig.getPortletContext()
             .getRequestDispatcher(target);
       rd.include(portletReq, portletResp);

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/368fbd4d/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests3_SPEC2_19_IncludeJSPRenderRequest.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests3_SPEC2_19_IncludeJSPRenderRequest.java b/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests3_SPEC2_19_IncludeJSPRenderRequest.java
index 1d9e35d..c2edf38 100644
--- a/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests3_SPEC2_19_IncludeJSPRenderRequest.java
+++ b/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests3_SPEC2_19_IncludeJSPRenderRequest.java
@@ -102,7 +102,7 @@ public class DispatcherReqRespTests3_SPEC2_19_IncludeJSPRenderRequest implements
       // Prereq for: V2DispatcherReqRespTests3_SPEC2_19_IncludeJSPRenderRequest_getAttributeNames
       portletReq.setAttribute(ATTR_PREFIX + "V2DispatcherReqRespTests3_SPEC2_19_IncludeJSPRenderRequest_getAttributeNames", "Value1");
 
-      String target = JSP_PREFIX + "DispatcherReqRespTests3_SPEC2_19_IncludeJSPRenderRequest" + JSP_SUFFIX + QUERY_STRING;
+      String target = JSP_PREFIX + "DispatcherReqRespTests3_SPEC2_19_IncludeJSPRenderRequest" + JSP_SUFFIX + "?" + QUERY_STRING;
       PortletRequestDispatcher rd = portletConfig.getPortletContext()
             .getRequestDispatcher(target);
       rd.include(portletReq, portletResp);

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/368fbd4d/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests3_SPEC2_19_IncludeJSPRenderResponse.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests3_SPEC2_19_IncludeJSPRenderResponse.java b/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests3_SPEC2_19_IncludeJSPRenderResponse.java
index b158659..d7fdfbf 100644
--- a/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests3_SPEC2_19_IncludeJSPRenderResponse.java
+++ b/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests3_SPEC2_19_IncludeJSPRenderResponse.java
@@ -96,7 +96,7 @@ public class DispatcherReqRespTests3_SPEC2_19_IncludeJSPRenderResponse implement
 
       PrintWriter writer = portletResp.getWriter();
 
-      String target = JSP_PREFIX + "DispatcherReqRespTests3_SPEC2_19_IncludeJSPRenderResponse" + JSP_SUFFIX + QUERY_STRING;
+      String target = JSP_PREFIX + "DispatcherReqRespTests3_SPEC2_19_IncludeJSPRenderResponse" + JSP_SUFFIX + "?" + QUERY_STRING;
       PortletRequestDispatcher rd = portletConfig.getPortletContext()
             .getRequestDispatcher(target);
       rd.include(portletReq, portletResp);

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/368fbd4d/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests3_SPEC2_19_IncludeJSPResourceRequest.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests3_SPEC2_19_IncludeJSPResourceRequest.java b/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests3_SPEC2_19_IncludeJSPResourceRequest.java
index 483a29a..e2eccdb 100644
--- a/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests3_SPEC2_19_IncludeJSPResourceRequest.java
+++ b/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests3_SPEC2_19_IncludeJSPResourceRequest.java
@@ -90,7 +90,7 @@ public class DispatcherReqRespTests3_SPEC2_19_IncludeJSPResourceRequest implemen
       // Prereq for: V2DispatcherReqRespTests3_SPEC2_19_IncludeJSPResourceRequest_getAttributeNames
       portletReq.setAttribute(ATTR_PREFIX + "V2DispatcherReqRespTests3_SPEC2_19_IncludeJSPResourceRequest_getAttributeNames", "Value1");
 
-      String target = JSP_PREFIX + "DispatcherReqRespTests3_SPEC2_19_IncludeJSPResourceRequest" + JSP_SUFFIX + QUERY_STRING;
+      String target = JSP_PREFIX + "DispatcherReqRespTests3_SPEC2_19_IncludeJSPResourceRequest" + JSP_SUFFIX + "?" + QUERY_STRING;
       PortletRequestDispatcher rd = portletConfig.getPortletContext()
             .getRequestDispatcher(target);
       rd.include(portletReq, portletResp);

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/368fbd4d/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests3_SPEC2_19_IncludeJSPResourceResponse.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests3_SPEC2_19_IncludeJSPResourceResponse.java b/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests3_SPEC2_19_IncludeJSPResourceResponse.java
index 401c7b8..1d9e06d 100644
--- a/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests3_SPEC2_19_IncludeJSPResourceResponse.java
+++ b/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests3_SPEC2_19_IncludeJSPResourceResponse.java
@@ -84,7 +84,7 @@ public class DispatcherReqRespTests3_SPEC2_19_IncludeJSPResourceResponse impleme
 
       PrintWriter writer = portletResp.getWriter();
 
-      String target = JSP_PREFIX + "DispatcherReqRespTests3_SPEC2_19_IncludeJSPResourceResponse" + JSP_SUFFIX + QUERY_STRING;
+      String target = JSP_PREFIX + "DispatcherReqRespTests3_SPEC2_19_IncludeJSPResourceResponse" + JSP_SUFFIX + "?" + QUERY_STRING;
       PortletRequestDispatcher rd = portletConfig.getPortletContext()
             .getRequestDispatcher(target);
       rd.include(portletReq, portletResp);

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/368fbd4d/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests3_SPEC2_19_IncludeJSPActionRequest.jsp
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests3_SPEC2_19_IncludeJSPActionRequest.jsp b/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests3_SPEC2_19_IncludeJSPActionRequest.jsp
index 4a6e6f6..b244f43 100644
--- a/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests3_SPEC2_19_IncludeJSPActionRequest.jsp
+++ b/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests3_SPEC2_19_IncludeJSPActionRequest.jsp
@@ -131,11 +131,12 @@
       /* the corresponding header name"                                       */
       TestResult tr8 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS3_SPEC2_19_INCLUDEJSPACTIONREQUEST_GETDATEHEADER);
       try {
-         long hval = request.getDateHeader(MOD_HEADER);
-         long pval = Long.parseLong(portletReq.getProperty(MOD_HEADER));
+         long hval = request.getDateHeader(DATE_HEADER);
+         String pstr = portletReq.getProperty(DATE_HEADER);
+         long pval = (pstr == null) ? -1 : Long.parseLong(pstr);
          boolean ok = (hval == pval);
          if (!ok) {
-            String str = MOD_HEADER + " from HttpServletRequest: " + hval + ", did not equal " + pval + " from ActionRequest";
+            String str = DATE_HEADER + " from HttpServletRequest: " + hval + ", did not equal " + pval + " from ActionRequest";
             tr8.appendTcDetail(str);
          }
          tr8.setTcSuccess(ok);
@@ -207,7 +208,8 @@
       TestResult tr12 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS3_SPEC2_19_INCLUDEJSPACTIONREQUEST_GETINTHEADER);
       try {
          int hval = request.getIntHeader(CONTENT_LENGTH_HEADER);
-         int pval = Integer.parseInt(portletReq.getProperty(CONTENT_LENGTH_HEADER));
+         String pstr = portletReq.getProperty(CONTENT_LENGTH_HEADER);
+         int pval = (pstr == null) ? -1 : Integer.parseInt(pstr);
          boolean ok = (hval == pval);
          if (!ok) {
             String str = CONTENT_LENGTH_HEADER + " from HttpServletRequest: " + hval + ", did not equal " + pval + " from ActionRequest";
@@ -358,7 +360,6 @@
       /* to the path used to obtain the PortletRequestDispatcher"             */
       TestResult tr23 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS3_SPEC2_19_INCLUDEJSPACTIONREQUEST_GETPATHINFO);
       try {
-         String sname = JSP_PREFIX + "DispatcherReqRespTests3_SPEC2_19_IncludeJSPActionRequest" + JSP_SUFFIX;
          String hval = request.getPathInfo();
          String pval = null;
          CompareUtils.stringsEqual("HttpServletRequest", hval, " defined: ", pval, tr23);
@@ -372,7 +373,6 @@
       /* PortletRequestDispatcher"                                            */
       TestResult tr24 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS3_SPEC2_19_INCLUDEJSPACTIONREQUEST_GETPATHTRANSLATED);
       try {
-         String sname = JSP_PREFIX + "DispatcherReqRespTests3_SPEC2_19_IncludeJSPActionRequest" + JSP_SUFFIX;
          String hval = request.getPathTranslated();
          String pval = null;
          CompareUtils.stringsEqual("HttpServletRequest", hval, " defined: ", pval, tr24);
@@ -396,7 +396,6 @@
       /* PortletRequestDispatcher"                                            */
       TestResult tr26 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS3_SPEC2_19_INCLUDEJSPACTIONREQUEST_GETQUERYSTRING);
       try {
-         String sname = JSP_PREFIX + "DispatcherReqRespTests3_SPEC2_19_IncludeJSPActionRequest" + JSP_SUFFIX;
          String hval = request.getQueryString();
          String pval = QUERY_STRING;
          CompareUtils.stringsEqual("HttpServletRequest", hval, " defined: ", pval, tr26);

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/368fbd4d/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests3_SPEC2_19_IncludeJSPEventRequest.jsp
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests3_SPEC2_19_IncludeJSPEventRequest.jsp b/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests3_SPEC2_19_IncludeJSPEventRequest.jsp
index ab84630..f078b80 100644
--- a/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests3_SPEC2_19_IncludeJSPEventRequest.jsp
+++ b/portlet-tck_3.0/V2DispatcherReqRespTests3/src/main/webapp/WEB-INF/jsp/DispatcherReqRespTests3_SPEC2_19_IncludeJSPEventRequest.jsp
@@ -122,11 +122,12 @@
       /* corresponding header name"                                           */
       TestResult tr8 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS3_SPEC2_19_INCLUDEJSPEVENTREQUEST_GETDATEHEADER);
       try {
-         long hval = request.getDateHeader(MOD_HEADER);
-         long pval = Long.parseLong(portletReq.getProperty(MOD_HEADER));
+         long hval = request.getDateHeader(DATE_HEADER);
+         String pstr = portletReq.getProperty(DATE_HEADER);
+         long pval = (pstr == null) ? -1 : Long.parseLong(pstr);
          boolean ok = (hval == pval);
          if (!ok) {
-            String str = MOD_HEADER + " from HttpServletRequest: " + hval + ", did not equal " + pval + " from EventRequest";
+            String str = DATE_HEADER + " from HttpServletRequest: " + hval + ", did not equal " + pval + " from EventRequest";
             tr8.appendTcDetail(str);
          }
          tr8.setTcSuccess(ok);
@@ -208,7 +209,8 @@
       TestResult tr13 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS3_SPEC2_19_INCLUDEJSPEVENTREQUEST_GETINTHEADER);
       try {
          int hval = request.getIntHeader(CONTENT_LENGTH_HEADER);
-         int pval = Integer.parseInt(portletReq.getProperty(CONTENT_LENGTH_HEADER));
+         String pstr = portletReq.getProperty(CONTENT_LENGTH_HEADER);
+         int pval = (pstr == null) ? -1 : Integer.parseInt(pstr);
          boolean ok = (hval == pval);
          if (!ok) {
             String str = CONTENT_LENGTH_HEADER + " from HttpServletRequest: " + hval + ", did not equal " + pval + " from EventRequest";
@@ -359,7 +361,6 @@
       /* to the path used to obtain the PortletRequestDispatcher"             */
       TestResult tr24 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS3_SPEC2_19_INCLUDEJSPEVENTREQUEST_GETPATHINFO);
       try {
-         String sname = JSP_PREFIX + "DispatcherReqRespTests3_SPEC2_19_IncludeJSPEventRequest" + JSP_SUFFIX;
          String hval = request.getPathInfo();
          String pval = null;
          CompareUtils.stringsEqual("HttpServletRequest", hval, " defined: ", pval, tr24);
@@ -373,7 +374,6 @@
       /* PortletRequestDispatcher"                                            */
       TestResult tr25 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS3_SPEC2_19_INCLUDEJSPEVENTREQUEST_GETPATHTRANSLATED);
       try {
-         String sname = JSP_PREFIX + "DispatcherReqRespTests3_SPEC2_19_IncludeJSPEventRequest" + JSP_SUFFIX;
          String hval = request.getPathTranslated();
          String pval = null;
          CompareUtils.stringsEqual("HttpServletRequest", hval, " defined: ", pval, tr25);
@@ -397,7 +397,6 @@
       /* PortletRequestDispatcher"                                            */
       TestResult tr27 = tcd.getTestResultFailed(V2DISPATCHERREQRESPTESTS3_SPEC2_19_INCLUDEJSPEVENTREQUEST_GETQUERYSTRING);
       try {
-         String sname = JSP_PREFIX + "DispatcherReqRespTests3_SPEC2_19_IncludeJSPEventRequest" + JSP_SUFFIX;
          String hval = request.getQueryString();
          String pval = QUERY_STRING;
          CompareUtils.stringsEqual("HttpServletRequest", hval, " defined: ", pval, tr27);


Mime
View raw message