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

[36/48] More work on dispatcher tests. Also, optimization work on selenium driver to make it look for results already being on the page before clicking on a page link.

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/b34ef749/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 2d41c6a..b8e6bd6 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
@@ -113,103 +113,103 @@ public class DispatcherTests_SPEC2_19_IncludeServletEvent implements Portlet, Re
 
       PrintWriter writer = portletResp.getWriter();
 
-      /* TestCase: SPEC2_19_IncludeServletEvent_dispatch1                     */
+      /* TestCase: V2DispatcherTests_SPEC2_19_IncludeServletEvent_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("SPEC2_19_IncludeServletEvent_dispatch1", aurl);
+         TestButton tb = new TestButton("V2DispatcherTests_SPEC2_19_IncludeServletEvent_dispatch1", aurl);
          tb.writeTo(writer);
       }
 
-      /* TestCase: SPEC2_19_IncludeServletEvent_dispatch2                     */
+      /* TestCase: V2DispatcherTests_SPEC2_19_IncludeServletEvent_dispatch2   */
       /* Details: "Parameters specified in the query strings must be          */
       /* aggregated with the portlet render parameters"                       */
       {
          PortletURL aurl = portletResp.createActionURL();
-         TestButton tb = new TestButton("SPEC2_19_IncludeServletEvent_dispatch2", aurl);
+         TestButton tb = new TestButton("V2DispatcherTests_SPEC2_19_IncludeServletEvent_dispatch2", aurl);
          tb.writeTo(writer);
       }
 
-      /* TestCase: SPEC2_19_IncludeServletEvent_dispatch3                     */
+      /* TestCase: V2DispatcherTests_SPEC2_19_IncludeServletEvent_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("SPEC2_19_IncludeServletEvent_dispatch3", aurl);
+         TestButton tb = new TestButton("V2DispatcherTests_SPEC2_19_IncludeServletEvent_dispatch3", aurl);
          tb.writeTo(writer);
       }
 
-      /* TestCase: SPEC2_19_IncludeServletEvent_dispatch4                     */
+      /* TestCase: V2DispatcherTests_SPEC2_19_IncludeServletEvent_dispatch4   */
       /* Details: "The parameters associated with a request dispatcher are    */
       /* scoped only for the duration of the include or forward call"         */
       {
          PortletURL aurl = portletResp.createActionURL();
-         TestButton tb = new TestButton("SPEC2_19_IncludeServletEvent_dispatch4", aurl);
+         TestButton tb = new TestButton("V2DispatcherTests_SPEC2_19_IncludeServletEvent_dispatch4", aurl);
          tb.writeTo(writer);
       }
 
-      /* TestCase: SPEC2_19_IncludeServletEvent_invoke1                       */
+      /* TestCase: V2DispatcherTests_SPEC2_19_IncludeServletEvent_invoke1     */
       /* Details: "The PortletRequestDispatcher include method can target a   */
       /* servlet "                                                            */
       {
          PortletURL aurl = portletResp.createActionURL();
-         TestButton tb = new TestButton("SPEC2_19_IncludeServletEvent_invoke1", aurl);
+         TestButton tb = new TestButton("V2DispatcherTests_SPEC2_19_IncludeServletEvent_invoke1", aurl);
          tb.writeTo(writer);
       }
 
-      /* TestCase: SPEC2_19_IncludeServletEvent_invoke2                       */
+      /* TestCase: V2DispatcherTests_SPEC2_19_IncludeServletEvent_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("SPEC2_19_IncludeServletEvent_invoke2", aurl);
+         TestButton tb = new TestButton("V2DispatcherTests_SPEC2_19_IncludeServletEvent_invoke2", aurl);
          tb.writeTo(writer);
       }
 
-      /* TestCase: SPEC2_19_IncludeServletEvent_invoke3                       */
+      /* TestCase: V2DispatcherTests_SPEC2_19_IncludeServletEvent_invoke3     */
       /* Details: "Parameters to the include method for a target servlet      */
       /* can be wrapped request and response classes from the portlet         */
       /* lifecyle method initiating the include"                              */
       {
          PortletURL aurl = portletResp.createActionURL();
-         TestButton tb = new TestButton("SPEC2_19_IncludeServletEvent_invoke3", aurl);
+         TestButton tb = new TestButton("V2DispatcherTests_SPEC2_19_IncludeServletEvent_invoke3", aurl);
          tb.writeTo(writer);
       }
 
-      /* TestCase: SPEC2_19_IncludeServletEvent_invoke4                       */
+      /* TestCase: V2DispatcherTests_SPEC2_19_IncludeServletEvent_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("SPEC2_19_IncludeServletEvent_invoke4", aurl);
+         TestButton tb = new TestButton("V2DispatcherTests_SPEC2_19_IncludeServletEvent_invoke4", aurl);
          tb.writeTo(writer);
       }
 
-      /* TestCase: SPEC2_19_IncludeServletEvent_invoke7                       */
+      /* TestCase: V2DispatcherTests_SPEC2_19_IncludeServletEvent_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("SPEC2_19_IncludeServletEvent_invoke7", aurl);
+         TestButton tb = new TestButton("V2DispatcherTests_SPEC2_19_IncludeServletEvent_invoke7", aurl);
          tb.writeTo(writer);
       }
 
-      /* TestCase: SPEC2_19_IncludeServletEvent_invoke8                       */
+      /* TestCase: V2DispatcherTests_SPEC2_19_IncludeServletEvent_invoke8     */
       /* Details: "The portlet can include multiple servlets during the       */
       /* same lifecycle method"                                               */
       {
          PortletURL aurl = portletResp.createActionURL();
-         TestButton tb = new TestButton("SPEC2_19_IncludeServletEvent_invoke8", aurl);
+         TestButton tb = new TestButton("V2DispatcherTests_SPEC2_19_IncludeServletEvent_invoke8", aurl);
          tb.writeTo(writer);
       }
 
-      /* TestCase: SPEC2_19_IncludeServletEvent_attributes1                   */
+      /* TestCase: V2DispatcherTests_SPEC2_19_IncludeServletEvent_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        */
@@ -217,11 +217,11 @@ public class DispatcherTests_SPEC2_19_IncludeServletEvent implements Portlet, Re
       /* in the include chain"                                                */
       {
          PortletURL aurl = portletResp.createActionURL();
-         TestButton tb = new TestButton("SPEC2_19_IncludeServletEvent_attributes1", aurl);
+         TestButton tb = new TestButton("V2DispatcherTests_SPEC2_19_IncludeServletEvent_attributes1", aurl);
          tb.writeTo(writer);
       }
 
-      /* TestCase: SPEC2_19_IncludeServletEvent_attributes2                   */
+      /* TestCase: V2DispatcherTests_SPEC2_19_IncludeServletEvent_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       */
@@ -229,11 +229,11 @@ public class DispatcherTests_SPEC2_19_IncludeServletEvent implements Portlet, Re
       /* in the include chain"                                                */
       {
          PortletURL aurl = portletResp.createActionURL();
-         TestButton tb = new TestButton("SPEC2_19_IncludeServletEvent_attributes2", aurl);
+         TestButton tb = new TestButton("V2DispatcherTests_SPEC2_19_IncludeServletEvent_attributes2", aurl);
          tb.writeTo(writer);
       }
 
-      /* TestCase: SPEC2_19_IncludeServletEvent_attributes3                   */
+      /* TestCase: V2DispatcherTests_SPEC2_19_IncludeServletEvent_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       */
@@ -241,11 +241,11 @@ public class DispatcherTests_SPEC2_19_IncludeServletEvent implements Portlet, Re
       /* in the include chain"                                                */
       {
          PortletURL aurl = portletResp.createActionURL();
-         TestButton tb = new TestButton("SPEC2_19_IncludeServletEvent_attributes3", aurl);
+         TestButton tb = new TestButton("V2DispatcherTests_SPEC2_19_IncludeServletEvent_attributes3", aurl);
          tb.writeTo(writer);
       }
 
-      /* TestCase: SPEC2_19_IncludeServletEvent_attributes4                   */
+      /* TestCase: V2DispatcherTests_SPEC2_19_IncludeServletEvent_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    */
@@ -253,11 +253,11 @@ public class DispatcherTests_SPEC2_19_IncludeServletEvent implements Portlet, Re
       /* include chain"                                                       */
       {
          PortletURL aurl = portletResp.createActionURL();
-         TestButton tb = new TestButton("SPEC2_19_IncludeServletEvent_attributes4", aurl);
+         TestButton tb = new TestButton("V2DispatcherTests_SPEC2_19_IncludeServletEvent_attributes4", aurl);
          tb.writeTo(writer);
       }
 
-      /* TestCase: SPEC2_19_IncludeServletEvent_attributes5                   */
+      /* TestCase: V2DispatcherTests_SPEC2_19_IncludeServletEvent_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       */
@@ -265,36 +265,36 @@ public class DispatcherTests_SPEC2_19_IncludeServletEvent implements Portlet, Re
       /* in the include chain"                                                */
       {
          PortletURL aurl = portletResp.createActionURL();
-         TestButton tb = new TestButton("SPEC2_19_IncludeServletEvent_attributes5", aurl);
+         TestButton tb = new TestButton("V2DispatcherTests_SPEC2_19_IncludeServletEvent_attributes5", aurl);
          tb.writeTo(writer);
       }
 
