portals-pluto-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From msnickl...@apache.org
Subject [07/35] Created test code for multiple includes and for using a wrappered portlet request & response in theinclude / forward call
Date Fri, 22 Aug 2014 13:13:45 GMT
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/738540a7/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 65ac0a2..8a56d5f 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
@@ -66,18 +66,16 @@ public class DispatcherTests_SPEC2_19_IncludeServletAction implements Portlet, R
          throws PortletException, IOException {
       LOGGER.entering(LOG_CLASS, "main portlet processAction entry");
 
-      Cookie c = new Cookie(COOKIE_PREFIX +"DispatcherTests_SPEC2_19_IncludeServletAction", COOKIE_VALUE);
-      c.setMaxAge(10);
-      portletResp.addProperty(c);
-      portletResp.addProperty(PROP_PREFIX +"DispatcherTests_SPEC2_19_IncludeServletAction", PROP_VALUE);
-
+      portletResp.setRenderParameters(portletReq.getParameterMap());
       long tid = Thread.currentThread().getId();
-      portletReq.setAttribute("void", tid);
+      portletReq.setAttribute(THREADID_ATTR, tid);
 
       StringWriter writer = new StringWriter();
 
+      // Now do the actual dispatch
+      String target = SERVLET_PREFIX + "DispatcherTests_SPEC2_19_IncludeServletAction_servlet" + SERVLET_SUFFIX + "?" + QUERY_STRING;
       PortletRequestDispatcher rd = portletConfig.getPortletContext()
-            .getRequestDispatcher("/DispatcherTests_SPEC2_19_IncludeServletAction_servlet?qparm1=qvalue1&qparm2=qvalue2");
+            .getRequestDispatcher(target);
       rd.include(portletReq, portletResp);
    }
 
