portals-pluto-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From msnickl...@apache.org
Subject [32/35] corrected some implementation errors in dispatcher tests
Date Fri, 22 Aug 2014 13:14:10 GMT
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/e531b0b7/portlet-tck_3.0/V2DispatcherReqRespTests5S/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests5S_SPEC2_19_IncludeServletResourceResponse.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherReqRespTests5S/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests5S_SPEC2_19_IncludeServletResourceResponse.java b/portlet-tck_3.0/V2DispatcherReqRespTests5S/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests5S_SPEC2_19_IncludeServletResourceResponse.java
index 87cd091..908cd24 100644
--- a/portlet-tck_3.0/V2DispatcherReqRespTests5S/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests5S_SPEC2_19_IncludeServletResourceResponse.java
+++ b/portlet-tck_3.0/V2DispatcherReqRespTests5S/src/main/java/javax/portlet/tck/portlets/DispatcherReqRespTests5S_SPEC2_19_IncludeServletResourceResponse.java
@@ -84,6 +84,7 @@ public class DispatcherReqRespTests5S_SPEC2_19_IncludeServletResourceResponse im
 
       PrintWriter writer = portletResp.getWriter();
 
+      // Now do the actual dispatch
       String target = SERVLET_PREFIX + "DispatcherReqRespTests5S_SPEC2_19_IncludeServletResourceResponse_servlet" + SERVLET_SUFFIX + "?" + QUERY_STRING;
       PortletRequestDispatcher rd = portletConfig.getPortletContext()
             .getRequestDispatcher(target);

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/e531b0b7/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 b9a6394..d6ec882 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
@@ -153,8 +153,9 @@ public class DispatcherTests_SPEC2_19_ForwardServletAction_servlet extends HttpS
       /* RequestDispatcher"                                                   */
       TestResult tr6 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_FORWARDSERVLETACTION_INVOKE7);
       try {
-         String ctxPath= request.getContextPath();
-         CompareUtils.stringsEqual(ctxPath, "/DispatcherTests_SPEC2_19_ForwardServletAction_servlet", tr6);
+         String sname = SERVLET_PREFIX + "DispatcherTests_SPEC2_19_ForwardServletAction_servlet" + SERVLET_SUFFIX;
+         String path= request.getServletPath();
+         CompareUtils.stringsEqual(path, sname, tr6);
       } catch(Exception e) {tr6.appendTcDetail(e.toString());}
       tr6.writeTo(writer);
 

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/e531b0b7/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 2691d5b..e8cab11 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
@@ -153,8 +153,9 @@ public class DispatcherTests_SPEC2_19_ForwardServletEvent_servlet extends HttpSe
       /* RequestDispatcher"                                                   */
       TestResult tr6 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_FORWARDSERVLETEVENT_INVOKE7);
       try {
-         String ctxPath= request.getContextPath();
-         CompareUtils.stringsEqual(ctxPath, "/DispatcherTests_SPEC2_19_ForwardServletEvent_servlet", tr6);
+         String sname = SERVLET_PREFIX + "DispatcherTests_SPEC2_19_ForwardServletEvent_servlet" + SERVLET_SUFFIX;
+         String path= request.getServletPath();
+         CompareUtils.stringsEqual(path, sname, tr6);
       } catch(Exception e) {tr6.appendTcDetail(e.toString());}
       tr6.writeTo(writer);
 

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/e531b0b7/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 22f552f..2f32599 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
@@ -153,8 +153,9 @@ public class DispatcherTests_SPEC2_19_ForwardServletRender_servlet extends HttpS
       /* RequestDispatcher"                                                   */
       TestResult tr6 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_FORWARDSERVLETRENDER_INVOKE7);
       try {
-         String ctxPath= request.getContextPath();
-         CompareUtils.stringsEqual(ctxPath, "/DispatcherTests_SPEC2_19_ForwardServletRender_servlet", tr6);
+         String sname = SERVLET_PREFIX + "DispatcherTests_SPEC2_19_ForwardServletRender_servlet" + SERVLET_SUFFIX;
+         String path= request.getServletPath();
+         CompareUtils.stringsEqual(path, sname, tr6);
       } catch(Exception e) {tr6.appendTcDetail(e.toString());}
       tr6.writeTo(writer);
 

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/e531b0b7/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 18ef5ac..7a0d93c 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
@@ -153,8 +153,9 @@ public class DispatcherTests_SPEC2_19_ForwardServletResource_servlet extends Htt
       /* RequestDispatcher"                                                   */
       TestResult tr6 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_FORWARDSERVLETRESOURCE_INVOKE7);
       try {
-         String ctxPath= request.getContextPath();
-         CompareUtils.stringsEqual(ctxPath, "/DispatcherTests_SPEC2_19_ForwardServletResource_servlet", tr6);
+         String sname = SERVLET_PREFIX + "DispatcherTests_SPEC2_19_ForwardServletResource_servlet" + SERVLET_SUFFIX;
+         String path= request.getServletPath();
+         CompareUtils.stringsEqual(path, sname, tr6);
       } catch(Exception e) {tr6.appendTcDetail(e.toString());}
       tr6.writeTo(writer);
 

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/e531b0b7/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/servlets/DispatcherTests_SPEC2_19_IncludeServletAction_servlet.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/servlets/DispatcherTests_SPEC2_19_IncludeServletAction_servlet.java b/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/servlets/DispatcherTests_SPEC2_19_IncludeServletAction_servlet.java
index 7196264..0d16b86 100644
--- a/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/servlets/DispatcherTests_SPEC2_19_IncludeServletAction_servlet.java
+++ b/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/servlets/DispatcherTests_SPEC2_19_IncludeServletAction_servlet.java
@@ -153,8 +153,9 @@ public class DispatcherTests_SPEC2_19_IncludeServletAction_servlet extends HttpS
       /* RequestDispatcher"                                                   */
       TestResult tr6 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETACTION_INVOKE7);
       try {
-         String ctxPath= request.getContextPath();
-         CompareUtils.stringsEqual(ctxPath, "/DispatcherTests_SPEC2_19_IncludeServletAction_servlet", tr6);
+         String sname = SERVLET_PREFIX + "DispatcherTests_SPEC2_19_IncludeServletAction_servlet" + SERVLET_SUFFIX;
+         String path= request.getServletPath();
+         CompareUtils.stringsEqual(path, sname, tr6);
       } catch(Exception e) {tr6.appendTcDetail(e.toString());}
       tr6.writeTo(writer);
 

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/e531b0b7/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/servlets/DispatcherTests_SPEC2_19_IncludeServletEvent_servlet.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/servlets/DispatcherTests_SPEC2_19_IncludeServletEvent_servlet.java b/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/servlets/DispatcherTests_SPEC2_19_IncludeServletEvent_servlet.java
index eeb7410..014ea18 100644
--- a/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/servlets/DispatcherTests_SPEC2_19_IncludeServletEvent_servlet.java
+++ b/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/servlets/DispatcherTests_SPEC2_19_IncludeServletEvent_servlet.java
@@ -153,8 +153,9 @@ public class DispatcherTests_SPEC2_19_IncludeServletEvent_servlet extends HttpSe
       /* RequestDispatcher"                                                   */
       TestResult tr6 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETEVENT_INVOKE7);
       try {
-         String ctxPath= request.getContextPath();
-         CompareUtils.stringsEqual(ctxPath, "/DispatcherTests_SPEC2_19_IncludeServletEvent_servlet", tr6);
+         String sname = SERVLET_PREFIX + "DispatcherTests_SPEC2_19_IncludeServletEvent_servlet" + SERVLET_SUFFIX;
+         String path= request.getServletPath();
+         CompareUtils.stringsEqual(path, sname, tr6);
       } catch(Exception e) {tr6.appendTcDetail(e.toString());}
       tr6.writeTo(writer);
 

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/e531b0b7/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/servlets/DispatcherTests_SPEC2_19_IncludeServletRender_servlet.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/servlets/DispatcherTests_SPEC2_19_IncludeServletRender_servlet.java b/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/servlets/DispatcherTests_SPEC2_19_IncludeServletRender_servlet.java
index d648425..33b7315 100644
--- a/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/servlets/DispatcherTests_SPEC2_19_IncludeServletRender_servlet.java
+++ b/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/servlets/DispatcherTests_SPEC2_19_IncludeServletRender_servlet.java
@@ -153,8 +153,9 @@ public class DispatcherTests_SPEC2_19_IncludeServletRender_servlet extends HttpS
       /* RequestDispatcher"                                                   */
       TestResult tr6 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETRENDER_INVOKE7);
       try {
-         String ctxPath= request.getContextPath();
-         CompareUtils.stringsEqual(ctxPath, "/DispatcherTests_SPEC2_19_IncludeServletRender_servlet", tr6);
+         String sname = SERVLET_PREFIX + "DispatcherTests_SPEC2_19_IncludeServletRender_servlet" + SERVLET_SUFFIX;
+         String path= request.getServletPath();
+         CompareUtils.stringsEqual(path, sname, tr6);
       } catch(Exception e) {tr6.appendTcDetail(e.toString());}
       tr6.writeTo(writer);
 

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/e531b0b7/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/servlets/DispatcherTests_SPEC2_19_IncludeServletResource_servlet.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/servlets/DispatcherTests_SPEC2_19_IncludeServletResource_servlet.java b/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/servlets/DispatcherTests_SPEC2_19_IncludeServletResource_servlet.java
index 1184b1d..61dd3c3 100644
--- a/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/servlets/DispatcherTests_SPEC2_19_IncludeServletResource_servlet.java
+++ b/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/servlets/DispatcherTests_SPEC2_19_IncludeServletResource_servlet.java
@@ -153,8 +153,9 @@ public class DispatcherTests_SPEC2_19_IncludeServletResource_servlet extends Htt
       /* RequestDispatcher"                                                   */
       TestResult tr6 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_INCLUDESERVLETRESOURCE_INVOKE7);
       try {
-         String ctxPath= request.getContextPath();
-         CompareUtils.stringsEqual(ctxPath, "/DispatcherTests_SPEC2_19_IncludeServletResource_servlet", tr6);
+         String sname = SERVLET_PREFIX + "DispatcherTests_SPEC2_19_IncludeServletResource_servlet" + SERVLET_SUFFIX;
+         String path= request.getServletPath();
+         CompareUtils.stringsEqual(path, sname, tr6);
       } catch(Exception e) {tr6.appendTcDetail(e.toString());}
       tr6.writeTo(writer);
 

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/e531b0b7/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_ForwardJSPAction.jsp
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_ForwardJSPAction.jsp b/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_ForwardJSPAction.jsp
index 6b95a58..a71d855 100644
--- a/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_ForwardJSPAction.jsp
+++ b/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_ForwardJSPAction.jsp
@@ -102,8 +102,9 @@
       /* RequestDispatcher"                                                   */
       TestResult tr6 = tcd.getTestResultFailed(V2DISPATCHERTESTS2_SPEC2_19_FORWARDJSPACTION_INVOKE7);
       try {
-         String ctxPath= request.getContextPath();
-         CompareUtils.stringsEqual(ctxPath, "/DispatcherTests2_SPEC2_19_ForwardJSPAction", tr6);
+         String sname = JSP_PREFIX + "DispatcherTests2_SPEC2_19_ForwardJSPAction" + JSP_SUFFIX;
+         String path= request.getServletPath();
+         CompareUtils.stringsEqual(path, sname, tr6);
       } catch(Exception e) {tr6.appendTcDetail(e.toString());}
       tr6.writeTo(writer);
 

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/e531b0b7/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_ForwardJSPEvent.jsp
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_ForwardJSPEvent.jsp b/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_ForwardJSPEvent.jsp
index 02f9bec..b9db8a9 100644
--- a/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_ForwardJSPEvent.jsp
+++ b/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_ForwardJSPEvent.jsp
@@ -102,8 +102,9 @@
       /* RequestDispatcher"                                                   */
       TestResult tr6 = tcd.getTestResultFailed(V2DISPATCHERTESTS2_SPEC2_19_FORWARDJSPEVENT_INVOKE7);
       try {
-         String ctxPath= request.getContextPath();
-         CompareUtils.stringsEqual(ctxPath, "/DispatcherTests2_SPEC2_19_ForwardJSPEvent", tr6);
+         String sname = JSP_PREFIX + "DispatcherTests2_SPEC2_19_ForwardJSPEvent" + JSP_SUFFIX;
+         String path= request.getServletPath();
+         CompareUtils.stringsEqual(path, sname, tr6);
       } catch(Exception e) {tr6.appendTcDetail(e.toString());}
       tr6.writeTo(writer);
 

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/e531b0b7/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_ForwardJSPRender.jsp
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_ForwardJSPRender.jsp b/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_ForwardJSPRender.jsp
index 06eb046..4a277cc 100644
--- a/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_ForwardJSPRender.jsp
+++ b/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_ForwardJSPRender.jsp
@@ -102,8 +102,9 @@
       /* RequestDispatcher"                                                   */
       TestResult tr6 = tcd.getTestResultFailed(V2DISPATCHERTESTS2_SPEC2_19_FORWARDJSPRENDER_INVOKE7);
       try {
-         String ctxPath= request.getContextPath();
-         CompareUtils.stringsEqual(ctxPath, "/DispatcherTests2_SPEC2_19_ForwardJSPRender", tr6);
+         String sname = JSP_PREFIX + "DispatcherTests2_SPEC2_19_ForwardJSPRender" + JSP_SUFFIX;
+         String path= request.getServletPath();
+         CompareUtils.stringsEqual(path, sname, tr6);
       } catch(Exception e) {tr6.appendTcDetail(e.toString());}
       tr6.writeTo(writer);
 

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/e531b0b7/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_ForwardJSPResource.jsp
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_ForwardJSPResource.jsp b/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_ForwardJSPResource.jsp
index 842c2e3..532ca56 100644
--- a/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_ForwardJSPResource.jsp
+++ b/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_ForwardJSPResource.jsp
@@ -102,8 +102,9 @@
       /* RequestDispatcher"                                                   */
       TestResult tr6 = tcd.getTestResultFailed(V2DISPATCHERTESTS2_SPEC2_19_FORWARDJSPRESOURCE_INVOKE7);
       try {
-         String ctxPath= request.getContextPath();
-         CompareUtils.stringsEqual(ctxPath, "/DispatcherTests2_SPEC2_19_ForwardJSPResource", tr6);
+         String sname = JSP_PREFIX + "DispatcherTests2_SPEC2_19_ForwardJSPResource" + JSP_SUFFIX;
+         String path= request.getServletPath();
+         CompareUtils.stringsEqual(path, sname, tr6);
       } catch(Exception e) {tr6.appendTcDetail(e.toString());}
       tr6.writeTo(writer);
 

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/e531b0b7/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_IncludeJSPAction.jsp
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_IncludeJSPAction.jsp b/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_IncludeJSPAction.jsp
index eac8fa8..f6374a4 100644
--- a/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_IncludeJSPAction.jsp
+++ b/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_IncludeJSPAction.jsp
@@ -102,8 +102,9 @@
       /* RequestDispatcher"                                                   */
       TestResult tr6 = tcd.getTestResultFailed(V2DISPATCHERTESTS2_SPEC2_19_INCLUDEJSPACTION_INVOKE7);
       try {
-         String ctxPath= request.getContextPath();
-         CompareUtils.stringsEqual(ctxPath, "/DispatcherTests2_SPEC2_19_IncludeJSPAction", tr6);
+         String sname = JSP_PREFIX + "DispatcherTests2_SPEC2_19_IncludeJSPAction" + JSP_SUFFIX;
+         String path= request.getServletPath();
+         CompareUtils.stringsEqual(path, sname, tr6);
       } catch(Exception e) {tr6.appendTcDetail(e.toString());}
       tr6.writeTo(writer);
 

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/e531b0b7/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_IncludeJSPEvent.jsp
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_IncludeJSPEvent.jsp b/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_IncludeJSPEvent.jsp
index b2bd9bc..953edef 100644
--- a/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_IncludeJSPEvent.jsp
+++ b/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_IncludeJSPEvent.jsp
@@ -102,8 +102,9 @@
       /* RequestDispatcher"                                                   */
       TestResult tr6 = tcd.getTestResultFailed(V2DISPATCHERTESTS2_SPEC2_19_INCLUDEJSPEVENT_INVOKE7);
       try {
-         String ctxPath= request.getContextPath();
-         CompareUtils.stringsEqual(ctxPath, "/DispatcherTests2_SPEC2_19_IncludeJSPEvent", tr6);
+         String sname = JSP_PREFIX + "DispatcherTests2_SPEC2_19_IncludeJSPEvent" + JSP_SUFFIX;
+         String path= request.getServletPath();
+         CompareUtils.stringsEqual(path, sname, tr6);
       } catch(Exception e) {tr6.appendTcDetail(e.toString());}
       tr6.writeTo(writer);
 

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/e531b0b7/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_IncludeJSPRender.jsp
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_IncludeJSPRender.jsp b/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_IncludeJSPRender.jsp
index 3f5eea8..c1b6625 100644
--- a/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_IncludeJSPRender.jsp
+++ b/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_IncludeJSPRender.jsp
@@ -102,8 +102,9 @@
       /* RequestDispatcher"                                                   */
       TestResult tr6 = tcd.getTestResultFailed(V2DISPATCHERTESTS2_SPEC2_19_INCLUDEJSPRENDER_INVOKE7);
       try {
-         String ctxPath= request.getContextPath();
-         CompareUtils.stringsEqual(ctxPath, "/DispatcherTests2_SPEC2_19_IncludeJSPRender", tr6);
+         String sname = JSP_PREFIX + "DispatcherTests2_SPEC2_19_IncludeJSPRender" + JSP_SUFFIX;
+         String path= request.getServletPath();
+         CompareUtils.stringsEqual(path, sname, tr6);
       } catch(Exception e) {tr6.appendTcDetail(e.toString());}
       tr6.writeTo(writer);
 

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/e531b0b7/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_IncludeJSPResource.jsp
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_IncludeJSPResource.jsp b/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_IncludeJSPResource.jsp
index ee8f23b..a8b8447 100644
--- a/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_IncludeJSPResource.jsp
+++ b/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_IncludeJSPResource.jsp
@@ -102,8 +102,9 @@
       /* RequestDispatcher"                                                   */
       TestResult tr6 = tcd.getTestResultFailed(V2DISPATCHERTESTS2_SPEC2_19_INCLUDEJSPRESOURCE_INVOKE7);
       try {
-         String ctxPath= request.getContextPath();
-         CompareUtils.stringsEqual(ctxPath, "/DispatcherTests2_SPEC2_19_IncludeJSPResource", tr6);
+         String sname = JSP_PREFIX + "DispatcherTests2_SPEC2_19_IncludeJSPResource" + JSP_SUFFIX;
+         String path= request.getServletPath();
+         CompareUtils.stringsEqual(path, sname, tr6);
       } catch(Exception e) {tr6.appendTcDetail(e.toString());}
       tr6.writeTo(writer);
 

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/e531b0b7/portlet-tck_3.0/V2DispatcherTests5/src/main/java/javax/portlet/tck/servlets/DispatcherTests5_SPEC2_19_IncThenForwardServletAction_servlet.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests5/src/main/java/javax/portlet/tck/servlets/DispatcherTests5_SPEC2_19_IncThenForwardServletAction_servlet.java b/portlet-tck_3.0/V2DispatcherTests5/src/main/java/javax/portlet/tck/servlets/DispatcherTests5_SPEC2_19_IncThenForwardServletAction_servlet.java
index 5ef3e41..b3ef01d 100644
--- a/portlet-tck_3.0/V2DispatcherTests5/src/main/java/javax/portlet/tck/servlets/DispatcherTests5_SPEC2_19_IncThenForwardServletAction_servlet.java
+++ b/portlet-tck_3.0/V2DispatcherTests5/src/main/java/javax/portlet/tck/servlets/DispatcherTests5_SPEC2_19_IncThenForwardServletAction_servlet.java
@@ -155,8 +155,9 @@ public class DispatcherTests5_SPEC2_19_IncThenForwardServletAction_servlet exten
       /* RequestDispatcher"                                                   */
       TestResult tr5 = tcd.getTestResultFailed(V2DISPATCHERTESTS5_SPEC2_19_INCTHENFORWARDSERVLETACTION_INVOKE7);
       try {
-         String ctxPath= request.getContextPath();
-         CompareUtils.stringsEqual(ctxPath, "/DispatcherTests5_SPEC2_19_IncThenForwardServletAction_servlet", tr5);
+         String sname = SERVLET_PREFIX + "DispatcherTests5_SPEC2_19_IncThenForwardServletAction_servlet" + SERVLET_SUFFIX;
+         String path= request.getServletPath();
+         CompareUtils.stringsEqual(path, sname, tr5);
       } catch(Exception e) {tr5.appendTcDetail(e.toString());}
       tr5.writeTo(writer);
 

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/e531b0b7/portlet-tck_3.0/V2DispatcherTests5/src/main/java/javax/portlet/tck/servlets/DispatcherTests5_SPEC2_19_IncThenForwardServletEvent_servlet.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests5/src/main/java/javax/portlet/tck/servlets/DispatcherTests5_SPEC2_19_IncThenForwardServletEvent_servlet.java b/portlet-tck_3.0/V2DispatcherTests5/src/main/java/javax/portlet/tck/servlets/DispatcherTests5_SPEC2_19_IncThenForwardServletEvent_servlet.java
index ed43a80..0f44287 100644
--- a/portlet-tck_3.0/V2DispatcherTests5/src/main/java/javax/portlet/tck/servlets/DispatcherTests5_SPEC2_19_IncThenForwardServletEvent_servlet.java
+++ b/portlet-tck_3.0/V2DispatcherTests5/src/main/java/javax/portlet/tck/servlets/DispatcherTests5_SPEC2_19_IncThenForwardServletEvent_servlet.java
@@ -155,8 +155,9 @@ public class DispatcherTests5_SPEC2_19_IncThenForwardServletEvent_servlet extend
       /* RequestDispatcher"                                                   */
       TestResult tr5 = tcd.getTestResultFailed(V2DISPATCHERTESTS5_SPEC2_19_INCTHENFORWARDSERVLETEVENT_INVOKE7);
       try {
-         String ctxPath= request.getContextPath();
-         CompareUtils.stringsEqual(ctxPath, "/DispatcherTests5_SPEC2_19_IncThenForwardServletEvent_servlet", tr5);
+         String sname = SERVLET_PREFIX + "DispatcherTests5_SPEC2_19_IncThenForwardServletEvent_servlet" + SERVLET_SUFFIX;
+         String path= request.getServletPath();
+         CompareUtils.stringsEqual(path, sname, tr5);
       } catch(Exception e) {tr5.appendTcDetail(e.toString());}
       tr5.writeTo(writer);
 

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/e531b0b7/portlet-tck_3.0/V2DispatcherTests5/src/main/java/javax/portlet/tck/servlets/DispatcherTests5_SPEC2_19_IncThenForwardServletRender_servlet.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests5/src/main/java/javax/portlet/tck/servlets/DispatcherTests5_SPEC2_19_IncThenForwardServletRender_servlet.java b/portlet-tck_3.0/V2DispatcherTests5/src/main/java/javax/portlet/tck/servlets/DispatcherTests5_SPEC2_19_IncThenForwardServletRender_servlet.java
index 41fc2f8..8779308 100644
--- a/portlet-tck_3.0/V2DispatcherTests5/src/main/java/javax/portlet/tck/servlets/DispatcherTests5_SPEC2_19_IncThenForwardServletRender_servlet.java
+++ b/portlet-tck_3.0/V2DispatcherTests5/src/main/java/javax/portlet/tck/servlets/DispatcherTests5_SPEC2_19_IncThenForwardServletRender_servlet.java
@@ -155,8 +155,9 @@ public class DispatcherTests5_SPEC2_19_IncThenForwardServletRender_servlet exten
       /* RequestDispatcher"                                                   */
       TestResult tr5 = tcd.getTestResultFailed(V2DISPATCHERTESTS5_SPEC2_19_INCTHENFORWARDSERVLETRENDER_INVOKE7);
       try {
-         String ctxPath= request.getContextPath();
-         CompareUtils.stringsEqual(ctxPath, "/DispatcherTests5_SPEC2_19_IncThenForwardServletRender_servlet", tr5);
+         String sname = SERVLET_PREFIX + "DispatcherTests5_SPEC2_19_IncThenForwardServletRender_servlet" + SERVLET_SUFFIX;
+         String path= request.getServletPath();
+         CompareUtils.stringsEqual(path, sname, tr5);
       } catch(Exception e) {tr5.appendTcDetail(e.toString());}
       tr5.writeTo(writer);
 

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/e531b0b7/portlet-tck_3.0/V2DispatcherTests5/src/main/java/javax/portlet/tck/servlets/DispatcherTests5_SPEC2_19_IncThenForwardServletResource_servlet.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests5/src/main/java/javax/portlet/tck/servlets/DispatcherTests5_SPEC2_19_IncThenForwardServletResource_servlet.java b/portlet-tck_3.0/V2DispatcherTests5/src/main/java/javax/portlet/tck/servlets/DispatcherTests5_SPEC2_19_IncThenForwardServletResource_servlet.java
index 8f66699..796def8 100644
--- a/portlet-tck_3.0/V2DispatcherTests5/src/main/java/javax/portlet/tck/servlets/DispatcherTests5_SPEC2_19_IncThenForwardServletResource_servlet.java
+++ b/portlet-tck_3.0/V2DispatcherTests5/src/main/java/javax/portlet/tck/servlets/DispatcherTests5_SPEC2_19_IncThenForwardServletResource_servlet.java
@@ -155,8 +155,9 @@ public class DispatcherTests5_SPEC2_19_IncThenForwardServletResource_servlet ext
       /* RequestDispatcher"                                                   */
       TestResult tr5 = tcd.getTestResultFailed(V2DISPATCHERTESTS5_SPEC2_19_INCTHENFORWARDSERVLETRESOURCE_INVOKE7);
       try {
-         String ctxPath= request.getContextPath();
-         CompareUtils.stringsEqual(ctxPath, "/DispatcherTests5_SPEC2_19_IncThenForwardServletResource_servlet", tr5);
+         String sname = SERVLET_PREFIX + "DispatcherTests5_SPEC2_19_IncThenForwardServletResource_servlet" + SERVLET_SUFFIX;
+         String path= request.getServletPath();
+         CompareUtils.stringsEqual(path, sname, tr5);
       } catch(Exception e) {tr5.appendTcDetail(e.toString());}
       tr5.writeTo(writer);
 

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/e531b0b7/portlet-tck_3.0/V2DispatcherTests5/src/main/java/javax/portlet/tck/servlets/DispatcherTests5_SPEC2_19_IncThenIncludeServletAction_servlet.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests5/src/main/java/javax/portlet/tck/servlets/DispatcherTests5_SPEC2_19_IncThenIncludeServletAction_servlet.java b/portlet-tck_3.0/V2DispatcherTests5/src/main/java/javax/portlet/tck/servlets/DispatcherTests5_SPEC2_19_IncThenIncludeServletAction_servlet.java
index 0778a9a..95f6db3 100644
--- a/portlet-tck_3.0/V2DispatcherTests5/src/main/java/javax/portlet/tck/servlets/DispatcherTests5_SPEC2_19_IncThenIncludeServletAction_servlet.java
+++ b/portlet-tck_3.0/V2DispatcherTests5/src/main/java/javax/portlet/tck/servlets/DispatcherTests5_SPEC2_19_IncThenIncludeServletAction_servlet.java
@@ -154,8 +154,9 @@ public class DispatcherTests5_SPEC2_19_IncThenIncludeServletAction_servlet exten
       /* must reflect the path used to obtain the RequestDispatcher"          */
       TestResult tr5 = tcd.getTestResultFailed(V2DISPATCHERTESTS5_SPEC2_19_INCTHENINCLUDESERVLETACTION_INVOKE7);
       try {
-         String ctxPath= request.getContextPath();
-         CompareUtils.stringsEqual(ctxPath, "/DispatcherTests5_SPEC2_19_IncThenIncludeServletAction_servlet", tr5);
+         String sname = SERVLET_PREFIX + "DispatcherTests5_SPEC2_19_IncThenIncludeServletAction_servlet" + SERVLET_SUFFIX;
+         String path= request.getServletPath();
+         CompareUtils.stringsEqual(path, sname, tr5);
       } catch(Exception e) {tr5.appendTcDetail(e.toString());}
       tr5.writeTo(writer);
 

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/e531b0b7/portlet-tck_3.0/V2DispatcherTests5/src/main/java/javax/portlet/tck/servlets/DispatcherTests5_SPEC2_19_IncThenIncludeServletEvent_servlet.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests5/src/main/java/javax/portlet/tck/servlets/DispatcherTests5_SPEC2_19_IncThenIncludeServletEvent_servlet.java b/portlet-tck_3.0/V2DispatcherTests5/src/main/java/javax/portlet/tck/servlets/DispatcherTests5_SPEC2_19_IncThenIncludeServletEvent_servlet.java
index d83f18a..4f3f411 100644
--- a/portlet-tck_3.0/V2DispatcherTests5/src/main/java/javax/portlet/tck/servlets/DispatcherTests5_SPEC2_19_IncThenIncludeServletEvent_servlet.java
+++ b/portlet-tck_3.0/V2DispatcherTests5/src/main/java/javax/portlet/tck/servlets/DispatcherTests5_SPEC2_19_IncThenIncludeServletEvent_servlet.java
@@ -154,8 +154,9 @@ public class DispatcherTests5_SPEC2_19_IncThenIncludeServletEvent_servlet extend
       /* must reflect the path used to obtain the RequestDispatcher"          */
       TestResult tr5 = tcd.getTestResultFailed(V2DISPATCHERTESTS5_SPEC2_19_INCTHENINCLUDESERVLETEVENT_INVOKE7);
       try {
-         String ctxPath= request.getContextPath();
-         CompareUtils.stringsEqual(ctxPath, "/DispatcherTests5_SPEC2_19_IncThenIncludeServletEvent_servlet", tr5);
+         String sname = SERVLET_PREFIX + "DispatcherTests5_SPEC2_19_IncThenIncludeServletEvent_servlet" + SERVLET_SUFFIX;
+         String path= request.getServletPath();
+         CompareUtils.stringsEqual(path, sname, tr5);
       } catch(Exception e) {tr5.appendTcDetail(e.toString());}
       tr5.writeTo(writer);
 

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/e531b0b7/portlet-tck_3.0/V2DispatcherTests5/src/main/java/javax/portlet/tck/servlets/DispatcherTests5_SPEC2_19_IncThenIncludeServletRender_servlet.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests5/src/main/java/javax/portlet/tck/servlets/DispatcherTests5_SPEC2_19_IncThenIncludeServletRender_servlet.java b/portlet-tck_3.0/V2DispatcherTests5/src/main/java/javax/portlet/tck/servlets/DispatcherTests5_SPEC2_19_IncThenIncludeServletRender_servlet.java
index c19cebf..03dd9a2 100644
--- a/portlet-tck_3.0/V2DispatcherTests5/src/main/java/javax/portlet/tck/servlets/DispatcherTests5_SPEC2_19_IncThenIncludeServletRender_servlet.java
+++ b/portlet-tck_3.0/V2DispatcherTests5/src/main/java/javax/portlet/tck/servlets/DispatcherTests5_SPEC2_19_IncThenIncludeServletRender_servlet.java
@@ -154,8 +154,9 @@ public class DispatcherTests5_SPEC2_19_IncThenIncludeServletRender_servlet exten
       /* must reflect the path used to obtain the RequestDispatcher"          */
       TestResult tr5 = tcd.getTestResultFailed(V2DISPATCHERTESTS5_SPEC2_19_INCTHENINCLUDESERVLETRENDER_INVOKE7);
       try {
-         String ctxPath= request.getContextPath();
-         CompareUtils.stringsEqual(ctxPath, "/DispatcherTests5_SPEC2_19_IncThenIncludeServletRender_servlet", tr5);
+         String sname = SERVLET_PREFIX + "DispatcherTests5_SPEC2_19_IncThenIncludeServletRender_servlet" + SERVLET_SUFFIX;
+         String path= request.getServletPath();
+         CompareUtils.stringsEqual(path, sname, tr5);
       } catch(Exception e) {tr5.appendTcDetail(e.toString());}
       tr5.writeTo(writer);
 

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/e531b0b7/portlet-tck_3.0/V2DispatcherTests5/src/main/java/javax/portlet/tck/servlets/DispatcherTests5_SPEC2_19_IncThenIncludeServletResource_servlet.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests5/src/main/java/javax/portlet/tck/servlets/DispatcherTests5_SPEC2_19_IncThenIncludeServletResource_servlet.java b/portlet-tck_3.0/V2DispatcherTests5/src/main/java/javax/portlet/tck/servlets/DispatcherTests5_SPEC2_19_IncThenIncludeServletResource_servlet.java
index d460d75..a4a2f9a 100644
--- a/portlet-tck_3.0/V2DispatcherTests5/src/main/java/javax/portlet/tck/servlets/DispatcherTests5_SPEC2_19_IncThenIncludeServletResource_servlet.java
+++ b/portlet-tck_3.0/V2DispatcherTests5/src/main/java/javax/portlet/tck/servlets/DispatcherTests5_SPEC2_19_IncThenIncludeServletResource_servlet.java
@@ -154,8 +154,9 @@ public class DispatcherTests5_SPEC2_19_IncThenIncludeServletResource_servlet ext
       /* must reflect the path used to obtain the RequestDispatcher"          */
       TestResult tr5 = tcd.getTestResultFailed(V2DISPATCHERTESTS5_SPEC2_19_INCTHENINCLUDESERVLETRESOURCE_INVOKE7);
       try {
-         String ctxPath= request.getContextPath();
-         CompareUtils.stringsEqual(ctxPath, "/DispatcherTests5_SPEC2_19_IncThenIncludeServletResource_servlet", tr5);
+         String sname = SERVLET_PREFIX + "DispatcherTests5_SPEC2_19_IncThenIncludeServletResource_servlet" + SERVLET_SUFFIX;
+         String path= request.getServletPath();
+         CompareUtils.stringsEqual(path, sname, tr5);
       } catch(Exception e) {tr5.appendTcDetail(e.toString());}
       tr5.writeTo(writer);
 

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/e531b0b7/portlet-tck_3.0/V2DispatcherTests6/src/main/java/javax/portlet/tck/servlets/DispatcherTests6_SPEC2_19_FwdThenForwardServletAction_servlet.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests6/src/main/java/javax/portlet/tck/servlets/DispatcherTests6_SPEC2_19_FwdThenForwardServletAction_servlet.java b/portlet-tck_3.0/V2DispatcherTests6/src/main/java/javax/portlet/tck/servlets/DispatcherTests6_SPEC2_19_FwdThenForwardServletAction_servlet.java
index f82f8ea..03cd13b 100644
--- a/portlet-tck_3.0/V2DispatcherTests6/src/main/java/javax/portlet/tck/servlets/DispatcherTests6_SPEC2_19_FwdThenForwardServletAction_servlet.java
+++ b/portlet-tck_3.0/V2DispatcherTests6/src/main/java/javax/portlet/tck/servlets/DispatcherTests6_SPEC2_19_FwdThenForwardServletAction_servlet.java
@@ -155,8 +155,9 @@ public class DispatcherTests6_SPEC2_19_FwdThenForwardServletAction_servlet exten
       /* RequestDispatcher"                                                   */
       TestResult tr5 = tcd.getTestResultFailed(V2DISPATCHERTESTS6_SPEC2_19_FWDTHENFORWARDSERVLETACTION_INVOKE7);
       try {
-         String ctxPath= request.getContextPath();
-         CompareUtils.stringsEqual(ctxPath, "/DispatcherTests6_SPEC2_19_FwdThenForwardServletAction_servlet", tr5);
+         String sname = SERVLET_PREFIX + "DispatcherTests6_SPEC2_19_FwdThenForwardServletAction_servlet" + SERVLET_SUFFIX;
+         String path= request.getServletPath();
+         CompareUtils.stringsEqual(path, sname, tr5);
       } catch(Exception e) {tr5.appendTcDetail(e.toString());}
       tr5.writeTo(writer);
 

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/e531b0b7/portlet-tck_3.0/V2DispatcherTests6/src/main/java/javax/portlet/tck/servlets/DispatcherTests6_SPEC2_19_FwdThenForwardServletEvent_servlet.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests6/src/main/java/javax/portlet/tck/servlets/DispatcherTests6_SPEC2_19_FwdThenForwardServletEvent_servlet.java b/portlet-tck_3.0/V2DispatcherTests6/src/main/java/javax/portlet/tck/servlets/DispatcherTests6_SPEC2_19_FwdThenForwardServletEvent_servlet.java
index 6becce4..d350e35 100644
--- a/portlet-tck_3.0/V2DispatcherTests6/src/main/java/javax/portlet/tck/servlets/DispatcherTests6_SPEC2_19_FwdThenForwardServletEvent_servlet.java
+++ b/portlet-tck_3.0/V2DispatcherTests6/src/main/java/javax/portlet/tck/servlets/DispatcherTests6_SPEC2_19_FwdThenForwardServletEvent_servlet.java
@@ -155,8 +155,9 @@ public class DispatcherTests6_SPEC2_19_FwdThenForwardServletEvent_servlet extend
       /* RequestDispatcher"                                                   */
       TestResult tr5 = tcd.getTestResultFailed(V2DISPATCHERTESTS6_SPEC2_19_FWDTHENFORWARDSERVLETEVENT_INVOKE7);
       try {
-         String ctxPath= request.getContextPath();
-         CompareUtils.stringsEqual(ctxPath, "/DispatcherTests6_SPEC2_19_FwdThenForwardServletEvent_servlet", tr5);
+         String sname = SERVLET_PREFIX + "DispatcherTests6_SPEC2_19_FwdThenForwardServletEvent_servlet" + SERVLET_SUFFIX;
+         String path= request.getServletPath();
+         CompareUtils.stringsEqual(path, sname, tr5);
       } catch(Exception e) {tr5.appendTcDetail(e.toString());}
       tr5.writeTo(writer);
 

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/e531b0b7/portlet-tck_3.0/V2DispatcherTests6/src/main/java/javax/portlet/tck/servlets/DispatcherTests6_SPEC2_19_FwdThenForwardServletRender_servlet.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests6/src/main/java/javax/portlet/tck/servlets/DispatcherTests6_SPEC2_19_FwdThenForwardServletRender_servlet.java b/portlet-tck_3.0/V2DispatcherTests6/src/main/java/javax/portlet/tck/servlets/DispatcherTests6_SPEC2_19_FwdThenForwardServletRender_servlet.java
index 6234408..f321b5a 100644
--- a/portlet-tck_3.0/V2DispatcherTests6/src/main/java/javax/portlet/tck/servlets/DispatcherTests6_SPEC2_19_FwdThenForwardServletRender_servlet.java
+++ b/portlet-tck_3.0/V2DispatcherTests6/src/main/java/javax/portlet/tck/servlets/DispatcherTests6_SPEC2_19_FwdThenForwardServletRender_servlet.java
@@ -155,8 +155,9 @@ public class DispatcherTests6_SPEC2_19_FwdThenForwardServletRender_servlet exten
       /* RequestDispatcher"                                                   */
       TestResult tr5 = tcd.getTestResultFailed(V2DISPATCHERTESTS6_SPEC2_19_FWDTHENFORWARDSERVLETRENDER_INVOKE7);
       try {
-         String ctxPath= request.getContextPath();
-         CompareUtils.stringsEqual(ctxPath, "/DispatcherTests6_SPEC2_19_FwdThenForwardServletRender_servlet", tr5);
+         String sname = SERVLET_PREFIX + "DispatcherTests6_SPEC2_19_FwdThenForwardServletRender_servlet" + SERVLET_SUFFIX;
+         String path= request.getServletPath();
+         CompareUtils.stringsEqual(path, sname, tr5);
       } catch(Exception e) {tr5.appendTcDetail(e.toString());}
       tr5.writeTo(writer);
 

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/e531b0b7/portlet-tck_3.0/V2DispatcherTests6/src/main/java/javax/portlet/tck/servlets/DispatcherTests6_SPEC2_19_FwdThenForwardServletResource_servlet.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests6/src/main/java/javax/portlet/tck/servlets/DispatcherTests6_SPEC2_19_FwdThenForwardServletResource_servlet.java b/portlet-tck_3.0/V2DispatcherTests6/src/main/java/javax/portlet/tck/servlets/DispatcherTests6_SPEC2_19_FwdThenForwardServletResource_servlet.java
index ec4aa32..22f9b50 100644
--- a/portlet-tck_3.0/V2DispatcherTests6/src/main/java/javax/portlet/tck/servlets/DispatcherTests6_SPEC2_19_FwdThenForwardServletResource_servlet.java
+++ b/portlet-tck_3.0/V2DispatcherTests6/src/main/java/javax/portlet/tck/servlets/DispatcherTests6_SPEC2_19_FwdThenForwardServletResource_servlet.java
@@ -155,8 +155,9 @@ public class DispatcherTests6_SPEC2_19_FwdThenForwardServletResource_servlet ext
       /* RequestDispatcher"                                                   */
       TestResult tr5 = tcd.getTestResultFailed(V2DISPATCHERTESTS6_SPEC2_19_FWDTHENFORWARDSERVLETRESOURCE_INVOKE7);
       try {
-         String ctxPath= request.getContextPath();
-         CompareUtils.stringsEqual(ctxPath, "/DispatcherTests6_SPEC2_19_FwdThenForwardServletResource_servlet", tr5);
+         String sname = SERVLET_PREFIX + "DispatcherTests6_SPEC2_19_FwdThenForwardServletResource_servlet" + SERVLET_SUFFIX;
+         String path= request.getServletPath();
+         CompareUtils.stringsEqual(path, sname, tr5);
       } catch(Exception e) {tr5.appendTcDetail(e.toString());}
       tr5.writeTo(writer);
 

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/e531b0b7/portlet-tck_3.0/V2DispatcherTests6/src/main/java/javax/portlet/tck/servlets/DispatcherTests6_SPEC2_19_FwdThenIncludeServletAction_servlet.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests6/src/main/java/javax/portlet/tck/servlets/DispatcherTests6_SPEC2_19_FwdThenIncludeServletAction_servlet.java b/portlet-tck_3.0/V2DispatcherTests6/src/main/java/javax/portlet/tck/servlets/DispatcherTests6_SPEC2_19_FwdThenIncludeServletAction_servlet.java
index 791f032..3022166 100644
--- a/portlet-tck_3.0/V2DispatcherTests6/src/main/java/javax/portlet/tck/servlets/DispatcherTests6_SPEC2_19_FwdThenIncludeServletAction_servlet.java
+++ b/portlet-tck_3.0/V2DispatcherTests6/src/main/java/javax/portlet/tck/servlets/DispatcherTests6_SPEC2_19_FwdThenIncludeServletAction_servlet.java
@@ -154,8 +154,9 @@ public class DispatcherTests6_SPEC2_19_FwdThenIncludeServletAction_servlet exten
       /* must reflect the path used to obtain the RequestDispatcher"          */
       TestResult tr5 = tcd.getTestResultFailed(V2DISPATCHERTESTS6_SPEC2_19_FWDTHENINCLUDESERVLETACTION_INVOKE7);
       try {
-         String ctxPath= request.getContextPath();
-         CompareUtils.stringsEqual(ctxPath, "/DispatcherTests6_SPEC2_19_FwdThenIncludeServletAction_servlet", tr5);
+         String sname = SERVLET_PREFIX + "DispatcherTests6_SPEC2_19_FwdThenIncludeServletAction_servlet" + SERVLET_SUFFIX;
+         String path= request.getServletPath();
+         CompareUtils.stringsEqual(path, sname, tr5);
       } catch(Exception e) {tr5.appendTcDetail(e.toString());}
       tr5.writeTo(writer);
 

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/e531b0b7/portlet-tck_3.0/V2DispatcherTests6/src/main/java/javax/portlet/tck/servlets/DispatcherTests6_SPEC2_19_FwdThenIncludeServletEvent_servlet.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests6/src/main/java/javax/portlet/tck/servlets/DispatcherTests6_SPEC2_19_FwdThenIncludeServletEvent_servlet.java b/portlet-tck_3.0/V2DispatcherTests6/src/main/java/javax/portlet/tck/servlets/DispatcherTests6_SPEC2_19_FwdThenIncludeServletEvent_servlet.java
index d69830d..bba1903 100644
--- a/portlet-tck_3.0/V2DispatcherTests6/src/main/java/javax/portlet/tck/servlets/DispatcherTests6_SPEC2_19_FwdThenIncludeServletEvent_servlet.java
+++ b/portlet-tck_3.0/V2DispatcherTests6/src/main/java/javax/portlet/tck/servlets/DispatcherTests6_SPEC2_19_FwdThenIncludeServletEvent_servlet.java
@@ -154,8 +154,9 @@ public class DispatcherTests6_SPEC2_19_FwdThenIncludeServletEvent_servlet extend
       /* must reflect the path used to obtain the RequestDispatcher"          */
       TestResult tr5 = tcd.getTestResultFailed(V2DISPATCHERTESTS6_SPEC2_19_FWDTHENINCLUDESERVLETEVENT_INVOKE7);
       try {
-         String ctxPath= request.getContextPath();
-         CompareUtils.stringsEqual(ctxPath, "/DispatcherTests6_SPEC2_19_FwdThenIncludeServletEvent_servlet", tr5);
+         String sname = SERVLET_PREFIX + "DispatcherTests6_SPEC2_19_FwdThenIncludeServletEvent_servlet" + SERVLET_SUFFIX;
+         String path= request.getServletPath();
+         CompareUtils.stringsEqual(path, sname, tr5);
       } catch(Exception e) {tr5.appendTcDetail(e.toString());}
       tr5.writeTo(writer);
 

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/e531b0b7/portlet-tck_3.0/V2DispatcherTests6/src/main/java/javax/portlet/tck/servlets/DispatcherTests6_SPEC2_19_FwdThenIncludeServletRender_servlet.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests6/src/main/java/javax/portlet/tck/servlets/DispatcherTests6_SPEC2_19_FwdThenIncludeServletRender_servlet.java b/portlet-tck_3.0/V2DispatcherTests6/src/main/java/javax/portlet/tck/servlets/DispatcherTests6_SPEC2_19_FwdThenIncludeServletRender_servlet.java
index 1bcdf12..5b5b408 100644
--- a/portlet-tck_3.0/V2DispatcherTests6/src/main/java/javax/portlet/tck/servlets/DispatcherTests6_SPEC2_19_FwdThenIncludeServletRender_servlet.java
+++ b/portlet-tck_3.0/V2DispatcherTests6/src/main/java/javax/portlet/tck/servlets/DispatcherTests6_SPEC2_19_FwdThenIncludeServletRender_servlet.java
@@ -154,8 +154,9 @@ public class DispatcherTests6_SPEC2_19_FwdThenIncludeServletRender_servlet exten
       /* must reflect the path used to obtain the RequestDispatcher"          */
       TestResult tr5 = tcd.getTestResultFailed(V2DISPATCHERTESTS6_SPEC2_19_FWDTHENINCLUDESERVLETRENDER_INVOKE7);
       try {
-         String ctxPath= request.getContextPath();
-         CompareUtils.stringsEqual(ctxPath, "/DispatcherTests6_SPEC2_19_FwdThenIncludeServletRender_servlet", tr5);
+         String sname = SERVLET_PREFIX + "DispatcherTests6_SPEC2_19_FwdThenIncludeServletRender_servlet" + SERVLET_SUFFIX;
+         String path= request.getServletPath();
+         CompareUtils.stringsEqual(path, sname, tr5);
       } catch(Exception e) {tr5.appendTcDetail(e.toString());}
       tr5.writeTo(writer);
 

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/e531b0b7/portlet-tck_3.0/V2DispatcherTests6/src/main/java/javax/portlet/tck/servlets/DispatcherTests6_SPEC2_19_FwdThenIncludeServletResource_servlet.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests6/src/main/java/javax/portlet/tck/servlets/DispatcherTests6_SPEC2_19_FwdThenIncludeServletResource_servlet.java b/portlet-tck_3.0/V2DispatcherTests6/src/main/java/javax/portlet/tck/servlets/DispatcherTests6_SPEC2_19_FwdThenIncludeServletResource_servlet.java
index 9d9e614..5d033cf 100644
--- a/portlet-tck_3.0/V2DispatcherTests6/src/main/java/javax/portlet/tck/servlets/DispatcherTests6_SPEC2_19_FwdThenIncludeServletResource_servlet.java
+++ b/portlet-tck_3.0/V2DispatcherTests6/src/main/java/javax/portlet/tck/servlets/DispatcherTests6_SPEC2_19_FwdThenIncludeServletResource_servlet.java
@@ -154,8 +154,9 @@ public class DispatcherTests6_SPEC2_19_FwdThenIncludeServletResource_servlet ext
       /* must reflect the path used to obtain the RequestDispatcher"          */
       TestResult tr5 = tcd.getTestResultFailed(V2DISPATCHERTESTS6_SPEC2_19_FWDTHENINCLUDESERVLETRESOURCE_INVOKE7);
       try {
-         String ctxPath= request.getContextPath();
-         CompareUtils.stringsEqual(ctxPath, "/DispatcherTests6_SPEC2_19_FwdThenIncludeServletResource_servlet", tr5);
+         String sname = SERVLET_PREFIX + "DispatcherTests6_SPEC2_19_FwdThenIncludeServletResource_servlet" + SERVLET_SUFFIX;
+         String path= request.getServletPath();
+         CompareUtils.stringsEqual(path, sname, tr5);
       } catch(Exception e) {tr5.appendTcDetail(e.toString());}
       tr5.writeTo(writer);
 


Mime
View raw message