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:12 UTC

[37/48] git commit: 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.

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.


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

Branch: refs/heads/master
Commit: b34ef74956b6f3b8062a007d9ef039bd01cfb2ff
Parents: a4500ff
Author: Scott Nicklous <ms...@apache.org>
Authored: Wed Aug 13 18:33:27 2014 +0200
Committer: Scott Nicklous <ms...@apache.org>
Committed: Wed Aug 13 18:33:27 2014 +0200

----------------------------------------------------------------------
 ...herTests_SPEC2_19_DispatchServletAction.java |   48 +-
 ...cherTests_SPEC2_19_DispatchServletEvent.java |   24 +-
 ...sts_SPEC2_19_DispatchServletEvent_event.java |   24 +-
 ...herTests_SPEC2_19_DispatchServletRender.java |   28 +-
 ...rTests_SPEC2_19_DispatchServletResource.java |   28 +-
 ...cherTests_SPEC2_19_ForwardServletAction.java |   68 +-
 ...tcherTests_SPEC2_19_ForwardServletEvent.java |   68 +-
 ...cherTests_SPEC2_19_IncludeServletAction.java |   72 +-
 ...tcherTests_SPEC2_19_IncludeServletEvent.java |   72 +-
 ...s_SPEC2_19_ForwardServletAction_servlet.java |   68 +-
 ...ts_SPEC2_19_ForwardServletEvent_servlet.java |   68 +-
 ...s_SPEC2_19_ForwardServletRender_servlet.java |   72 +-
 ...SPEC2_19_ForwardServletResource_servlet.java |   72 +-
 ...s_SPEC2_19_IncludeServletAction_servlet.java |   72 +-
 ...ts_SPEC2_19_IncludeServletEvent_servlet.java |   72 +-
 ...s_SPEC2_19_IncludeServletRender_servlet.java |   76 +-
 ...SPEC2_19_IncludeServletResource_servlet.java |   76 +-
 .../resources/xml-resources/additionalTCs.xml   |  340 ++---
 ...patcherTests2_SPEC2_19_ForwardJSPAction.java |   68 +-
 ...spatcherTests2_SPEC2_19_ForwardJSPEvent.java |   68 +-
 ...patcherTests2_SPEC2_19_IncludeJSPAction.java |   72 +-
 ...spatcherTests2_SPEC2_19_IncludeJSPEvent.java |   72 +-
 .../resources/xml-resources/additionalTCs.xml   |  288 ++--
 ...spatcherTests2_SPEC2_19_ForwardJSPAction.jsp |   68 +-
 ...ispatcherTests2_SPEC2_19_ForwardJSPEvent.jsp |   68 +-
 ...spatcherTests2_SPEC2_19_ForwardJSPRender.jsp |   72 +-
 ...atcherTests2_SPEC2_19_ForwardJSPResource.jsp |   72 +-
 ...spatcherTests2_SPEC2_19_IncludeJSPAction.jsp |   72 +-
 ...ispatcherTests2_SPEC2_19_IncludeJSPEvent.jsp |   72 +-
 ...spatcherTests2_SPEC2_19_IncludeJSPRender.jsp |   76 +-
 ...atcherTests2_SPEC2_19_IncludeJSPResource.jsp |   76 +-
 .../beans/JSR286DispatcherTestCaseDetails.java  | 1256 +++++++++---------
 .../javax/portlet/tck/beans/TestButton.java     |    2 +-
 .../java/javax/portlet/tck/beans/TestLink.java  |    2 +-
 .../javax/portlet/tck/beans/TestResult.java     |    2 +-
 .../portlet/tck/driver/TCKSimpleTestDriver.java |  165 ++-
 36 files changed, 1978 insertions(+), 1941 deletions(-)
----------------------------------------------------------------------


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_DispatchServletAction.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/portlets/DispatcherTests_SPEC2_19_DispatchServletAction.java b/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/portlets/DispatcherTests_SPEC2_19_DispatchServletAction.java
index f55731c..acbacd7 100644
--- a/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/portlets/DispatcherTests_SPEC2_19_DispatchServletAction.java
+++ b/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/portlets/DispatcherTests_SPEC2_19_DispatchServletAction.java
@@ -80,11 +80,11 @@ public class DispatcherTests_SPEC2_19_DispatchServletAction implements Portlet,
 
       // Create result objects for the tests
 
-      /* TestCase: SPEC2_19_DispatchServletAction_dispatch1                   */
+      /* TestCase: V2DispatcherTests_SPEC2_19_DispatchServletAction_dispatch1 */
       /* Details: "The PortletContext getRequestDispatcher method returns a   */
       /* PortletRequestDispatcher for a path within the portlet               */
       /* application"                                                         */
-      TestResult tr0 = tcd.getTestResultFailed(SPEC2_19_DISPATCHSERVLETACTION_DISPATCH1);
+      TestResult tr0 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_DISPATCHSERVLETACTION_DISPATCH1);
       try {
          PortletRequestDispatcher rd = portletConfig.getPortletContext()
                .getRequestDispatcher("/DispatcherTests_SPEC2_19_DispatchServletAction_servlet");
@@ -92,10 +92,10 @@ public class DispatcherTests_SPEC2_19_DispatchServletAction implements Portlet,
       } catch(Exception e) {tr0.appendTcDetail(e.toString());}
       tr0.writeTo(writer);
 
-      /* TestCase: SPEC2_19_DispatchServletAction_dispatch2                   */
+      /* TestCase: V2DispatcherTests_SPEC2_19_DispatchServletAction_dispatch2 */
       /* Details: "If the path provided to getRequestDispatcher method does   */
       /* not start with \"/\", the method returns null"                       */
-      TestResult tr1 = tcd.getTestResultFailed(SPEC2_19_DISPATCHSERVLETACTION_DISPATCH2);
+      TestResult tr1 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_DISPATCHSERVLETACTION_DISPATCH2);
       try {
          PortletRequestDispatcher rd = portletConfig.getPortletContext()
                .getRequestDispatcher("DispatcherTests_SPEC2_19_DispatchServletAction_servlet");
@@ -103,10 +103,10 @@ public class DispatcherTests_SPEC2_19_DispatchServletAction implements Portlet,
       } catch(Exception e) {tr1.appendTcDetail(e.toString());}
       tr1.writeTo(writer);
 
-      /* TestCase: SPEC2_19_DispatchServletAction_dispatch3                   */
+      /* TestCase: V2DispatcherTests_SPEC2_19_DispatchServletAction_dispatch3 */
       /* Details: "If the path provided to getRequestDispatcher method ends   */
       /* with \"/\", the method returns null"                                 */
-      TestResult tr2 = tcd.getTestResultFailed(SPEC2_19_DISPATCHSERVLETACTION_DISPATCH3);
+      TestResult tr2 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_DISPATCHSERVLETACTION_DISPATCH3);
       try {
          PortletRequestDispatcher rd = portletConfig.getPortletContext()
                .getRequestDispatcher("DispatcherTests_SPEC2_19_DispatchServletAction_servlet");
@@ -114,10 +114,10 @@ public class DispatcherTests_SPEC2_19_DispatchServletAction implements Portlet,
       } catch(Exception e) {tr2.appendTcDetail(e.toString());}
       tr2.writeTo(writer);
 
-      /* TestCase: SPEC2_19_DispatchServletAction_dispatch4                   */
+      /* TestCase: V2DispatcherTests_SPEC2_19_DispatchServletAction_dispatch4 */
       /* Details: "If the path provided to getRequestDispatcher method does   */
       /* not specify a valid path, the method returns null"                   */