-      /* TestCase: SPEC2_19_IncludeServletEvent_attributes6                   */
+      /* TestCase: V2DispatcherTests_SPEC2_19_IncludeServletEvent_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("SPEC2_19_IncludeServletEvent_attributes6", aurl);
+         TestButton tb = new TestButton("V2DispatcherTests_SPEC2_19_IncludeServletEvent_attributes6", aurl);
          tb.writeTo(writer);
       }
 
-      /* TestCase: SPEC2_19_IncludeServletEvent_attributes7                   */
+      /* TestCase: V2DispatcherTests_SPEC2_19_IncludeServletEvent_attributes7 */
       /* Details: "For includes from the processEvent method, The request     */
       /* attribute javax.portlet.request must be set to the                   */
       /* javax.portlet.EventRequest object"                                   */
       {
          PortletURL aurl = portletResp.createActionURL();
-         TestButton tb = new TestButton("SPEC2_19_IncludeServletEvent_attributes7", aurl);
+         TestButton tb = new TestButton("V2DispatcherTests_SPEC2_19_IncludeServletEvent_attributes7", aurl);
          tb.writeTo(writer);
       }
 
-      /* TestCase: SPEC2_19_IncludeServletEvent_attributes8                   */
+      /* TestCase: V2DispatcherTests_SPEC2_19_IncludeServletEvent_attributes8 */
       /* Details: "For includes from the processEvent method, The request     */
       /* attribute javax.portlet.response must be set to the                  */
       /* javax.portlet.EventResponse object"                                  */
       {
          PortletURL aurl = portletResp.createActionURL();
-         TestButton tb = new TestButton("SPEC2_19_IncludeServletEvent_attributes8", aurl);
+         TestButton tb = new TestButton("V2DispatcherTests_SPEC2_19_IncludeServletEvent_attributes8", aurl);
          tb.writeTo(writer);
       }
 

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/b34ef749/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 037124f..e51418b 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
@@ -73,11 +73,11 @@ public class DispatcherTests_SPEC2_19_ForwardServletAction_servlet extends HttpS
 
       // Create result objects for the tests
 
-      /* TestCase: SPEC2_19_ForwardServletAction_dispatch1                    */
+      /* TestCase: V2DispatcherTests_SPEC2_19_ForwardServletAction_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 forward"              */
-      TestResult tr0 = tcd.getTestResultFailed(SPEC2_19_FORWARDSERVLETACTION_DISPATCH1);
+      TestResult tr0 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_FORWARDSERVLETACTION_DISPATCH1);
       try {
          String qparm1 = portletReq.getParameter("qparm1");
          String qparm2 = portletReq.getParameter("qparm2");
@@ -88,10 +88,10 @@ public class DispatcherTests_SPEC2_19_ForwardServletAction_servlet extends HttpS
       } catch(Exception e) {tr0.appendTcDetail(e.toString());}
       tr0.writeTo(writer);
 
-      /* TestCase: SPEC2_19_ForwardServletAction_dispatch2                    */
+      /* TestCase: V2DispatcherTests_SPEC2_19_ForwardServletAction_dispatch2  */
       /* Details: "Parameters specified in the query strings must be          */
       /* aggregated with the portlet render parameters"                       */
-      TestResult tr1 = tcd.getTestResultFailed(SPEC2_19_FORWARDSERVLETACTION_DISPATCH2);
+      TestResult tr1 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_FORWARDSERVLETACTION_DISPATCH2);
       try {
          String[] qparm2 = portletReq.getParameterValues("qparm2");
          boolean ok = ((qparm2 != null) && (qparm2.length > 1));
@@ -101,11 +101,11 @@ public class DispatcherTests_SPEC2_19_ForwardServletAction_servlet extends HttpS
       } catch(Exception e) {tr1.appendTcDetail(e.toString());}
       tr1.writeTo(writer);
 
-      /* TestCase: SPEC2_19_ForwardServletAction_dispatch3                    */
+      /* TestCase: V2DispatcherTests_SPEC2_19_ForwardServletAction_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"           */
-      TestResult tr2 = tcd.getTestResultFailed(SPEC2_19_FORWARDSERVLETACTION_DISPATCH3);
+      TestResult tr2 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_FORWARDSERVLETACTION_DISPATCH3);
       try {
          String qparm1 = portletReq.getParameter("qparm1");
          String qparm2 = portletReq.getParameter("qparm2");
@@ -116,72 +116,72 @@ public class DispatcherTests_SPEC2_19_ForwardServletAction_servlet extends HttpS
       } catch(Exception e) {tr2.appendTcDetail(e.toString());}
       tr2.writeTo(writer);
 
-      /* TestCase: SPEC2_19_ForwardServletAction_dispatch4                    */
+      /* TestCase: V2DispatcherTests_SPEC2_19_ForwardServletAction_dispatch4  */
       /* Details: "The parameters associated with a request dispatcher are    */
       /* scoped only for the duration of the forward or forward call"         */
-      TestResult tr3 = tcd.getTestResultFailed(SPEC2_19_FORWARDSERVLETACTION_DISPATCH4);
+      TestResult tr3 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_FORWARDSERVLETACTION_DISPATCH4);
       /* TODO: implement test */
       tr3.appendTcDetail("Not implemented.");
       tr3.writeTo(writer);
 
-      /* TestCase: SPEC2_19_ForwardServletAction_invoke1                      */
+      /* TestCase: V2DispatcherTests_SPEC2_19_ForwardServletAction_invoke1    */
       /* Details: "The PortletRequestDispatcher forward method can target a   */
       /* servlet "                                                            */
-      TestResult tr4 = tcd.getTestResultFailed(SPEC2_19_FORWARDSERVLETACTION_INVOKE1);
+      TestResult tr4 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_FORWARDSERVLETACTION_INVOKE1);
       try {
          // If this gets executed, include worked.
          tr4.setTcSuccess(true);
       } catch(Exception e) {tr4.appendTcDetail(e.toString());}
       tr4.writeTo(writer);
 
-      /* TestCase: SPEC2_19_ForwardServletAction_invoke2                      */
+      /* TestCase: V2DispatcherTests_SPEC2_19_ForwardServletAction_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"                                       */
-      TestResult tr5 = tcd.getTestResultFailed(SPEC2_19_FORWARDSERVLETACTION_INVOKE2);
+      TestResult tr5 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_FORWARDSERVLETACTION_INVOKE2);
       try {
          // If this gets executed, include worked.
          tr5.setTcSuccess(true);
       } catch(Exception e) {tr5.appendTcDetail(e.toString());}
       tr5.writeTo(writer);
 
-      /* TestCase: SPEC2_19_ForwardServletAction_invoke3                      */
+      /* TestCase: V2DispatcherTests_SPEC2_19_ForwardServletAction_invoke3    */
       /* Details: "Parameters to the include method for a target servlet      */
       /* can be wrapped request and response classes from the portlet         */
       /* lifecyle method initiating the include"                              */
-      TestResult tr6 = tcd.getTestResultFailed(SPEC2_19_FORWARDSERVLETACTION_INVOKE3);
+      TestResult tr6 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_FORWARDSERVLETACTION_INVOKE3);
       /* TODO: implement test */
       tr6.appendTcDetail("Not implemented.");
       tr6.writeTo(writer);
 
-      /* TestCase: SPEC2_19_ForwardServletAction_invoke4                      */
+      /* TestCase: V2DispatcherTests_SPEC2_19_ForwardServletAction_invoke4    */
       /* Details: "The portlet container must invoke the target servlet in    */
       /* the same thread as the PortletRequestDispatcher include              */
       /* invocation"                                                          */
-      TestResult tr7 = tcd.getTestResultFailed(SPEC2_19_FORWARDSERVLETACTION_INVOKE4);
+      TestResult tr7 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_FORWARDSERVLETACTION_INVOKE4);
       try {
          tr7.setTcSuccess(reqTid == svtTid);
       } catch(Exception e) {tr7.appendTcDetail(e.toString());}
       tr7.writeTo(writer);
 
-      /* TestCase: SPEC2_19_ForwardServletAction_invoke7                      */
+      /* TestCase: V2DispatcherTests_SPEC2_19_ForwardServletAction_invoke7    */
       /* Details: "The path elements of the request object exposed to the     */
       /* target servlet must reflect the path used to obtain the              */
       /* RequestDispatcher"                                                   */
-      TestResult tr8 = tcd.getTestResultFailed(SPEC2_19_FORWARDSERVLETACTION_INVOKE7);
+      TestResult tr8 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_FORWARDSERVLETACTION_INVOKE7);
       try {
          String ctxPath= request.getContextPath();
          CompareUtils.stringsEqual(ctxPath, "/DispatcherTests_SPEC2_19_ForwardServletAction_servlet", tr8);
       } catch(Exception e) {tr8.appendTcDetail(e.toString());}
       tr8.writeTo(writer);
 