@@ -86,13 +84,8 @@ public class DispatcherTests_SPEC2_19_IncludeServletAction implements Portlet, R
          throws PortletException, IOException {
       LOGGER.entering(LOG_CLASS, "main portlet serveResource entry");
 
-      Cookie c = new Cookie(COOKIE_PREFIX +"DispatcherTests_SPEC2_19_IncludeServletAction", COOKIE_VALUE);
-      c.setMaxAge(10);
-      portletResp.addProperty(c);
-      portletResp.addProperty(PROP_PREFIX +"DispatcherTests_SPEC2_19_IncludeServletAction", PROP_VALUE);
-
       long tid = Thread.currentThread().getId();
-      portletReq.setAttribute("void", tid);
+      portletReq.setAttribute(THREADID_ATTR, tid);
 
       PrintWriter writer = portletResp.getWriter();
 
@@ -103,181 +96,190 @@ public class DispatcherTests_SPEC2_19_IncludeServletAction implements Portlet, R
          throws PortletException, IOException {
       LOGGER.entering(LOG_CLASS, "main portlet render entry");
 
-      Cookie c = new Cookie(COOKIE_PREFIX +"DispatcherTests_SPEC2_19_IncludeServletAction", COOKIE_VALUE);
-      c.setMaxAge(10);
-      portletResp.addProperty(c);
-      portletResp.addProperty(PROP_PREFIX +"DispatcherTests_SPEC2_19_IncludeServletAction", PROP_VALUE);
-
       long tid = Thread.currentThread().getId();
-      portletReq.setAttribute("void", tid);
+      portletReq.setAttribute(THREADID_ATTR, tid);
 
       PrintWriter writer = portletResp.getWriter();
 
       PortletSession ps = portletReq.getPortletSession();
       String msg = (String) ps.getAttribute(RESULT_ATTR_PREFIX + "DispatcherTests_SPEC2_19_IncludeServletAction", APPLICATION_SCOPE);
       if (msg != null) {
-         writer.write("<p>" + msg + "</p>\n");
+         writer.write("<p>" + msg + "</p><br/>\n");
          ps.removeAttribute(RESULT_ATTR_PREFIX + "DispatcherTests_SPEC2_19_IncludeServletAction", APPLICATION_SCOPE);
-      } else {
-
-         /* TestCase: V2DispatcherTests_SPEC2_19_IncludeServletAction_dispatch1  */
-         /* Details: "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 include"              */
-         {
-            PortletURL aurl = portletResp.createActionURL();
-            TestButton tb = new TestButton("V2DispatcherTests_SPEC2_19_IncludeServletAction_dispatch1", aurl);
-            tb.writeTo(writer);
-         }
-
-         /* TestCase: V2DispatcherTests_SPEC2_19_IncludeServletAction_dispatch2  */
-         /* Details: "Parameters specified in the query strings must be          */
-         /* aggregated with the portlet render parameters"                       */
-         {
-            PortletURL aurl = portletResp.createActionURL();
-            TestButton tb = new TestButton("V2DispatcherTests_SPEC2_19_IncludeServletAction_dispatch2", aurl);
-            tb.writeTo(writer);
-         }
-
-         /* TestCase: V2DispatcherTests_SPEC2_19_IncludeServletAction_dispatch3  */
-         /* Details: "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();
-            TestButton tb = new TestButton("V2DispatcherTests_SPEC2_19_IncludeServletAction_dispatch3", aurl);
-            tb.writeTo(writer);
-         }
-
-         /* TestCase: V2DispatcherTests_SPEC2_19_IncludeServletAction_invoke1    */
-         /* Details: "The PortletRequestDispatcher include method can target a   */
-         /* servlet "                                                            */
-         {
-            PortletURL aurl = portletResp.createActionURL();
-            TestButton tb = new TestButton("V2DispatcherTests_SPEC2_19_IncludeServletAction_invoke1", aurl);
-            tb.writeTo(writer);
-         }
-
-         /* TestCase: V2DispatcherTests_SPEC2_19_IncludeServletAction_invoke2    */
-         /* Details: "Parameters to the include method for a target servlet      */
-         /* can be the request and response classes from the portlet lifecyle    */
-         /* method initiating the include"                                       */
-         {
-            PortletURL aurl = portletResp.createActionURL();
-            TestButton tb = new TestButton("V2DispatcherTests_SPEC2_19_IncludeServletAction_invoke2", aurl);
-            tb.writeTo(writer);
-         }
-
-         /* TestCase: V2DispatcherTests_SPEC2_19_IncludeServletAction_invoke4    */
-         /* Details: "The portlet container must invoke the target servlet in    */
-         /* the same thread as the PortletRequestDispatcher include              */
-         /* invocation"                                                          */
-         {
-            PortletURL aurl = portletResp.createActionURL();
-            TestButton tb = new TestButton("V2DispatcherTests_SPEC2_19_IncludeServletAction_invoke4", aurl);
-            tb.writeTo(writer);
-         }
-
-         /* TestCase: V2DispatcherTests_SPEC2_19_IncludeServletAction_invoke7    */
-         /* Details: "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();
-            TestButton tb = new TestButton("V2DispatcherTests_SPEC2_19_IncludeServletAction_invoke7", aurl);
-            tb.writeTo(writer);
-         }
-
-         /* TestCase: V2DispatcherTests_SPEC2_19_IncludeServletAction_attributes1 */
-         /* Details: "If the request dispatcher is obtained through the          */
-         /* getRequestDispatcher method, the request attribute                   */
-         /* javax.servlet.include.request_uri will be set, and equals the        */
-         /* value from HTTPServletRequest.getRequestURI for the first servlet    */
-         /* in the include chain"                                                */
-         {
-            PortletURL aurl = portletResp.createActionURL();
-            TestButton tb = new TestButton("V2DispatcherTests_SPEC2_19_IncludeServletAction_attributes1", aurl);
-            tb.writeTo(writer);
-         }
-
-         /* TestCase: V2DispatcherTests_SPEC2_19_IncludeServletAction_attributes2 */
-         /* Details: "If the request dispatcher is obtained through the          */
-         /* getRequestDispatcher method, the request attribute                   */
-         /* javax.servlet.include.context_path will be set, and equals the       */
-         /* value from HTTPServletRequest.getContestPath for the first servlet   */
-         /* in the include chain"                                                */
-         {
-            PortletURL aurl = portletResp.createActionURL();
-            TestButton tb = new TestButton("V2DispatcherTests_SPEC2_19_IncludeServletAction_attributes2", aurl);
-            tb.writeTo(writer);
-         }
-
-         /* TestCase: V2DispatcherTests_SPEC2_19_IncludeServletAction_attributes3 */
-         /* Details: "If the request dispatcher is obtained through the          */
-         /* getRequestDispatcher method, the request attribute                   */
-         /* javax.servlet.include.servlet_path will be set, and equals the       */
-         /* value from HTTPServletRequest.getServletPath for the first servlet   */
-         /* in the include chain"                                                */
-         {
-            PortletURL aurl = portletResp.createActionURL();
-            TestButton tb = new TestButton("V2DispatcherTests_SPEC2_19_IncludeServletAction_attributes3", aurl);
-            tb.writeTo(writer);
-         }
-
-         /* TestCase: V2DispatcherTests_SPEC2_19_IncludeServletAction_attributes4 */
-         /* Details: "If the request dispatcher is obtained through the          */
-         /* getRequestDispatcher method, the request attribute                   */
-         /* javax.servlet.include.path_info will be set, and equals the value    */
-         /* from HTTPServletRequest.getPathInfo for the first servlet in the     */
-         /* include chain"                                                       */
-         {
-            PortletURL aurl = portletResp.createActionURL();
-            TestButton tb = new TestButton("V2DispatcherTests_SPEC2_19_IncludeServletAction_attributes4", aurl);
-            tb.writeTo(writer);
-         }
-
-         /* TestCase: V2DispatcherTests_SPEC2_19_IncludeServletAction_attributes5 */
-         /* Details: "If the request dispatcher is obtained through the          */
-         /* getRequestDispatcher method, the request attribute                   */
-         /* javax.servlet.include.query_string will be set, and equals the       */
-         /* value from HTTPServletRequest.getQueryString for the first servlet   */
-         /* in the include chain"                                                */
-         {
-            PortletURL aurl = portletResp.createActionURL();
-            TestButton tb = new TestButton("V2DispatcherTests_SPEC2_19_IncludeServletAction_attributes5", aurl);
-            tb.writeTo(writer);
-         }
-
-         /* TestCase: V2DispatcherTests_SPEC2_19_IncludeServletAction_attributes6 */
-         /* Details: "The request attribute javax.portlet.config must be set     */
-         /* to the javax.portlet.PortletConfig object"                           */
-         {
-            PortletURL aurl = portletResp.createActionURL();
-            TestButton tb = new TestButton("V2DispatcherTests_SPEC2_19_IncludeServletAction_attributes6", aurl);
-            tb.writeTo(writer);
-         }
-
-         /* TestCase: V2DispatcherTests_SPEC2_19_IncludeServletAction_attributes7 */
-         /* Details: "For includes from the processAction method, The request    */
-         /* attribute javax.portlet.request must be set to the                   */
-         /* javax.portlet.ActionRequest object"                                  */
-         {
-            PortletURL aurl = portletResp.createActionURL();
-            TestButton tb = new TestButton("V2DispatcherTests_SPEC2_19_IncludeServletAction_attributes7", aurl);
-            tb.writeTo(writer);
-         }
-
-         /* TestCase: V2DispatcherTests_SPEC2_19_IncludeServletAction_attributes8 */
-         /* Details: "For includes from the processAction method, The request    */
-         /* attribute javax.portlet.response must be set to the                  */
-         /* javax.portlet.ActionResponse object"                                 */
-         {
-            PortletURL aurl = portletResp.createActionURL();
-            TestButton tb = new TestButton("V2DispatcherTests_SPEC2_19_IncludeServletAction_attributes8", aurl);
-            tb.writeTo(writer);
-         }
+      }
 
+      /* TestCase: V2DispatcherTests_SPEC2_19_IncludeServletAction_dispatch1  */
+      /* Details: "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 include"              */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2DispatcherTests_SPEC2_19_IncludeServletAction_dispatch1", aurl);
+         tb.writeTo(writer);
       }
+
+      /* TestCase: V2DispatcherTests_SPEC2_19_IncludeServletAction_dispatch2  */
+      /* Details: "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("V2DispatcherTests_SPEC2_19_IncludeServletAction_dispatch2", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2DispatcherTests_SPEC2_19_IncludeServletAction_dispatch3  */
+      /* Details: "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("V2DispatcherTests_SPEC2_19_IncludeServletAction_dispatch3", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2DispatcherTests_SPEC2_19_IncludeServletAction_invoke1    */
+      /* Details: "The PortletRequestDispatcher include method can target a   */
+      /* servlet "                                                            */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2DispatcherTests_SPEC2_19_IncludeServletAction_invoke1", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2DispatcherTests_SPEC2_19_IncludeServletAction_invoke2    */
+      /* Details: "Parameters to the include 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("V2DispatcherTests_SPEC2_19_IncludeServletAction_invoke2", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2DispatcherTests_SPEC2_19_IncludeServletAction_invoke4    */
+      /* Details: "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("V2DispatcherTests_SPEC2_19_IncludeServletAction_invoke4", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2DispatcherTests_SPEC2_19_IncludeServletAction_invoke7    */
+      /* Details: "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("V2DispatcherTests_SPEC2_19_IncludeServletAction_invoke7", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2DispatcherTests_SPEC2_19_IncludeServletAction_attributes1 */
+      /* Details: "If the request dispatcher is obtained through the          */
+      /* getRequestDispatcher method, the request attribute                   */
+      /* javax.servlet.include.request_uri will be set, and equals the        */
+      /* value from HTTPServletRequest.getRequestURI for the first servlet    */
+      /* in the include chain"                                                */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2DispatcherTests_SPEC2_19_IncludeServletAction_attributes1", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2DispatcherTests_SPEC2_19_IncludeServletAction_attributes2 */
+      /* Details: "If the request dispatcher is obtained through the          */
+      /* getRequestDispatcher method, the request attribute                   */
+      /* javax.servlet.include.context_path will be set, and equals the       */
+      /* value from HTTPServletRequest.getContestPath for the first servlet   */
+      /* in the include chain"                                                */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2DispatcherTests_SPEC2_19_IncludeServletAction_attributes2", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2DispatcherTests_SPEC2_19_IncludeServletAction_attributes3 */
+      /* Details: "If the request dispatcher is obtained through the          */
+      /* getRequestDispatcher method, the request attribute                   */
+      /* javax.servlet.include.servlet_path will be set, and equals the       */
+      /* value from HTTPServletRequest.getServletPath for the first servlet   */
+      /* in the include chain"                                                */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2DispatcherTests_SPEC2_19_IncludeServletAction_attributes3", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2DispatcherTests_SPEC2_19_IncludeServletAction_attributes4 */
+      /* Details: "If the request dispatcher is obtained through the          */
+      /* getRequestDispatcher method, the request attribute                   */
+      /* javax.servlet.include.path_info will be set, and equals the value    */
+      /* from HTTPServletRequest.getPathInfo for the first servlet in the     */
+      /* include chain"                                                       */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2DispatcherTests_SPEC2_19_IncludeServletAction_attributes4", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2DispatcherTests_SPEC2_19_IncludeServletAction_attributes5 */
+      /* Details: "If the request dispatcher is obtained through the          */
+      /* getRequestDispatcher method, the request attribute                   */
+      /* javax.servlet.include.query_string will be set, and equals the       */
+      /* value from HTTPServletRequest.getQueryString for the first servlet   */
+      /* in the include chain"                                                */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2DispatcherTests_SPEC2_19_IncludeServletAction_attributes5", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2DispatcherTests_SPEC2_19_IncludeServletAction_attributes6 */
+      /* Details: "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("V2DispatcherTests_SPEC2_19_IncludeServletAction_attributes6", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2DispatcherTests_SPEC2_19_IncludeServletAction_attributes7 */
+      /* Details: "For includes 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("V2DispatcherTests_SPEC2_19_IncludeServletAction_attributes7", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2DispatcherTests_SPEC2_19_IncludeServletAction_attributes8 */
+      /* Details: "For includes 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("V2DispatcherTests_SPEC2_19_IncludeServletAction_attributes8", aurl);
+         tb.writeTo(writer);
+      }
+
    }
 
 }

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/738540a7/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 5d056f4..d1ca3cc 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
@@ -66,13 +66,9 @@ public class DispatcherTests_SPEC2_19_IncludeServletEvent implements Portlet, Re
          throws PortletException, IOException {
       LOGGER.entering(LOG_CLASS, "main portlet processAction entry");
 
-      Cookie c = new Cookie(COOKIE_PREFIX +"DispatcherTests_SPEC2_19_IncludeServletEvent", COOKIE_VALUE);
-      c.setMaxAge(10);
-      portletResp.addProperty(c);
-      portletResp.addProperty(PROP_PREFIX +"DispatcherTests_SPEC2_19_IncludeServletEvent", PROP_VALUE);
-
+      portletResp.setRenderParameters(portletReq.getParameterMap());
       long tid = Thread.currentThread().getId();
-      portletReq.setAttribute("void", tid);
+      portletReq.setAttribute(THREADID_ATTR, tid);
 
       StringWriter writer = new StringWriter();
 
@@ -86,13 +82,8 @@ public class DispatcherTests_SPEC2_19_IncludeServletEvent implements Portlet, Re
          throws PortletException, IOException {
       LOGGER.entering(LOG_CLASS, "main portlet serveResource entry");
 
-      Cookie c = new Cookie(COOKIE_PREFIX +"DispatcherTests_SPEC2_19_IncludeServletEvent", COOKIE_VALUE);
-      c.setMaxAge(10);
-      portletResp.addProperty(c);
-      portletResp.addProperty(PROP_PREFIX +"DispatcherTests_SPEC2_19_IncludeServletEvent", PROP_VALUE);
-
       long tid = Thread.currentThread().getId();
-      portletReq.setAttribute("void", tid);
+      portletReq.setAttribute(THREADID_ATTR, tid);
 
       PrintWriter writer = portletResp.getWriter();
 
@@ -103,13 +94,8 @@ public class DispatcherTests_SPEC2_19_IncludeServletEvent implements Portlet, Re
          throws PortletException, IOException {
       LOGGER.entering(LOG_CLASS, "main portlet render entry");
 
-      Cookie c = new Cookie(COOKIE_PREFIX +"DispatcherTests_SPEC2_19_IncludeServletEvent", COOKIE_VALUE);
-      c.setMaxAge(10);
-      portletResp.addProperty(c);
-      portletResp.addProperty(PROP_PREFIX +"DispatcherTests_SPEC2_19_IncludeServletEvent", PROP_VALUE);
-
       long tid = Thread.currentThread().getId();
-      portletReq.setAttribute("void", tid);
+      portletReq.setAttribute(THREADID_ATTR, tid);
 
       PrintWriter writer = portletResp.getWriter();
 
@@ -119,6 +105,7 @@ public class DispatcherTests_SPEC2_19_IncludeServletEvent implements Portlet, Re
       /* must be passed to the target servlet during an include"              */
       {
          PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
          TestButton tb = new TestButton("V2DispatcherTests_SPEC2_19_IncludeServletEvent_dispatch1", aurl);
          tb.writeTo(writer);
       }
@@ -128,6 +115,7 @@ public class DispatcherTests_SPEC2_19_IncludeServletEvent implements Portlet, Re
       /* aggregated with the portlet render parameters"                       */
       {
          PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
          TestButton tb = new TestButton("V2DispatcherTests_SPEC2_19_IncludeServletEvent_dispatch2", aurl);
          tb.writeTo(writer);
       }
@@ -138,6 +126,7 @@ public class DispatcherTests_SPEC2_19_IncludeServletEvent implements Portlet, Re
       /* parameter values array before the render parameter values"           */
       {
          PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
          TestButton tb = new TestButton("V2DispatcherTests_SPEC2_19_IncludeServletEvent_dispatch3", aurl);
          tb.writeTo(writer);
       }
@@ -147,6 +136,7 @@ public class DispatcherTests_SPEC2_19_IncludeServletEvent implements Portlet, Re
       /* servlet "                                                            */
       {
          PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
          TestButton tb = new TestButton("V2DispatcherTests_SPEC2_19_IncludeServletEvent_invoke1", aurl);
          tb.writeTo(writer);
       }
@@ -157,6 +147,7 @@ public class DispatcherTests_SPEC2_19_IncludeServletEvent implements Portlet, Re
       /* method initiating the include"                                       */
       {
          PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
          TestButton tb = new TestButton("V2DispatcherTests_SPEC2_19_IncludeServletEvent_invoke2", aurl);
          tb.writeTo(writer);
       }
@@ -167,6 +158,7 @@ public class DispatcherTests_SPEC2_19_IncludeServletEvent implements Portlet, Re
       /* invocation"                                                          */
       {
          PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
          TestButton tb = new TestButton("V2DispatcherTests_SPEC2_19_IncludeServletEvent_invoke4", aurl);
          tb.writeTo(writer);
       }
@@ -177,6 +169,7 @@ public class DispatcherTests_SPEC2_19_IncludeServletEvent implements Portlet, Re
       /* RequestDispatcher"                                                   */
       {
          PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
          TestButton tb = new TestButton("V2DispatcherTests_SPEC2_19_IncludeServletEvent_invoke7", aurl);
          tb.writeTo(writer);
       }
@@ -189,6 +182,7 @@ public class DispatcherTests_SPEC2_19_IncludeServletEvent implements Portlet, Re
       /* in the include chain"                                                */
       {
          PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
          TestButton tb = new TestButton("V2DispatcherTests_SPEC2_19_IncludeServletEvent_attributes1", aurl);
          tb.writeTo(writer);
       }
@@ -201,6 +195,7 @@ public class DispatcherTests_SPEC2_19_IncludeServletEvent implements Portlet, Re
       /* in the include chain"                                                */
       {
          PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
          TestButton tb = new TestButton("V2DispatcherTests_SPEC2_19_IncludeServletEvent_attributes2", aurl);
          tb.writeTo(writer);
       }
@@ -213,6 +208,7 @@ public class DispatcherTests_SPEC2_19_IncludeServletEvent implements Portlet, Re
       /* in the include chain"                                                */
       {
          PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
          TestButton tb = new TestButton("V2DispatcherTests_SPEC2_19_IncludeServletEvent_attributes3", aurl);
          tb.writeTo(writer);
       }
@@ -225,6 +221,7 @@ public class DispatcherTests_SPEC2_19_IncludeServletEvent implements Portlet, Re
       /* include chain"                                                       */
       {
          PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
          TestButton tb = new TestButton("V2DispatcherTests_SPEC2_19_IncludeServletEvent_attributes4", aurl);
          tb.writeTo(writer);
       }
@@ -237,6 +234,7 @@ public class DispatcherTests_SPEC2_19_IncludeServletEvent implements Portlet, Re
       /* in the include chain"                                                */
       {
          PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
          TestButton tb = new TestButton("V2DispatcherTests_SPEC2_19_IncludeServletEvent_attributes5", aurl);
          tb.writeTo(writer);
       }
@@ -246,6 +244,7 @@ public class DispatcherTests_SPEC2_19_IncludeServletEvent implements Portlet, Re
       /* to the javax.portlet.PortletConfig object"                           */
       {
          PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
          TestButton tb = new TestButton("V2DispatcherTests_SPEC2_19_IncludeServletEvent_attributes6", aurl);
          tb.writeTo(writer);
       }
@@ -256,6 +255,7 @@ public class DispatcherTests_SPEC2_19_IncludeServletEvent implements Portlet, Re
       /* javax.portlet.EventRequest object"                                   */
       {
          PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
          TestButton tb = new TestButton("V2DispatcherTests_SPEC2_19_IncludeServletEvent_attributes7", aurl);
          tb.writeTo(writer);
       }
@@ -266,6 +266,7 @@ public class DispatcherTests_SPEC2_19_IncludeServletEvent implements Portlet, Re
       /* javax.portlet.EventResponse object"                                  */
       {
          PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
          TestButton tb = new TestButton("V2DispatcherTests_SPEC2_19_IncludeServletEvent_attributes8", aurl);
          tb.writeTo(writer);
       }

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/738540a7/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/portlets/DispatcherTests_SPEC2_19_IncludeServletEvent_event.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/portlets/DispatcherTests_SPEC2_19_IncludeServletEvent_event.java b/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/portlets/DispatcherTests_SPEC2_19_IncludeServletEvent_event.java
index 4fe8a93..34962f0 100644
--- a/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/portlets/DispatcherTests_SPEC2_19_IncludeServletEvent_event.java
+++ b/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/portlets/DispatcherTests_SPEC2_19_IncludeServletEvent_event.java
@@ -66,6 +66,27 @@ public class DispatcherTests_SPEC2_19_IncludeServletEvent_event implements Portl
    }
 
    @Override