-      TestResult tr3 = tcd.getTestResultFailed(SPEC2_19_DISPATCHSERVLETACTION_DISPATCH4);
+      TestResult tr3 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_DISPATCHSERVLETACTION_DISPATCH4);
       try {
          PortletRequestDispatcher rd = portletConfig.getPortletContext()
                .getRequestDispatcher("/Invalid/path.jsp");
@@ -125,11 +125,11 @@ public class DispatcherTests_SPEC2_19_DispatchServletAction implements Portlet,
       } catch(Exception e) {tr3.appendTcDetail(e.toString());}
       tr3.writeTo(writer);
 
-      /* TestCase: SPEC2_19_DispatchServletAction_dispatch5                   */
+      /* TestCase: V2DispatcherTests_SPEC2_19_DispatchServletAction_dispatch5 */
       /* Details: "The PortletContext getNamedDispatcher method returns a     */
       /* PortletRequestDispatcher for a servlet within the portlet            */
       /* application"                                                         */
-      TestResult tr4 = tcd.getTestResultFailed(SPEC2_19_DISPATCHSERVLETACTION_DISPATCH5);
+      TestResult tr4 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_DISPATCHSERVLETACTION_DISPATCH5);
       try {
          PortletRequestDispatcher rd = portletConfig.getPortletContext()
                .getNamedDispatcher("DispatcherTests_SPEC2_19_DispatchServletAction_servlet");
@@ -137,10 +137,10 @@ public class DispatcherTests_SPEC2_19_DispatchServletAction implements Portlet,
       } catch(Exception e) {tr4.appendTcDetail(e.toString());}
       tr4.writeTo(writer);
 
-      /* TestCase: SPEC2_19_DispatchServletAction_dispatch6                   */
+      /* TestCase: V2DispatcherTests_SPEC2_19_DispatchServletAction_dispatch6 */
       /* Details: "If the name provided to getNamedDispatcher method is not   */
       /* valid, the method returns null"                                      */