-      /* TestCase: SPEC2_19_ForwardServletAction_attributes1                  */
+      /* TestCase: V2DispatcherTests_SPEC2_19_ForwardServletAction_attributes1 */
       /* Details: "If the request dispatcher is obtained through the          */
       /* getRequestDispatcher method, the request attribute                   */
       /* javax.servlet.forward.request_uri will be set, and equals the        */
       /* value from HTTPServletRequest.getRequestURI for the first servlet    */
       /* in the forward chain"                                                */
-      TestResult tr9 = tcd.getTestResultFailed(SPEC2_19_FORWARDSERVLETACTION_ATTRIBUTES1);
+      TestResult tr9 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_FORWARDSERVLETACTION_ATTRIBUTES1);
       try {
          String name = "javax.servlet.forward.req.uri";
          String attrVal = (String) portletReq.getAttribute(name);
@@ -190,13 +190,13 @@ public class DispatcherTests_SPEC2_19_ForwardServletAction_servlet extends HttpS
       } catch(Exception e) {tr9.appendTcDetail(e.toString());}
       tr9.writeTo(writer);
 
-      /* TestCase: SPEC2_19_ForwardServletAction_attributes2                  */
+      /* TestCase: V2DispatcherTests_SPEC2_19_ForwardServletAction_attributes2 */
       /* Details: "If the request dispatcher is obtained through the          */
       /* getRequestDispatcher method, the request attribute                   */
       /* javax.servlet.forward.context_path will be set, and equals the       */
       /* value from HTTPServletRequest.getContestPath for the first servlet   */
       /* in the forward chain"                                                */
-      TestResult tr10 = tcd.getTestResultFailed(SPEC2_19_FORWARDSERVLETACTION_ATTRIBUTES2);
+      TestResult tr10 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_FORWARDSERVLETACTION_ATTRIBUTES2);
       try {
          String name = "javax.servlet.forward.context_path";
          String attrVal = (String) portletReq.getAttribute(name);
@@ -205,13 +205,13 @@ public class DispatcherTests_SPEC2_19_ForwardServletAction_servlet extends HttpS
       } catch(Exception e) {tr10.appendTcDetail(e.toString());}
       tr10.writeTo(writer);
 
-      /* TestCase: SPEC2_19_ForwardServletAction_attributes3                  */
+      /* TestCase: V2DispatcherTests_SPEC2_19_ForwardServletAction_attributes3 */
       /* Details: "If the request dispatcher is obtained through the          */
       /* getRequestDispatcher method, the request attribute                   */
       /* javax.servlet.forward.servlet_path will be set, and equals the       */
       /* value from HTTPServletRequest.getServletPath for the first servlet   */
       /* in the forward chain"                                                */
-      TestResult tr11 = tcd.getTestResultFailed(SPEC2_19_FORWARDSERVLETACTION_ATTRIBUTES3);
+      TestResult tr11 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_FORWARDSERVLETACTION_ATTRIBUTES3);
       try {
          String name = "javax.servlet.forward.servlet_path";
          String attrVal = (String) portletReq.getAttribute(name);
@@ -220,13 +220,13 @@ public class DispatcherTests_SPEC2_19_ForwardServletAction_servlet extends HttpS
       } catch(Exception e) {tr11.appendTcDetail(e.toString());}
       tr11.writeTo(writer);
 
-      /* TestCase: SPEC2_19_ForwardServletAction_attributes4                  */
+      /* TestCase: V2DispatcherTests_SPEC2_19_ForwardServletAction_attributes4 */
       /* Details: "If the request dispatcher is obtained through the          */
       /* getRequestDispatcher method, the request attribute                   */
       /* javax.servlet.forward.path_info will be set, and equals the value    */
       /* from HTTPServletRequest.getPathInfo for the first servlet in the     */
       /* forward chain"                                                       */
-      TestResult tr12 = tcd.getTestResultFailed(SPEC2_19_FORWARDSERVLETACTION_ATTRIBUTES4);
+      TestResult tr12 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_FORWARDSERVLETACTION_ATTRIBUTES4);
       try {
          String name = "javax.servlet.forward.path_info";
          String attrVal = (String) portletReq.getAttribute(name);
@@ -235,13 +235,13 @@ public class DispatcherTests_SPEC2_19_ForwardServletAction_servlet extends HttpS
       } catch(Exception e) {tr12.appendTcDetail(e.toString());}
       tr12.writeTo(writer);
 
-      /* TestCase: SPEC2_19_ForwardServletAction_attributes5                  */
+      /* TestCase: V2DispatcherTests_SPEC2_19_ForwardServletAction_attributes5 */
       /* Details: "If the request dispatcher is obtained through the          */
       /* getRequestDispatcher method, the request attribute                   */
       /* javax.servlet.forward.query_string will be set, and equals the       */
       /* value from HTTPServletRequest.getQueryString for the first servlet   */
       /* in the forward chain"                                                */
-      TestResult tr13 = tcd.getTestResultFailed(SPEC2_19_FORWARDSERVLETACTION_ATTRIBUTES5);
+      TestResult tr13 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_FORWARDSERVLETACTION_ATTRIBUTES5);
       try {
          String name = "javax.servlet.forward.query_string";
          String attrVal = (String) portletReq.getAttribute(name);
@@ -250,10 +250,10 @@ public class DispatcherTests_SPEC2_19_ForwardServletAction_servlet extends HttpS
       } catch(Exception e) {tr13.appendTcDetail(e.toString());}
       tr13.writeTo(writer);
 
-      /* TestCase: SPEC2_19_ForwardServletAction_attributes6                  */
+      /* TestCase: V2DispatcherTests_SPEC2_19_ForwardServletAction_attributes6 */
       /* Details: "The request attribute javax.portlet.config must be set     */
       /* to the javax.portlet.PortletConfig object"                           */
-      TestResult tr14 = tcd.getTestResultFailed(SPEC2_19_FORWARDSERVLETACTION_ATTRIBUTES6);
+      TestResult tr14 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_FORWARDSERVLETACTION_ATTRIBUTES6);
       try {
          ClassChecker cc = new ClassChecker(portletConfig.getClass());
          boolean ok = cc.implementsInterface(PortletConfig.class);
@@ -261,11 +261,11 @@ public class DispatcherTests_SPEC2_19_ForwardServletAction_servlet extends HttpS
       } catch(Exception e) {tr14.appendTcDetail(e.toString());}
       tr14.writeTo(writer);
 
-      /* TestCase: SPEC2_19_ForwardServletAction_attributes7                  */
+      /* TestCase: V2DispatcherTests_SPEC2_19_ForwardServletAction_attributes7 */
       /* Details: "For forwards from the processAction method, The request    */
       /* attribute javax.portlet.request must be set to the                   */
       /* javax.portlet.ActionRequest object"                                  */
-      TestResult tr15 = tcd.getTestResultFailed(SPEC2_19_FORWARDSERVLETACTION_ATTRIBUTES7);
+      TestResult tr15 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_FORWARDSERVLETACTION_ATTRIBUTES7);
       try {
          ClassChecker cc = new ClassChecker(portletReq.getClass());
          boolean ok = cc.implementsInterface(ActionRequest.class);
@@ -273,11 +273,11 @@ public class DispatcherTests_SPEC2_19_ForwardServletAction_servlet extends HttpS
       } catch(Exception e) {tr15.appendTcDetail(e.toString());}
       tr15.writeTo(writer);
 
-      /* TestCase: SPEC2_19_ForwardServletAction_attributes8                  */
+      /* TestCase: V2DispatcherTests_SPEC2_19_ForwardServletAction_attributes8 */
       /* Details: "For forwards from the processAction method, The request    */
       /* attribute javax.portlet.response must be set to the                  */
       /* javax.portlet.ActionResponse object"                                 */
-      TestResult tr16 = tcd.getTestResultFailed(SPEC2_19_FORWARDSERVLETACTION_ATTRIBUTES8);
+      TestResult tr16 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_FORWARDSERVLETACTION_ATTRIBUTES8);
       try {
          ClassChecker cc = new ClassChecker(portletResp.getClass());
          boolean ok = cc.implementsInterface(ActionResponse.class);

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/b34ef749/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 a817e5f..8015511 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
@@ -73,11 +73,11 @@ public class DispatcherTests_SPEC2_19_ForwardServletEvent_servlet extends HttpSe
 
       // Create result objects for the tests
 
-      /* TestCase: SPEC2_19_ForwardServletEvent_dispatch1                     */
+      /* TestCase: V2DispatcherTests_SPEC2_19_ForwardServletEvent_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 forward"              */
-      TestResult tr0 = tcd.getTestResultFailed(SPEC2_19_FORWARDSERVLETEVENT_DISPATCH1);
+      TestResult tr0 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_FORWARDSERVLETEVENT_DISPATCH1);
       try {
          String qparm1 = portletReq.getParameter("qparm1");
          String qparm2 = portletReq.getParameter("qparm2");
@@ -88,10 +88,10 @@ public class DispatcherTests_SPEC2_19_ForwardServletEvent_servlet extends HttpSe
       } catch(Exception e) {tr0.appendTcDetail(e.toString());}
       tr0.writeTo(writer);
 
-      /* TestCase: SPEC2_19_ForwardServletEvent_dispatch2                     */
+      /* TestCase: V2DispatcherTests_SPEC2_19_ForwardServletEvent_dispatch2   */
       /* Details: "Parameters specified in the query strings must be          */
       /* aggregated with the portlet render parameters"                       */
