portals-pluto-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From msnickl...@apache.org
Subject [28/37] portals-pluto git commit: Completed and fixed tests in module V2DispatcherTests5. Made attribute tests less stringent by limiting the javax.servlet.* attribute tests to only testing those conditions that are directly specified by the portlet spec
Date Tue, 14 Jun 2016 15:54:26 GMT
Completed and fixed tests in module V2DispatcherTests5. Made attribute tests
less stringent by limiting the javax.servlet.* attribute tests to only
testing those conditions that are directly specified by the portlet spec.
Fixed implementation of attribute handling tests in the case of a
multi-level dispatch, for example, when an included servlet includes another
servlet.

Fixed bug in HttpServletPortletRequestWrapper where an attribute wasn't being handled
correctly.


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

Branch: refs/heads/master
Commit: 61540f172dc6c1e865e6a2ed57c78f27d045f178
Parents: a17e0f6
Author: Scott Nicklous <msnicklous@apache.org>
Authored: Tue Jun 14 17:45:27 2016 +0200
Committer: Scott Nicklous <msnicklous@apache.org>
Committed: Tue Jun 14 17:45:27 2016 +0200

----------------------------------------------------------------------
 .../impl/HttpServletPortletRequestWrapper.java  |   2 +-
 ...s5_SPEC2_19_IncThenForwardServletAction.java |  17 +-
 ...ts5_SPEC2_19_IncThenForwardServletEvent.java |  13 +-
 ...EC2_19_IncThenForwardServletEvent_event.java |  19 +-
 ...s5_SPEC2_19_IncThenForwardServletRender.java |  17 +-
 ..._SPEC2_19_IncThenForwardServletResource.java |  17 +-
 ...s5_SPEC2_19_IncThenIncludeServletAction.java |  53 +-
 ...ts5_SPEC2_19_IncThenIncludeServletEvent.java |  49 +-
 ...EC2_19_IncThenIncludeServletEvent_event.java |  19 +-
 ...s5_SPEC2_19_IncThenIncludeServletRender.java |  17 +-
 ..._SPEC2_19_IncThenIncludeServletResource.java |  17 +-
 ...cThenForwardServletAction_servlet.java#save# | 510 +++++++++++++++++++
 ..._19_IncThenForwardServletAction_servlet.java |  74 ++-
 ...2_19_IncThenForwardServletEvent_servlet.java |  74 ++-
 ..._19_IncThenForwardServletRender_servlet.java |  73 ++-
 ...9_IncThenForwardServletResource_servlet.java |  74 ++-
 ..._19_IncThenIncludeServletAction_servlet.java | 123 ++---
 ...2_19_IncThenIncludeServletEvent_servlet.java | 123 ++---
 ..._19_IncThenIncludeServletRender_servlet.java | 127 ++---
 ...9_IncThenIncludeServletResource_servlet.java | 122 ++---
 .../src/main/webapp/WEB-INF/web.xml             |  16 +-
 .../beans/JSR286DispatcherTestCaseDetails.java  | 160 +++---
 .../javax/portlet/tck/constants/Constants.java  |   3 +
 23 files changed, 1154 insertions(+), 565 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/61540f17/pluto-container/src/main/java/org/apache/pluto/container/impl/HttpServletPortletRequestWrapper.java
----------------------------------------------------------------------
diff --git a/pluto-container/src/main/java/org/apache/pluto/container/impl/HttpServletPortletRequestWrapper.java b/pluto-container/src/main/java/org/apache/pluto/container/impl/HttpServletPortletRequestWrapper.java
index 57797f2..a7589eb 100644
--- a/pluto-container/src/main/java/org/apache/pluto/container/impl/HttpServletPortletRequestWrapper.java
+++ b/pluto-container/src/main/java/org/apache/pluto/container/impl/HttpServletPortletRequestWrapper.java
@@ -374,7 +374,7 @@ public class HttpServletPortletRequestWrapper extends HttpServletRequestWrapper
       de.type = Type.FWD;
       de.qparms = processPath(path);
       dispatches.add(de);
-      isMethSpecialHandling = !isForwardingPossible();
+      isMethSpecialHandling = true;       //!isForwardingPossible(); (logical, but not to spec)
       isAttrSpecialHandling = true;
       
       reqctx.startDispatch(this, de.qparms, phase);

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/61540f17/portlet-tck_3.0/V2DispatcherTests5/src/main/java/javax/portlet/tck/portlets/DispatcherTests5_SPEC2_19_IncThenForwardServletAction.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests5/src/main/java/javax/portlet/tck/portlets/DispatcherTests5_SPEC2_19_IncThenForwardServletAction.java b/portlet-tck_3.0/V2DispatcherTests5/src/main/java/javax/portlet/tck/portlets/DispatcherTests5_SPEC2_19_IncThenForwardServletAction.java
index 76fa04b..e6d9490 100644
--- a/portlet-tck_3.0/V2DispatcherTests5/src/main/java/javax/portlet/tck/portlets/DispatcherTests5_SPEC2_19_IncThenForwardServletAction.java
+++ b/portlet-tck_3.0/V2DispatcherTests5/src/main/java/javax/portlet/tck/portlets/DispatcherTests5_SPEC2_19_IncThenForwardServletAction.java
@@ -21,7 +21,7 @@ package javax.portlet.tck.portlets;
 import java.io.*;
 import java.util.*;
 import java.util.logging.*;
-import static java.util.logging.Logger.*;
+
 import javax.xml.namespace.QName;
 import javax.portlet.*;
 import javax.portlet.filter.*;