-      TestResult tr5 = tcd.getTestResultFailed(SPEC2_19_DISPATCHSERVLETACTION_DISPATCH6);
+      TestResult tr5 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_DISPATCHSERVLETACTION_DISPATCH6);
       try {
          PortletRequestDispatcher rd = portletConfig.getPortletContext()
                .getNamedDispatcher("Invalid Name");
@@ -193,59 +193,59 @@ public class DispatcherTests_SPEC2_19_DispatchServletAction implements Portlet,
          ps.removeAttribute(RESULT_ATTR_PREFIX + "DispatcherTests_SPEC2_19_DispatchServletAction", APPLICATION_SCOPE);
       } else {
 
-         /* TestCase: SPEC2_19_DispatchServletAction_dispatch1                   */
+         /* TestCase: V2DispatcherTests_SPEC2_19_DispatchServletAction_dispatch1 */
          /* Details: "The PortletContext getRequestDispatcher method returns a   */
          /* PortletRequestDispatcher for a path within the portlet               */
          /* application"                                                         */
          {
             PortletURL aurl = portletResp.createActionURL();
-            TestButton tb = new TestButton("SPEC2_19_DispatchServletAction_dispatch1", aurl);
+            TestButton tb = new TestButton("V2DispatcherTests_SPEC2_19_DispatchServletAction_dispatch1", aurl);
             tb.writeTo(writer);
          }
 
-         /* TestCase: SPEC2_19_DispatchServletAction_dispatch2                   */
+         /* TestCase: V2DispatcherTests_SPEC2_19_DispatchServletAction_dispatch2 */
          /* Details: "If the path provided to getRequestDispatcher method does   */
          /* not start with \"/\", the method returns null"                       */
          {
             PortletURL aurl = portletResp.createActionURL();
-            TestButton tb = new TestButton("SPEC2_19_DispatchServletAction_dispatch2", aurl);
+            TestButton tb = new TestButton("V2DispatcherTests_SPEC2_19_DispatchServletAction_dispatch2", aurl);
             tb.writeTo(writer);
          }
 
-         /* TestCase: SPEC2_19_DispatchServletAction_dispatch3                   */
+         /* TestCase: V2DispatcherTests_SPEC2_19_DispatchServletAction_dispatch3 */
          /* Details: "If the path provided to getRequestDispatcher method ends   */
          /* with \"/\", the method returns null"                                 */
          {
             PortletURL aurl = portletResp.createActionURL();
-            TestButton tb = new TestButton("SPEC2_19_DispatchServletAction_dispatch3", aurl);
+            TestButton tb = new TestButton("V2DispatcherTests_SPEC2_19_DispatchServletAction_dispatch3", aurl);
             tb.writeTo(writer);
          }
 
-         /* TestCase: SPEC2_19_DispatchServletAction_dispatch4                   */
+         /* TestCase: V2DispatcherTests_SPEC2_19_DispatchServletAction_dispatch4 */
          /* Details: "If the path provided to getRequestDispatcher method does   */
          /* not specify a valid path, the method returns null"                   */
          {
             PortletURL aurl = portletResp.createActionURL();
-            TestButton tb = new TestButton("SPEC2_19_DispatchServletAction_dispatch4", aurl);
+            TestButton tb = new TestButton("V2DispatcherTests_SPEC2_19_DispatchServletAction_dispatch4", aurl);
             tb.writeTo(writer);
          }
 
-         /* TestCase: SPEC2_19_DispatchServletAction_dispatch5                   */
+         /* TestCase: V2DispatcherTests_SPEC2_19_DispatchServletAction_dispatch5 */
          /* Details: "The PortletContext getNamedDispatcher method returns a     */
          /* PortletRequestDispatcher for a servlet within the portlet            */
          /* application"                                                         */
          {
             PortletURL aurl = portletResp.createActionURL();
-            TestButton tb = new TestButton("SPEC2_19_DispatchServletAction_dispatch5", aurl);
+            TestButton tb = new TestButton("V2DispatcherTests_SPEC2_19_DispatchServletAction_dispatch5", aurl);
             tb.writeTo(writer);
          }
 
-         /* TestCase: SPEC2_19_DispatchServletAction_dispatch6                   */
+         /* TestCase: V2DispatcherTests_SPEC2_19_DispatchServletAction_dispatch6 */
          /* Details: "If the name provided to getNamedDispatcher method is not   */
          /* valid, the method returns null"                                      */
          {
             PortletURL aurl = portletResp.createActionURL();
-            TestButton tb = new TestButton("SPEC2_19_DispatchServletAction_dispatch6", aurl);
+            TestButton tb = new TestButton("V2DispatcherTests_SPEC2_19_DispatchServletAction_dispatch6", 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/portlets/DispatcherTests_SPEC2_19_DispatchServletEvent.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/portlets/DispatcherTests_SPEC2_19_DispatchServletEvent.java b/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/portlets/DispatcherTests_SPEC2_19_DispatchServletEvent.java
index 177460f..d86763c 100644
--- a/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/portlets/DispatcherTests_SPEC2_19_DispatchServletEvent.java
+++ b/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/portlets/DispatcherTests_SPEC2_19_DispatchServletEvent.java
@@ -113,59 +113,59 @@ public class DispatcherTests_SPEC2_19_DispatchServletEvent implements Portlet, R
 
       PrintWriter writer = portletResp.getWriter();
 
-      /* TestCase: SPEC2_19_DispatchServletEvent_dispatch1                    */
+      /* TestCase: V2DispatcherTests_SPEC2_19_DispatchServletEvent_dispatch1  */
       /* Details: "The PortletContext getRequestDispatcher method returns a   */
       /* PortletRequestDispatcher for a path within the portlet               */
       /* application"                                                         */
       {
          PortletURL aurl = portletResp.createActionURL();
-         TestButton tb = new TestButton("SPEC2_19_DispatchServletEvent_dispatch1", aurl);
+         TestButton tb = new TestButton("V2DispatcherTests_SPEC2_19_DispatchServletEvent_dispatch1", aurl);
          tb.writeTo(writer);
       }
 
-      /* TestCase: SPEC2_19_DispatchServletEvent_dispatch2                    */
+      /* TestCase: V2DispatcherTests_SPEC2_19_DispatchServletEvent_dispatch2  */
       /* Details: "If the path provided to getRequestDispatcher method does   */
       /* not start with \"/\", the method returns null"                       */
       {
          PortletURL aurl = portletResp.createActionURL();
-         TestButton tb = new TestButton("SPEC2_19_DispatchServletEvent_dispatch2", aurl);
+         TestButton tb = new TestButton("V2DispatcherTests_SPEC2_19_DispatchServletEvent_dispatch2", aurl);
          tb.writeTo(writer);
       }
 
-      /* TestCase: SPEC2_19_DispatchServletEvent_dispatch3                    */
+      /* TestCase: V2DispatcherTests_SPEC2_19_DispatchServletEvent_dispatch3  */
       /* Details: "If the path provided to getRequestDispatcher method ends   */
       /* with \"/\", the method returns null"                                 */
       {
          PortletURL aurl = portletResp.createActionURL();
-         TestButton tb = new TestButton("SPEC2_19_DispatchServletEvent_dispatch3", aurl);
+         TestButton tb = new TestButton("V2DispatcherTests_SPEC2_19_DispatchServletEvent_dispatch3", aurl);
          tb.writeTo(writer);
       }
 
-      /* TestCase: SPEC2_19_DispatchServletEvent_dispatch4                    */
+      /* TestCase: V2DispatcherTests_SPEC2_19_DispatchServletEvent_dispatch4  */
       /* Details: "If the path provided to getRequestDispatcher method does   */
       /* not specify a valid path, the method returns null"                   */
       {
          PortletURL aurl = portletResp.createActionURL();
-         TestButton tb = new TestButton("SPEC2_19_DispatchServletEvent_dispatch4", aurl);
+         TestButton tb = new TestButton("V2DispatcherTests_SPEC2_19_DispatchServletEvent_dispatch4", aurl);
          tb.writeTo(writer);
       }
 
-      /* TestCase: SPEC2_19_DispatchServletEvent_dispatch5                    */
+      /* TestCase: V2DispatcherTests_SPEC2_19_DispatchServletEvent_dispatch5  */
       /* Details: "The PortletContext getNamedDispatcher method returns a     */
       /* PortletRequestDispatcher for a servlet within the portlet            */
       /* application"                                                         */
       {
          PortletURL aurl = portletResp.createActionURL();
-         TestButton tb = new TestButton("SPEC2_19_DispatchServletEvent_dispatch5", aurl);
+         TestButton tb = new TestButton("V2DispatcherTests_SPEC2_19_DispatchServletEvent_dispatch5", aurl);
          tb.writeTo(writer);
       }
 
-      /* TestCase: SPEC2_19_DispatchServletEvent_dispatch6                    */
+      /* TestCase: V2DispatcherTests_SPEC2_19_DispatchServletEvent_dispatch6  */
       /* Details: "If the name provided to getNamedDispatcher method is not   */
       /* valid, the method returns null"                                      */
       {
          PortletURL aurl = portletResp.createActionURL();
-         TestButton tb = new TestButton("SPEC2_19_DispatchServletEvent_dispatch6", aurl);
+         TestButton tb = new TestButton("V2DispatcherTests_SPEC2_19_DispatchServletEvent_dispatch6", 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/portlets/DispatcherTests_SPEC2_19_DispatchServletEvent_event.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/portlets/DispatcherTests_SPEC2_19_DispatchServletEvent_event.java b/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/portlets/DispatcherTests_SPEC2_19_DispatchServletEvent_event.java
index 89386d1..5904992 100644
--- a/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/portlets/DispatcherTests_SPEC2_19_DispatchServletEvent_event.java
+++ b/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/portlets/DispatcherTests_SPEC2_19_DispatchServletEvent_event.java
@@ -103,11 +103,11 @@ public class DispatcherTests_SPEC2_19_DispatchServletEvent_event implements Port
 
       // Create result objects for the tests
 
-      /* TestCase: SPEC2_19_DispatchServletEvent_dispatch1                    */
+      /* TestCase: V2DispatcherTests_SPEC2_19_DispatchServletEvent_dispatch1  */
       /* Details: "The PortletContext getRequestDispatcher method returns a   */
       /* PortletRequestDispatcher for a path within the portlet               */
       /* application"                                                         */
-      TestResult tr0 = tcd.getTestResultFailed(SPEC2_19_DISPATCHSERVLETEVENT_DISPATCH1);
+      TestResult tr0 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_DISPATCHSERVLETEVENT_DISPATCH1);
       try {
          PortletRequestDispatcher rd = portletConfig.getPortletContext()
                .getRequestDispatcher("/DispatcherTests_SPEC2_19_DispatchServletEvent_servlet");
@@ -115,10 +115,10 @@ public class DispatcherTests_SPEC2_19_DispatchServletEvent_event implements Port
       } catch(Exception e) {tr0.appendTcDetail(e.toString());}
       tr0.writeTo(writer);
 
-      /* TestCase: SPEC2_19_DispatchServletEvent_dispatch2                    */
+      /* TestCase: V2DispatcherTests_SPEC2_19_DispatchServletEvent_dispatch2  */
       /* Details: "If the path provided to getRequestDispatcher method does   */
       /* not start with \"/\", the method returns null"                       */
-      TestResult tr1 = tcd.getTestResultFailed(SPEC2_19_DISPATCHSERVLETEVENT_DISPATCH2);
+      TestResult tr1 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_DISPATCHSERVLETEVENT_DISPATCH2);
       try {
          PortletRequestDispatcher rd = portletConfig.getPortletContext()
                .getRequestDispatcher("DispatcherTests_SPEC2_19_DispatchServletEvent_servlet");
@@ -126,10 +126,10 @@ public class DispatcherTests_SPEC2_19_DispatchServletEvent_event implements Port
       } catch(Exception e) {tr1.appendTcDetail(e.toString());}
       tr1.writeTo(writer);
 
-      /* TestCase: SPEC2_19_DispatchServletEvent_dispatch3                    */
+      /* TestCase: V2DispatcherTests_SPEC2_19_DispatchServletEvent_dispatch3  */
       /* Details: "If the path provided to getRequestDispatcher method ends   */
       /* with \"/\", the method returns null"                                 */
-      TestResult tr2 = tcd.getTestResultFailed(SPEC2_19_DISPATCHSERVLETEVENT_DISPATCH3);
+      TestResult tr2 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_DISPATCHSERVLETEVENT_DISPATCH3);
       try {
          PortletRequestDispatcher rd = portletConfig.getPortletContext()
                .getRequestDispatcher("DispatcherTests_SPEC2_19_DispatchServletEvent_servlet");
@@ -137,10 +137,10 @@ public class DispatcherTests_SPEC2_19_DispatchServletEvent_event implements Port
       } catch(Exception e) {tr2.appendTcDetail(e.toString());}
       tr2.writeTo(writer);
 
-      /* TestCase: SPEC2_19_DispatchServletEvent_dispatch4                    */
+      /* TestCase: V2DispatcherTests_SPEC2_19_DispatchServletEvent_dispatch4  */
       /* Details: "If the path provided to getRequestDispatcher method does   */
       /* not specify a valid path, the method returns null"                   */
-      TestResult tr3 = tcd.getTestResultFailed(SPEC2_19_DISPATCHSERVLETEVENT_DISPATCH4);
+      TestResult tr3 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_DISPATCHSERVLETEVENT_DISPATCH4);
       try {
          PortletRequestDispatcher rd = portletConfig.getPortletContext()
                .getRequestDispatcher("/Invalid/path.jsp");
@@ -148,11 +148,11 @@ public class DispatcherTests_SPEC2_19_DispatchServletEvent_event implements Port
       } catch(Exception e) {tr3.appendTcDetail(e.toString());}
       tr3.writeTo(writer);
 
-      /* TestCase: SPEC2_19_DispatchServletEvent_dispatch5                    */
+      /* TestCase: V2DispatcherTests_SPEC2_19_DispatchServletEvent_dispatch5  */
       /* Details: "The PortletContext getNamedDispatcher method returns a     */
       /* PortletRequestDispatcher for a servlet within the portlet            */
       /* application"                                                         */
-      TestResult tr4 = tcd.getTestResultFailed(SPEC2_19_DISPATCHSERVLETEVENT_DISPATCH5);
+      TestResult tr4 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_DISPATCHSERVLETEVENT_DISPATCH5);
       try {
          PortletRequestDispatcher rd = portletConfig.getPortletContext()
                .getNamedDispatcher("DispatcherTests_SPEC2_19_DispatchServletEvent_servlet");
@@ -160,10 +160,10 @@ public class DispatcherTests_SPEC2_19_DispatchServletEvent_event implements Port
       } catch(Exception e) {tr4.appendTcDetail(e.toString());}
       tr4.writeTo(writer);
 