-      TestResult tr1 = tcd.getTestResultFailed(SPEC2_19_FORWARDSERVLETEVENT_DISPATCH2);
+      TestResult tr1 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_FORWARDSERVLETEVENT_DISPATCH2);
       try {
          String[] qparm2 = portletReq.getParameterValues("qparm2");
          boolean ok = ((qparm2 != null) && (qparm2.length > 1));
@@ -101,11 +101,11 @@ public class DispatcherTests_SPEC2_19_ForwardServletEvent_servlet extends HttpSe
       } catch(Exception e) {tr1.appendTcDetail(e.toString());}
       tr1.writeTo(writer);
 
-      /* TestCase: SPEC2_19_ForwardServletEvent_dispatch3                     */
+      /* TestCase: V2DispatcherTests_SPEC2_19_ForwardServletEvent_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"           */
-      TestResult tr2 = tcd.getTestResultFailed(SPEC2_19_FORWARDSERVLETEVENT_DISPATCH3);
+      TestResult tr2 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_FORWARDSERVLETEVENT_DISPATCH3);
       try {
          String qparm1 = portletReq.getParameter("qparm1");
          String qparm2 = portletReq.getParameter("qparm2");
@@ -116,72 +116,72 @@ public class DispatcherTests_SPEC2_19_ForwardServletEvent_servlet extends HttpSe
       } catch(Exception e) {tr2.appendTcDetail(e.toString());}
       tr2.writeTo(writer);
 
-      /* TestCase: SPEC2_19_ForwardServletEvent_dispatch4                     */
+      /* TestCase: V2DispatcherTests_SPEC2_19_ForwardServletEvent_dispatch4   */
       /* Details: "The parameters associated with a request dispatcher are    */
       /* scoped only for the duration of the forward or forward call"         */
-      TestResult tr3 = tcd.getTestResultFailed(SPEC2_19_FORWARDSERVLETEVENT_DISPATCH4);
+      TestResult tr3 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_FORWARDSERVLETEVENT_DISPATCH4);
       /* TODO: implement test */
       tr3.appendTcDetail("Not implemented.");
       tr3.writeTo(writer);
 
-      /* TestCase: SPEC2_19_ForwardServletEvent_invoke1                       */
+      /* TestCase: V2DispatcherTests_SPEC2_19_ForwardServletEvent_invoke1     */
       /* Details: "The PortletRequestDispatcher forward method can target a   */
       /* servlet "                                                            */
-      TestResult tr4 = tcd.getTestResultFailed(SPEC2_19_FORWARDSERVLETEVENT_INVOKE1);
+      TestResult tr4 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_FORWARDSERVLETEVENT_INVOKE1);
       try {
          // If this gets executed, include worked.
          tr4.setTcSuccess(true);
       } catch(Exception e) {tr4.appendTcDetail(e.toString());}
       tr4.writeTo(writer);
 
-      /* TestCase: SPEC2_19_ForwardServletEvent_invoke2                       */
+      /* TestCase: V2DispatcherTests_SPEC2_19_ForwardServletEvent_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"                                       */
-      TestResult tr5 = tcd.getTestResultFailed(SPEC2_19_FORWARDSERVLETEVENT_INVOKE2);
+      TestResult tr5 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_FORWARDSERVLETEVENT_INVOKE2);
       try {
          // If this gets executed, include worked.
          tr5.setTcSuccess(true);
       } catch(Exception e) {tr5.appendTcDetail(e.toString());}
       tr5.writeTo(writer);
 
-      /* TestCase: SPEC2_19_ForwardServletEvent_invoke3                       */
+      /* TestCase: V2DispatcherTests_SPEC2_19_ForwardServletEvent_invoke3     */
       /* Details: "Parameters to the include method for a target servlet      */
       /* can be wrapped request and response classes from the portlet         */
       /* lifecyle method initiating the include"                              */
-      TestResult tr6 = tcd.getTestResultFailed(SPEC2_19_FORWARDSERVLETEVENT_INVOKE3);
+      TestResult tr6 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_FORWARDSERVLETEVENT_INVOKE3);
       /* TODO: implement test */
       tr6.appendTcDetail("Not implemented.");
       tr6.writeTo(writer);
 
-      /* TestCase: SPEC2_19_ForwardServletEvent_invoke4                       */
+      /* TestCase: V2DispatcherTests_SPEC2_19_ForwardServletEvent_invoke4     */
       /* Details: "The portlet container must invoke the target servlet in    */
       /* the same thread as the PortletRequestDispatcher include              */
       /* invocation"                                                          */
-      TestResult tr7 = tcd.getTestResultFailed(SPEC2_19_FORWARDSERVLETEVENT_INVOKE4);
+      TestResult tr7 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_FORWARDSERVLETEVENT_INVOKE4);
       try {
          tr7.setTcSuccess(reqTid == svtTid);
       } catch(Exception e) {tr7.appendTcDetail(e.toString());}
       tr7.writeTo(writer);
 
-      /* TestCase: SPEC2_19_ForwardServletEvent_invoke7                       */
+      /* TestCase: V2DispatcherTests_SPEC2_19_ForwardServletEvent_invoke7     */
       /* Details: "The path elements of the request object exposed to the     */
       /* target servlet must reflect the path used to obtain the              */
       /* RequestDispatcher"                                                   */
-      TestResult tr8 = tcd.getTestResultFailed(SPEC2_19_FORWARDSERVLETEVENT_INVOKE7);
+      TestResult tr8 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_FORWARDSERVLETEVENT_INVOKE7);
       try {
          String ctxPath= request.getContextPath();
          CompareUtils.stringsEqual(ctxPath, "/DispatcherTests_SPEC2_19_ForwardServletEvent_servlet", tr8);
       } catch(Exception e) {tr8.appendTcDetail(e.toString());}
       tr8.writeTo(writer);
 
-      /* TestCase: SPEC2_19_ForwardServletEvent_attributes1                   */
+      /* TestCase: V2DispatcherTests_SPEC2_19_ForwardServletEvent_attributes1 */
       /* Details: "If the request dispatcher is obtained through the          */
       /* getRequestDispatcher method, the request attribute                   */
       /* javax.servlet.forward.request_uri will be set, and equals the        */
       /* value from HTTPServletRequest.getRequestURI for the first servlet    */
       /* in the forward chain"                                                */
-      TestResult tr9 = tcd.getTestResultFailed(SPEC2_19_FORWARDSERVLETEVENT_ATTRIBUTES1);
+      TestResult tr9 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_FORWARDSERVLETEVENT_ATTRIBUTES1);
       try {
          String name = "javax.servlet.forward.req.uri";
          String attrVal = (String) portletReq.getAttribute(name);
@@ -190,13 +190,13 @@ public class DispatcherTests_SPEC2_19_ForwardServletEvent_servlet extends HttpSe
       } catch(Exception e) {tr9.appendTcDetail(e.toString());}
       tr9.writeTo(writer);
 
-      /* TestCase: SPEC2_19_ForwardServletEvent_attributes2                   */
+      /* TestCase: V2DispatcherTests_SPEC2_19_ForwardServletEvent_attributes2 */
       /* Details: "If the request dispatcher is obtained through the          */
       /* getRequestDispatcher method, the request attribute                   */
       /* javax.servlet.forward.context_path will be set, and equals the       */
       /* value from HTTPServletRequest.getContestPath for the first servlet   */
       /* in the forward chain"                                                */
-      TestResult tr10 = tcd.getTestResultFailed(SPEC2_19_FORWARDSERVLETEVENT_ATTRIBUTES2);
+      TestResult tr10 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_FORWARDSERVLETEVENT_ATTRIBUTES2);
       try {
          String name = "javax.servlet.forward.context_path";
          String attrVal = (String) portletReq.getAttribute(name);
@@ -205,13 +205,13 @@ public class DispatcherTests_SPEC2_19_ForwardServletEvent_servlet extends HttpSe
       } catch(Exception e) {tr10.appendTcDetail(e.toString());}
       tr10.writeTo(writer);
 
-      /* TestCase: SPEC2_19_ForwardServletEvent_attributes3                   */
+      /* TestCase: V2DispatcherTests_SPEC2_19_ForwardServletEvent_attributes3 */
       /* Details: "If the request dispatcher is obtained through the          */
       /* getRequestDispatcher method, the request attribute                   */
       /* javax.servlet.forward.servlet_path will be set, and equals the       */
       /* value from HTTPServletRequest.getServletPath for the first servlet   */
       /* in the forward chain"                                                */
-      TestResult tr11 = tcd.getTestResultFailed(SPEC2_19_FORWARDSERVLETEVENT_ATTRIBUTES3);
+      TestResult tr11 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_FORWARDSERVLETEVENT_ATTRIBUTES3);
       try {
          String name = "javax.servlet.forward.servlet_path";
          String attrVal = (String) portletReq.getAttribute(name);
@@ -220,13 +220,13 @@ public class DispatcherTests_SPEC2_19_ForwardServletEvent_servlet extends HttpSe
       } catch(Exception e) {tr11.appendTcDetail(e.toString());}
       tr11.writeTo(writer);
 