+   public void processEvent(EventRequest portletReq, EventResponse portletResp)
+         throws PortletException, IOException {
+      LOGGER.entering(LOG_CLASS, "event companion processEvent");
+
+
+      portletResp.setRenderParameters(portletReq);
+
+      long tid = Thread.currentThread().getId();
+      portletReq.setAttribute(THREADID_ATTR, tid);
+
+      StringWriter writer = new StringWriter();
+
+      // Now do the actual dispatch
+      String target = SERVLET_PREFIX + "DispatcherTests_SPEC2_19_IncludeServletEvent_servlet" + SERVLET_SUFFIX + "?" + QUERY_STRING;
+      PortletRequestDispatcher rd = portletConfig.getPortletContext()
+            .getRequestDispatcher(target);
+      rd.include(portletReq, portletResp);
+
+   }
+
+   @Override
    public void render(RenderRequest portletReq, RenderResponse portletResp)
          throws PortletException, IOException {
       
@@ -83,26 +104,4 @@ public class DispatcherTests_SPEC2_19_IncludeServletEvent_event implements Portl
 
    }
 
-   @Override
-   public void processEvent(EventRequest portletReq, EventResponse portletResp)
-         throws PortletException, IOException {
-      LOGGER.entering(LOG_CLASS, "event companion processEvent");
-
-
-      Cookie c = new Cookie(COOKIE_PREFIX +"DispatcherTests_SPEC2_19_IncludeServletEvent_event", COOKIE_VALUE);
-      c.setMaxAge(10);
-      portletResp.addProperty(c);
-      portletResp.addProperty(PROP_PREFIX +"DispatcherTests_SPEC2_19_IncludeServletEvent_event", PROP_VALUE);
-
-      long tid = Thread.currentThread().getId();
-      portletReq.setAttribute("void", tid);
-
-      StringWriter writer = new StringWriter();
-
-      PortletRequestDispatcher rd = portletConfig.getPortletContext()
-            .getRequestDispatcher("/DispatcherTests_SPEC2_19_IncludeServletEvent_servlet?qparm1=qvalue1&qparm2=qvalue2");
-      rd.include(portletReq, portletResp);
-
-   }
-
 }

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/738540a7/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/portlets/DispatcherTests_SPEC2_19_IncludeServletRender.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/portlets/DispatcherTests_SPEC2_19_IncludeServletRender.java b/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/portlets/DispatcherTests_SPEC2_19_IncludeServletRender.java
index 8a02d73..c8cd857 100644
--- a/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/portlets/DispatcherTests_SPEC2_19_IncludeServletRender.java
+++ b/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/portlets/DispatcherTests_SPEC2_19_IncludeServletRender.java
@@ -66,13 +66,9 @@ public class DispatcherTests_SPEC2_19_IncludeServletRender implements Portlet, R
          throws PortletException, IOException {
       LOGGER.entering(LOG_CLASS, "main portlet processAction entry");
 
-      Cookie c = new Cookie(COOKIE_PREFIX +"DispatcherTests_SPEC2_19_IncludeServletRender", COOKIE_VALUE);
-      c.setMaxAge(10);
-      portletResp.addProperty(c);
-      portletResp.addProperty(PROP_PREFIX +"DispatcherTests_SPEC2_19_IncludeServletRender", PROP_VALUE);
-
+      portletResp.setRenderParameters(portletReq.getParameterMap());
       long tid = Thread.currentThread().getId();
-      portletReq.setAttribute("void", tid);
+      portletReq.setAttribute(THREADID_ATTR, tid);
 
       StringWriter writer = new StringWriter();
 
@@ -83,13 +79,8 @@ public class DispatcherTests_SPEC2_19_IncludeServletRender implements Portlet, R
          throws PortletException, IOException {
       LOGGER.entering(LOG_CLASS, "main portlet serveResource entry");
 
-      Cookie c = new Cookie(COOKIE_PREFIX +"DispatcherTests_SPEC2_19_IncludeServletRender", COOKIE_VALUE);
-      c.setMaxAge(10);
-      portletResp.addProperty(c);
-      portletResp.addProperty(PROP_PREFIX +"DispatcherTests_SPEC2_19_IncludeServletRender", PROP_VALUE);
-
       long tid = Thread.currentThread().getId();
-      portletReq.setAttribute("void", tid);
+      portletReq.setAttribute(THREADID_ATTR, tid);
 
       PrintWriter writer = portletResp.getWriter();
 
@@ -100,18 +91,15 @@ public class DispatcherTests_SPEC2_19_IncludeServletRender implements Portlet, R
          throws PortletException, IOException {
       LOGGER.entering(LOG_CLASS, "main portlet render entry");
 
-      Cookie c = new Cookie(COOKIE_PREFIX +"DispatcherTests_SPEC2_19_IncludeServletRender", COOKIE_VALUE);
-      c.setMaxAge(10);
-      portletResp.addProperty(c);
-      portletResp.addProperty(PROP_PREFIX +"DispatcherTests_SPEC2_19_IncludeServletRender", PROP_VALUE);
-
       long tid = Thread.currentThread().getId();
-      portletReq.setAttribute("void", tid);
+      portletReq.setAttribute(THREADID_ATTR, tid);
 
       PrintWriter writer = portletResp.getWriter();
 
+      // Now do the actual dispatch
+      String target = SERVLET_PREFIX + "DispatcherTests_SPEC2_19_IncludeServletRender_servlet" + SERVLET_SUFFIX + "?" + QUERY_STRING;
       PortletRequestDispatcher rd = portletConfig.getPortletContext()
-            .getRequestDispatcher("/DispatcherTests_SPEC2_19_IncludeServletRender_servlet?qparm1=qvalue1&qparm2=qvalue2");
+            .getRequestDispatcher(target);
       rd.include(portletReq, portletResp);
    }
 

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/738540a7/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/portlets/DispatcherTests_SPEC2_19_IncludeServletResource.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/portlets/DispatcherTests_SPEC2_19_IncludeServletResource.java b/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/portlets/DispatcherTests_SPEC2_19_IncludeServletResource.java
index d96ceab..c724a60 100644
--- a/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/portlets/DispatcherTests_SPEC2_19_IncludeServletResource.java
+++ b/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/portlets/DispatcherTests_SPEC2_19_IncludeServletResource.java
@@ -66,13 +66,9 @@ public class DispatcherTests_SPEC2_19_IncludeServletResource implements Portlet,
          throws PortletException, IOException {
       LOGGER.entering(LOG_CLASS, "main portlet processAction entry");
 
-      Cookie c = new Cookie(COOKIE_PREFIX +"DispatcherTests_SPEC2_19_IncludeServletResource", COOKIE_VALUE);
-      c.setMaxAge(10);
-      portletResp.addProperty(c);
-      portletResp.addProperty(PROP_PREFIX +"DispatcherTests_SPEC2_19_IncludeServletResource", PROP_VALUE);
-
+      portletResp.setRenderParameters(portletReq.getParameterMap());
       long tid = Thread.currentThread().getId();
-      portletReq.setAttribute("void", tid);
+      portletReq.setAttribute(THREADID_ATTR, tid);
 
       StringWriter writer = new StringWriter();
 
@@ -83,18 +79,15 @@ public class DispatcherTests_SPEC2_19_IncludeServletResource implements Portlet,
          throws PortletException, IOException {
       LOGGER.entering(LOG_CLASS, "main portlet serveResource entry");
 
-      Cookie c = new Cookie(COOKIE_PREFIX +"DispatcherTests_SPEC2_19_IncludeServletResource", COOKIE_VALUE);
-      c.setMaxAge(10);
-      portletResp.addProperty(c);
-      portletResp.addProperty(PROP_PREFIX +"DispatcherTests_SPEC2_19_IncludeServletResource", PROP_VALUE);
-
       long tid = Thread.currentThread().getId();
-      portletReq.setAttribute("void", tid);
+      portletReq.setAttribute(THREADID_ATTR, tid);
 
       PrintWriter writer = portletResp.getWriter();
 
+      // Now do the actual dispatch
+      String target = SERVLET_PREFIX + "DispatcherTests_SPEC2_19_IncludeServletResource_servlet" + SERVLET_SUFFIX + "?" + QUERY_STRING;
       PortletRequestDispatcher rd = portletConfig.getPortletContext()
-            .getRequestDispatcher("/DispatcherTests_SPEC2_19_IncludeServletResource_servlet?qparm1=qvalue1&qparm2=qvalue2");
+            .getRequestDispatcher(target);
       rd.include(portletReq, portletResp);
    }
 
@@ -103,13 +96,8 @@ public class DispatcherTests_SPEC2_19_IncludeServletResource implements Portlet,
          throws PortletException, IOException {
       LOGGER.entering(LOG_CLASS, "main portlet render entry");
 
-      Cookie c = new Cookie(COOKIE_PREFIX +"DispatcherTests_SPEC2_19_IncludeServletResource", COOKIE_VALUE);
-      c.setMaxAge(10);
-      portletResp.addProperty(c);
-      portletResp.addProperty(PROP_PREFIX +"DispatcherTests_SPEC2_19_IncludeServletResource", PROP_VALUE);
-
       long tid = Thread.currentThread().getId();
-      portletReq.setAttribute("void", tid);
+      portletReq.setAttribute(THREADID_ATTR, tid);
 
       PrintWriter writer = portletResp.getWriter();
 

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/738540a7/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 8239c1d..baafa3b 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
@@ -65,7 +65,7 @@ public class DispatcherTests_SPEC2_19_ForwardServletAction_servlet extends HttpS
       PortletResponse portletResp = (PortletResponse) request.getAttribute("javax.portlet.response");
       PortletConfig portletConfig = (PortletConfig) request.getAttribute("javax.portlet.config");
       long svtTid = Thread.currentThread().getId();
-      long reqTid = (Long) portletReq.getAttribute("void");
+      long reqTid = (Long) portletReq.getAttribute(THREADID_ATTR);
 
       StringWriter writer = new StringWriter();
 
@@ -167,7 +167,7 @@ public class DispatcherTests_SPEC2_19_ForwardServletAction_servlet extends HttpS
       TestResult tr7 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_FORWARDSERVLETACTION_ATTRIBUTES1);
       try {
          String name = "javax.servlet.forward.req.uri";
-         String attrVal = (String) portletReq.getAttribute(name);
+         String attrVal = (String) request.getAttribute(name);
          String currVal =  request.getRequestURI();
          CompareUtils.stringsEqual(attrVal, currVal, tr7);
       } catch(Exception e) {tr7.appendTcDetail(e.toString());}
@@ -182,7 +182,7 @@ public class DispatcherTests_SPEC2_19_ForwardServletAction_servlet extends HttpS
       TestResult tr8 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_FORWARDSERVLETACTION_ATTRIBUTES2);
       try {
          String name = "javax.servlet.forward.context_path";
-         String attrVal = (String) portletReq.getAttribute(name);
+         String attrVal = (String) request.getAttribute(name);
          String currVal =  request.getContextPath();
          CompareUtils.stringsEqual(attrVal, currVal, tr8);
       } catch(Exception e) {tr8.appendTcDetail(e.toString());}
@@ -197,7 +197,7 @@ public class DispatcherTests_SPEC2_19_ForwardServletAction_servlet extends HttpS
       TestResult tr9 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_FORWARDSERVLETACTION_ATTRIBUTES3);
       try {
          String name = "javax.servlet.forward.servlet_path";
-         String attrVal = (String) portletReq.getAttribute(name);
+         String attrVal = (String) request.getAttribute(name);
          String currVal =  request.getServletPath();
          CompareUtils.stringsEqual(attrVal, currVal, tr9);
       } catch(Exception e) {tr9.appendTcDetail(e.toString());}
@@ -212,7 +212,7 @@ public class DispatcherTests_SPEC2_19_ForwardServletAction_servlet extends HttpS
       TestResult tr10 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_FORWARDSERVLETACTION_ATTRIBUTES4);
       try {
          String name = "javax.servlet.forward.path_info";
-         String attrVal = (String) portletReq.getAttribute(name);
+         String attrVal = (String) request.getAttribute(name);
          String currVal =  request.getPathInfo();
          CompareUtils.stringsEqual(attrVal, currVal, tr10);
       } catch(Exception e) {tr10.appendTcDetail(e.toString());}