-      /* TestCase: SPEC2_19_DispatchServletEvent_dispatch6                    */
+      /* TestCase: V2DispatcherTests_SPEC2_19_DispatchServletEvent_dispatch6  */
       /* Details: "If the name provided to getNamedDispatcher method is not   */
       /* valid, the method returns null"                                      */
-      TestResult tr5 = tcd.getTestResultFailed(SPEC2_19_DISPATCHSERVLETEVENT_DISPATCH6);
+      TestResult tr5 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_DISPATCHSERVLETEVENT_DISPATCH6);
       try {
          PortletRequestDispatcher rd = portletConfig.getPortletContext()
                .getNamedDispatcher("Invalid Name");

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_DispatchServletRender.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/portlets/DispatcherTests_SPEC2_19_DispatchServletRender.java b/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/portlets/DispatcherTests_SPEC2_19_DispatchServletRender.java
index 3220e27..534ae61 100644
--- a/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/portlets/DispatcherTests_SPEC2_19_DispatchServletRender.java
+++ b/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/portlets/DispatcherTests_SPEC2_19_DispatchServletRender.java
@@ -114,11 +114,11 @@ public class DispatcherTests_SPEC2_19_DispatchServletRender implements Portlet,
 
       // Create result objects for the tests
 
-      /* TestCase: SPEC2_19_DispatchServletRender_dispatch1                   */
+      /* TestCase: V2DispatcherTests_SPEC2_19_DispatchServletRender_dispatch1 */
       /* Details: "The PortletContext getRequestDispatcher method returns a   */
       /* PortletRequestDispatcher for a path within the portlet               */
       /* application"                                                         */
-      TestResult tr0 = tcd.getTestResultFailed(SPEC2_19_DISPATCHSERVLETRENDER_DISPATCH1);
+      TestResult tr0 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_DISPATCHSERVLETRENDER_DISPATCH1);
       try {
          PortletRequestDispatcher rd = portletConfig.getPortletContext()
                .getRequestDispatcher("/DispatcherTests_SPEC2_19_DispatchServletRender_servlet");
@@ -126,10 +126,10 @@ public class DispatcherTests_SPEC2_19_DispatchServletRender implements Portlet,
       } catch(Exception e) {tr0.appendTcDetail(e.toString());}
       tr0.writeTo(writer);
 
-      /* TestCase: SPEC2_19_DispatchServletRender_dispatch2                   */
+      /* TestCase: V2DispatcherTests_SPEC2_19_DispatchServletRender_dispatch2 */
       /* Details: "If the path provided to getRequestDispatcher method does   */
       /* not start with \"/\", the method returns null"                       */
-      TestResult tr1 = tcd.getTestResultFailed(SPEC2_19_DISPATCHSERVLETRENDER_DISPATCH2);
+      TestResult tr1 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_DISPATCHSERVLETRENDER_DISPATCH2);
       try {
          PortletRequestDispatcher rd = portletConfig.getPortletContext()
                .getRequestDispatcher("DispatcherTests_SPEC2_19_DispatchServletRender_servlet");
@@ -137,10 +137,10 @@ public class DispatcherTests_SPEC2_19_DispatchServletRender implements Portlet,
       } catch(Exception e) {tr1.appendTcDetail(e.toString());}
       tr1.writeTo(writer);
 
-      /* TestCase: SPEC2_19_DispatchServletRender_dispatch3                   */
+      /* TestCase: V2DispatcherTests_SPEC2_19_DispatchServletRender_dispatch3 */
       /* Details: "If the path provided to getRequestDispatcher method ends   */
       /* with \"/\", the method returns null"                                 */
-      TestResult tr2 = tcd.getTestResultFailed(SPEC2_19_DISPATCHSERVLETRENDER_DISPATCH3);
+      TestResult tr2 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_DISPATCHSERVLETRENDER_DISPATCH3);
       try {
          PortletRequestDispatcher rd = portletConfig.getPortletContext()
                .getRequestDispatcher("DispatcherTests_SPEC2_19_DispatchServletRender_servlet");
@@ -148,10 +148,10 @@ public class DispatcherTests_SPEC2_19_DispatchServletRender implements Portlet,
       } catch(Exception e) {tr2.appendTcDetail(e.toString());}
       tr2.writeTo(writer);
 
-      /* TestCase: SPEC2_19_DispatchServletRender_dispatch4                   */
+      /* TestCase: V2DispatcherTests_SPEC2_19_DispatchServletRender_dispatch4 */
       /* Details: "If the path provided to getRequestDispatcher method does   */
       /* not specify a valid path, the method returns null"                   */
-      TestResult tr3 = tcd.getTestResultFailed(SPEC2_19_DISPATCHSERVLETRENDER_DISPATCH4);
+      TestResult tr3 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_DISPATCHSERVLETRENDER_DISPATCH4);
       try {
          PortletRequestDispatcher rd = portletConfig.getPortletContext()
                .getRequestDispatcher("/Invalid/path.jsp");
@@ -159,11 +159,11 @@ public class DispatcherTests_SPEC2_19_DispatchServletRender implements Portlet,
       } catch(Exception e) {tr3.appendTcDetail(e.toString());}
       tr3.writeTo(writer);
 
-      /* TestCase: SPEC2_19_DispatchServletRender_dispatch5                   */
+      /* TestCase: V2DispatcherTests_SPEC2_19_DispatchServletRender_dispatch5 */
       /* Details: "The PortletContext getNamedDispatcher method returns a     */
       /* PortletRequestDispatcher for a servlet within the portlet            */
       /* application"                                                         */
-      TestResult tr4 = tcd.getTestResultFailed(SPEC2_19_DISPATCHSERVLETRENDER_DISPATCH5);
+      TestResult tr4 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_DISPATCHSERVLETRENDER_DISPATCH5);
       try {
          PortletRequestDispatcher rd = portletConfig.getPortletContext()
                .getNamedDispatcher("DispatcherTests_SPEC2_19_DispatchServletRender_servlet");
@@ -171,10 +171,10 @@ public class DispatcherTests_SPEC2_19_DispatchServletRender implements Portlet,
       } catch(Exception e) {tr4.appendTcDetail(e.toString());}
       tr4.writeTo(writer);
 
-      /* TestCase: SPEC2_19_DispatchServletRender_dispatch6                   */
+      /* TestCase: V2DispatcherTests_SPEC2_19_DispatchServletRender_dispatch6 */
       /* Details: "If the name provided to getNamedDispatcher method is not   */
       /* valid, the method returns null"                                      */
-      TestResult tr5 = tcd.getTestResultFailed(SPEC2_19_DISPATCHSERVLETRENDER_DISPATCH6);
+      TestResult tr5 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_DISPATCHSERVLETRENDER_DISPATCH6);
       try {
          PortletRequestDispatcher rd = portletConfig.getPortletContext()
                .getNamedDispatcher("Invalid Name");
@@ -183,10 +183,10 @@ public class DispatcherTests_SPEC2_19_DispatchServletRender implements Portlet,
       } catch(Exception e) {tr5.appendTcDetail(e.toString());}
       tr5.writeTo(writer);
 