-      /* TestCase: SPEC2_19_ForwardServletEvent_attributes4                   */
+      /* TestCase: V2DispatcherTests_SPEC2_19_ForwardServletEvent_attributes4 */
       /* Details: "If the request dispatcher is obtained through the          */
       /* getRequestDispatcher method, the request attribute                   */
       /* javax.servlet.forward.path_info will be set, and equals the value    */
       /* from HTTPServletRequest.getPathInfo for the first servlet in the     */
       /* forward chain"                                                       */
-      TestResult tr12 = tcd.getTestResultFailed(SPEC2_19_FORWARDSERVLETEVENT_ATTRIBUTES4);
+      TestResult tr12 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_FORWARDSERVLETEVENT_ATTRIBUTES4);
       try {
          String name = "javax.servlet.forward.path_info";
          String attrVal = (String) portletReq.getAttribute(name);
@@ -235,13 +235,13 @@ public class DispatcherTests_SPEC2_19_ForwardServletEvent_servlet extends HttpSe
       } catch(Exception e) {tr12.appendTcDetail(e.toString());}
       tr12.writeTo(writer);
 
-      /* TestCase: SPEC2_19_ForwardServletEvent_attributes5                   */
+      /* TestCase: V2DispatcherTests_SPEC2_19_ForwardServletEvent_attributes5 */
       /* Details: "If the request dispatcher is obtained through the          */
       /* getRequestDispatcher method, the request attribute                   */
       /* javax.servlet.forward.query_string will be set, and equals the       */
       /* value from HTTPServletRequest.getQueryString for the first servlet   */
       /* in the forward chain"                                                */
-      TestResult tr13 = tcd.getTestResultFailed(SPEC2_19_FORWARDSERVLETEVENT_ATTRIBUTES5);
+      TestResult tr13 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_FORWARDSERVLETEVENT_ATTRIBUTES5);
       try {
          String name = "javax.servlet.forward.query_string";
          String attrVal = (String) portletReq.getAttribute(name);
@@ -250,10 +250,10 @@ public class DispatcherTests_SPEC2_19_ForwardServletEvent_servlet extends HttpSe
       } catch(Exception e) {tr13.appendTcDetail(e.toString());}
       tr13.writeTo(writer);
 
-      /* TestCase: SPEC2_19_ForwardServletEvent_attributes6                   */
+      /* TestCase: V2DispatcherTests_SPEC2_19_ForwardServletEvent_attributes6 */
       /* Details: "The request attribute javax.portlet.config must be set     */
       /* to the javax.portlet.PortletConfig object"                           */
-      TestResult tr14 = tcd.getTestResultFailed(SPEC2_19_FORWARDSERVLETEVENT_ATTRIBUTES6);
+      TestResult tr14 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_FORWARDSERVLETEVENT_ATTRIBUTES6);
       try {
          ClassChecker cc = new ClassChecker(portletConfig.getClass());
          boolean ok = cc.implementsInterface(PortletConfig.class);
@@ -261,11 +261,11 @@ public class DispatcherTests_SPEC2_19_ForwardServletEvent_servlet extends HttpSe
       } catch(Exception e) {tr14.appendTcDetail(e.toString());}
       tr14.writeTo(writer);
 
-      /* TestCase: SPEC2_19_ForwardServletEvent_attributes7                   */
+      /* TestCase: V2DispatcherTests_SPEC2_19_ForwardServletEvent_attributes7 */
       /* Details: "For forwards from the processEvent method, The request     */
       /* attribute javax.portlet.request must be set to the                   */
       /* javax.portlet.EventRequest object"                                   */
-      TestResult tr15 = tcd.getTestResultFailed(SPEC2_19_FORWARDSERVLETEVENT_ATTRIBUTES7);
+      TestResult tr15 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_FORWARDSERVLETEVENT_ATTRIBUTES7);
       try {
          ClassChecker cc = new ClassChecker(portletReq.getClass());
          boolean ok = cc.implementsInterface(EventRequest.class);
@@ -273,11 +273,11 @@ public class DispatcherTests_SPEC2_19_ForwardServletEvent_servlet extends HttpSe
       } catch(Exception e) {tr15.appendTcDetail(e.toString());}
       tr15.writeTo(writer);
 
-      /* TestCase: SPEC2_19_ForwardServletEvent_attributes8                   */
+      /* TestCase: V2DispatcherTests_SPEC2_19_ForwardServletEvent_attributes8 */
       /* Details: "For forwards from the processEvent method, The request     */
       /* attribute javax.portlet.response must be set to the                  */
       /* javax.portlet.EventResponse object"                                  */
-      TestResult tr16 = tcd.getTestResultFailed(SPEC2_19_FORWARDSERVLETEVENT_ATTRIBUTES8);
+      TestResult tr16 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_FORWARDSERVLETEVENT_ATTRIBUTES8);
       try {
          ClassChecker cc = new ClassChecker(portletResp.getClass());
          boolean ok = cc.implementsInterface(EventResponse.class);

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/b34ef749/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 15b4f86..ba642b7 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
@@ -73,11 +73,11 @@ public class DispatcherTests_SPEC2_19_ForwardServletRender_servlet extends HttpS
 
       // Create result objects for the tests
 
-      /* TestCase: SPEC2_19_ForwardServletRender_dispatch1                    */
+      /* TestCase: V2DispatcherTests_SPEC2_19_ForwardServletRender_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 forward"              */
-      TestResult tr0 = tcd.getTestResultFailed(SPEC2_19_FORWARDSERVLETRENDER_DISPATCH1);
+      TestResult tr0 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_FORWARDSERVLETRENDER_DISPATCH1);
       try {
          String qparm1 = portletReq.getParameter("qparm1");
          String qparm2 = portletReq.getParameter("qparm2");
@@ -88,10 +88,10 @@ public class DispatcherTests_SPEC2_19_ForwardServletRender_servlet extends HttpS
       } catch(Exception e) {tr0.appendTcDetail(e.toString());}
       tr0.writeTo(writer);
 
-      /* TestCase: SPEC2_19_ForwardServletRender_dispatch2                    */
+      /* TestCase: V2DispatcherTests_SPEC2_19_ForwardServletRender_dispatch2  */
       /* Details: "Parameters specified in the query strings must be          */
       /* aggregated with the portlet render parameters"                       */
-      TestResult tr1 = tcd.getTestResultFailed(SPEC2_19_FORWARDSERVLETRENDER_DISPATCH2);
+      TestResult tr1 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_FORWARDSERVLETRENDER_DISPATCH2);
       try {
          String[] qparm2 = portletReq.getParameterValues("qparm2");
          boolean ok = ((qparm2 != null) && (qparm2.length > 1));
@@ -101,11 +101,11 @@ public class DispatcherTests_SPEC2_19_ForwardServletRender_servlet extends HttpS
       } catch(Exception e) {tr1.appendTcDetail(e.toString());}
       tr1.writeTo(writer);
 
-      /* TestCase: SPEC2_19_ForwardServletRender_dispatch3                    */
+      /* TestCase: V2DispatcherTests_SPEC2_19_ForwardServletRender_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"           */
-      TestResult tr2 = tcd.getTestResultFailed(SPEC2_19_FORWARDSERVLETRENDER_DISPATCH3);
+      TestResult tr2 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_FORWARDSERVLETRENDER_DISPATCH3);
       try {
          String qparm1 = portletReq.getParameter("qparm1");
          String qparm2 = portletReq.getParameter("qparm2");
@@ -116,81 +116,81 @@ public class DispatcherTests_SPEC2_19_ForwardServletRender_servlet extends HttpS
       } catch(Exception e) {tr2.appendTcDetail(e.toString());}
       tr2.writeTo(writer);
 
-      /* TestCase: SPEC2_19_ForwardServletRender_dispatch4                    */
+      /* TestCase: V2DispatcherTests_SPEC2_19_ForwardServletRender_dispatch4  */
       /* Details: "The parameters associated with a request dispatcher are    */
       /* scoped only for the duration of the forward or forward call"         */
-      TestResult tr3 = tcd.getTestResultFailed(SPEC2_19_FORWARDSERVLETRENDER_DISPATCH4);
+      TestResult tr3 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_FORWARDSERVLETRENDER_DISPATCH4);
       /* TODO: implement test */
       tr3.appendTcDetail("Not implemented.");
       tr3.writeTo(writer);
 
-      /* TestCase: SPEC2_19_ForwardServletRender_invoke1                      */
+      /* TestCase: V2DispatcherTests_SPEC2_19_ForwardServletRender_invoke1    */
       /* Details: "The PortletRequestDispatcher forward method can target a   */
       /* servlet "                                                            */
-      TestResult tr4 = tcd.getTestResultFailed(SPEC2_19_FORWARDSERVLETRENDER_INVOKE1);
+      TestResult tr4 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_FORWARDSERVLETRENDER_INVOKE1);
       try {
          // If this gets executed, include worked.
          tr4.setTcSuccess(true);
       } catch(Exception e) {tr4.appendTcDetail(e.toString());}
       tr4.writeTo(writer);
 