@@ -227,7 +227,7 @@ public class DispatcherTests_SPEC2_19_ForwardServletAction_servlet extends HttpS
       TestResult tr11 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_FORWARDSERVLETACTION_ATTRIBUTES5);
       try {
          String name = "javax.servlet.forward.query_string";
-         String attrVal = (String) portletReq.getAttribute(name);
+         String attrVal = (String) request.getAttribute(name);
          String currVal =  request.getQueryString();
          CompareUtils.stringsEqual(attrVal, currVal, tr11);
       } catch(Exception e) {tr11.appendTcDetail(e.toString());}

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/738540a7/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 8b29341..2ffcddd 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
@@ -65,7 +65,7 @@ public class DispatcherTests_SPEC2_19_ForwardServletEvent_servlet extends HttpSe
       PortletResponse portletResp = (PortletResponse) request.getAttribute("javax.portlet.response");
       PortletConfig portletConfig = (PortletConfig) request.getAttribute("javax.portlet.config");
       long svtTid = Thread.currentThread().getId();
-      long reqTid = (Long) portletReq.getAttribute("void");
+      long reqTid = (Long) portletReq.getAttribute(THREADID_ATTR);
 
       StringWriter writer = new StringWriter();
 
@@ -167,7 +167,7 @@ public class DispatcherTests_SPEC2_19_ForwardServletEvent_servlet extends HttpSe
       TestResult tr7 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_FORWARDSERVLETEVENT_ATTRIBUTES1);
       try {
          String name = "javax.servlet.forward.req.uri";
-         String attrVal = (String) portletReq.getAttribute(name);
+         String attrVal = (String) request.getAttribute(name);
          String currVal =  request.getRequestURI();
          CompareUtils.stringsEqual(attrVal, currVal, tr7);
       } catch(Exception e) {tr7.appendTcDetail(e.toString());}