-      /* TestCase: SPEC2_19_DispatchServletRender_invoke2                     */
+      /* TestCase: V2DispatcherTests_SPEC2_19_DispatchServletRender_invoke2   */
       /* Details: "If the forward method is called after the response has     */
       /* been committed, an IllegalStateException exception is thrown"        */
-      TestResult tr6 = tcd.getTestResultFailed(SPEC2_19_DISPATCHSERVLETRENDER_INVOKE2);
+      TestResult tr6 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_DISPATCHSERVLETRENDER_INVOKE2);
       try {
          PortletRequestDispatcher rd = portletConfig.getPortletContext()
                .getRequestDispatcher("/DispatcherTests_SPEC2_19_DispatchServletRender_servlet");

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_DispatchServletResource.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/portlets/DispatcherTests_SPEC2_19_DispatchServletResource.java b/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/portlets/DispatcherTests_SPEC2_19_DispatchServletResource.java
index 2f53584..8ce80aa 100644
--- a/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/portlets/DispatcherTests_SPEC2_19_DispatchServletResource.java
+++ b/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/portlets/DispatcherTests_SPEC2_19_DispatchServletResource.java
@@ -97,11 +97,11 @@ public class DispatcherTests_SPEC2_19_DispatchServletResource implements Portlet
 
       // Create result objects for the tests
 
-      /* TestCase: SPEC2_19_DispatchServletResource_dispatch1                 */
+      /* TestCase: V2DispatcherTests_SPEC2_19_DispatchServletResource_dispatch1 */
       /* Details: "The PortletContext getRequestDispatcher method returns a   */
       /* PortletRequestDispatcher for a path within the portlet               */
       /* application"                                                         */
-      TestResult tr0 = tcd.getTestResultFailed(SPEC2_19_DISPATCHSERVLETRESOURCE_DISPATCH1);
+      TestResult tr0 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_DISPATCHSERVLETRESOURCE_DISPATCH1);
       try {
          PortletRequestDispatcher rd = portletConfig.getPortletContext()
                .getRequestDispatcher("/DispatcherTests_SPEC2_19_DispatchServletResource_servlet");
@@ -109,10 +109,10 @@ public class DispatcherTests_SPEC2_19_DispatchServletResource implements Portlet
       } catch(Exception e) {tr0.appendTcDetail(e.toString());}
       tr0.writeTo(writer);
 
-      /* TestCase: SPEC2_19_DispatchServletResource_dispatch2                 */
+      /* TestCase: V2DispatcherTests_SPEC2_19_DispatchServletResource_dispatch2 */
       /* Details: "If the path provided to getRequestDispatcher method does   */
       /* not start with \"/\", the method returns null"                       */
-      TestResult tr1 = tcd.getTestResultFailed(SPEC2_19_DISPATCHSERVLETRESOURCE_DISPATCH2);
+      TestResult tr1 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_DISPATCHSERVLETRESOURCE_DISPATCH2);
       try {
          PortletRequestDispatcher rd = portletConfig.getPortletContext()
                .getRequestDispatcher("DispatcherTests_SPEC2_19_DispatchServletResource_servlet");
@@ -120,10 +120,10 @@ public class DispatcherTests_SPEC2_19_DispatchServletResource implements Portlet
       } catch(Exception e) {tr1.appendTcDetail(e.toString());}
       tr1.writeTo(writer);
 
-      /* TestCase: SPEC2_19_DispatchServletResource_dispatch3                 */
+      /* TestCase: V2DispatcherTests_SPEC2_19_DispatchServletResource_dispatch3 */
       /* Details: "If the path provided to getRequestDispatcher method ends   */
       /* with \"/\", the method returns null"                                 */
-      TestResult tr2 = tcd.getTestResultFailed(SPEC2_19_DISPATCHSERVLETRESOURCE_DISPATCH3);
+      TestResult tr2 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_DISPATCHSERVLETRESOURCE_DISPATCH3);
       try {
          PortletRequestDispatcher rd = portletConfig.getPortletContext()
                .getRequestDispatcher("DispatcherTests_SPEC2_19_DispatchServletResource_servlet");
@@ -131,10 +131,10 @@ public class DispatcherTests_SPEC2_19_DispatchServletResource implements Portlet
       } catch(Exception e) {tr2.appendTcDetail(e.toString());}
       tr2.writeTo(writer);
 
-      /* TestCase: SPEC2_19_DispatchServletResource_dispatch4                 */
+      /* TestCase: V2DispatcherTests_SPEC2_19_DispatchServletResource_dispatch4 */
       /* Details: "If the path provided to getRequestDispatcher method does   */
       /* not specify a valid path, the method returns null"                   */
-      TestResult tr3 = tcd.getTestResultFailed(SPEC2_19_DISPATCHSERVLETRESOURCE_DISPATCH4);
+      TestResult tr3 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_DISPATCHSERVLETRESOURCE_DISPATCH4);
       try {
          PortletRequestDispatcher rd = portletConfig.getPortletContext()
                .getRequestDispatcher("/Invalid/path.jsp");
@@ -142,11 +142,11 @@ public class DispatcherTests_SPEC2_19_DispatchServletResource implements Portlet
       } catch(Exception e) {tr3.appendTcDetail(e.toString());}
       tr3.writeTo(writer);
 
-      /* TestCase: SPEC2_19_DispatchServletResource_dispatch5                 */
+      /* TestCase: V2DispatcherTests_SPEC2_19_DispatchServletResource_dispatch5 */
       /* Details: "The PortletContext getNamedDispatcher method returns a     */
       /* PortletRequestDispatcher for a servlet within the portlet            */
       /* application"                                                         */
-      TestResult tr4 = tcd.getTestResultFailed(SPEC2_19_DISPATCHSERVLETRESOURCE_DISPATCH5);
+      TestResult tr4 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_DISPATCHSERVLETRESOURCE_DISPATCH5);
       try {
          PortletRequestDispatcher rd = portletConfig.getPortletContext()
                .getNamedDispatcher("DispatcherTests_SPEC2_19_DispatchServletResource_servlet");
@@ -154,10 +154,10 @@ public class DispatcherTests_SPEC2_19_DispatchServletResource implements Portlet
       } catch(Exception e) {tr4.appendTcDetail(e.toString());}
       tr4.writeTo(writer);
 
-      /* TestCase: SPEC2_19_DispatchServletResource_dispatch6                 */
+      /* TestCase: V2DispatcherTests_SPEC2_19_DispatchServletResource_dispatch6 */
       /* Details: "If the name provided to getNamedDispatcher method is not   */
       /* valid, the method returns null"                                      */
-      TestResult tr5 = tcd.getTestResultFailed(SPEC2_19_DISPATCHSERVLETRESOURCE_DISPATCH6);
+      TestResult tr5 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_DISPATCHSERVLETRESOURCE_DISPATCH6);
       try {
          PortletRequestDispatcher rd = portletConfig.getPortletContext()
                .getNamedDispatcher("Invalid Name");
@@ -166,10 +166,10 @@ public class DispatcherTests_SPEC2_19_DispatchServletResource implements Portlet
       } catch(Exception e) {tr5.appendTcDetail(e.toString());}
       tr5.writeTo(writer);
 
-      /* TestCase: SPEC2_19_DispatchServletResource_invoke2                   */
+      /* TestCase: V2DispatcherTests_SPEC2_19_DispatchServletResource_invoke2 */
       /* Details: "If the forward method is called after the response has     */
       /* been committed, an IllegalStateException exception is thrown"        */