-      /* TestCase: SPEC2_19_ForwardServletRender_invoke2                      */
+      /* TestCase: V2DispatcherTests_SPEC2_19_ForwardServletRender_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"                                       */
-      TestResult tr5 = tcd.getTestResultFailed(SPEC2_19_FORWARDSERVLETRENDER_INVOKE2);
+      TestResult tr5 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_FORWARDSERVLETRENDER_INVOKE2);
       try {
          // If this gets executed, include worked.
          tr5.setTcSuccess(true);
       } catch(Exception e) {tr5.appendTcDetail(e.toString());}
       tr5.writeTo(writer);
 
-      /* TestCase: SPEC2_19_ForwardServletRender_invoke3                      */
+      /* TestCase: V2DispatcherTests_SPEC2_19_ForwardServletRender_invoke3    */
       /* Details: "Parameters to the include method for a target servlet      */
       /* can be wrapped request and response classes from the portlet         */
       /* lifecyle method initiating the include"                              */
-      TestResult tr6 = tcd.getTestResultFailed(SPEC2_19_FORWARDSERVLETRENDER_INVOKE3);
+      TestResult tr6 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_FORWARDSERVLETRENDER_INVOKE3);
       /* TODO: implement test */
       tr6.appendTcDetail("Not implemented.");
       tr6.writeTo(writer);
 
-      /* TestCase: SPEC2_19_ForwardServletRender_invoke4                      */
+      /* TestCase: V2DispatcherTests_SPEC2_19_ForwardServletRender_invoke4    */
       /* Details: "The portlet container must invoke the target servlet in    */
       /* the same thread as the PortletRequestDispatcher include              */
       /* invocation"                                                          */
-      TestResult tr7 = tcd.getTestResultFailed(SPEC2_19_FORWARDSERVLETRENDER_INVOKE4);
+      TestResult tr7 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_FORWARDSERVLETRENDER_INVOKE4);
       try {
          tr7.setTcSuccess(reqTid == svtTid);
       } catch(Exception e) {tr7.appendTcDetail(e.toString());}
       tr7.writeTo(writer);
 
-      /* TestCase: SPEC2_19_ForwardServletRender_invoke7                      */
+      /* TestCase: V2DispatcherTests_SPEC2_19_ForwardServletRender_invoke7    */
       /* Details: "The path elements of the request object exposed to the     */
       /* target servlet must reflect the path used to obtain the              */
       /* RequestDispatcher"                                                   */
-      TestResult tr8 = tcd.getTestResultFailed(SPEC2_19_FORWARDSERVLETRENDER_INVOKE7);
+      TestResult tr8 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_FORWARDSERVLETRENDER_INVOKE7);
       try {
          String ctxPath= request.getContextPath();
          CompareUtils.stringsEqual(ctxPath, "/DispatcherTests_SPEC2_19_ForwardServletRender_servlet", tr8);
       } catch(Exception e) {tr8.appendTcDetail(e.toString());}
       tr8.writeTo(writer);
 
-      /* TestCase: SPEC2_19_ForwardServletRender_commit1                      */
+      /* TestCase: V2DispatcherTests_SPEC2_19_ForwardServletRender_commit1    */
       /* Details: "Before the forward method of the RequestDispatcher         */
       /* interface returns, the response content must be sent and             */
       /* committed, and closed by the portlet container"                      */
-      TestResult tr9 = tcd.getTestResultFailed(SPEC2_19_FORWARDSERVLETRENDER_COMMIT1);
+      TestResult tr9 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_FORWARDSERVLETRENDER_COMMIT1);
       /* TODO: implement test */
       tr9.appendTcDetail("Not implemented.");
       tr9.writeTo(writer);
 
-      /* TestCase: SPEC2_19_ForwardServletRender_attributes1                  */
+      /* TestCase: V2DispatcherTests_SPEC2_19_ForwardServletRender_attributes1 */
       /* Details: "If the request dispatcher is obtained through the          */
       /* getRequestDispatcher method, the request attribute                   */
       /* javax.servlet.forward.request_uri will be set, and equals the        */
       /* value from HTTPServletRequest.getRequestURI for the first servlet    */
       /* in the forward chain"                                                */
-      TestResult tr10 = tcd.getTestResultFailed(SPEC2_19_FORWARDSERVLETRENDER_ATTRIBUTES1);
+      TestResult tr10 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_FORWARDSERVLETRENDER_ATTRIBUTES1);
       try {
          String name = "javax.servlet.forward.req.uri";
          String attrVal = (String) portletReq.getAttribute(name);
@@ -199,13 +199,13 @@ public class DispatcherTests_SPEC2_19_ForwardServletRender_servlet extends HttpS
       } catch(Exception e) {tr10.appendTcDetail(e.toString());}
       tr10.writeTo(writer);
 
-      /* TestCase: SPEC2_19_ForwardServletRender_attributes2                  */
+      /* TestCase: V2DispatcherTests_SPEC2_19_ForwardServletRender_attributes2 */
       /* Details: "If the request dispatcher is obtained through the          */
       /* getRequestDispatcher method, the request attribute                   */
       /* javax.servlet.forward.context_path will be set, and equals the       */
       /* value from HTTPServletRequest.getContestPath for the first servlet   */
       /* in the forward chain"                                                */
-      TestResult tr11 = tcd.getTestResultFailed(SPEC2_19_FORWARDSERVLETRENDER_ATTRIBUTES2);
+      TestResult tr11 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_FORWARDSERVLETRENDER_ATTRIBUTES2);
       try {
          String name = "javax.servlet.forward.context_path";
          String attrVal = (String) portletReq.getAttribute(name);
@@ -214,13 +214,13 @@ public class DispatcherTests_SPEC2_19_ForwardServletRender_servlet extends HttpS
       } catch(Exception e) {tr11.appendTcDetail(e.toString());}
       tr11.writeTo(writer);
 
-      /* TestCase: SPEC2_19_ForwardServletRender_attributes3                  */
+      /* TestCase: V2DispatcherTests_SPEC2_19_ForwardServletRender_attributes3 */
       /* Details: "If the request dispatcher is obtained through the          */
       /* getRequestDispatcher method, the request attribute                   */
       /* javax.servlet.forward.servlet_path will be set, and equals the       */
       /* value from HTTPServletRequest.getServletPath for the first servlet   */
       /* in the forward chain"                                                */
-      TestResult tr12 = tcd.getTestResultFailed(SPEC2_19_FORWARDSERVLETRENDER_ATTRIBUTES3);
+      TestResult tr12 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_FORWARDSERVLETRENDER_ATTRIBUTES3);
       try {
          String name = "javax.servlet.forward.servlet_path";
          String attrVal = (String) portletReq.getAttribute(name);
@@ -229,13 +229,13 @@ public class DispatcherTests_SPEC2_19_ForwardServletRender_servlet extends HttpS
       } catch(Exception e) {tr12.appendTcDetail(e.toString());}
       tr12.writeTo(writer);
 
-      /* TestCase: SPEC2_19_ForwardServletRender_attributes4                  */
+      /* TestCase: V2DispatcherTests_SPEC2_19_ForwardServletRender_attributes4 */
       /* Details: "If the request dispatcher is obtained through the          */
       /* getRequestDispatcher method, the request attribute                   */
       /* javax.servlet.forward.path_info will be set, and equals the value    */
       /* from HTTPServletRequest.getPathInfo for the first servlet in the     */
       /* forward chain"                                                       */
-      TestResult tr13 = tcd.getTestResultFailed(SPEC2_19_FORWARDSERVLETRENDER_ATTRIBUTES4);
+      TestResult tr13 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_FORWARDSERVLETRENDER_ATTRIBUTES4);
       try {
          String name = "javax.servlet.forward.path_info";
          String attrVal = (String) portletReq.getAttribute(name);
@@ -244,13 +244,13 @@ public class DispatcherTests_SPEC2_19_ForwardServletRender_servlet extends HttpS
       } catch(Exception e) {tr13.appendTcDetail(e.toString());}
       tr13.writeTo(writer);
 
-      /* TestCase: SPEC2_19_ForwardServletRender_attributes5                  */
+      /* TestCase: V2DispatcherTests_SPEC2_19_ForwardServletRender_attributes5 */
       /* Details: "If the request dispatcher is obtained through the          */
       /* getRequestDispatcher method, the request attribute                   */
       /* javax.servlet.forward.query_string will be set, and equals the       */
       /* value from HTTPServletRequest.getQueryString for the first servlet   */
       /* in the forward chain"                                                */
-      TestResult tr14 = tcd.getTestResultFailed(SPEC2_19_FORWARDSERVLETRENDER_ATTRIBUTES5);
+      TestResult tr14 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_FORWARDSERVLETRENDER_ATTRIBUTES5);
       try {
          String name = "javax.servlet.forward.query_string";
          String attrVal = (String) portletReq.getAttribute(name);
@@ -259,10 +259,10 @@ public class DispatcherTests_SPEC2_19_ForwardServletRender_servlet extends HttpS
       } catch(Exception e) {tr14.appendTcDetail(e.toString());}
       tr14.writeTo(writer);
 
-      /* TestCase: SPEC2_19_ForwardServletRender_attributes6                  */
+      /* TestCase: V2DispatcherTests_SPEC2_19_ForwardServletRender_attributes6 */
       /* Details: "The request attribute javax.portlet.config must be set     */
       /* to the javax.portlet.PortletConfig object"                           */