@@ -182,7 +182,7 @@ public class DispatcherTests_SPEC2_19_ForwardServletEvent_servlet extends HttpSe
       TestResult tr8 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_FORWARDSERVLETEVENT_ATTRIBUTES2);
       try {
          String name = "javax.servlet.forward.context_path";
-         String attrVal = (String) portletReq.getAttribute(name);
+         String attrVal = (String) request.getAttribute(name);
          String currVal =  request.getContextPath();
          CompareUtils.stringsEqual(attrVal, currVal, tr8);
       } catch(Exception e) {tr8.appendTcDetail(e.toString());}
@@ -197,7 +197,7 @@ public class DispatcherTests_SPEC2_19_ForwardServletEvent_servlet extends HttpSe
       TestResult tr9 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_FORWARDSERVLETEVENT_ATTRIBUTES3);
       try {
          String name = "javax.servlet.forward.servlet_path";
-         String attrVal = (String) portletReq.getAttribute(name);
+         String attrVal = (String) request.getAttribute(name);
          String currVal =  request.getServletPath();
          CompareUtils.stringsEqual(attrVal, currVal, tr9);
       } catch(Exception e) {tr9.appendTcDetail(e.toString());}
@@ -212,7 +212,7 @@ public class DispatcherTests_SPEC2_19_ForwardServletEvent_servlet extends HttpSe
       TestResult tr10 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_FORWARDSERVLETEVENT_ATTRIBUTES4);
       try {
          String name = "javax.servlet.forward.path_info";
-         String attrVal = (String) portletReq.getAttribute(name);
+         String attrVal = (String) request.getAttribute(name);
          String currVal =  request.getPathInfo();
          CompareUtils.stringsEqual(attrVal, currVal, tr10);
       } catch(Exception e) {tr10.appendTcDetail(e.toString());}