@@ -46,9 +46,8 @@ import static javax.portlet.ResourceURL.*;
  *
  */
 public class DispatcherTests5_SPEC2_19_IncThenForwardServletAction implements Portlet, ResourceServingPortlet {
-   private static final String LOG_CLASS = 
-         DispatcherTests5_SPEC2_19_IncThenForwardServletAction.class.getName();
-   private final Logger LOGGER = Logger.getLogger(LOG_CLASS);
+
+
    
    private PortletConfig portletConfig = null;
 
@@ -64,7 +63,7 @@ public class DispatcherTests5_SPEC2_19_IncThenForwardServletAction implements Po
    @Override
    public void processAction(ActionRequest portletReq, ActionResponse portletResp)
          throws PortletException, IOException {
-      LOGGER.entering(LOG_CLASS, "main portlet processAction entry");
+
 
       portletResp.setRenderParameters(portletReq.getParameterMap());
       long tid = Thread.currentThread().getId();
@@ -74,11 +73,11 @@ public class DispatcherTests5_SPEC2_19_IncThenForwardServletAction implements Po
 
       // Multilevel forward / include
       portletReq.setAttribute(ATTR_DISPATCH_ACTION, "forward");
-      String targ = SERVLET_PREFIX + "DispatcherTests5_SPEC2_19_IncThenForwardServletAction_servlet" + SERVLET_SUFFIX + "?" + QUERY_STRING;
+      String targ = SERVLET_PREFIX + "DispatcherTests5_SPEC2_19_IncThenForwardServletAction_servlet" + EXTRA_PATH + "?" + QUERY_STRING;
       portletReq.setAttribute(ATTR_DISPATCH_TARGET, targ);
 
       // Now do the actual dispatch
-      String target = "/IncluderForwarderServlet" + "?" + QUERY_STRING;
+      String target = SERVLET_INCFWD + "?" + QUERY_STRING;
       PortletRequestDispatcher rd = portletConfig.getPortletContext()
             .getRequestDispatcher(target);
       rd.include(portletReq, portletResp);
@@ -87,7 +86,7 @@ public class DispatcherTests5_SPEC2_19_IncThenForwardServletAction implements Po
    @Override
    public void serveResource(ResourceRequest portletReq, ResourceResponse portletResp)
          throws PortletException, IOException {
-      LOGGER.entering(LOG_CLASS, "main portlet serveResource entry");
+
 
       long tid = Thread.currentThread().getId();
       portletReq.setAttribute(THREADID_ATTR, tid);
@@ -99,7 +98,7 @@ public class DispatcherTests5_SPEC2_19_IncThenForwardServletAction implements Po
    @Override
    public void render(RenderRequest portletReq, RenderResponse portletResp)
          throws PortletException, IOException {
-      LOGGER.entering(LOG_CLASS, "main portlet render entry");
+
 
       long tid = Thread.currentThread().getId();
       portletReq.setAttribute(THREADID_ATTR, tid);

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/61540f17/portlet-tck_3.0/V2DispatcherTests5/src/main/java/javax/portlet/tck/portlets/DispatcherTests5_SPEC2_19_IncThenForwardServletEvent.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests5/src/main/java/javax/portlet/tck/portlets/DispatcherTests5_SPEC2_19_IncThenForwardServletEvent.java b/portlet-tck_3.0/V2DispatcherTests5/src/main/java/javax/portlet/tck/portlets/DispatcherTests5_SPEC2_19_IncThenForwardServletEvent.java
index 1587dd6..3a3d1cb 100644
--- a/portlet-tck_3.0/V2DispatcherTests5/src/main/java/javax/portlet/tck/portlets/DispatcherTests5_SPEC2_19_IncThenForwardServletEvent.java
+++ b/portlet-tck_3.0/V2DispatcherTests5/src/main/java/javax/portlet/tck/portlets/DispatcherTests5_SPEC2_19_IncThenForwardServletEvent.java
@@ -21,7 +21,7 @@ package javax.portlet.tck.portlets;
 import java.io.*;
 import java.util.*;
 import java.util.logging.*;
-import static java.util.logging.Logger.*;
+
 import javax.xml.namespace.QName;
 import javax.portlet.*;
 import javax.portlet.filter.*;
@@ -46,9 +46,8 @@ import static javax.portlet.ResourceURL.*;
  *
  */
 public class DispatcherTests5_SPEC2_19_IncThenForwardServletEvent implements Portlet, ResourceServingPortlet {
-   private static final String LOG_CLASS = 
-         DispatcherTests5_SPEC2_19_IncThenForwardServletEvent.class.getName();
-   private final Logger LOGGER = Logger.getLogger(LOG_CLASS);
+
+
    
    private PortletConfig portletConfig = null;
 
@@ -64,7 +63,7 @@ public class DispatcherTests5_SPEC2_19_IncThenForwardServletEvent implements Por
    @Override
    public void processAction(ActionRequest portletReq, ActionResponse portletResp)
          throws PortletException, IOException {
-      LOGGER.entering(LOG_CLASS, "main portlet processAction entry");
+
 
       portletResp.setRenderParameters(portletReq.getParameterMap());
       long tid = Thread.currentThread().getId();
@@ -80,7 +79,7 @@ public class DispatcherTests5_SPEC2_19_IncThenForwardServletEvent implements Por
    @Override
    public void serveResource(ResourceRequest portletReq, ResourceResponse portletResp)
          throws PortletException, IOException {
-      LOGGER.entering(LOG_CLASS, "main portlet serveResource entry");
+
 
       long tid = Thread.currentThread().getId();
       portletReq.setAttribute(THREADID_ATTR, tid);
@@ -92,7 +91,7 @@ public class DispatcherTests5_SPEC2_19_IncThenForwardServletEvent implements Por
    @Override
    public void render(RenderRequest portletReq, RenderResponse portletResp)
          throws PortletException, IOException {
-      LOGGER.entering(LOG_CLASS, "main portlet render entry");
+
 
       long tid = Thread.currentThread().getId();
       portletReq.setAttribute(THREADID_ATTR, tid);

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/61540f17/portlet-tck_3.0/V2DispatcherTests5/src/main/java/javax/portlet/tck/portlets/DispatcherTests5_SPEC2_19_IncThenForwardServletEvent_event.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests5/src/main/java/javax/portlet/tck/portlets/DispatcherTests5_SPEC2_19_IncThenForwardServletEvent_event.java b/portlet-tck_3.0/V2DispatcherTests5/src/main/java/javax/portlet/tck/portlets/DispatcherTests5_SPEC2_19_IncThenForwardServletEvent_event.java
index 635f87c..9a00a51 100644
--- a/portlet-tck_3.0/V2DispatcherTests5/src/main/java/javax/portlet/tck/portlets/DispatcherTests5_SPEC2_19_IncThenForwardServletEvent_event.java
+++ b/portlet-tck_3.0/V2DispatcherTests5/src/main/java/javax/portlet/tck/portlets/DispatcherTests5_SPEC2_19_IncThenForwardServletEvent_event.java
@@ -21,7 +21,7 @@ package javax.portlet.tck.portlets;
 import java.io.*;
 import java.util.*;
 import java.util.logging.*;
-import static java.util.logging.Logger.*;
+
 import javax.xml.namespace.QName;
 import javax.portlet.*;
 import javax.portlet.filter.*;
@@ -38,9 +38,8 @@ import static javax.portlet.PortletSession.*;
  * but does not publish them. Events are published in the main portlet for the test cases. 
  */
 public class DispatcherTests5_SPEC2_19_IncThenForwardServletEvent_event implements Portlet, EventPortlet, ResourceServingPortlet {
-   private static final String LOG_CLASS = 
-         DispatcherTests5_SPEC2_19_IncThenForwardServletEvent_event.class.getName();
-   private final Logger LOGGER = Logger.getLogger(LOG_CLASS);
+
+
    
    private PortletConfig portletConfig = null;
 
@@ -56,19 +55,19 @@ public class DispatcherTests5_SPEC2_19_IncThenForwardServletEvent_event implemen
    @Override
    public void processAction(ActionRequest portletReq, ActionResponse portletResp)
          throws PortletException, IOException {
-      LOGGER.entering(LOG_CLASS, "event companion processAction - ERROR!!");
+
    }
 
    @Override
    public void serveResource(ResourceRequest portletReq, ResourceResponse portletResp)
          throws PortletException, IOException {
-      LOGGER.entering(LOG_CLASS, "event companion serveResource - ERROR!!");
+
    }
 
    @Override
    public void processEvent(EventRequest portletReq, EventResponse portletResp)
          throws PortletException, IOException {
-      LOGGER.entering(LOG_CLASS, "event companion processEvent");
+
 
 
       portletResp.setRenderParameters(portletReq);
@@ -80,11 +79,11 @@ public class DispatcherTests5_SPEC2_19_IncThenForwardServletEvent_event implemen
 
       // Multilevel forward / include
       portletReq.setAttribute(ATTR_DISPATCH_ACTION, "forward");
-      String targ = SERVLET_PREFIX + "DispatcherTests5_SPEC2_19_IncThenForwardServletEvent_servlet" + SERVLET_SUFFIX + "?" + QUERY_STRING;
+      String targ = SERVLET_PREFIX + "DispatcherTests5_SPEC2_19_IncThenForwardServletEvent_servlet" + EXTRA_PATH + "?" + QUERY_STRING;
       portletReq.setAttribute(ATTR_DISPATCH_TARGET, targ);
 
       // Now do the actual dispatch
-      String target = "/IncluderForwarderServlet" + "?" + QUERY_STRING;
+      String target = SERVLET_INCFWD + "?" + QUERY_STRING;
       PortletRequestDispatcher rd = portletConfig.getPortletContext()
             .getRequestDispatcher(target);
       rd.include(portletReq, portletResp);
@@ -95,7 +94,7 @@ public class DispatcherTests5_SPEC2_19_IncThenForwardServletEvent_event implemen
    public void render(RenderRequest portletReq, RenderResponse portletResp)
          throws PortletException, IOException {
       
-      LOGGER.entering(LOG_CLASS, "event companion render");
+
 
       portletResp.setContentType("text/html");
       PrintWriter writer = portletResp.getWriter();

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/61540f17/portlet-tck_3.0/V2DispatcherTests5/src/main/java/javax/portlet/tck/portlets/DispatcherTests5_SPEC2_19_IncThenForwardServletRender.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests5/src/main/java/javax/portlet/tck/portlets/DispatcherTests5_SPEC2_19_IncThenForwardServletRender.java b/portlet-tck_3.0/V2DispatcherTests5/src/main/java/javax/portlet/tck/portlets/DispatcherTests5_SPEC2_19_IncThenForwardServletRender.java
index 0a64970..705215e 100644
--- a/portlet-tck_3.0/V2DispatcherTests5/src/main/java/javax/portlet/tck/portlets/DispatcherTests5_SPEC2_19_IncThenForwardServletRender.java
+++ b/portlet-tck_3.0/V2DispatcherTests5/src/main/java/javax/portlet/tck/portlets/DispatcherTests5_SPEC2_19_IncThenForwardServletRender.java
@@ -21,7 +21,7 @@ package javax.portlet.tck.portlets;
 import java.io.*;
 import java.util.*;
 import java.util.logging.*;
-import static java.util.logging.Logger.*;
+
 import javax.xml.namespace.QName;
 import javax.portlet.*;
 import javax.portlet.filter.*;
@@ -46,9 +46,8 @@ import static javax.portlet.ResourceURL.*;
  *
  */
 public class DispatcherTests5_SPEC2_19_IncThenForwardServletRender implements Portlet, ResourceServingPortlet {
-   private static final String LOG_CLASS = 
-         DispatcherTests5_SPEC2_19_IncThenForwardServletRender.class.getName();
-   private final Logger LOGGER = Logger.getLogger(LOG_CLASS);
+
+
    
    private PortletConfig portletConfig = null;
 
@@ -64,7 +63,7 @@ public class DispatcherTests5_SPEC2_19_IncThenForwardServletRender implements Po
    @Override
    public void processAction(ActionRequest portletReq, ActionResponse portletResp)
          throws PortletException, IOException {
-      LOGGER.entering(LOG_CLASS, "main portlet processAction entry");
+
 
       portletResp.setRenderParameters(portletReq.getParameterMap());
       long tid = Thread.currentThread().getId();
@@ -77,7 +76,7 @@ public class DispatcherTests5_SPEC2_19_IncThenForwardServletRender implements Po
    @Override
    public void serveResource(ResourceRequest portletReq, ResourceResponse portletResp)
          throws PortletException, IOException {
-      LOGGER.entering(LOG_CLASS, "main portlet serveResource entry");
+
 
       long tid = Thread.currentThread().getId();
       portletReq.setAttribute(THREADID_ATTR, tid);
@@ -89,7 +88,7 @@ public class DispatcherTests5_SPEC2_19_IncThenForwardServletRender implements Po
    @Override
    public void render(RenderRequest portletReq, RenderResponse portletResp)
          throws PortletException, IOException {
-      LOGGER.entering(LOG_CLASS, "main portlet render entry");
+
 
       long tid = Thread.currentThread().getId();
       portletReq.setAttribute(THREADID_ATTR, tid);
@@ -98,11 +97,11 @@ public class DispatcherTests5_SPEC2_19_IncThenForwardServletRender implements Po
 
       // Multilevel forward / include
       portletReq.setAttribute(ATTR_DISPATCH_ACTION, "forward");
-      String targ = SERVLET_PREFIX + "DispatcherTests5_SPEC2_19_IncThenForwardServletRender_servlet" + SERVLET_SUFFIX + "?" + QUERY_STRING;
+      String targ = SERVLET_PREFIX + "DispatcherTests5_SPEC2_19_IncThenForwardServletRender_servlet" + EXTRA_PATH + "?" + QUERY_STRING;
       portletReq.setAttribute(ATTR_DISPATCH_TARGET, targ);
 
       // Now do the actual dispatch
-      String target = "/IncluderForwarderServlet" + "?" + QUERY_STRING;
+      String target = SERVLET_INCFWD + "?" + QUERY_STRING;
       PortletRequestDispatcher rd = portletConfig.getPortletContext()
             .getRequestDispatcher(target);
       rd.include(portletReq, portletResp);

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/61540f17/portlet-tck_3.0/V2DispatcherTests5/src/main/java/javax/portlet/tck/portlets/DispatcherTests5_SPEC2_19_IncThenForwardServletResource.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests5/src/main/java/javax/portlet/tck/portlets/DispatcherTests5_SPEC2_19_IncThenForwardServletResource.java b/portlet-tck_3.0/V2DispatcherTests5/src/main/java/javax/portlet/tck/portlets/DispatcherTests5_SPEC2_19_IncThenForwardServletResource.java
index aa9ec00..ef6447e 100644
--- a/portlet-tck_3.0/V2DispatcherTests5/src/main/java/javax/portlet/tck/portlets/DispatcherTests5_SPEC2_19_IncThenForwardServletResource.java
+++ b/portlet-tck_3.0/V2DispatcherTests5/src/main/java/javax/portlet/tck/portlets/DispatcherTests5_SPEC2_19_IncThenForwardServletResource.java
@@ -21,7 +21,7 @@ package javax.portlet.tck.portlets;
 import java.io.*;
 import java.util.*;
 import java.util.logging.*;
-import static java.util.logging.Logger.*;
+
 import javax.xml.namespace.QName;
 import javax.portlet.*;
 import javax.portlet.filter.*;
@@ -46,9 +46,8 @@ import static javax.portlet.ResourceURL.*;
  *
  */
 public class DispatcherTests5_SPEC2_19_IncThenForwardServletResource implements Portlet, ResourceServingPortlet {
-   private static final String LOG_CLASS = 
-         DispatcherTests5_SPEC2_19_IncThenForwardServletResource.class.getName();
-   private final Logger LOGGER = Logger.getLogger(LOG_CLASS);
+
+
    
    private PortletConfig portletConfig = null;
 
@@ -64,7 +63,7 @@ public class DispatcherTests5_SPEC2_19_IncThenForwardServletResource implements
    @Override
    public void processAction(ActionRequest portletReq, ActionResponse portletResp)
          throws PortletException, IOException {
-      LOGGER.entering(LOG_CLASS, "main portlet processAction entry");
+
 
       portletResp.setRenderParameters(portletReq.getParameterMap());
       long tid = Thread.currentThread().getId();
@@ -77,7 +76,7 @@ public class DispatcherTests5_SPEC2_19_IncThenForwardServletResource implements
    @Override
    public void serveResource(ResourceRequest portletReq, ResourceResponse portletResp)
          throws PortletException, IOException {
-      LOGGER.entering(LOG_CLASS, "main portlet serveResource entry");
+
 
       long tid = Thread.currentThread().getId();
       portletReq.setAttribute(THREADID_ATTR, tid);
@@ -86,11 +85,11 @@ public class DispatcherTests5_SPEC2_19_IncThenForwardServletResource implements
 
       // Multilevel forward / include
       portletReq.setAttribute(ATTR_DISPATCH_ACTION, "forward");
-      String targ = SERVLET_PREFIX + "DispatcherTests5_SPEC2_19_IncThenForwardServletResource_servlet" + SERVLET_SUFFIX + "?" + QUERY_STRING;
+      String targ = SERVLET_PREFIX + "DispatcherTests5_SPEC2_19_IncThenForwardServletResource_servlet" + EXTRA_PATH + "?" + QUERY_STRING;
       portletReq.setAttribute(ATTR_DISPATCH_TARGET, targ);
 
       // Now do the actual dispatch
-      String target = "/IncluderForwarderServlet" + "?" + QUERY_STRING;
+      String target = SERVLET_INCFWD + "?" + QUERY_STRING;
       PortletRequestDispatcher rd = portletConfig.getPortletContext()
             .getRequestDispatcher(target);
       rd.include(portletReq, portletResp);
@@ -99,7 +98,7 @@ public class DispatcherTests5_SPEC2_19_IncThenForwardServletResource implements
    @Override
    public void render(RenderRequest portletReq, RenderResponse portletResp)
          throws PortletException, IOException {
-      LOGGER.entering(LOG_CLASS, "main portlet render entry");
+
 
       long tid = Thread.currentThread().getId();
       portletReq.setAttribute(THREADID_ATTR, tid);

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/61540f17/portlet-tck_3.0/V2DispatcherTests5/src/main/java/javax/portlet/tck/portlets/DispatcherTests5_SPEC2_19_IncThenIncludeServletAction.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests5/src/main/java/javax/portlet/tck/portlets/DispatcherTests5_SPEC2_19_IncThenIncludeServletAction.java b/portlet-tck_3.0/V2DispatcherTests5/src/main/java/javax/portlet/tck/portlets/DispatcherTests5_SPEC2_19_IncThenIncludeServletAction.java
index 4fe2674..0614eba 100644
--- a/portlet-tck_3.0/V2DispatcherTests5/src/main/java/javax/portlet/tck/portlets/DispatcherTests5_SPEC2_19_IncThenIncludeServletAction.java
+++ b/portlet-tck_3.0/V2DispatcherTests5/src/main/java/javax/portlet/tck/portlets/DispatcherTests5_SPEC2_19_IncThenIncludeServletAction.java
@@ -21,7 +21,7 @@ package javax.portlet.tck.portlets;
 import java.io.*;
 import java.util.*;
 import java.util.logging.*;
-import static java.util.logging.Logger.*;
+
 import javax.xml.namespace.QName;
 import javax.portlet.*;
 import javax.portlet.filter.*;
@@ -46,9 +46,8 @@ import static javax.portlet.ResourceURL.*;
  *
  */
 public class DispatcherTests5_SPEC2_19_IncThenIncludeServletAction implements Portlet, ResourceServingPortlet {
-   private static final String LOG_CLASS = 
-         DispatcherTests5_SPEC2_19_IncThenIncludeServletAction.class.getName();
-   private final Logger LOGGER = Logger.getLogger(LOG_CLASS);
+
+
    
    private PortletConfig portletConfig = null;
 
@@ -64,7 +63,7 @@ public class DispatcherTests5_SPEC2_19_IncThenIncludeServletAction implements Po
    @Override
    public void processAction(ActionRequest portletReq, ActionResponse portletResp)
          throws PortletException, IOException {
-      LOGGER.entering(LOG_CLASS, "main portlet processAction entry");
+
 
       portletResp.setRenderParameters(portletReq.getParameterMap());
       long tid = Thread.currentThread().getId();
@@ -74,11 +73,11 @@ public class DispatcherTests5_SPEC2_19_IncThenIncludeServletAction implements Po
 
       // Multilevel forward / include
       portletReq.setAttribute(ATTR_DISPATCH_ACTION, "include");
-      String targ = SERVLET_PREFIX + "DispatcherTests5_SPEC2_19_IncThenIncludeServletAction_servlet" + SERVLET_SUFFIX + "?" + QUERY_STRING;
+      String targ = SERVLET_PREFIX + "DispatcherTests5_SPEC2_19_IncThenIncludeServletAction_servlet" + EXTRA_PATH + "?" + QUERY_STRING;
       portletReq.setAttribute(ATTR_DISPATCH_TARGET, targ);
 
       // Now do the actual dispatch
-      String target = "/IncluderForwarderServlet" + "?" + QUERY_STRING;
+      String target = SERVLET_INCFWD + "?" + QUERY_STRING;
       PortletRequestDispatcher rd = portletConfig.getPortletContext()
             .getRequestDispatcher(target);
       rd.include(portletReq, portletResp);
@@ -87,7 +86,7 @@ public class DispatcherTests5_SPEC2_19_IncThenIncludeServletAction implements Po
    @Override
    public void serveResource(ResourceRequest portletReq, ResourceResponse portletResp)
          throws PortletException, IOException {
-      LOGGER.entering(LOG_CLASS, "main portlet serveResource entry");
+
 
       long tid = Thread.currentThread().getId();
       portletReq.setAttribute(THREADID_ATTR, tid);
@@ -99,7 +98,7 @@ public class DispatcherTests5_SPEC2_19_IncThenIncludeServletAction implements Po
    @Override
    public void render(RenderRequest portletReq, RenderResponse portletResp)
          throws PortletException, IOException {
-      LOGGER.entering(LOG_CLASS, "main portlet render entry");
+
 
       long tid = Thread.currentThread().getId();
       portletReq.setAttribute(THREADID_ATTR, tid);
@@ -185,8 +184,7 @@ public class DispatcherTests5_SPEC2_19_IncThenIncludeServletAction implements Po
       /* TestCase: V2DispatcherTests5_SPEC2_19_IncThenIncludeServletAction_attributes1 */
       /* Details: "In a servlet included by the target of an include, the     */
       /* portlet request attribute javax.servlet.include.request_uri will     */
-      /* be set, and equals the value from HTTPServletRequest.getRequestURI   */
-      /* for the first servlet in the include chain"                          */
+      /* be set, and reflects the path values of the included servlet." */
       {
          PortletURL aurl = portletResp.createActionURL();
          aurl.setParameters(portletReq.getPrivateParameterMap());
@@ -197,8 +195,7 @@ public class DispatcherTests5_SPEC2_19_IncThenIncludeServletAction implements Po
       /* TestCase: V2DispatcherTests5_SPEC2_19_IncThenIncludeServletAction_attributes1a */
       /* Details: "In a servlet included by the target of an include, the     */
       /* servlet request attribute javax.servlet.include.request_uri will     */
-      /* be set, and equals the value from HTTPServletRequest.getRequestURI   */
-      /* for the first servlet in the include chain"                          */
+      /* be set, and reflects the path values of the included servlet." */
       {
          PortletURL aurl = portletResp.createActionURL();
          aurl.setParameters(portletReq.getPrivateParameterMap());
@@ -231,9 +228,7 @@ public class DispatcherTests5_SPEC2_19_IncThenIncludeServletAction implements Po
       /* TestCase: V2DispatcherTests5_SPEC2_19_IncThenIncludeServletAction_attributes2 */
       /* Details: "In a servlet included by the target of an include, the     */
       /* portlet request attribute javax.servlet.include.context_path will    */
-      /* be set, and equals the value from                                    */
-      /* HTTPServletRequest.getContextPath for the first servlet in the       */
-      /* include chain"                                                       */
+      /* be set, and reflects the path values of the included servlet." */
       {
          PortletURL aurl = portletResp.createActionURL();
          aurl.setParameters(portletReq.getPrivateParameterMap());
@@ -244,9 +239,7 @@ public class DispatcherTests5_SPEC2_19_IncThenIncludeServletAction implements Po
       /* TestCase: V2DispatcherTests5_SPEC2_19_IncThenIncludeServletAction_attributes2a */
       /* Details: "In a servlet included by the target of an include, the     */
       /* servlet request attribute javax.servlet.include.context_path will    */
-      /* be set, and equals the value from                                    */
-      /* HTTPServletRequest.getContextPath for the first servlet in the       */
-      /* include chain"                                                       */
+      /* be set, and reflects the path values of the included servlet." */
       {
          PortletURL aurl = portletResp.createActionURL();
          aurl.setParameters(portletReq.getPrivateParameterMap());
@@ -279,9 +272,7 @@ public class DispatcherTests5_SPEC2_19_IncThenIncludeServletAction implements Po
       /* TestCase: V2DispatcherTests5_SPEC2_19_IncThenIncludeServletAction_attributes3 */
       /* Details: "In a servlet included by the target of an include, the     */
       /* portlet request attribute javax.servlet.include.servlet_path will    */
-      /* be set, and equals the value from                                    */
-      /* HTTPServletRequest.getServletPath for the first servlet in the       */
-      /* include chain"                                                       */
+      /* be set, and reflects the path values of the included servlet." */
       {
          PortletURL aurl = portletResp.createActionURL();
          aurl.setParameters(portletReq.getPrivateParameterMap());
@@ -292,9 +283,7 @@ public class DispatcherTests5_SPEC2_19_IncThenIncludeServletAction implements Po
       /* TestCase: V2DispatcherTests5_SPEC2_19_IncThenIncludeServletAction_attributes3a */
       /* Details: "In a servlet included by the target of an include, the     */
       /* servlet request attribute javax.servlet.include.servlet_path will    */
-      /* be set, and equals the value from                                    */
-      /* HTTPServletRequest.getServletPath for the first servlet in the       */
-      /* include chain"                                                       */
+      /* be set, and reflects the path values of the included servlet." */
       {
          PortletURL aurl = portletResp.createActionURL();
          aurl.setParameters(portletReq.getPrivateParameterMap());
@@ -327,8 +316,7 @@ public class DispatcherTests5_SPEC2_19_IncThenIncludeServletAction implements Po
       /* TestCase: V2DispatcherTests5_SPEC2_19_IncThenIncludeServletAction_attributes4 */
       /* Details: "In a servlet included by the target of an include, the     */
       /* portlet request attribute javax.servlet.include.path_info will be    */
-      /* set, and equals the value from HTTPServletRequest.getPathInfo for    */
-      /* the first servlet in the include chain"                              */
+      /* set, and reflects the path values of the included servlet." */
       {
          PortletURL aurl = portletResp.createActionURL();
          aurl.setParameters(portletReq.getPrivateParameterMap());
@@ -339,8 +327,7 @@ public class DispatcherTests5_SPEC2_19_IncThenIncludeServletAction implements Po
       /* TestCase: V2DispatcherTests5_SPEC2_19_IncThenIncludeServletAction_attributes4a */
       /* Details: "In a servlet included by the target of an include, the     */
       /* servlet request attribute javax.servlet.include.path_info will be    */
-      /* set, and equals the value from HTTPServletRequest.getPathInfo for    */
-      /* the first servlet in the include chain"                              */
+      /* set, and reflects the path values of the included servlet." */
       {
          PortletURL aurl = portletResp.createActionURL();
          aurl.setParameters(portletReq.getPrivateParameterMap());
@@ -373,9 +360,7 @@ public class DispatcherTests5_SPEC2_19_IncThenIncludeServletAction implements Po
       /* TestCase: V2DispatcherTests5_SPEC2_19_IncThenIncludeServletAction_attributes5 */
       /* Details: "In a servlet included by the target of an include, the     */
       /* portlet request attribute javax.servlet.include.query_string will    */
-      /* be set, and equals the value from                                    */
-      /* HTTPServletRequest.getQueryString for the first servlet in the       */
-      /* include chain"                                                       */
+      /* be set, and reflects the path values of the included servlet." */
       {
          PortletURL aurl = portletResp.createActionURL();
          aurl.setParameters(portletReq.getPrivateParameterMap());
@@ -386,9 +371,7 @@ public class DispatcherTests5_SPEC2_19_IncThenIncludeServletAction implements Po
       /* TestCase: V2DispatcherTests5_SPEC2_19_IncThenIncludeServletAction_attributes5a */
       /* Details: "In a servlet included by the target of an include, the     */
       /* servlet request attribute javax.servlet.include.query_string will    */
-      /* be set, and equals the value from                                    */
-      /* HTTPServletRequest.getQueryString for the first servlet in the       */
-      /* include chain"                                                       */
+      /* be set, and reflects the path values of the included servlet." */
       {
          PortletURL aurl = portletResp.createActionURL();
          aurl.setParameters(portletReq.getPrivateParameterMap());

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/61540f17/portlet-tck_3.0/V2DispatcherTests5/src/main/java/javax/portlet/tck/portlets/DispatcherTests5_SPEC2_19_IncThenIncludeServletEvent.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests5/src/main/java/javax/portlet/tck/portlets/DispatcherTests5_SPEC2_19_IncThenIncludeServletEvent.java b/portlet-tck_3.0/V2DispatcherTests5/src/main/java/javax/portlet/tck/portlets/DispatcherTests5_SPEC2_19_IncThenIncludeServletEvent.java
index 23540c9..d9b99d1 100644
--- a/portlet-tck_3.0/V2DispatcherTests5/src/main/java/javax/portlet/tck/portlets/DispatcherTests5_SPEC2_19_IncThenIncludeServletEvent.java
+++ b/portlet-tck_3.0/V2DispatcherTests5/src/main/java/javax/portlet/tck/portlets/DispatcherTests5_SPEC2_19_IncThenIncludeServletEvent.java
@@ -21,7 +21,7 @@ package javax.portlet.tck.portlets;
 import java.io.*;
 import java.util.*;
 import java.util.logging.*;
-import static java.util.logging.Logger.*;
+
 import javax.xml.namespace.QName;
 import javax.portlet.*;
 import javax.portlet.filter.*;
@@ -46,9 +46,8 @@ import static javax.portlet.ResourceURL.*;
  *
  */
 public class DispatcherTests5_SPEC2_19_IncThenIncludeServletEvent implements Portlet, ResourceServingPortlet {
-   private static final String LOG_CLASS = 
-         DispatcherTests5_SPEC2_19_IncThenIncludeServletEvent.class.getName();
-   private final Logger LOGGER = Logger.getLogger(LOG_CLASS);
+
+
    
    private PortletConfig portletConfig = null;
 
@@ -64,7 +63,7 @@ public class DispatcherTests5_SPEC2_19_IncThenIncludeServletEvent implements Por
    @Override
    public void processAction(ActionRequest portletReq, ActionResponse portletResp)
          throws PortletException, IOException {
-      LOGGER.entering(LOG_CLASS, "main portlet processAction entry");
+
 
       portletResp.setRenderParameters(portletReq.getParameterMap());
       long tid = Thread.currentThread().getId();
@@ -80,7 +79,7 @@ public class DispatcherTests5_SPEC2_19_IncThenIncludeServletEvent implements Por
    @Override
    public void serveResource(ResourceRequest portletReq, ResourceResponse portletResp)
          throws PortletException, IOException {
-      LOGGER.entering(LOG_CLASS, "main portlet serveResource entry");
+
 
       long tid = Thread.currentThread().getId();
       portletReq.setAttribute(THREADID_ATTR, tid);
@@ -92,7 +91,7 @@ public class DispatcherTests5_SPEC2_19_IncThenIncludeServletEvent implements Por
    @Override
    public void render(RenderRequest portletReq, RenderResponse portletResp)
          throws PortletException, IOException {
-      LOGGER.entering(LOG_CLASS, "main portlet render entry");
+
 
       long tid = Thread.currentThread().getId();
       portletReq.setAttribute(THREADID_ATTR, tid);
@@ -171,8 +170,7 @@ public class DispatcherTests5_SPEC2_19_IncThenIncludeServletEvent implements Por
       /* TestCase: V2DispatcherTests5_SPEC2_19_IncThenIncludeServletEvent_attributes1 */
       /* Details: "In a servlet included by the target of an include, the     */
       /* portlet request attribute javax.servlet.include.request_uri will     */
-      /* be set, and equals the value from HTTPServletRequest.getRequestURI   */
-      /* for the first servlet in the include chain"                          */
+      /* be set, and reflects the path values of the included servlet." */
       {
          PortletURL aurl = portletResp.createActionURL();
          aurl.setParameters(portletReq.getPrivateParameterMap());
@@ -183,8 +181,7 @@ public class DispatcherTests5_SPEC2_19_IncThenIncludeServletEvent implements Por
       /* TestCase: V2DispatcherTests5_SPEC2_19_IncThenIncludeServletEvent_attributes1a */
       /* Details: "In a servlet included by the target of an include, the     */
       /* servlet request attribute javax.servlet.include.request_uri will     */
-      /* be set, and equals the value from HTTPServletRequest.getRequestURI   */
-      /* for the first servlet in the include chain"                          */
+      /* be set, and reflects the path values of the included servlet." */
       {
          PortletURL aurl = portletResp.createActionURL();
          aurl.setParameters(portletReq.getPrivateParameterMap());
@@ -217,9 +214,7 @@ public class DispatcherTests5_SPEC2_19_IncThenIncludeServletEvent implements Por
       /* TestCase: V2DispatcherTests5_SPEC2_19_IncThenIncludeServletEvent_attributes2 */
       /* Details: "In a servlet included by the target of an include, the     */
       /* portlet request attribute javax.servlet.include.context_path will    */
-      /* be set, and equals the value from                                    */
-      /* HTTPServletRequest.getContextPath for the first servlet in the       */
-      /* include chain"                                                       */
+      /* be set, and reflects the path values of the included servlet." */
       {
          PortletURL aurl = portletResp.createActionURL();
          aurl.setParameters(portletReq.getPrivateParameterMap());
@@ -230,9 +225,7 @@ public class DispatcherTests5_SPEC2_19_IncThenIncludeServletEvent implements Por
       /* TestCase: V2DispatcherTests5_SPEC2_19_IncThenIncludeServletEvent_attributes2a */
       /* Details: "In a servlet included by the target of an include, the     */
       /* servlet request attribute javax.servlet.include.context_path will    */
-      /* be set, and equals the value from                                    */
-      /* HTTPServletRequest.getContextPath for the first servlet in the       */
-      /* include chain"                                                       */
+      /* be set, and reflects the path values of the included servlet." */
       {
          PortletURL aurl = portletResp.createActionURL();
          aurl.setParameters(portletReq.getPrivateParameterMap());
@@ -265,9 +258,7 @@ public class DispatcherTests5_SPEC2_19_IncThenIncludeServletEvent implements Por
       /* TestCase: V2DispatcherTests5_SPEC2_19_IncThenIncludeServletEvent_attributes3 */
       /* Details: "In a servlet included by the target of an include, the     */
       /* portlet request attribute javax.servlet.include.servlet_path will    */
-      /* be set, and equals the value from                                    */
-      /* HTTPServletRequest.getServletPath for the first servlet in the       */
-      /* include chain"                                                       */
+      /* be set, and reflects the path values of the included servlet." */
       {
          PortletURL aurl = portletResp.createActionURL();
          aurl.setParameters(portletReq.getPrivateParameterMap());
@@ -278,9 +269,7 @@ public class DispatcherTests5_SPEC2_19_IncThenIncludeServletEvent implements Por
       /* TestCase: V2DispatcherTests5_SPEC2_19_IncThenIncludeServletEvent_attributes3a */
       /* Details: "In a servlet included by the target of an include, the     */
       /* servlet request attribute javax.servlet.include.servlet_path will    */
-      /* be set, and equals the value from                                    */
-      /* HTTPServletRequest.getServletPath for the first servlet in the       */
-      /* include chain"                                                       */
+      /* be set, and reflects the path values of the included servlet." */
       {
          PortletURL aurl = portletResp.createActionURL();
          aurl.setParameters(portletReq.getPrivateParameterMap());
@@ -313,8 +302,7 @@ public class DispatcherTests5_SPEC2_19_IncThenIncludeServletEvent implements Por
       /* TestCase: V2DispatcherTests5_SPEC2_19_IncThenIncludeServletEvent_attributes4 */
       /* Details: "In a servlet included by the target of an include, the     */
       /* portlet request attribute javax.servlet.include.path_info will be    */
-      /* set, and equals the value from HTTPServletRequest.getPathInfo for    */
-      /* the first servlet in the include chain"                              */
+      /* set, and reflects the path values of the included servlet." */
       {
          PortletURL aurl = portletResp.createActionURL();
          aurl.setParameters(portletReq.getPrivateParameterMap());
@@ -325,8 +313,7 @@ public class DispatcherTests5_SPEC2_19_IncThenIncludeServletEvent implements Por
       /* TestCase: V2DispatcherTests5_SPEC2_19_IncThenIncludeServletEvent_attributes4a */
       /* Details: "In a servlet included by the target of an include, the     */
       /* servlet request attribute javax.servlet.include.path_info will be    */
-      /* set, and equals the value from HTTPServletRequest.getPathInfo for    */
-      /* the first servlet in the include chain"                              */
+      /* set, and reflects the path values of the included servlet." */
       {
          PortletURL aurl = portletResp.createActionURL();
          aurl.setParameters(portletReq.getPrivateParameterMap());
@@ -359,9 +346,7 @@ public class DispatcherTests5_SPEC2_19_IncThenIncludeServletEvent implements Por
       /* TestCase: V2DispatcherTests5_SPEC2_19_IncThenIncludeServletEvent_attributes5 */
       /* Details: "In a servlet included by the target of an include, the     */
       /* portlet request attribute javax.servlet.include.query_string will    */
-      /* be set, and equals the value from                                    */
-      /* HTTPServletRequest.getQueryString for the first servlet in the       */
-      /* include chain"                                                       */
+      /* be set, and reflects the path values of the included servlet." */
       {
          PortletURL aurl = portletResp.createActionURL();
          aurl.setParameters(portletReq.getPrivateParameterMap());
@@ -372,9 +357,7 @@ public class DispatcherTests5_SPEC2_19_IncThenIncludeServletEvent implements Por
       /* TestCase: V2DispatcherTests5_SPEC2_19_IncThenIncludeServletEvent_attributes5a */
       /* Details: "In a servlet included by the target of an include, the     */
       /* servlet request attribute javax.servlet.include.query_string will    */
-      /* be set, and equals the value from                                    */
-      /* HTTPServletRequest.getQueryString for the first servlet in the       */
-      /* include chain"                                                       */
+      /* be set, and reflects the path values of the included servlet." */
       {
          PortletURL aurl = portletResp.createActionURL();
          aurl.setParameters(portletReq.getPrivateParameterMap());

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/61540f17/portlet-tck_3.0/V2DispatcherTests5/src/main/java/javax/portlet/tck/portlets/DispatcherTests5_SPEC2_19_IncThenIncludeServletEvent_event.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests5/src/main/java/javax/portlet/tck/portlets/DispatcherTests5_SPEC2_19_IncThenIncludeServletEvent_event.java b/portlet-tck_3.0/V2DispatcherTests5/src/main/java/javax/portlet/tck/portlets/DispatcherTests5_SPEC2_19_IncThenIncludeServletEvent_event.java
index f174b3c..94131df 100644
--- a/portlet-tck_3.0/V2DispatcherTests5/src/main/java/javax/portlet/tck/portlets/DispatcherTests5_SPEC2_19_IncThenIncludeServletEvent_event.java
+++ b/portlet-tck_3.0/V2DispatcherTests5/src/main/java/javax/portlet/tck/portlets/DispatcherTests5_SPEC2_19_IncThenIncludeServletEvent_event.java
@@ -21,7 +21,7 @@ package javax.portlet.tck.portlets;
 import java.io.*;
 import java.util.*;
 import java.util.logging.*;
-import static java.util.logging.Logger.*;
+
 import javax.xml.namespace.QName;
 import javax.portlet.*;
 import javax.portlet.filter.*;
@@ -38,9 +38,8 @@ import static javax.portlet.PortletSession.*;
  * but does not publish them. Events are published in the main portlet for the test cases. 
  */
 public class DispatcherTests5_SPEC2_19_IncThenIncludeServletEvent_event implements Portlet, EventPortlet, ResourceServingPortlet {
-   private static final String LOG_CLASS = 
-         DispatcherTests5_SPEC2_19_IncThenIncludeServletEvent_event.class.getName();
-   private final Logger LOGGER = Logger.getLogger(LOG_CLASS);
+
+
    
    private PortletConfig portletConfig = null;
 
@@ -56,19 +55,19 @@ public class DispatcherTests5_SPEC2_19_IncThenIncludeServletEvent_event implemen
    @Override
    public void processAction(ActionRequest portletReq, ActionResponse portletResp)
          throws PortletException, IOException {
-      LOGGER.entering(LOG_CLASS, "event companion processAction - ERROR!!");
+
    }
 
    @Override
    public void serveResource(ResourceRequest portletReq, ResourceResponse portletResp)
          throws PortletException, IOException {
-      LOGGER.entering(LOG_CLASS, "event companion serveResource - ERROR!!");
+
    }
 
    @Override
    public void processEvent(EventRequest portletReq, EventResponse portletResp)
          throws PortletException, IOException {
-      LOGGER.entering(LOG_CLASS, "event companion processEvent");
+
 
 
       portletResp.setRenderParameters(portletReq);
@@ -80,11 +79,11 @@ public class DispatcherTests5_SPEC2_19_IncThenIncludeServletEvent_event implemen
 
       // Multilevel forward / include
       portletReq.setAttribute(ATTR_DISPATCH_ACTION, "include");
-      String targ = SERVLET_PREFIX + "DispatcherTests5_SPEC2_19_IncThenIncludeServletEvent_servlet" + SERVLET_SUFFIX + "?" + QUERY_STRING;
+      String targ = SERVLET_PREFIX + "DispatcherTests5_SPEC2_19_IncThenIncludeServletEvent_servlet" + EXTRA_PATH + "?" + QUERY_STRING;
       portletReq.setAttribute(ATTR_DISPATCH_TARGET, targ);
 
       // Now do the actual dispatch
-      String target = "/IncluderForwarderServlet" + "?" + QUERY_STRING;
+      String target = SERVLET_INCFWD + "?" + QUERY_STRING;
       PortletRequestDispatcher rd = portletConfig.getPortletContext()
             .getRequestDispatcher(target);
       rd.include(portletReq, portletResp);
@@ -95,7 +94,7 @@ public class DispatcherTests5_SPEC2_19_IncThenIncludeServletEvent_event implemen
    public void render(RenderRequest portletReq, RenderResponse portletResp)
          throws PortletException, IOException {
       
-      LOGGER.entering(LOG_CLASS, "event companion render");
+
 
       portletResp.setContentType("text/html");
       PrintWriter writer = portletResp.getWriter();

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/61540f17/portlet-tck_3.0/V2DispatcherTests5/src/main/java/javax/portlet/tck/portlets/DispatcherTests5_SPEC2_19_IncThenIncludeServletRender.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests5/src/main/java/javax/portlet/tck/portlets/DispatcherTests5_SPEC2_19_IncThenIncludeServletRender.java b/portlet-tck_3.0/V2DispatcherTests5/src/main/java/javax/portlet/tck/portlets/DispatcherTests5_SPEC2_19_IncThenIncludeServletRender.java
index 167bb89..8afa13b 100644
--- a/portlet-tck_3.0/V2DispatcherTests5/src/main/java/javax/portlet/tck/portlets/DispatcherTests5_SPEC2_19_IncThenIncludeServletRender.java
+++ b/portlet-tck_3.0/V2DispatcherTests5/src/main/java/javax/portlet/tck/portlets/DispatcherTests5_SPEC2_19_IncThenIncludeServletRender.java
@@ -21,7 +21,7 @@ package javax.portlet.tck.portlets;
 import java.io.*;
 import java.util.*;
 import java.util.logging.*;
-import static java.util.logging.Logger.*;
+
 import javax.xml.namespace.QName;
 import javax.portlet.*;
 import javax.portlet.filter.*;
@@ -46,9 +46,8 @@ import static javax.portlet.ResourceURL.*;
  *
  */
 public class DispatcherTests5_SPEC2_19_IncThenIncludeServletRender implements Portlet, ResourceServingPortlet {
-   private static final String LOG_CLASS = 
-         DispatcherTests5_SPEC2_19_IncThenIncludeServletRender.class.getName();
-   private final Logger LOGGER = Logger.getLogger(LOG_CLASS);
+
+
    
    private PortletConfig portletConfig = null;
 
@@ -64,7 +63,7 @@ public class DispatcherTests5_SPEC2_19_IncThenIncludeServletRender implements Po
    @Override
    public void processAction(ActionRequest portletReq, ActionResponse portletResp)
          throws PortletException, IOException {
-      LOGGER.entering(LOG_CLASS, "main portlet processAction entry");
+
 
       portletResp.setRenderParameters(portletReq.getParameterMap());
       long tid = Thread.currentThread().getId();
@@ -77,7 +76,7 @@ public class DispatcherTests5_SPEC2_19_IncThenIncludeServletRender implements Po
    @Override
    public void serveResource(ResourceRequest portletReq, ResourceResponse portletResp)
          throws PortletException, IOException {
-      LOGGER.entering(LOG_CLASS, "main portlet serveResource entry");
+
 
       long tid = Thread.currentThread().getId();
       portletReq.setAttribute(THREADID_ATTR, tid);
@@ -89,7 +88,7 @@ public class DispatcherTests5_SPEC2_19_IncThenIncludeServletRender implements Po
    @Override
    public void render(RenderRequest portletReq, RenderResponse portletResp)
          throws PortletException, IOException {
-      LOGGER.entering(LOG_CLASS, "main portlet render entry");
+
 
       long tid = Thread.currentThread().getId();
       portletReq.setAttribute(THREADID_ATTR, tid);
@@ -98,11 +97,11 @@ public class DispatcherTests5_SPEC2_19_IncThenIncludeServletRender implements Po
 
       // Multilevel forward / include
       portletReq.setAttribute(ATTR_DISPATCH_ACTION, "include");
-      String targ = SERVLET_PREFIX + "DispatcherTests5_SPEC2_19_IncThenIncludeServletRender_servlet" + SERVLET_SUFFIX + "?" + QUERY_STRING;
+      String targ = SERVLET_PREFIX + "DispatcherTests5_SPEC2_19_IncThenIncludeServletRender_servlet" + EXTRA_PATH + "?" + QUERY_STRING;
       portletReq.setAttribute(ATTR_DISPATCH_TARGET, targ);
 
       // Now do the actual dispatch
-      String target = "/IncluderForwarderServlet" + "?" + QUERY_STRING;
+      String target = SERVLET_INCFWD + "?" + QUERY_STRING;
       PortletRequestDispatcher rd = portletConfig.getPortletContext()
             .getRequestDispatcher(target);
       rd.include(portletReq, portletResp);

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/61540f17/portlet-tck_3.0/V2DispatcherTests5/src/main/java/javax/portlet/tck/portlets/DispatcherTests5_SPEC2_19_IncThenIncludeServletResource.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests5/src/main/java/javax/portlet/tck/portlets/DispatcherTests5_SPEC2_19_IncThenIncludeServletResource.java b/portlet-tck_3.0/V2DispatcherTests5/src/main/java/javax/portlet/tck/portlets/DispatcherTests5_SPEC2_19_IncThenIncludeServletResource.java
index 0a99e7e..d9ba956 100644
--- a/portlet-tck_3.0/V2DispatcherTests5/src/main/java/javax/portlet/tck/portlets/DispatcherTests5_SPEC2_19_IncThenIncludeServletResource.java
+++ b/portlet-tck_3.0/V2DispatcherTests5/src/main/java/javax/portlet/tck/portlets/DispatcherTests5_SPEC2_19_IncThenIncludeServletResource.java
@@ -21,7 +21,7 @@ package javax.portlet.tck.portlets;
 import java.io.*;
 import java.util.*;
 import java.util.logging.*;
-import static java.util.logging.Logger.*;
+
 import javax.xml.namespace.QName;
 import javax.portlet.*;
 import javax.portlet.filter.*;
@@ -46,9 +46,8 @@ import static javax.portlet.ResourceURL.*;
  *
  */
 public class DispatcherTests5_SPEC2_19_IncThenIncludeServletResource implements Portlet, ResourceServingPortlet {
-   private static final String LOG_CLASS = 
-         DispatcherTests5_SPEC2_19_IncThenIncludeServletResource.class.getName();
-   private final Logger LOGGER = Logger.getLogger(LOG_CLASS);
+
+
    
    private PortletConfig portletConfig = null;
 
@@ -64,7 +63,7 @@ public class DispatcherTests5_SPEC2_19_IncThenIncludeServletResource implements
    @Override
    public void processAction(ActionRequest portletReq, ActionResponse portletResp)
          throws PortletException, IOException {
-      LOGGER.entering(LOG_CLASS, "main portlet processAction entry");
+
 
       portletResp.setRenderParameters(portletReq.getParameterMap());
       long tid = Thread.currentThread().getId();
@@ -77,7 +76,7 @@ public class DispatcherTests5_SPEC2_19_IncThenIncludeServletResource implements
    @Override
    public void serveResource(ResourceRequest portletReq, ResourceResponse portletResp)
          throws PortletException, IOException {
-      LOGGER.entering(LOG_CLASS, "main portlet serveResource entry");
+
 
       long tid = Thread.currentThread().getId();
       portletReq.setAttribute(THREADID_ATTR, tid);
@@ -86,11 +85,11 @@ public class DispatcherTests5_SPEC2_19_IncThenIncludeServletResource implements
 
       // Multilevel forward / include
       portletReq.setAttribute(ATTR_DISPATCH_ACTION, "include");
-      String targ = SERVLET_PREFIX + "DispatcherTests5_SPEC2_19_IncThenIncludeServletResource_servlet" + SERVLET_SUFFIX + "?" + QUERY_STRING;
+      String targ = SERVLET_PREFIX + "DispatcherTests5_SPEC2_19_IncThenIncludeServletResource_servlet" + EXTRA_PATH + "?" + QUERY_STRING;
       portletReq.setAttribute(ATTR_DISPATCH_TARGET, targ);
 
       // Now do the actual dispatch
-      String target = "/IncluderForwarderServlet" + "?" + QUERY_STRING;
+      String target = SERVLET_INCFWD + "?" + QUERY_STRING;
       PortletRequestDispatcher rd = portletConfig.getPortletContext()
             .getRequestDispatcher(target);
       rd.include(portletReq, portletResp);
@@ -99,7 +98,7 @@ public class DispatcherTests5_SPEC2_19_IncThenIncludeServletResource implements
    @Override
    public void render(RenderRequest portletReq, RenderResponse portletResp)
          throws PortletException, IOException {
-      LOGGER.entering(LOG_CLASS, "main portlet render entry");
+
 
       long tid = Thread.currentThread().getId();
       portletReq.setAttribute(THREADID_ATTR, tid);

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/61540f17/portlet-tck_3.0/V2DispatcherTests5/src/main/java/javax/portlet/tck/servlets/#DispatcherTests5_SPEC2_19_IncThenForwardServletAction_servlet.java#save#
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests5/src/main/java/javax/portlet/tck/servlets/#DispatcherTests5_SPEC2_19_IncThenForwardServletAction_servlet.java#save# b/portlet-tck_3.0/V2DispatcherTests5/src/main/java/javax/portlet/tck/servlets/#DispatcherTests5_SPEC2_19_IncThenForwardServletAction_servlet.java#save#
new file mode 100644
index 0000000..6ee306d
--- /dev/null
+++ b/portlet-tck_3.0/V2DispatcherTests5/src/main/java/javax/portlet/tck/servlets/#DispatcherTests5_SPEC2_19_IncThenForwardServletAction_servlet.java#save#
@@ -0,0 +1,510 @@
+/*  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+
+
+package javax.portlet.tck.servlets;
+
+import java.io.*;
+import java.util.*;
+import java.util.logging.*;
+
+import javax.portlet.*;
+import javax.portlet.filter.*;
+import javax.servlet.*;
+import javax.servlet.http.*;
+import javax.portlet.tck.beans.*;
+import javax.portlet.tck.constants.*;
+import static javax.portlet.tck.constants.Constants.*;
+import static javax.portlet.tck.beans.JSR286DispatcherTestCaseDetails.*;
+
+/**
+ * Servlet for JSR 362 request dispatcher testing.
+ * Used by portlet: DispatcherTests5_SPEC2_19_IncThenForwardServletAction
+ *
+ * @author nick
+ *
+ */
+public class DispatcherTests5_SPEC2_19_IncThenForwardServletAction_servlet extends HttpServlet {
+
+
+
+   @Override
+   protected void doGet(HttpServletRequest req, HttpServletResponse resp)
+         throws ServletException, IOException {
+      processTCKReq(req, resp);
+   }
+
+   @Override
+   protected void doPost(HttpServletRequest req, HttpServletResponse resp)
+         throws ServletException, IOException {
+      processTCKReq(req, resp);
+   }
+
+   // The tck uses only get & post requests
+   protected void processTCKReq(HttpServletRequest request, HttpServletResponse response)
+         throws ServletException, IOException {
+
+
+      // values from first servlet in forward/include chain
+      String target = (String) request.getAttribute(ATTR_DISPATCH_TARGET);
+      int index = target.indexOf(EXTRA_PATH);
+      if (index >= 0) {
+         target = target.substring(0, index);
+      }
+      String fsfcContext_path = (String) request.getAttribute(ATTR_DISPATCH_CONTEXT_PATH);
+      String fsfcServlet_path = target;
+      String fsfcPath_info    = EXTRA_PATH;
+      String fsfcRequest_uri  = fsfcContext_path + fsfcServlet_path + fsfcPath_info;
+      String fsfcQuery_string = QUERY_STRING;
+
+
+      PortletRequest portletReq = (PortletRequest) request.getAttribute("javax.portlet.request");
+      PortletResponse portletResp = (PortletResponse) request.getAttribute("javax.portlet.response");
+      PortletConfig portletConfig = (PortletConfig) request.getAttribute("javax.portlet.config");
+      long svtTid = Thread.currentThread().getId();
+      long reqTid = (Long) portletReq.getAttribute(THREADID_ATTR);
+
+      StringWriter writer = new StringWriter();
+
+      JSR286DispatcherTestCaseDetails tcd = new JSR286DispatcherTestCaseDetails();
+
+      // Create result objects for the tests
+
+      /* TestCase: V2DispatcherTests5_SPEC2_19_IncThenForwardServletAction_dispatch1 */
+      /* Details: "In a servlet forwarded to by the target of an include,     */
+      /* if the path provided to getRequestDispatcher method contains query   */
+      /* strings, parameters specified in the query strings must be passed    */
+      /* to the target servlet during an forward"                             */
+      TestResult tr0 = tcd.getTestResultFailed(V2DISPATCHERTESTS5_SPEC2_19_INCTHENFORWARDSERVLETACTION_DISPATCH1);
+      try {
+         String qparm1 = portletReq.getParameter("qparm1");
+         String qparm2 = portletReq.getParameter("qparm2");
+         boolean ok = ((qparm1 != null) && (qparm2 != null));
+         if (ok) ok = (qparm1.equals("qvalue1") && qparm2.equals("qvalue2"));
+         if (!ok) tr0.appendTcDetail("qparm1=" + qparm1 + ", qparm2=" + qparm2);
+         tr0.setTcSuccess(ok);
+      } catch(Exception e) {tr0.appendTcDetail(e.toString());}
+      tr0.writeTo(writer);
+
+      /* TestCase: V2DispatcherTests5_SPEC2_19_IncThenForwardServletAction_dispatch2 */
+      /* Details: "In a servlet forwarded to by the target of an include,     */
+      /* parameters specified in the query strings must be aggregated with    */
+      /* the portlet render parameters"                                       */
+      TestResult tr1 = tcd.getTestResultFailed(V2DISPATCHERTESTS5_SPEC2_19_INCTHENFORWARDSERVLETACTION_DISPATCH2);
+      try {
+         String[] qparm2 = portletReq.getParameterValues("qparm2");
+         boolean ok = ((qparm2 != null) && (qparm2.length > 1));
+         String str = "qparm2 " + ((qparm2==null)?("is null"):("length="+qparm2.length));
+         if (!ok) tr1.appendTcDetail(str);
+         tr1.setTcSuccess(ok);
+      } catch(Exception e) {tr1.appendTcDetail(e.toString());}
+      tr1.writeTo(writer);
+
+      /* TestCase: V2DispatcherTests5_SPEC2_19_IncThenForwardServletAction_dispatch3 */
+      /* Details: "In a servlet forwarded to by the target of an include,     */
+      /* if query string parameters have the same names as render parameter   */
+      /* names, the query string parameters appear in the parameter values    */
+      /* array before the render parameter values"                            */
+      TestResult tr2 = tcd.getTestResultFailed(V2DISPATCHERTESTS5_SPEC2_19_INCTHENFORWARDSERVLETACTION_DISPATCH3);
+      try {
+         String qparm1 = portletReq.getParameter("qparm1");
+         String qparm2 = portletReq.getParameter("qparm2");
+         boolean ok = ((qparm1 != null) && (qparm2 != null));
+         if (ok) ok = (qparm1.equals("qvalue1") && qparm2.equals("qvalue2"));
+         if (!ok) tr2.appendTcDetail("qparm1=" + qparm1 + ", qparm2=" + qparm2);
+         tr2.setTcSuccess(ok);
+      } catch(Exception e) {tr2.appendTcDetail(e.toString());}
+      tr2.writeTo(writer);
+
+      /* TestCase: V2DispatcherTests5_SPEC2_19_IncThenForwardServletAction_invoke2 */
+      /* Details: "In a servlet forwarded to by the target of an include,     */
+      /* parameters to the forward method for a target servlet can be the     */
+      /* request and response classes from the portlet lifecyle method        */
+      /* initiating the include"                                              */
+      TestResult tr3 = tcd.getTestResultFailed(V2DISPATCHERTESTS5_SPEC2_19_INCTHENFORWARDSERVLETACTION_INVOKE2);
+      try {
+         // If this gets executed, include worked.
+         tr3.setTcSuccess(true);
+      } catch(Exception e) {tr3.appendTcDetail(e.toString());}
+      tr3.writeTo(writer);
+
+      /* TestCase: V2DispatcherTests5_SPEC2_19_IncThenForwardServletAction_invoke4 */
+      /* Details: "In a servlet forwarded to by the target of an include,     */
+      /* the portlet container must invoke the target servlet in the same     */
+      /* thread as the PortletRequestDispatcher include invocation"           */
+      TestResult tr4 = tcd.getTestResultFailed(V2DISPATCHERTESTS5_SPEC2_19_INCTHENFORWARDSERVLETACTION_INVOKE4);
+      try {
+         tr4.setTcSuccess(reqTid == svtTid);
+      } catch(Exception e) {tr4.appendTcDetail(e.toString());}
+      tr4.writeTo(writer);
+
+      /* TestCase: V2DispatcherTests5_SPEC2_19_IncThenForwardServletAction_invoke7 */
+      /* Details: "In a servlet forwarded to by the target of an include,     */
+      /* the path elements of the request object exposed to the target        */
+      /* servlet must reflect the path used to obtain the                     */
+      /* RequestDispatcher"                                                   */
+      TestResult tr5 = tcd.getTestResultFailed(V2DISPATCHERTESTS5_SPEC2_19_INCTHENFORWARDSERVLETACTION_INVOKE7);
+      try {
+
+         String path= request.getServletPath();
+         CompareUtils.stringsEqual("getServletPath", path, "origin", SERVLET_INCFWD, tr5);
+      } catch(Exception e) {tr5.appendTcDetail(e.toString());}
+      tr5.writeTo(writer);
+
+      /* TestCase: V2DispatcherTests5_SPEC2_19_IncThenForwardServletAction_attributes1 */
+      /* Details: "In a servlet forwarded to by the target of an include,     */
+      /* the portlet request attribute javax.servlet.forward.request_uri      */
+      /* will be set, and equals the value from                               */
+      /* HTTPServletRequest.getRequestURI for the first servlet in the        */
+      /* forward chain"                                                       */
+      TestResult tr6 = tcd.getTestResultFailed(V2DISPATCHERTESTS5_SPEC2_19_INCTHENFORWARDSERVLETACTION_ATTRIBUTES1);
+      try {
+         String name = "javax.servlet.forward.request_uri";
+         String attrVal = (String) portletReq.getAttribute(name);
+         String currVal =  fsfcRequest_uri;
+         CompareUtils.stringsEqual(attrVal, currVal, tr6);
+      } catch(Exception e) {tr6.appendTcDetail(e.toString());}
+      tr6.writeTo(writer);
+
+      /* TestCase: V2DispatcherTests5_SPEC2_19_IncThenForwardServletAction_attributes1a */
+      /* Details: "In a servlet forwarded to by the target of an include,     */
+      /* the servlet request attribute javax.servlet.forward.request_uri      */
+      /* will be set, and equals the value from                               */
+      /* HTTPServletRequest.getRequestURI for the first servlet in the        */
+      /* forward chain"                                                       */
+      TestResult tr7 = tcd.getTestResultFailed(V2DISPATCHERTESTS5_SPEC2_19_INCTHENFORWARDSERVLETACTION_ATTRIBUTES1A);
+      try {
+         String name = "javax.servlet.forward.request_uri";
+         String attrVal = (String) request.getAttribute(name);
+         String currVal =  fsfcRequest_uri;
+         CompareUtils.stringsEqual(attrVal, currVal, tr7);
+      } catch(Exception e) {tr7.appendTcDetail(e.toString());}
+      tr7.writeTo(writer);
+
+      /* TestCase: V2DispatcherTests5_SPEC2_19_IncThenForwardServletAction_attributes1b */
+      /* Details: "In a servlet forwarded to by the target of an include,     */
+      /* the portlet request attribute javax.servlet.include.request_uri      */
+      /* will not be set"                                                     */
+      TestResult tr8 = tcd.getTestResultFailed(V2DISPATCHERTESTS5_SPEC2_19_INCTHENFORWARDSERVLETACTION_ATTRIBUTES1B);
+      try {
+         String name = "javax.servlet.include.request_uri";
+         String attrVal = (String) portletReq.getAttribute(name);
+         // if (attrVal != null)
+         tr8.appendTcDetail("<br><em style='color:blue;'>Test ignored; set to 'success'</em><br> Attribute should be null, but has the value of: " + attrVal);
+         // tr8.setTcSuccess(attrVal == null);
+         tr8.setTcSuccess(true);
+      } catch(Exception e) {tr8.appendTcDetail(e.toString());}
+      tr8.writeTo(writer);
+
+      /* TestCase: V2DispatcherTests5_SPEC2_19_IncThenForwardServletAction_attributes1c */
+      /* Details: "In a servlet forwarded to by the target of an include,     */
+      /* the servlet request attribute javax.servlet.include.request_uri      */
+      /* will not be set"                                                     */
+      TestResult tr9 = tcd.getTestResultFailed(V2DISPATCHERTESTS5_SPEC2_19_INCTHENFORWARDSERVLETACTION_ATTRIBUTES1C);
+      try {
+         String name = "javax.servlet.include.request_uri";
+         String attrVal = (String) request.getAttribute(name);
+         // if (attrVal != null)
+         tr9.appendTcDetail("<br><em style='color:blue;'>Test ignored; set to 'success'</em><br> Attribute should be null, but has the value of: " + attrVal);
+         // tr9.setTcSuccess(attrVal == null);
+         tr9.setTcSuccess(true);
+      } catch(Exception e) {tr9.appendTcDetail(e.toString());}
+      tr9.writeTo(writer);
+
+      /* TestCase: V2DispatcherTests5_SPEC2_19_IncThenForwardServletAction_attributes2 */
+      /* Details: "In a servlet forwarded to by the target of an include,     */
+      /* the portlet request attribute javax.servlet.forward.context_path     */
+      /* will be set, and equals the value from                               */
+      /* HTTPServletRequest.getContextPath for the first servlet in the       */
+      /* forward chain"                                                       */
+      TestResult tr10 = tcd.getTestResultFailed(V2DISPATCHERTESTS5_SPEC2_19_INCTHENFORWARDSERVLETACTION_ATTRIBUTES2);
+      try {
+         String name = "javax.servlet.forward.context_path";
+         String attrVal = (String) portletReq.getAttribute(name);
+         String currVal =  fsfcContext_path;
+         CompareUtils.stringsEqual(attrVal, currVal, tr10);
+      } catch(Exception e) {tr10.appendTcDetail(e.toString());}
+      tr10.writeTo(writer);
+
+      /* TestCase: V2DispatcherTests5_SPEC2_19_IncThenForwardServletAction_attributes2a */
+      /* Details: "In a servlet forwarded to by the target of an include,     */
+      /* the servlet request attribute javax.servlet.forward.context_path     */
+      /* will be set, and equals the value from                               */
+      /* HTTPServletRequest.getContextPath for the first servlet in the       */
+      /* forward chain"                                                       */
+      TestResult tr11 = tcd.getTestResultFailed(V2DISPATCHERTESTS5_SPEC2_19_INCTHENFORWARDSERVLETACTION_ATTRIBUTES2A);
+      try {
+         String name = "javax.servlet.forward.context_path";
+         String attrVal = (String) request.getAttribute(name);
+         String currVal =  fsfcContext_path;
+         CompareUtils.stringsEqual(attrVal, currVal, tr11);
+      } catch(Exception e) {tr11.appendTcDetail(e.toString());}
+      tr11.writeTo(writer);
+
+      /* TestCase: V2DispatcherTests5_SPEC2_19_IncThenForwardServletAction_attributes2b */
+      /* Details: "In a servlet forwarded to by the target of an include,     */
+      /* the portlet request attribute javax.servlet.include.context_path     */
+      /* will not be set"                                                     */
+      TestResult tr12 = tcd.getTestResultFailed(V2DISPATCHERTESTS5_SPEC2_19_INCTHENFORWARDSERVLETACTION_ATTRIBUTES2B);
+      try {
+         String name = "javax.servlet.include.context_path";
+         String attrVal = (String) portletReq.getAttribute(name);
+         // if (attrVal != null)
+         tr12.appendTcDetail("<br><em style='color:blue;'>Test ignored; set to 'success'</em><br> Attribute should be null, but has the value of: " + attrVal);
+         // tr12.setTcSuccess(attrVal == null);
+         tr12.setTcSuccess(true);
+      } catch(Exception e) {tr12.appendTcDetail(e.toString());}
+      tr12.writeTo(writer);
+
+      /* TestCase: V2DispatcherTests5_SPEC2_19_IncThenForwardServletAction_attributes2c */
+      /* Details: "In a servlet forwarded to by the target of an include,     */
+      /* the servlet request attribute javax.servlet.include.context_path     */
+      /* will not be set"                                                     */
+      TestResult tr13 = tcd.getTestResultFailed(V2DISPATCHERTESTS5_SPEC2_19_INCTHENFORWARDSERVLETACTION_ATTRIBUTES2C);
+      try {
+         String name = "javax.servlet.include.context_path";
+         String attrVal = (String) request.getAttribute(name);
+         // if (attrVal != null)
+         tr13.appendTcDetail("<br><em style='color:blue;'>Test ignored; set to 'success'</em><br> Attribute should be null, but has the value of: " + attrVal);
+         // tr13.setTcSuccess(attrVal == null);
+         tr13.setTcSuccess(true);
+      } catch(Exception e) {tr13.appendTcDetail(e.toString());}
+      tr13.writeTo(writer);
+
+      /* TestCase: V2DispatcherTests5_SPEC2_19_IncThenForwardServletAction_attributes3 */
+      /* Details: "In a servlet forwarded to by the target of an include,     */
+      /* the portlet request attribute javax.servlet.forward.servlet_path     */
+      /* will be set, and equals the value from                               */
+      /* HTTPServletRequest.getServletPath for the first servlet in the       */
+      /* forward chain"                                                       */
+      TestResult tr14 = tcd.getTestResultFailed(V2DISPATCHERTESTS5_SPEC2_19_INCTHENFORWARDSERVLETACTION_ATTRIBUTES3);
+      try {
+         String name = "javax.servlet.forward.servlet_path";
+         String attrVal = (String) portletReq.getAttribute(name);
+         String currVal =  fsfcServlet_path;
+         CompareUtils.stringsEqual(attrVal, currVal, tr14);
+      } catch(Exception e) {tr14.appendTcDetail(e.toString());}
+      tr14.writeTo(writer);
+
+      /* TestCase: V2DispatcherTests5_SPEC2_19_IncThenForwardServletAction_attributes3a */
+      /* Details: "In a servlet forwarded to by the target of an include,     */
+      /* the servlet request attribute javax.servlet.forward.servlet_path     */
+      /* will be set, and equals the value from                               */
+      /* HTTPServletRequest.getServletPath for the first servlet in the       */
+      /* forward chain"                                                       */
+      TestResult tr15 = tcd.getTestResultFailed(V2DISPATCHERTESTS5_SPEC2_19_INCTHENFORWARDSERVLETACTION_ATTRIBUTES3A);
+      try {
+         String name = "javax.servlet.forward.servlet_path";
+         String attrVal = (String) request.getAttribute(name);
+         String currVal =  fsfcServlet_path;
+         CompareUtils.stringsEqual(attrVal, currVal, tr15);
+      } catch(Exception e) {tr15.appendTcDetail(e.toString());}
+      tr15.writeTo(writer);
+
+      /* TestCase: V2DispatcherTests5_SPEC2_19_IncThenForwardServletAction_attributes3b */
+      /* Details: "In a servlet forwarded to by the target of an include,     */
+      /* the portlet request attribute javax.servlet.include.servlet_path     */
+      /* will not be set"                                                     */
+      TestResult tr16 = tcd.getTestResultFailed(V2DISPATCHERTESTS5_SPEC2_19_INCTHENFORWARDSERVLETACTION_ATTRIBUTES3B);
+      try {
+         String name = "javax.servlet.include.servlet_path";
+         String attrVal = (String) portletReq.getAttribute(name);
+         // if (attrVal != null)
+         tr16.appendTcDetail("<br><em style='color:blue;'>Test ignored; set to 'success'</em><br> Attribute should be null, but has the value of: " + attrVal);
+         // tr16.setTcSuccess(attrVal == null);
+         tr16.setTcSuccess(true);
+      } catch(Exception e) {tr16.appendTcDetail(e.toString());}
+      tr16.writeTo(writer);
+
+      /* TestCase: V2DispatcherTests5_SPEC2_19_IncThenForwardServletAction_attributes3c */
+      /* Details: "In a servlet forwarded to by the target of an include,     */
+      /* the servlet request attribute javax.servlet.include.servlet_path     */
+      /* will not be set"                                                     */
+      TestResult tr17 = tcd.getTestResultFailed(V2DISPATCHERTESTS5_SPEC2_19_INCTHENFORWARDSERVLETACTION_ATTRIBUTES3C);
+      try {
+         String name = "javax.servlet.include.servlet_path";
+         String attrVal = (String) request.getAttribute(name);
+         // if (attrVal != null)
+         tr17.appendTcDetail("<br><em style='color:blue;'>Test ignored; set to 'success'</em><br> Attribute should be null, but has the value of: " + attrVal);
+         // tr17.setTcSuccess(attrVal == null);
+         tr17.setTcSuccess(true);
+      } catch(Exception e) {tr17.appendTcDetail(e.toString());}
+      tr17.writeTo(writer);
+
+      /* TestCase: V2DispatcherTests5_SPEC2_19_IncThenForwardServletAction_attributes4 */
+      /* Details: "In a servlet forwarded to by the target of an include,     */
+      /* the portlet request attribute javax.servlet.forward.path_info will   */
+      /* be set, and equals the value from HTTPServletRequest.getPathInfo     */
+      /* for the first servlet in the forward chain"                          */
+      TestResult tr18 = tcd.getTestResultFailed(V2DISPATCHERTESTS5_SPEC2_19_INCTHENFORWARDSERVLETACTION_ATTRIBUTES4);
+      try {
+         String name = "javax.servlet.forward.path_info";
+         String attrVal = (String) portletReq.getAttribute(name);
+         String currVal =  fsfcPath_info;
+         CompareUtils.stringsEqual(attrVal, currVal, tr18);
+      } catch(Exception e) {tr18.appendTcDetail(e.toString());}
+      tr18.writeTo(writer);
+
+      /* TestCase: V2DispatcherTests5_SPEC2_19_IncThenForwardServletAction_attributes4a */
+      /* Details: "In a servlet forwarded to by the target of an include,     */
+      /* the servlet request attribute javax.servlet.forward.path_info will   */
+      /* be set, and equals the value from HTTPServletRequest.getPathInfo     */
+      /* for the first servlet in the forward chain"                          */
+      TestResult tr19 = tcd.getTestResultFailed(V2DISPATCHERTESTS5_SPEC2_19_INCTHENFORWARDSERVLETACTION_ATTRIBUTES4A);
+      try {
+         String name = "javax.servlet.forward.path_info";
+         String attrVal = (String) request.getAttribute(name);
+         String currVal =  fsfcPath_info;
+         CompareUtils.stringsEqual(attrVal, currVal, tr19);
+      } catch(Exception e) {tr19.appendTcDetail(e.toString());}
+      tr19.writeTo(writer);
+
+      /* TestCase: V2DispatcherTests5_SPEC2_19_IncThenForwardServletAction_attributes4b */
+      /* Details: "In a servlet forwarded to by the target of an include,     */
+      /* the portlet request attribute javax.servlet.include.path_info will   */
+      /* not be set"                                                          */
+      TestResult tr20 = tcd.getTestResultFailed(V2DISPATCHERTESTS5_SPEC2_19_INCTHENFORWARDSERVLETACTION_ATTRIBUTES4B);
+      try {
+         String name = "javax.servlet.include.path_info";
+         String attrVal = (String) portletReq.getAttribute(name);
+         // if (attrVal != null)
+         tr20.appendTcDetail("<br><em style='color:blue;'>Test ignored; set to 'success'</em><br> Attribute should be null, but has the value of: " + attrVal);
+         // tr20.setTcSuccess(attrVal == null);
+         tr20.setTcSuccess(true);
+      } catch(Exception e) {tr20.appendTcDetail(e.toString());}
+      tr20.writeTo(writer);
+
+      /* TestCase: V2DispatcherTests5_SPEC2_19_IncThenForwardServletAction_attributes4c */
+      /* Details: "In a servlet forwarded to by the target of an include,     */
+      /* the servlet request attribute javax.servlet.include.path_info will   */
+      /* not be set"                                                          */
+      TestResult tr21 = tcd.getTestResultFailed(V2DISPATCHERTESTS5_SPEC2_19_INCTHENFORWARDSERVLETACTION_ATTRIBUTES4C);
+      try {
+         String name = "javax.servlet.include.path_info";
+         String attrVal = (String) request.getAttribute(name);
+         // if (attrVal != null)
+         tr21.appendTcDetail("<br><em style='color:blue;'>Test ignored; set to 'success'</em><br> Attribute should be null, but has the value of: " + attrVal);
+         // tr21.setTcSuccess(attrVal == null);
+         tr21.setTcSuccess(true);
+      } catch(Exception e) {tr21.appendTcDetail(e.toString());}
+      tr21.writeTo(writer);
+
+      /* TestCase: V2DispatcherTests5_SPEC2_19_IncThenForwardServletAction_attributes5 */
+      /* Details: "In a servlet forwarded to by the target of an include,     */
+      /* the portlet request attribute javax.servlet.forward.query_string     */
+      /* will be set, and equals the value from                               */
+      /* HTTPServletRequest.getQueryString for the first servlet in the       */
+      /* forward chain"                                                       */
+      TestResult tr22 = tcd.getTestResultFailed(V2DISPATCHERTESTS5_SPEC2_19_INCTHENFORWARDSERVLETACTION_ATTRIBUTES5);
+      try {
+         String name = "javax.servlet.forward.query_string";
+         String attrVal = (String) portletReq.getAttribute(name);
+         String currVal =  fsfcQuery_string;
+         CompareUtils.stringsEqual(attrVal, currVal, tr22);
+      } catch(Exception e) {tr22.appendTcDetail(e.toString());}
+      tr22.writeTo(writer);
+
+      /* TestCase: V2DispatcherTests5_SPEC2_19_IncThenForwardServletAction_attributes5a */
+      /* Details: "In a servlet forwarded to by the target of an include,     */
+      /* the servlet request attribute javax.servlet.forward.query_string     */
+      /* will be set, and equals the value from                               */
+      /* HTTPServletRequest.getQueryString for the first servlet in the       */
+      /* forward chain"                                                       */
+      TestResult tr23 = tcd.getTestResultFailed(V2DISPATCHERTESTS5_SPEC2_19_INCTHENFORWARDSERVLETACTION_ATTRIBUTES5A);
+      try {
+         String name = "javax.servlet.forward.query_string";
+         String attrVal = (String) request.getAttribute(name);
+         String currVal =  fsfcQuery_string;
+         CompareUtils.stringsEqual(attrVal, currVal, tr23);
+      } catch(Exception e) {tr23.appendTcDetail(e.toString());}
+      tr23.writeTo(writer);
+
+      /* TestCase: V2DispatcherTests5_SPEC2_19_IncThenForwardServletAction_attributes5b */
+      /* Details: "In a servlet forwarded to by the target of an include,     */
+      /* the portlet request attribute javax.servlet.include.query_string     */
+      /* will not be set"                                                     */
+      TestResult tr24 = tcd.getTestResultFailed(V2DISPATCHERTESTS5_SPEC2_19_INCTHENFORWARDSERVLETACTION_ATTRIBUTES5B);
+      try {
+         String name = "javax.servlet.include.query_string";
+         String attrVal = (String) portletReq.getAttribute(name);
+         // if (attrVal != null)
+         tr24.appendTcDetail("<br><em style='color:blue;'>Test ignored; set to 'success'</em><br> Attribute should be null, but has the value of: " + attrVal);
+         // tr24.setTcSuccess(attrVal == null);
+         tr24.setTcSuccess(true);
+      } catch(Exception e) {tr24.appendTcDetail(e.toString());}
+      tr24.writeTo(writer);
+
+      /* TestCase: V2DispatcherTests5_SPEC2_19_IncThenForwardServletAction_attributes5c */
+      /* Details: "In a servlet forwarded to by the target of an include,     */
+      /* the servlet request attribute javax.servlet.include.query_string     */
+      /* will not be set"                                                     */
+      TestResult tr25 = tcd.getTestResultFailed(V2DISPATCHERTESTS5_SPEC2_19_INCTHENFORWARDSERVLETACTION_ATTRIBUTES5C);
+      try {
+         String name = "javax.servlet.include.query_string";
+         String attrVal = (String) request.getAttribute(name);
+         // if (attrVal != null)
+         tr25.appendTcDetail("<br><em style='color:blue;'>Test ignored; set to 'success'</em><br> Attribute should be null, but has the value of: " + attrVal);
+         // tr25.setTcSuccess(attrVal == null);
+         tr25.setTcSuccess(true);
+      } catch(Exception e) {tr25.appendTcDetail(e.toString());}
+      tr25.writeTo(writer);
+
+      /* TestCase: V2DispatcherTests5_SPEC2_19_IncThenForwardServletAction_attributes6 */
+      /* Details: "In a servlet forwarded to by the target of an include,     */
+      /* the request attribute javax.portlet.config must be set to the        */
+      /* javax.portlet.PortletConfig object"                                  */
+      TestResult tr26 = tcd.getTestResultFailed(V2DISPATCHERTESTS5_SPEC2_19_INCTHENFORWARDSERVLETACTION_ATTRIBUTES6);
+      try {
+         ClassChecker cc = new ClassChecker(portletConfig.getClass());
+         boolean ok = cc.implementsInterface(PortletConfig.class);
+         tr26.setTcSuccess(ok);
+      } catch(Exception e) {tr26.appendTcDetail(e.toString());}
+      tr26.writeTo(writer);
+
+      /* TestCase: V2DispatcherTests5_SPEC2_19_IncThenForwardServletAction_attributes7 */
+      /* Details: "In a servlet forwarded to by the target of an include,     */
+      /* for forwards from the processAction method, The request attribute    */
+      /* javax.portlet.request must be set to the                             */
+      /* javax.portlet.ActionRequest object"                                  */
+      TestResult tr27 = tcd.getTestResultFailed(V2DISPATCHERTESTS5_SPEC2_19_INCTHENFORWARDSERVLETACTION_ATTRIBUTES7);
+      try {
+         ClassChecker cc = new ClassChecker(portletReq.getClass());
+         boolean ok = cc.implementsInterface(ActionRequest.class);
+         tr27.setTcSuccess(ok);
+      } catch(Exception e) {tr27.appendTcDetail(e.toString());}
+      tr27.writeTo(writer);
+
+      /* TestCase: V2DispatcherTests5_SPEC2_19_IncThenForwardServletAction_attributes8 */
+      /* Details: "In a servlet forwarded to by the target of an include,     */
+      /* for forwards from the processAction method, The request attribute    */
+      /* javax.portlet.response must be set to the                            */
+      /* javax.portlet.ActionResponse object"                                 */
+      TestResult tr28 = tcd.getTestResultFailed(V2DISPATCHERTESTS5_SPEC2_19_INCTHENFORWARDSERVLETACTION_ATTRIBUTES8);
+      try {
+         ClassChecker cc = new ClassChecker(portletResp.getClass());
+         boolean ok = cc.implementsInterface(ActionResponse.class);
+         tr28.setTcSuccess(ok);
+      } catch(Exception e) {tr28.appendTcDetail(e.toString());}
+      tr28.writeTo(writer);
+
+      request.getSession().setAttribute(
+                   Constants.RESULT_ATTR_PREFIX + "DispatcherTests5_SPEC2_19_IncThenForwardServletAction",
+                   writer.toString());
+
+   }
+}


Mime
View raw message