-      TestResult tr15 = tcd.getTestResultFailed(SPEC2_19_FORWARDSERVLETRENDER_ATTRIBUTES6);
+      TestResult tr15 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_FORWARDSERVLETRENDER_ATTRIBUTES6);
       try {
          ClassChecker cc = new ClassChecker(portletConfig.getClass());
          boolean ok = cc.implementsInterface(PortletConfig.class);
@@ -270,11 +270,11 @@ public class DispatcherTests_SPEC2_19_ForwardServletRender_servlet extends HttpS
       } catch(Exception e) {tr15.appendTcDetail(e.toString());}
       tr15.writeTo(writer);
 
-      /* TestCase: SPEC2_19_ForwardServletRender_attributes7                  */
+      /* TestCase: V2DispatcherTests_SPEC2_19_ForwardServletRender_attributes7 */
       /* Details: "For forwards from the render method, The request           */
       /* attribute javax.portlet.request must be set to the                   */
       /* javax.portlet.RenderRequest object"                                  */
-      TestResult tr16 = tcd.getTestResultFailed(SPEC2_19_FORWARDSERVLETRENDER_ATTRIBUTES7);
+      TestResult tr16 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_FORWARDSERVLETRENDER_ATTRIBUTES7);
       try {
          ClassChecker cc = new ClassChecker(portletReq.getClass());
          boolean ok = cc.implementsInterface(RenderRequest.class);
@@ -282,11 +282,11 @@ public class DispatcherTests_SPEC2_19_ForwardServletRender_servlet extends HttpS
       } catch(Exception e) {tr16.appendTcDetail(e.toString());}
       tr16.writeTo(writer);
 
-      /* TestCase: SPEC2_19_ForwardServletRender_attributes8                  */
+      /* TestCase: V2DispatcherTests_SPEC2_19_ForwardServletRender_attributes8 */
       /* Details: "For forwards from the render method, The request           */
       /* attribute javax.portlet.response must be set to the                  */
       /* javax.portlet.RenderResponse object"                                 */
-      TestResult tr17 = tcd.getTestResultFailed(SPEC2_19_FORWARDSERVLETRENDER_ATTRIBUTES8);
+      TestResult tr17 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_FORWARDSERVLETRENDER_ATTRIBUTES8);
       try {
          ClassChecker cc = new ClassChecker(portletResp.getClass());
          boolean ok = cc.implementsInterface(RenderResponse.class);

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/b34ef749/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 1e7ce10..73e2e4b 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
@@ -73,11 +73,11 @@ public class DispatcherTests_SPEC2_19_ForwardServletResource_servlet extends Htt
 
       // Create result objects for the tests
 
-      /* TestCase: SPEC2_19_ForwardServletResource_dispatch1                  */
+      /* TestCase: V2DispatcherTests_SPEC2_19_ForwardServletResource_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 forward"              */
-      TestResult tr0 = tcd.getTestResultFailed(SPEC2_19_FORWARDSERVLETRESOURCE_DISPATCH1);
+      TestResult tr0 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_FORWARDSERVLETRESOURCE_DISPATCH1);
       try {
          String qparm1 = portletReq.getParameter("qparm1");
          String qparm2 = portletReq.getParameter("qparm2");
@@ -88,10 +88,10 @@ public class DispatcherTests_SPEC2_19_ForwardServletResource_servlet extends Htt
       } catch(Exception e) {tr0.appendTcDetail(e.toString());}
       tr0.writeTo(writer);
 
-      /* TestCase: SPEC2_19_ForwardServletResource_dispatch2                  */
+      /* TestCase: V2DispatcherTests_SPEC2_19_ForwardServletResource_dispatch2 */
       /* Details: "Parameters specified in the query strings must be          */
       /* aggregated with the portlet render parameters"                       */
-      TestResult tr1 = tcd.getTestResultFailed(SPEC2_19_FORWARDSERVLETRESOURCE_DISPATCH2);
+      TestResult tr1 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_FORWARDSERVLETRESOURCE_DISPATCH2);
       try {
          String[] qparm2 = portletReq.getParameterValues("qparm2");
          boolean ok = ((qparm2 != null) && (qparm2.length > 1));
@@ -101,11 +101,11 @@ public class DispatcherTests_SPEC2_19_ForwardServletResource_servlet extends Htt
       } catch(Exception e) {tr1.appendTcDetail(e.toString());}
       tr1.writeTo(writer);
 
-      /* TestCase: SPEC2_19_ForwardServletResource_dispatch3                  */
+      /* TestCase: V2DispatcherTests_SPEC2_19_ForwardServletResource_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"           */
-      TestResult tr2 = tcd.getTestResultFailed(SPEC2_19_FORWARDSERVLETRESOURCE_DISPATCH3);
+      TestResult tr2 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_FORWARDSERVLETRESOURCE_DISPATCH3);
       try {
          String qparm1 = portletReq.getParameter("qparm1");
          String qparm2 = portletReq.getParameter("qparm2");
@@ -116,81 +116,81 @@ public class DispatcherTests_SPEC2_19_ForwardServletResource_servlet extends Htt
       } catch(Exception e) {tr2.appendTcDetail(e.toString());}
       tr2.writeTo(writer);
 
-      /* TestCase: SPEC2_19_ForwardServletResource_dispatch4                  */
+      /* TestCase: V2DispatcherTests_SPEC2_19_ForwardServletResource_dispatch4 */
       /* Details: "The parameters associated with a request dispatcher are    */
       /* scoped only for the duration of the forward or forward call"         */
-      TestResult tr3 = tcd.getTestResultFailed(SPEC2_19_FORWARDSERVLETRESOURCE_DISPATCH4);
+      TestResult tr3 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_FORWARDSERVLETRESOURCE_DISPATCH4);
       /* TODO: implement test */
       tr3.appendTcDetail("Not implemented.");
       tr3.writeTo(writer);
 
-      /* TestCase: SPEC2_19_ForwardServletResource_invoke1                    */
+      /* TestCase: V2DispatcherTests_SPEC2_19_ForwardServletResource_invoke1  */
       /* Details: "The PortletRequestDispatcher forward method can target a   */
       /* servlet "                                                            */
-      TestResult tr4 = tcd.getTestResultFailed(SPEC2_19_FORWARDSERVLETRESOURCE_INVOKE1);
+      TestResult tr4 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_FORWARDSERVLETRESOURCE_INVOKE1);
       try {
          // If this gets executed, include worked.
          tr4.setTcSuccess(true);
       } catch(Exception e) {tr4.appendTcDetail(e.toString());}
       tr4.writeTo(writer);
 
-      /* TestCase: SPEC2_19_ForwardServletResource_invoke2                    */
+      /* TestCase: V2DispatcherTests_SPEC2_19_ForwardServletResource_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"                                       */
-      TestResult tr5 = tcd.getTestResultFailed(SPEC2_19_FORWARDSERVLETRESOURCE_INVOKE2);
+      TestResult tr5 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_FORWARDSERVLETRESOURCE_INVOKE2);
       try {
          // If this gets executed, include worked.
          tr5.setTcSuccess(true);
       } catch(Exception e) {tr5.appendTcDetail(e.toString());}
       tr5.writeTo(writer);
 
-      /* TestCase: SPEC2_19_ForwardServletResource_invoke3                    */
+      /* TestCase: V2DispatcherTests_SPEC2_19_ForwardServletResource_invoke3  */
       /* Details: "Parameters to the include method for a target servlet      */
       /* can be wrapped request and response classes from the portlet         */
       /* lifecyle method initiating the include"                              */
-      TestResult tr6 = tcd.getTestResultFailed(SPEC2_19_FORWARDSERVLETRESOURCE_INVOKE3);
+      TestResult tr6 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_FORWARDSERVLETRESOURCE_INVOKE3);
       /* TODO: implement test */
       tr6.appendTcDetail("Not implemented.");
       tr6.writeTo(writer);
 
-      /* TestCase: SPEC2_19_ForwardServletResource_invoke4                    */
+      /* TestCase: V2DispatcherTests_SPEC2_19_ForwardServletResource_invoke4  */
       /* Details: "The portlet container must invoke the target servlet in    */
       /* the same thread as the PortletRequestDispatcher include              */
       /* invocation"                                                          */
-      TestResult tr7 = tcd.getTestResultFailed(SPEC2_19_FORWARDSERVLETRESOURCE_INVOKE4);
+      TestResult tr7 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_FORWARDSERVLETRESOURCE_INVOKE4);
       try {
          tr7.setTcSuccess(reqTid == svtTid);
       } catch(Exception e) {tr7.appendTcDetail(e.toString());}
       tr7.writeTo(writer);
 
-      /* TestCase: SPEC2_19_ForwardServletResource_invoke7                    */
+      /* TestCase: V2DispatcherTests_SPEC2_19_ForwardServletResource_invoke7  */
       /* Details: "The path elements of the request object exposed to the     */
       /* target servlet must reflect the path used to obtain the              */
       /* RequestDispatcher"                                                   */