@@ -227,7 +227,7 @@ public class DispatcherTests_SPEC2_19_ForwardServletEvent_servlet extends HttpSe
       TestResult tr11 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_FORWARDSERVLETEVENT_ATTRIBUTES5);
       try {
          String name = "javax.servlet.forward.query_string";
-         String attrVal = (String) portletReq.getAttribute(name);
+         String attrVal = (String) request.getAttribute(name);
          String currVal =  request.getQueryString();
          CompareUtils.stringsEqual(attrVal, currVal, tr11);
       } catch(Exception e) {tr11.appendTcDetail(e.toString());}

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/738540a7/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 a9b63fd..6e9008c 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
@@ -65,7 +65,7 @@ public class DispatcherTests_SPEC2_19_ForwardServletRender_servlet extends HttpS
       PortletResponse portletResp = (PortletResponse) request.getAttribute("javax.portlet.response");
       PortletConfig portletConfig = (PortletConfig) request.getAttribute("javax.portlet.config");
       long svtTid = Thread.currentThread().getId();
-      long reqTid = (Long) portletReq.getAttribute("void");
+      long reqTid = (Long) portletReq.getAttribute(THREADID_ATTR);
 
       PrintWriter writer = ((MimeResponse)portletResp).getWriter();
 
@@ -167,7 +167,7 @@ public class DispatcherTests_SPEC2_19_ForwardServletRender_servlet extends HttpS
       TestResult tr7 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_FORWARDSERVLETRENDER_ATTRIBUTES1);
       try {
          String name = "javax.servlet.forward.req.uri";
-         String attrVal = (String) portletReq.getAttribute(name);
+         String attrVal = (String) request.getAttribute(name);
          String currVal =  request.getRequestURI();
          CompareUtils.stringsEqual(attrVal, currVal, tr7);
       } catch(Exception e) {tr7.appendTcDetail(e.toString());}
@@ -182,7 +182,7 @@ public class DispatcherTests_SPEC2_19_ForwardServletRender_servlet extends HttpS
       TestResult tr8 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_FORWARDSERVLETRENDER_ATTRIBUTES2);
       try {
          String name = "javax.servlet.forward.context_path";
-         String attrVal = (String) portletReq.getAttribute(name);
+         String attrVal = (String) request.getAttribute(name);
          String currVal =  request.getContextPath();
          CompareUtils.stringsEqual(attrVal, currVal, tr8);
       } catch(Exception e) {tr8.appendTcDetail(e.toString());}
@@ -197,7 +197,7 @@ public class DispatcherTests_SPEC2_19_ForwardServletRender_servlet extends HttpS
       TestResult tr9 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_FORWARDSERVLETRENDER_ATTRIBUTES3);
       try {
          String name = "javax.servlet.forward.servlet_path";
-         String attrVal = (String) portletReq.getAttribute(name);
+         String attrVal = (String) request.getAttribute(name);
          String currVal =  request.getServletPath();
          CompareUtils.stringsEqual(attrVal, currVal, tr9);
       } catch(Exception e) {tr9.appendTcDetail(e.toString());}
@@ -212,7 +212,7 @@ public class DispatcherTests_SPEC2_19_ForwardServletRender_servlet extends HttpS
       TestResult tr10 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_FORWARDSERVLETRENDER_ATTRIBUTES4);
       try {
          String name = "javax.servlet.forward.path_info";
-         String attrVal = (String) portletReq.getAttribute(name);
+         String attrVal = (String) request.getAttribute(name);
          String currVal =  request.getPathInfo();
          CompareUtils.stringsEqual(attrVal, currVal, tr10);
       } catch(Exception e) {tr10.appendTcDetail(e.toString());}
@@ -227,7 +227,7 @@ public class DispatcherTests_SPEC2_19_ForwardServletRender_servlet extends HttpS
       TestResult tr11 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_FORWARDSERVLETRENDER_ATTRIBUTES5);
       try {
          String name = "javax.servlet.forward.query_string";
-         String attrVal = (String) portletReq.getAttribute(name);
+         String attrVal = (String) request.getAttribute(name);
          String currVal =  request.getQueryString();
          CompareUtils.stringsEqual(attrVal, currVal, tr11);
       } catch(Exception e) {tr11.appendTcDetail(e.toString());}

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/738540a7/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 323d74a..164adb4 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
@@ -65,7 +65,7 @@ public class DispatcherTests_SPEC2_19_ForwardServletResource_servlet extends Htt
       PortletResponse portletResp = (PortletResponse) request.getAttribute("javax.portlet.response");
       PortletConfig portletConfig = (PortletConfig) request.getAttribute("javax.portlet.config");
       long svtTid = Thread.currentThread().getId();
-      long reqTid = (Long) portletReq.getAttribute("void");
+      long reqTid = (Long) portletReq.getAttribute(THREADID_ATTR);
 
       PrintWriter writer = ((MimeResponse)portletResp).getWriter();
 
@@ -167,7 +167,7 @@ public class DispatcherTests_SPEC2_19_ForwardServletResource_servlet extends Htt
       TestResult tr7 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_FORWARDSERVLETRESOURCE_ATTRIBUTES1);
       try {
          String name = "javax.servlet.forward.req.uri";
-         String attrVal = (String) portletReq.getAttribute(name);
+         String attrVal = (String) request.getAttribute(name);
          String currVal =  request.getRequestURI();
          CompareUtils.stringsEqual(attrVal, currVal, tr7);
       } catch(Exception e) {tr7.appendTcDetail(e.toString());}
@@ -182,7 +182,7 @@ public class DispatcherTests_SPEC2_19_ForwardServletResource_servlet extends Htt
       TestResult tr8 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_FORWARDSERVLETRESOURCE_ATTRIBUTES2);
       try {
          String name = "javax.servlet.forward.context_path";
-         String attrVal = (String) portletReq.getAttribute(name);
+         String attrVal = (String) request.getAttribute(name);
          String currVal =  request.getContextPath();
          CompareUtils.stringsEqual(attrVal, currVal, tr8);
       } catch(Exception e) {tr8.appendTcDetail(e.toString());}