-      TestResult tr6 = tcd.getTestResultFailed(SPEC2_19_DISPATCHSERVLETRESOURCE_INVOKE2);
+      TestResult tr6 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_DISPATCHSERVLETRESOURCE_INVOKE2);
       try {
          PortletRequestDispatcher rd = portletConfig.getPortletContext()
                .getRequestDispatcher("/DispatcherTests_SPEC2_19_DispatchServletResource_servlet");

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_ForwardServletAction.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/portlets/DispatcherTests_SPEC2_19_ForwardServletAction.java b/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/portlets/DispatcherTests_SPEC2_19_ForwardServletAction.java
index bcf32fb..ac08691 100644
--- a/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/portlets/DispatcherTests_SPEC2_19_ForwardServletAction.java
+++ b/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/portlets/DispatcherTests_SPEC2_19_ForwardServletAction.java
@@ -120,94 +120,94 @@ public class DispatcherTests_SPEC2_19_ForwardServletAction implements Portlet, R
          ps.removeAttribute(RESULT_ATTR_PREFIX + "DispatcherTests_SPEC2_19_ForwardServletAction", APPLICATION_SCOPE);
       } else {
 
-         /* 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"              */
          {
             PortletURL aurl = portletResp.createActionURL();
-            TestButton tb = new TestButton("SPEC2_19_ForwardServletAction_dispatch1", aurl);
+            TestButton tb = new TestButton("V2DispatcherTests_SPEC2_19_ForwardServletAction_dispatch1", aurl);
             tb.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"                       */
          {
             PortletURL aurl = portletResp.createActionURL();
-            TestButton tb = new TestButton("SPEC2_19_ForwardServletAction_dispatch2", aurl);
+            TestButton tb = new TestButton("V2DispatcherTests_SPEC2_19_ForwardServletAction_dispatch2", aurl);
             tb.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"           */
          {
             PortletURL aurl = portletResp.createActionURL();
-            TestButton tb = new TestButton("SPEC2_19_ForwardServletAction_dispatch3", aurl);
+            TestButton tb = new TestButton("V2DispatcherTests_SPEC2_19_ForwardServletAction_dispatch3", aurl);
             tb.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"         */
          {
             PortletURL aurl = portletResp.createActionURL();
-            TestButton tb = new TestButton("SPEC2_19_ForwardServletAction_dispatch4", aurl);
+            TestButton tb = new TestButton("V2DispatcherTests_SPEC2_19_ForwardServletAction_dispatch4", aurl);
             tb.writeTo(writer);
          }
 
-         /* TestCase: SPEC2_19_ForwardServletAction_invoke1                      */
+         /* TestCase: V2DispatcherTests_SPEC2_19_ForwardServletAction_invoke1    */
          /* Details: "The PortletRequestDispatcher forward method can target a   */
          /* servlet "                                                            */
          {
             PortletURL aurl = portletResp.createActionURL();
-            TestButton tb = new TestButton("SPEC2_19_ForwardServletAction_invoke1", aurl);
+            TestButton tb = new TestButton("V2DispatcherTests_SPEC2_19_ForwardServletAction_invoke1", aurl);
             tb.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"                                       */
          {
             PortletURL aurl = portletResp.createActionURL();
-            TestButton tb = new TestButton("SPEC2_19_ForwardServletAction_invoke2", aurl);
+            TestButton tb = new TestButton("V2DispatcherTests_SPEC2_19_ForwardServletAction_invoke2", aurl);
             tb.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"                              */
          {
             PortletURL aurl = portletResp.createActionURL();
-            TestButton tb = new TestButton("SPEC2_19_ForwardServletAction_invoke3", aurl);
+            TestButton tb = new TestButton("V2DispatcherTests_SPEC2_19_ForwardServletAction_invoke3", aurl);
             tb.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"                                                          */
          {
             PortletURL aurl = portletResp.createActionURL();
-            TestButton tb = new TestButton("SPEC2_19_ForwardServletAction_invoke4", aurl);
+            TestButton tb = new TestButton("V2DispatcherTests_SPEC2_19_ForwardServletAction_invoke4", aurl);
             tb.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"                                                   */
          {
             PortletURL aurl = portletResp.createActionURL();
-            TestButton tb = new TestButton("SPEC2_19_ForwardServletAction_invoke7", aurl);
+            TestButton tb = new TestButton("V2DispatcherTests_SPEC2_19_ForwardServletAction_invoke7", aurl);
             tb.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        */
@@ -215,11 +215,11 @@ public class DispatcherTests_SPEC2_19_ForwardServletAction implements Portlet, R
          /* in the forward chain"                                                */
          {
             PortletURL aurl = portletResp.createActionURL();
-            TestButton tb = new TestButton("SPEC2_19_ForwardServletAction_attributes1", aurl);
+            TestButton tb = new TestButton("V2DispatcherTests_SPEC2_19_ForwardServletAction_attributes1", aurl);
             tb.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       */
@@ -227,11 +227,11 @@ public class DispatcherTests_SPEC2_19_ForwardServletAction implements Portlet, R
          /* in the forward chain"                                                */
          {
             PortletURL aurl = portletResp.createActionURL();
-            TestButton tb = new TestButton("SPEC2_19_ForwardServletAction_attributes2", aurl);
+            TestButton tb = new TestButton("V2DispatcherTests_SPEC2_19_ForwardServletAction_attributes2", aurl);
             tb.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       */
@@ -239,11 +239,11 @@ public class DispatcherTests_SPEC2_19_ForwardServletAction implements Portlet, R
          /* in the forward chain"                                                */
          {
             PortletURL aurl = portletResp.createActionURL();
-            TestButton tb = new TestButton("SPEC2_19_ForwardServletAction_attributes3", aurl);
+            TestButton tb = new TestButton("V2DispatcherTests_SPEC2_19_ForwardServletAction_attributes3", aurl);
             tb.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    */
@@ -251,11 +251,11 @@ public class DispatcherTests_SPEC2_19_ForwardServletAction implements Portlet, R
          /* forward chain"                                                       */
          {
             PortletURL aurl = portletResp.createActionURL();
-            TestButton tb = new TestButton("SPEC2_19_ForwardServletAction_attributes4", aurl);
+            TestButton tb = new TestButton("V2DispatcherTests_SPEC2_19_ForwardServletAction_attributes4", aurl);
             tb.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       */
@@ -263,36 +263,36 @@ public class DispatcherTests_SPEC2_19_ForwardServletAction implements Portlet, R
          /* in the forward chain"                                                */
          {
             PortletURL aurl = portletResp.createActionURL();
-            TestButton tb = new TestButton("SPEC2_19_ForwardServletAction_attributes5", aurl);
+            TestButton tb = new TestButton("V2DispatcherTests_SPEC2_19_ForwardServletAction_attributes5", aurl);
             tb.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"                           */
          {
             PortletURL aurl = portletResp.createActionURL();
-            TestButton tb = new TestButton("SPEC2_19_ForwardServletAction_attributes6", aurl);
+            TestButton tb = new TestButton("V2DispatcherTests_SPEC2_19_ForwardServletAction_attributes6", aurl);
             tb.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"                                  */
          {
             PortletURL aurl = portletResp.createActionURL();
-            TestButton tb = new TestButton("SPEC2_19_ForwardServletAction_attributes7", aurl);
+            TestButton tb = new TestButton("V2DispatcherTests_SPEC2_19_ForwardServletAction_attributes7", aurl);
             tb.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"                                 */
          {
             PortletURL aurl = portletResp.createActionURL();
-            TestButton tb = new TestButton("SPEC2_19_ForwardServletAction_attributes8", aurl);
+            TestButton tb = new TestButton("V2DispatcherTests_SPEC2_19_ForwardServletAction_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/portlets/DispatcherTests_SPEC2_19_ForwardServletEvent.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/portlets/DispatcherTests_SPEC2_19_ForwardServletEvent.java b/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/portlets/DispatcherTests_SPEC2_19_ForwardServletEvent.java
index 8ee64f4..85e498b 100644
--- a/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/portlets/DispatcherTests_SPEC2_19_ForwardServletEvent.java
+++ b/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/portlets/DispatcherTests_SPEC2_19_ForwardServletEvent.java
@@ -113,94 +113,94 @@ public class DispatcherTests_SPEC2_19_ForwardServletEvent implements Portlet, Re
 
       PrintWriter writer = portletResp.getWriter();
 
-      /* 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"              */
       {
          PortletURL aurl = portletResp.createActionURL();
-         TestButton tb = new TestButton("SPEC2_19_ForwardServletEvent_dispatch1", aurl);
+         TestButton tb = new TestButton("V2DispatcherTests_SPEC2_19_ForwardServletEvent_dispatch1", aurl);
          tb.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"                       */
       {
          PortletURL aurl = portletResp.createActionURL();
-         TestButton tb = new TestButton("SPEC2_19_ForwardServletEvent_dispatch2", aurl);
+         TestButton tb = new TestButton("V2DispatcherTests_SPEC2_19_ForwardServletEvent_dispatch2", aurl);
          tb.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"           */
       {
          PortletURL aurl = portletResp.createActionURL();
-         TestButton tb = new TestButton("SPEC2_19_ForwardServletEvent_dispatch3", aurl);
+         TestButton tb = new TestButton("V2DispatcherTests_SPEC2_19_ForwardServletEvent_dispatch3", aurl);
          tb.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"         */
       {
          PortletURL aurl = portletResp.createActionURL();
-         TestButton tb = new TestButton("SPEC2_19_ForwardServletEvent_dispatch4", aurl);
+         TestButton tb = new TestButton("V2DispatcherTests_SPEC2_19_ForwardServletEvent_dispatch4", aurl);
          tb.writeTo(writer);
       }
 
-      /* TestCase: SPEC2_19_ForwardServletEvent_invoke1                       */
+      /* TestCase: V2DispatcherTests_SPEC2_19_ForwardServletEvent_invoke1     */
       /* Details: "The PortletRequestDispatcher forward method can target a   */
       /* servlet "                                                            */
       {
          PortletURL aurl = portletResp.createActionURL();
-         TestButton tb = new TestButton("SPEC2_19_ForwardServletEvent_invoke1", aurl);
+         TestButton tb = new TestButton("V2DispatcherTests_SPEC2_19_ForwardServletEvent_invoke1", aurl);
          tb.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"                                       */
       {
          PortletURL aurl = portletResp.createActionURL();
-         TestButton tb = new TestButton("SPEC2_19_ForwardServletEvent_invoke2", aurl);
+         TestButton tb = new TestButton("V2DispatcherTests_SPEC2_19_ForwardServletEvent_invoke2", aurl);
          tb.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"                              */
       {
          PortletURL aurl = portletResp.createActionURL();
-         TestButton tb = new TestButton("SPEC2_19_ForwardServletEvent_invoke3", aurl);
+         TestButton tb = new TestButton("V2DispatcherTests_SPEC2_19_ForwardServletEvent_invoke3", aurl);
          tb.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"                                                          */
       {
          PortletURL aurl = portletResp.createActionURL();
-         TestButton tb = new TestButton("SPEC2_19_ForwardServletEvent_invoke4", aurl);
+         TestButton tb = new TestButton("V2DispatcherTests_SPEC2_19_ForwardServletEvent_invoke4", aurl);
          tb.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"                                                   */
       {
          PortletURL aurl = portletResp.createActionURL();
-         TestButton tb = new TestButton("SPEC2_19_ForwardServletEvent_invoke7", aurl);
+         TestButton tb = new TestButton("V2DispatcherTests_SPEC2_19_ForwardServletEvent_invoke7", aurl);
          tb.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        */
@@ -208,11 +208,11 @@ public class DispatcherTests_SPEC2_19_ForwardServletEvent implements Portlet, Re
       /* in the forward chain"                                                */
       {
          PortletURL aurl = portletResp.createActionURL();
-         TestButton tb = new TestButton("SPEC2_19_ForwardServletEvent_attributes1", aurl);
+         TestButton tb = new TestButton("V2DispatcherTests_SPEC2_19_ForwardServletEvent_attributes1", aurl);
          tb.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       */
@@ -220,11 +220,11 @@ public class DispatcherTests_SPEC2_19_ForwardServletEvent implements Portlet, Re
       /* in the forward chain"                                                */
       {
          PortletURL aurl = portletResp.createActionURL();
-         TestButton tb = new TestButton("SPEC2_19_ForwardServletEvent_attributes2", aurl);
+         TestButton tb = new TestButton("V2DispatcherTests_SPEC2_19_ForwardServletEvent_attributes2", aurl);
          tb.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       */
@@ -232,11 +232,11 @@ public class DispatcherTests_SPEC2_19_ForwardServletEvent implements Portlet, Re
       /* in the forward chain"                                                */
       {
          PortletURL aurl = portletResp.createActionURL();
-         TestButton tb = new TestButton("SPEC2_19_ForwardServletEvent_attributes3", aurl);
+         TestButton tb = new TestButton("V2DispatcherTests_SPEC2_19_ForwardServletEvent_attributes3", aurl);
          tb.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    */
@@ -244,11 +244,11 @@ public class DispatcherTests_SPEC2_19_ForwardServletEvent implements Portlet, Re
       /* forward chain"                                                       */
       {
          PortletURL aurl = portletResp.createActionURL();
-         TestButton tb = new TestButton("SPEC2_19_ForwardServletEvent_attributes4", aurl);
+         TestButton tb = new TestButton("V2DispatcherTests_SPEC2_19_ForwardServletEvent_attributes4", aurl);
          tb.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       */
@@ -256,36 +256,36 @@ public class DispatcherTests_SPEC2_19_ForwardServletEvent implements Portlet, Re
       /* in the forward chain"                                                */
       {
          PortletURL aurl = portletResp.createActionURL();
-         TestButton tb = new TestButton("SPEC2_19_ForwardServletEvent_attributes5", aurl);
+         TestButton tb = new TestButton("V2DispatcherTests_SPEC2_19_ForwardServletEvent_attributes5", aurl);
          tb.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"                           */
       {
          PortletURL aurl = portletResp.createActionURL();
-         TestButton tb = new TestButton("SPEC2_19_ForwardServletEvent_attributes6", aurl);
+         TestButton tb = new TestButton("V2DispatcherTests_SPEC2_19_ForwardServletEvent_attributes6", aurl);
          tb.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"                                   */
       {
          PortletURL aurl = portletResp.createActionURL();
-         TestButton tb = new TestButton("SPEC2_19_ForwardServletEvent_attributes7", aurl);
+         TestButton tb = new TestButton("V2DispatcherTests_SPEC2_19_ForwardServletEvent_attributes7", aurl);
          tb.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"                                  */
       {
          PortletURL aurl = portletResp.createActionURL();
-         TestButton tb = new TestButton("SPEC2_19_ForwardServletEvent_attributes8", aurl);
+         TestButton tb = new TestButton("V2DispatcherTests_SPEC2_19_ForwardServletEvent_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/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 a334917..2b4374f 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
@@ -120,103 +120,103 @@ public class DispatcherTests_SPEC2_19_IncludeServletAction implements Portlet, R
          ps.removeAttribute(RESULT_ATTR_PREFIX + "DispatcherTests_SPEC2_19_IncludeServletAction", APPLICATION_SCOPE);
       } else {
 
-         /* TestCase: SPEC2_19_IncludeServletAction_dispatch1                    */
+         /* 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("SPEC2_19_IncludeServletAction_dispatch1", aurl);
+            TestButton tb = new TestButton("V2DispatcherTests_SPEC2_19_IncludeServletAction_dispatch1", aurl);
             tb.writeTo(writer);
          }
 
-         /* TestCase: SPEC2_19_IncludeServletAction_dispatch2                    */
+         /* 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("SPEC2_19_IncludeServletAction_dispatch2", aurl);
+            TestButton tb = new TestButton("V2DispatcherTests_SPEC2_19_IncludeServletAction_dispatch2", aurl);
             tb.writeTo(writer);
          }
 
-         /* TestCase: SPEC2_19_IncludeServletAction_dispatch3                    */
+         /* 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("SPEC2_19_IncludeServletAction_dispatch3", aurl);
+            TestButton tb = new TestButton("V2DispatcherTests_SPEC2_19_IncludeServletAction_dispatch3", aurl);
             tb.writeTo(writer);
          }
 
-         /* TestCase: SPEC2_19_IncludeServletAction_dispatch4                    */
+         /* TestCase: V2DispatcherTests_SPEC2_19_IncludeServletAction_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_IncludeServletAction_dispatch4", aurl);
+            TestButton tb = new TestButton("V2DispatcherTests_SPEC2_19_IncludeServletAction_dispatch4", aurl);
             tb.writeTo(writer);
          }
 
-         /* TestCase: SPEC2_19_IncludeServletAction_invoke1                      */
+         /* TestCase: V2DispatcherTests_SPEC2_19_IncludeServletAction_invoke1    */
          /* Details: "The PortletRequestDispatcher include method can target a   */
          /* servlet "                                                            */
          {
             PortletURL aurl = portletResp.createActionURL();
-            TestButton tb = new TestButton("SPEC2_19_IncludeServletAction_invoke1", aurl);
+            TestButton tb = new TestButton("V2DispatcherTests_SPEC2_19_IncludeServletAction_invoke1", aurl);
             tb.writeTo(writer);
          }
 
-         /* TestCase: SPEC2_19_IncludeServletAction_invoke2                      */
+         /* 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("SPEC2_19_IncludeServletAction_invoke2", aurl);
+            TestButton tb = new TestButton("V2DispatcherTests_SPEC2_19_IncludeServletAction_invoke2", aurl);
             tb.writeTo(writer);
          }
 
-         /* TestCase: SPEC2_19_IncludeServletAction_invoke3                      */
+         /* TestCase: V2DispatcherTests_SPEC2_19_IncludeServletAction_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_IncludeServletAction_invoke3", aurl);
+            TestButton tb = new TestButton("V2DispatcherTests_SPEC2_19_IncludeServletAction_invoke3", aurl);
             tb.writeTo(writer);
          }
 
-         /* TestCase: SPEC2_19_IncludeServletAction_invoke4                      */
+         /* 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("SPEC2_19_IncludeServletAction_invoke4", aurl);
+            TestButton tb = new TestButton("V2DispatcherTests_SPEC2_19_IncludeServletAction_invoke4", aurl);
             tb.writeTo(writer);
          }
 
-         /* TestCase: SPEC2_19_IncludeServletAction_invoke7                      */
+         /* 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("SPEC2_19_IncludeServletAction_invoke7", aurl);
+            TestButton tb = new TestButton("V2DispatcherTests_SPEC2_19_IncludeServletAction_invoke7", aurl);
             tb.writeTo(writer);
          }
 
-         /* TestCase: SPEC2_19_IncludeServletAction_invoke8                      */
+         /* TestCase: V2DispatcherTests_SPEC2_19_IncludeServletAction_invoke8    */
          /* Details: "The portlet can include multiple servlets during the       */
          /* same lifecycle method"                                               */
          {
             PortletURL aurl = portletResp.createActionURL();
-            TestButton tb = new TestButton("SPEC2_19_IncludeServletAction_invoke8", aurl);
+            TestButton tb = new TestButton("V2DispatcherTests_SPEC2_19_IncludeServletAction_invoke8", aurl);
             tb.writeTo(writer);
          }
 
-         /* TestCase: SPEC2_19_IncludeServletAction_attributes1                  */
+         /* 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        */
@@ -224,11 +224,11 @@ public class DispatcherTests_SPEC2_19_IncludeServletAction implements Portlet, R
          /* in the include chain"                                                */
          {
             PortletURL aurl = portletResp.createActionURL();
-            TestButton tb = new TestButton("SPEC2_19_IncludeServletAction_attributes1", aurl);
+            TestButton tb = new TestButton("V2DispatcherTests_SPEC2_19_IncludeServletAction_attributes1", aurl);
             tb.writeTo(writer);
          }
 
-         /* TestCase: SPEC2_19_IncludeServletAction_attributes2                  */
+         /* 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       */
@@ -236,11 +236,11 @@ public class DispatcherTests_SPEC2_19_IncludeServletAction implements Portlet, R
          /* in the include chain"                                                */
          {
             PortletURL aurl = portletResp.createActionURL();
-            TestButton tb = new TestButton("SPEC2_19_IncludeServletAction_attributes2", aurl);
+            TestButton tb = new TestButton("V2DispatcherTests_SPEC2_19_IncludeServletAction_attributes2", aurl);
             tb.writeTo(writer);
          }
 
-         /* TestCase: SPEC2_19_IncludeServletAction_attributes3                  */
+         /* 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       */
@@ -248,11 +248,11 @@ public class DispatcherTests_SPEC2_19_IncludeServletAction implements Portlet, R
          /* in the include chain"                                                */
          {
             PortletURL aurl = portletResp.createActionURL();
-            TestButton tb = new TestButton("SPEC2_19_IncludeServletAction_attributes3", aurl);
+            TestButton tb = new TestButton("V2DispatcherTests_SPEC2_19_IncludeServletAction_attributes3", aurl);
             tb.writeTo(writer);
          }
 
-         /* TestCase: SPEC2_19_IncludeServletAction_attributes4                  */
+         /* 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    */
@@ -260,11 +260,11 @@ public class DispatcherTests_SPEC2_19_IncludeServletAction implements Portlet, R
          /* include chain"                                                       */
          {
             PortletURL aurl = portletResp.createActionURL();
-            TestButton tb = new TestButton("SPEC2_19_IncludeServletAction_attributes4", aurl);
+            TestButton tb = new TestButton("V2DispatcherTests_SPEC2_19_IncludeServletAction_attributes4", aurl);
             tb.writeTo(writer);
          }
 
-         /* TestCase: SPEC2_19_IncludeServletAction_attributes5                  */
+         /* 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       */
@@ -272,36 +272,36 @@ public class DispatcherTests_SPEC2_19_IncludeServletAction implements Portlet, R
          /* in the include chain"                                                */
          {
             PortletURL aurl = portletResp.createActionURL();
-            TestButton tb = new TestButton("SPEC2_19_IncludeServletAction_attributes5", aurl);
+            TestButton tb = new TestButton("V2DispatcherTests_SPEC2_19_IncludeServletAction_attributes5", aurl);
             tb.writeTo(writer);
          }
 
-         /* TestCase: SPEC2_19_IncludeServletAction_attributes6                  */
+         /* 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("SPEC2_19_IncludeServletAction_attributes6", aurl);
+            TestButton tb = new TestButton("V2DispatcherTests_SPEC2_19_IncludeServletAction_attributes6", aurl);
             tb.writeTo(writer);
          }
 
-         /* TestCase: SPEC2_19_IncludeServletAction_attributes7                  */
+         /* 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("SPEC2_19_IncludeServletAction_attributes7", aurl);
+            TestButton tb = new TestButton("V2DispatcherTests_SPEC2_19_IncludeServletAction_attributes7", aurl);
             tb.writeTo(writer);
          }
 
-         /* TestCase: SPEC2_19_IncludeServletAction_attributes8                  */
+         /* 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("SPEC2_19_IncludeServletAction_attributes8", aurl);
+            TestButton tb = new TestButton("V2DispatcherTests_SPEC2_19_IncludeServletAction_attributes8", aurl);
             tb.writeTo(writer);
          }