-      TestResult tr8 = tcd.getTestResultFailed(SPEC2_19_FORWARDSERVLETRESOURCE_INVOKE7);
+      TestResult tr8 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_FORWARDSERVLETRESOURCE_INVOKE7);
       try {
          String ctxPath= request.getContextPath();
          CompareUtils.stringsEqual(ctxPath, "/DispatcherTests_SPEC2_19_ForwardServletResource_servlet", tr8);
       } catch(Exception e) {tr8.appendTcDetail(e.toString());}
       tr8.writeTo(writer);
 
-      /* TestCase: SPEC2_19_ForwardServletResource_commit1                    */
+      /* TestCase: V2DispatcherTests_SPEC2_19_ForwardServletResource_commit1  */
       /* Details: "Before the forward method of the RequestDispatcher         */
       /* interface returns, the response content must be sent and             */
       /* committed, and closed by the portlet container"                      */
-      TestResult tr9 = tcd.getTestResultFailed(SPEC2_19_FORWARDSERVLETRESOURCE_COMMIT1);
+      TestResult tr9 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_FORWARDSERVLETRESOURCE_COMMIT1);
       /* TODO: implement test */
       tr9.appendTcDetail("Not implemented.");
       tr9.writeTo(writer);
 
-      /* TestCase: SPEC2_19_ForwardServletResource_attributes1                */
+      /* TestCase: V2DispatcherTests_SPEC2_19_ForwardServletResource_attributes1 */
       /* Details: "If the request dispatcher is obtained through the          */
       /* getRequestDispatcher method, the request attribute                   */
       /* javax.servlet.forward.request_uri will be set, and equals the        */
       /* value from HTTPServletRequest.getRequestURI for the first servlet    */
       /* in the forward chain"                                                */
-      TestResult tr10 = tcd.getTestResultFailed(SPEC2_19_FORWARDSERVLETRESOURCE_ATTRIBUTES1);
+      TestResult tr10 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_FORWARDSERVLETRESOURCE_ATTRIBUTES1);
       try {
          String name = "javax.servlet.forward.req.uri";
          String attrVal = (String) portletReq.getAttribute(name);
@@ -199,13 +199,13 @@ public class DispatcherTests_SPEC2_19_ForwardServletResource_servlet extends Htt
       } catch(Exception e) {tr10.appendTcDetail(e.toString());}
       tr10.writeTo(writer);
 
-      /* TestCase: SPEC2_19_ForwardServletResource_attributes2                */
+      /* TestCase: V2DispatcherTests_SPEC2_19_ForwardServletResource_attributes2 */
       /* Details: "If the request dispatcher is obtained through the          */
       /* getRequestDispatcher method, the request attribute                   */
       /* javax.servlet.forward.context_path will be set, and equals the       */
       /* value from HTTPServletRequest.getContestPath for the first servlet   */
       /* in the forward chain"                                                */
-      TestResult tr11 = tcd.getTestResultFailed(SPEC2_19_FORWARDSERVLETRESOURCE_ATTRIBUTES2);
+      TestResult tr11 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_FORWARDSERVLETRESOURCE_ATTRIBUTES2);
       try {
          String name = "javax.servlet.forward.context_path";
          String attrVal = (String) portletReq.getAttribute(name);
@@ -214,13 +214,13 @@ public class DispatcherTests_SPEC2_19_ForwardServletResource_servlet extends Htt
       } catch(Exception e) {tr11.appendTcDetail(e.toString());}
       tr11.writeTo(writer);
 
-      /* TestCase: SPEC2_19_ForwardServletResource_attributes3                */
+      /* TestCase: V2DispatcherTests_SPEC2_19_ForwardServletResource_attributes3 */
       /* Details: "If the request dispatcher is obtained through the          */
       /* getRequestDispatcher method, the request attribute                   */
       /* javax.servlet.forward.servlet_path will be set, and equals the       */
       /* value from HTTPServletRequest.getServletPath for the first servlet   */
       /* in the forward chain"                                                */
-      TestResult tr12 = tcd.getTestResultFailed(SPEC2_19_FORWARDSERVLETRESOURCE_ATTRIBUTES3);
+      TestResult tr12 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_FORWARDSERVLETRESOURCE_ATTRIBUTES3);
       try {
          String name = "javax.servlet.forward.servlet_path";
          String attrVal = (String) portletReq.getAttribute(name);
@@ -229,13 +229,13 @@ public class DispatcherTests_SPEC2_19_ForwardServletResource_servlet extends Htt
       } catch(Exception e) {tr12.appendTcDetail(e.toString());}
       tr12.writeTo(writer);
 
-      /* TestCase: SPEC2_19_ForwardServletResource_attributes4                */
+      /* TestCase: V2DispatcherTests_SPEC2_19_ForwardServletResource_attributes4 */
       /* Details: "If the request dispatcher is obtained through the          */
       /* getRequestDispatcher method, the request attribute                   */
       /* javax.servlet.forward.path_info will be set, and equals the value    */
       /* from HTTPServletRequest.getPathInfo for the first servlet in the     */
       /* forward chain"                                                       */
-      TestResult tr13 = tcd.getTestResultFailed(SPEC2_19_FORWARDSERVLETRESOURCE_ATTRIBUTES4);
+      TestResult tr13 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_FORWARDSERVLETRESOURCE_ATTRIBUTES4);
       try {
          String name = "javax.servlet.forward.path_info";
          String attrVal = (String) portletReq.getAttribute(name);
@@ -244,13 +244,13 @@ public class DispatcherTests_SPEC2_19_ForwardServletResource_servlet extends Htt
       } catch(Exception e) {tr13.appendTcDetail(e.toString());}
       tr13.writeTo(writer);
 
-      /* TestCase: SPEC2_19_ForwardServletResource_attributes5                */
+      /* TestCase: V2DispatcherTests_SPEC2_19_ForwardServletResource_attributes5 */
       /* Details: "If the request dispatcher is obtained through the          */
       /* getRequestDispatcher method, the request attribute                   */
       /* javax.servlet.forward.query_string will be set, and equals the       */
       /* value from HTTPServletRequest.getQueryString for the first servlet   */
       /* in the forward chain"                                                */
-      TestResult tr14 = tcd.getTestResultFailed(SPEC2_19_FORWARDSERVLETRESOURCE_ATTRIBUTES5);
+      TestResult tr14 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_FORWARDSERVLETRESOURCE_ATTRIBUTES5);
       try {
          String name = "javax.servlet.forward.query_string";
          String attrVal = (String) portletReq.getAttribute(name);
@@ -259,10 +259,10 @@ public class DispatcherTests_SPEC2_19_ForwardServletResource_servlet extends Htt
       } catch(Exception e) {tr14.appendTcDetail(e.toString());}
       tr14.writeTo(writer);
 
-      /* TestCase: SPEC2_19_ForwardServletResource_attributes6                */
+      /* TestCase: V2DispatcherTests_SPEC2_19_ForwardServletResource_attributes6 */
       /* Details: "The request attribute javax.portlet.config must be set     */
       /* to the javax.portlet.PortletConfig object"                           */
-      TestResult tr15 = tcd.getTestResultFailed(SPEC2_19_FORWARDSERVLETRESOURCE_ATTRIBUTES6);
+      TestResult tr15 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_FORWARDSERVLETRESOURCE_ATTRIBUTES6);
       try {
          ClassChecker cc = new ClassChecker(portletConfig.getClass());
          boolean ok = cc.implementsInterface(PortletConfig.class);
@@ -270,11 +270,11 @@ public class DispatcherTests_SPEC2_19_ForwardServletResource_servlet extends Htt
       } catch(Exception e) {tr15.appendTcDetail(e.toString());}
       tr15.writeTo(writer);
 
-      /* TestCase: SPEC2_19_ForwardServletResource_attributes7                */
+      /* TestCase: V2DispatcherTests_SPEC2_19_ForwardServletResource_attributes7 */
       /* Details: "For forwards from the serveResource method, The request    */
       /* attribute javax.portlet.request must be set to the                   */
       /* javax.portlet.ResourceRequest object"                                */
-      TestResult tr16 = tcd.getTestResultFailed(SPEC2_19_FORWARDSERVLETRESOURCE_ATTRIBUTES7);
+      TestResult tr16 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_FORWARDSERVLETRESOURCE_ATTRIBUTES7);
       try {
          ClassChecker cc = new ClassChecker(portletReq.getClass());
          boolean ok = cc.implementsInterface(ResourceRequest.class);
@@ -282,11 +282,11 @@ public class DispatcherTests_SPEC2_19_ForwardServletResource_servlet extends Htt
       } catch(Exception e) {tr16.appendTcDetail(e.toString());}
       tr16.writeTo(writer);
 
-      /* TestCase: SPEC2_19_ForwardServletResource_attributes8                */
+      /* TestCase: V2DispatcherTests_SPEC2_19_ForwardServletResource_attributes8 */
       /* Details: "For forwards from the serveResource method, The request    */
       /* attribute javax.portlet.response must be set to the                  */
       /* javax.portlet.ResourceResponse object"                               */
-      TestResult tr17 = tcd.getTestResultFailed(SPEC2_19_FORWARDSERVLETRESOURCE_ATTRIBUTES8);
+      TestResult tr17 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_FORWARDSERVLETRESOURCE_ATTRIBUTES8);
       try {
          ClassChecker cc = new ClassChecker(portletResp.getClass());
          boolean ok = cc.implementsInterface(ResourceResponse.class);