@@ -197,7 +197,7 @@ public class DispatcherTests_SPEC2_19_ForwardServletResource_servlet extends Htt
       TestResult tr9 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_FORWARDSERVLETRESOURCE_ATTRIBUTES3);
       try {
          String name = "javax.servlet.forward.servlet_path";
-         String attrVal = (String) portletReq.getAttribute(name);
+         String attrVal = (String) request.getAttribute(name);
          String currVal =  request.getServletPath();
          CompareUtils.stringsEqual(attrVal, currVal, tr9);
       } catch(Exception e) {tr9.appendTcDetail(e.toString());}
@@ -212,7 +212,7 @@ public class DispatcherTests_SPEC2_19_ForwardServletResource_servlet extends Htt
       TestResult tr10 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_FORWARDSERVLETRESOURCE_ATTRIBUTES4);
       try {
          String name = "javax.servlet.forward.path_info";
-         String attrVal = (String) portletReq.getAttribute(name);
+         String attrVal = (String) request.getAttribute(name);
          String currVal =  request.getPathInfo();
          CompareUtils.stringsEqual(attrVal, currVal, tr10);
       } catch(Exception e) {tr10.appendTcDetail(e.toString());}
@@ -227,7 +227,7 @@ public class DispatcherTests_SPEC2_19_ForwardServletResource_servlet extends Htt
       TestResult tr11 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_FORWARDSERVLETRESOURCE_ATTRIBUTES5);
       try {
          String name = "javax.servlet.forward.query_string";
-         String attrVal = (String) portletReq.getAttribute(name);
+         String attrVal = (String) request.getAttribute(name);
          String currVal =  request.getQueryString();
          CompareUtils.stringsEqual(attrVal, currVal, tr11);
       } catch(Exception e) {tr11.appendTcDetail(e.toString());}

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/738540a7/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 6aaffcb..0ab5b9e 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
@@ -65,7 +65,7 @@ public class DispatcherTests_SPEC2_19_IncludeServletAction_servlet extends HttpS
       PortletResponse portletResp = (PortletResponse) request.getAttribute("javax.portlet.response");
       PortletConfig portletConfig = (PortletConfig) request.getAttribute("javax.portlet.config");
       long svtTid = Thread.currentThread().getId();
-      long reqTid = (Long) portletReq.getAttribute("void");
+      long reqTid = (Long) portletReq.getAttribute(THREADID_ATTR);
 
       StringWriter writer = new StringWriter();
 
@@ -167,7 +167,7 @@ public class DispatcherTests_SPEC2_19_IncludeServletAction_servlet extends HttpS
       TestResult tr7 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETACTION_ATTRIBUTES1);
       try {
          String name = "javax.servlet.include.req.uri";
-         String attrVal = (String) portletReq.getAttribute(name);
+         String attrVal = (String) request.getAttribute(name);
          String currVal =  request.getRequestURI();
          CompareUtils.stringsEqual(attrVal, currVal, tr7);
       } catch(Exception e) {tr7.appendTcDetail(e.toString());}
@@ -182,7 +182,7 @@ public class DispatcherTests_SPEC2_19_IncludeServletAction_servlet extends HttpS
       TestResult tr8 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETACTION_ATTRIBUTES2);
       try {
          String name = "javax.servlet.include.context_path";
-         String attrVal = (String) portletReq.getAttribute(name);
+         String attrVal = (String) request.getAttribute(name);
          String currVal =  request.getContextPath();
          CompareUtils.stringsEqual(attrVal, currVal, tr8);
       } catch(Exception e) {tr8.appendTcDetail(e.toString());}
@@ -197,7 +197,7 @@ public class DispatcherTests_SPEC2_19_IncludeServletAction_servlet extends HttpS
       TestResult tr9 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETACTION_ATTRIBUTES3);
       try {
          String name = "javax.servlet.include.servlet_path";
-         String attrVal = (String) portletReq.getAttribute(name);
+         String attrVal = (String) request.getAttribute(name);
          String currVal =  request.getServletPath();
          CompareUtils.stringsEqual(attrVal, currVal, tr9);
       } catch(Exception e) {tr9.appendTcDetail(e.toString());}
@@ -212,7 +212,7 @@ public class DispatcherTests_SPEC2_19_IncludeServletAction_servlet extends HttpS
       TestResult tr10 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETACTION_ATTRIBUTES4);
       try {
          String name = "javax.servlet.include.path_info";
-         String attrVal = (String) portletReq.getAttribute(name);
+         String attrVal = (String) request.getAttribute(name);
          String currVal =  request.getPathInfo();
          CompareUtils.stringsEqual(attrVal, currVal, tr10);
       } catch(Exception e) {tr10.appendTcDetail(e.toString());}
@@ -227,7 +227,7 @@ public class DispatcherTests_SPEC2_19_IncludeServletAction_servlet extends HttpS
       TestResult tr11 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETACTION_ATTRIBUTES5);
       try {
          String name = "javax.servlet.include.query_string";
-         String attrVal = (String) portletReq.getAttribute(name);
+         String attrVal = (String) request.getAttribute(name);
          String currVal =  request.getQueryString();
          CompareUtils.stringsEqual(attrVal, currVal, tr11);
       } catch(Exception e) {tr11.appendTcDetail(e.toString());}

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/738540a7/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 49742be..b7b27c2 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
@@ -65,7 +65,7 @@ public class DispatcherTests_SPEC2_19_IncludeServletEvent_servlet extends HttpSe
       PortletResponse portletResp = (PortletResponse) request.getAttribute("javax.portlet.response");
       PortletConfig portletConfig = (PortletConfig) request.getAttribute("javax.portlet.config");
       long svtTid = Thread.currentThread().getId();
-      long reqTid = (Long) portletReq.getAttribute("void");
+      long reqTid = (Long) portletReq.getAttribute(THREADID_ATTR);
 
       StringWriter writer = new StringWriter();
 
@@ -167,7 +167,7 @@ public class DispatcherTests_SPEC2_19_IncludeServletEvent_servlet extends HttpSe
       TestResult tr7 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETEVENT_ATTRIBUTES1);
       try {
          String name = "javax.servlet.include.req.uri";
-         String attrVal = (String) portletReq.getAttribute(name);
+         String attrVal = (String) request.getAttribute(name);
          String currVal =  request.getRequestURI();
          CompareUtils.stringsEqual(attrVal, currVal, tr7);
       } catch(Exception e) {tr7.appendTcDetail(e.toString());}
@@ -182,7 +182,7 @@ public class DispatcherTests_SPEC2_19_IncludeServletEvent_servlet extends HttpSe
       TestResult tr8 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETEVENT_ATTRIBUTES2);
       try {
          String name = "javax.servlet.include.context_path";
-         String attrVal = (String) portletReq.getAttribute(name);
+         String attrVal = (String) request.getAttribute(name);
          String currVal =  request.getContextPath();
          CompareUtils.stringsEqual(attrVal, currVal, tr8);
       } catch(Exception e) {tr8.appendTcDetail(e.toString());}
@@ -197,7 +197,7 @@ public class DispatcherTests_SPEC2_19_IncludeServletEvent_servlet extends HttpSe
       TestResult tr9 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETEVENT_ATTRIBUTES3);
       try {
          String name = "javax.servlet.include.servlet_path";
-         String attrVal = (String) portletReq.getAttribute(name);
+         String attrVal = (String) request.getAttribute(name);
          String currVal =  request.getServletPath();
          CompareUtils.stringsEqual(attrVal, currVal, tr9);
       } catch(Exception e) {tr9.appendTcDetail(e.toString());}
@@ -212,7 +212,7 @@ public class DispatcherTests_SPEC2_19_IncludeServletEvent_servlet extends HttpSe
       TestResult tr10 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETEVENT_ATTRIBUTES4);
       try {
          String name = "javax.servlet.include.path_info";
-         String attrVal = (String) portletReq.getAttribute(name);
+         String attrVal = (String) request.getAttribute(name);
          String currVal =  request.getPathInfo();
          CompareUtils.stringsEqual(attrVal, currVal, tr10);
       } catch(Exception e) {tr10.appendTcDetail(e.toString());}
@@ -227,7 +227,7 @@ public class DispatcherTests_SPEC2_19_IncludeServletEvent_servlet extends HttpSe
       TestResult tr11 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETEVENT_ATTRIBUTES5);
       try {
          String name = "javax.servlet.include.query_string";
-         String attrVal = (String) portletReq.getAttribute(name);
+         String attrVal = (String) request.getAttribute(name);
          String currVal =  request.getQueryString();
          CompareUtils.stringsEqual(attrVal, currVal, tr11);
       } catch(Exception e) {tr11.appendTcDetail(e.toString());}

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/738540a7/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 929b9a5..6591f96 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
@@ -65,7 +65,7 @@ public class DispatcherTests_SPEC2_19_IncludeServletRender_servlet extends HttpS
       PortletResponse portletResp = (PortletResponse) request.getAttribute("javax.portlet.response");
       PortletConfig portletConfig = (PortletConfig) request.getAttribute("javax.portlet.config");
       long svtTid = Thread.currentThread().getId();
-      long reqTid = (Long) portletReq.getAttribute("void");
+      long reqTid = (Long) portletReq.getAttribute(THREADID_ATTR);
 
       PrintWriter writer = ((MimeResponse)portletResp).getWriter();
 
@@ -177,7 +177,7 @@ public class DispatcherTests_SPEC2_19_IncludeServletRender_servlet extends HttpS
       TestResult tr8 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETRENDER_ATTRIBUTES1);
       try {
          String name = "javax.servlet.include.req.uri";
-         String attrVal = (String) portletReq.getAttribute(name);
+         String attrVal = (String) request.getAttribute(name);
          String currVal =  request.getRequestURI();
          CompareUtils.stringsEqual(attrVal, currVal, tr8);
       } catch(Exception e) {tr8.appendTcDetail(e.toString());}
@@ -192,7 +192,7 @@ public class DispatcherTests_SPEC2_19_IncludeServletRender_servlet extends HttpS
       TestResult tr9 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETRENDER_ATTRIBUTES2);
       try {
          String name = "javax.servlet.include.context_path";
-         String attrVal = (String) portletReq.getAttribute(name);
+         String attrVal = (String) request.getAttribute(name);
          String currVal =  request.getContextPath();
          CompareUtils.stringsEqual(attrVal, currVal, tr9);
       } catch(Exception e) {tr9.appendTcDetail(e.toString());}
@@ -207,7 +207,7 @@ public class DispatcherTests_SPEC2_19_IncludeServletRender_servlet extends HttpS
       TestResult tr10 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETRENDER_ATTRIBUTES3);
       try {
          String name = "javax.servlet.include.servlet_path";
-         String attrVal = (String) portletReq.getAttribute(name);
+         String attrVal = (String) request.getAttribute(name);
          String currVal =  request.getServletPath();
          CompareUtils.stringsEqual(attrVal, currVal, tr10);
       } catch(Exception e) {tr10.appendTcDetail(e.toString());}
@@ -222,7 +222,7 @@ public class DispatcherTests_SPEC2_19_IncludeServletRender_servlet extends HttpS
       TestResult tr11 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETRENDER_ATTRIBUTES4);
       try {
          String name = "javax.servlet.include.path_info";
-         String attrVal = (String) portletReq.getAttribute(name);
+         String attrVal = (String) request.getAttribute(name);
          String currVal =  request.getPathInfo();
          CompareUtils.stringsEqual(attrVal, currVal, tr11);
       } catch(Exception e) {tr11.appendTcDetail(e.toString());}
@@ -237,7 +237,7 @@ public class DispatcherTests_SPEC2_19_IncludeServletRender_servlet extends HttpS
       TestResult tr12 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETRENDER_ATTRIBUTES5);
       try {
          String name = "javax.servlet.include.query_string";
-         String attrVal = (String) portletReq.getAttribute(name);
+         String attrVal = (String) request.getAttribute(name);
          String currVal =  request.getQueryString();
          CompareUtils.stringsEqual(attrVal, currVal, tr12);
       } catch(Exception e) {tr12.appendTcDetail(e.toString());}

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/738540a7/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 1790f30..e752479 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
@@ -65,7 +65,7 @@ public class DispatcherTests_SPEC2_19_IncludeServletResource_servlet extends Htt
       PortletResponse portletResp = (PortletResponse) request.getAttribute("javax.portlet.response");
       PortletConfig portletConfig = (PortletConfig) request.getAttribute("javax.portlet.config");
       long svtTid = Thread.currentThread().getId();
-      long reqTid = (Long) portletReq.getAttribute("void");
+      long reqTid = (Long) portletReq.getAttribute(THREADID_ATTR);
 
       PrintWriter writer = ((MimeResponse)portletResp).getWriter();
 
@@ -177,7 +177,7 @@ public class DispatcherTests_SPEC2_19_IncludeServletResource_servlet extends Htt
       TestResult tr8 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETRESOURCE_ATTRIBUTES1);
       try {
          String name = "javax.servlet.include.req.uri";
-         String attrVal = (String) portletReq.getAttribute(name);
+         String attrVal = (String) request.getAttribute(name);
          String currVal =  request.getRequestURI();
          CompareUtils.stringsEqual(attrVal, currVal, tr8);
       } catch(Exception e) {tr8.appendTcDetail(e.toString());}
@@ -192,7 +192,7 @@ public class DispatcherTests_SPEC2_19_IncludeServletResource_servlet extends Htt
       TestResult tr9 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETRESOURCE_ATTRIBUTES2);
       try {
          String name = "javax.servlet.include.context_path";
-         String attrVal = (String) portletReq.getAttribute(name);
+         String attrVal = (String) request.getAttribute(name);
          String currVal =  request.getContextPath();
          CompareUtils.stringsEqual(attrVal, currVal, tr9);
       } catch(Exception e) {tr9.appendTcDetail(e.toString());}
@@ -207,7 +207,7 @@ public class DispatcherTests_SPEC2_19_IncludeServletResource_servlet extends Htt
       TestResult tr10 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETRESOURCE_ATTRIBUTES3);
       try {
          String name = "javax.servlet.include.servlet_path";
-         String attrVal = (String) portletReq.getAttribute(name);
+         String attrVal = (String) request.getAttribute(name);
          String currVal =  request.getServletPath();
          CompareUtils.stringsEqual(attrVal, currVal, tr10);
       } catch(Exception e) {tr10.appendTcDetail(e.toString());}
@@ -222,7 +222,7 @@ public class DispatcherTests_SPEC2_19_IncludeServletResource_servlet extends Htt
       TestResult tr11 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETRESOURCE_ATTRIBUTES4);
       try {
          String name = "javax.servlet.include.path_info";
-         String attrVal = (String) portletReq.getAttribute(name);
+         String attrVal = (String) request.getAttribute(name);
          String currVal =  request.getPathInfo();
          CompareUtils.stringsEqual(attrVal, currVal, tr11);
       } catch(Exception e) {tr11.appendTcDetail(e.toString());}
@@ -237,7 +237,7 @@ public class DispatcherTests_SPEC2_19_IncludeServletResource_servlet extends Htt
       TestResult tr12 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETRESOURCE_ATTRIBUTES5);
       try {
          String name = "javax.servlet.include.query_string";
-         String attrVal = (String) portletReq.getAttribute(name);
+         String attrVal = (String) request.getAttribute(name);
          String currVal =  request.getQueryString();
          CompareUtils.stringsEqual(attrVal, currVal, tr12);
       } catch(Exception e) {tr12.appendTcDetail(e.toString());}


Mime
View raw message