portals-pluto-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From msnickl...@apache.org
Subject [09/13] portals-pluto git commit: Completed and fixed tests in module V2DispatcherTests6. 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 Wed, 15 Jun 2016 10:56:02 GMT
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/66951fc2/portlet-tck_3.0/V2DispatcherTests6/src/main/java/javax/portlet/tck/portlets/DispatcherTests6_SPEC2_19_FwdThenForwardServletResource.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests6/src/main/java/javax/portlet/tck/portlets/DispatcherTests6_SPEC2_19_FwdThenForwardServletResource.java b/portlet-tck_3.0/V2DispatcherTests6/src/main/java/javax/portlet/tck/portlets/DispatcherTests6_SPEC2_19_FwdThenForwardServletResource.java
index 51b55e4..b252a45 100644
--- a/portlet-tck_3.0/V2DispatcherTests6/src/main/java/javax/portlet/tck/portlets/DispatcherTests6_SPEC2_19_FwdThenForwardServletResource.java
+++ b/portlet-tck_3.0/V2DispatcherTests6/src/main/java/javax/portlet/tck/portlets/DispatcherTests6_SPEC2_19_FwdThenForwardServletResource.java
@@ -18,38 +18,43 @@
 
 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.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
-import javax.portlet.tck.beans.*;
-import javax.portlet.tck.constants.*;
-import static javax.portlet.tck.beans.JSR286DispatcherTestCaseDetails.*;
-import static javax.portlet.tck.constants.Constants.*;
-import static javax.portlet.PortletSession.*;
-import static javax.portlet.ResourceURL.*;
+import static javax.portlet.ResourceURL.PAGE;
+import static javax.portlet.tck.constants.Constants.ATTR_DISPATCH_ACTION;
+import static javax.portlet.tck.constants.Constants.ATTR_DISPATCH_TARGET;
+import static javax.portlet.tck.constants.Constants.EXTRA_PATH;
+import static javax.portlet.tck.constants.Constants.QUERY_STRING;
+import static javax.portlet.tck.constants.Constants.SERVLET_PREFIX;
+import static javax.portlet.tck.constants.Constants.THREADID_ATTR;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+
+import javax.portlet.ActionRequest;
+import javax.portlet.ActionResponse;
+import javax.portlet.Portlet;
+import javax.portlet.PortletConfig;
+import javax.portlet.PortletException;
+import javax.portlet.PortletRequestDispatcher;
+import javax.portlet.RenderRequest;
+import javax.portlet.RenderResponse;
+import javax.portlet.ResourceRequest;
+import javax.portlet.ResourceResponse;
+import javax.portlet.ResourceServingPortlet;
+import javax.portlet.ResourceURL;
 
 /**
- * This portlet implements several test cases for the JSR 362 TCK. The test case names
- * are defined in the /src/main/resources/xml-resources/additionalTCs.xml
- * file. The build process will integrate the test case names defined in the 
- * additionalTCs.xml file into the complete list of test case names for execution by the driver.
- *
- * This is the main portlet for the test cases. If the test cases call for events, this portlet
- * will initiate the events, but not process them. The processing is done in the companion 
- * portlet DispatcherTests6_SPEC2_19_FwdThenForwardServletResource_event
- *
+ * This portlet implements several test cases for the JSR 362 TCK. The test case names are defined in the
+ * /src/main/resources/xml-resources/additionalTCs.xml file. The build process will integrate the test case names
+ * defined in the additionalTCs.xml file into the complete list of test case names for execution by the driver.
+ * 
+ * This is the main portlet for the test cases. If the test cases call for events, this portlet will initiate the
+ * events, but not process them. The processing is done in the companion portlet
+ * DispatcherTests6_SPEC2_19_FwdThenForwardServletResource_event
+ * 
  */
 public class DispatcherTests6_SPEC2_19_FwdThenForwardServletResource implements Portlet, ResourceServingPortlet {
-   private static final String LOG_CLASS = 
-         DispatcherTests6_SPEC2_19_FwdThenForwardServletResource.class.getName();
-   private final Logger LOGGER = Logger.getLogger(LOG_CLASS);
-   
+
    private PortletConfig portletConfig = null;
 
    @Override
@@ -62,44 +67,39 @@ public class DispatcherTests6_SPEC2_19_FwdThenForwardServletResource implements
    }
 
    @Override
-   public void processAction(ActionRequest portletReq, ActionResponse portletResp)
-         throws PortletException, IOException {
-      LOGGER.entering(LOG_CLASS, "main portlet processAction entry");
+   public void processAction(ActionRequest portletReq, ActionResponse portletResp) throws PortletException, IOException {
 
       portletResp.setRenderParameters(portletReq.getParameterMap());
       long tid = Thread.currentThread().getId();
       portletReq.setAttribute(THREADID_ATTR, tid);
 
-      StringWriter writer = new StringWriter();
+      new StringWriter();
 
    }
 
    @Override
-   public void serveResource(ResourceRequest portletReq, ResourceResponse portletResp)
-         throws PortletException, IOException {
-      LOGGER.entering(LOG_CLASS, "main portlet serveResource entry");
+   public void serveResource(ResourceRequest portletReq, ResourceResponse portletResp) throws PortletException,
+         IOException {
 
       long tid = Thread.currentThread().getId();
       portletReq.setAttribute(THREADID_ATTR, tid);
 
-      PrintWriter writer = portletResp.getWriter();
+      portletResp.getWriter();
 
       // Multilevel forward / include
       portletReq.setAttribute(ATTR_DISPATCH_ACTION, "forward");
-      String targ = SERVLET_PREFIX + "DispatcherTests6_SPEC2_19_FwdThenForwardServletResource_servlet" + SERVLET_SUFFIX + "?" + QUERY_STRING;
+      String targ = SERVLET_PREFIX + "DispatcherTests6_SPEC2_19_FwdThenForwardServletResource_servlet" + EXTRA_PATH
+            + "?" + QUERY_STRING;
       portletReq.setAttribute(ATTR_DISPATCH_TARGET, targ);
 
       // Now do the actual dispatch
       String target = "/IncluderForwarderServlet" + "?" + QUERY_STRING;
-      PortletRequestDispatcher rd = portletConfig.getPortletContext()
-            .getRequestDispatcher(target);
+      PortletRequestDispatcher rd = portletConfig.getPortletContext().getRequestDispatcher(target);
       rd.forward(portletReq, portletResp);
    }
 
    @Override
-   public void render(RenderRequest portletReq, RenderResponse portletResp)
-         throws PortletException, IOException {
-      LOGGER.entering(LOG_CLASS, "main portlet render entry");
+   public void render(RenderRequest portletReq, RenderResponse portletResp) throws PortletException, IOException {
 
       long tid = Thread.currentThread().getId();
       portletReq.setAttribute(THREADID_ATTR, tid);

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/66951fc2/portlet-tck_3.0/V2DispatcherTests6/src/main/java/javax/portlet/tck/portlets/DispatcherTests6_SPEC2_19_FwdThenIncludeServletAction.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests6/src/main/java/javax/portlet/tck/portlets/DispatcherTests6_SPEC2_19_FwdThenIncludeServletAction.java b/portlet-tck_3.0/V2DispatcherTests6/src/main/java/javax/portlet/tck/portlets/DispatcherTests6_SPEC2_19_FwdThenIncludeServletAction.java
index de16c44..b8278a5 100644
--- a/portlet-tck_3.0/V2DispatcherTests6/src/main/java/javax/portlet/tck/portlets/DispatcherTests6_SPEC2_19_FwdThenIncludeServletAction.java
+++ b/portlet-tck_3.0/V2DispatcherTests6/src/main/java/javax/portlet/tck/portlets/DispatcherTests6_SPEC2_19_FwdThenIncludeServletAction.java
@@ -18,38 +18,46 @@
 
 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.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
-import javax.portlet.tck.beans.*;
-import javax.portlet.tck.constants.*;
-import static javax.portlet.tck.beans.JSR286DispatcherTestCaseDetails.*;
-import static javax.portlet.tck.constants.Constants.*;
-import static javax.portlet.PortletSession.*;
-import static javax.portlet.ResourceURL.*;
+import static javax.portlet.PortletSession.APPLICATION_SCOPE;
+import static javax.portlet.tck.constants.Constants.ATTR_DISPATCH_ACTION;
+import static javax.portlet.tck.constants.Constants.ATTR_DISPATCH_TARGET;
+import static javax.portlet.tck.constants.Constants.EXTRA_PATH;
+import static javax.portlet.tck.constants.Constants.QUERY_STRING;
+import static javax.portlet.tck.constants.Constants.RESULT_ATTR_PREFIX;
+import static javax.portlet.tck.constants.Constants.SERVLET_PREFIX;
+import static javax.portlet.tck.constants.Constants.THREADID_ATTR;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+
+import javax.portlet.ActionRequest;
+import javax.portlet.ActionResponse;
+import javax.portlet.Portlet;
+import javax.portlet.PortletConfig;
+import javax.portlet.PortletException;
+import javax.portlet.PortletRequestDispatcher;
+import javax.portlet.PortletSession;
+import javax.portlet.PortletURL;
+import javax.portlet.RenderRequest;
+import javax.portlet.RenderResponse;
+import javax.portlet.ResourceRequest;
+import javax.portlet.ResourceResponse;
+import javax.portlet.ResourceServingPortlet;
+import javax.portlet.tck.beans.TestButton;
 
 /**
- * This portlet implements several test cases for the JSR 362 TCK. The test case names
- * are defined in the /src/main/resources/xml-resources/additionalTCs.xml
- * file. The build process will integrate the test case names defined in the 
- * additionalTCs.xml file into the complete list of test case names for execution by the driver.
- *
- * This is the main portlet for the test cases. If the test cases call for events, this portlet
- * will initiate the events, but not process them. The processing is done in the companion 
- * portlet DispatcherTests6_SPEC2_19_FwdThenIncludeServletAction_event
- *
+ * This portlet implements several test cases for the JSR 362 TCK. The test case names are defined in the
+ * /src/main/resources/xml-resources/additionalTCs.xml file. The build process will integrate the test case names
+ * defined in the additionalTCs.xml file into the complete list of test case names for execution by the driver.
+ * 
+ * This is the main portlet for the test cases. If the test cases call for events, this portlet will initiate the
+ * events, but not process them. The processing is done in the companion portlet
+ * DispatcherTests6_SPEC2_19_FwdThenIncludeServletAction_event
+ * 
  */
 public class DispatcherTests6_SPEC2_19_FwdThenIncludeServletAction implements Portlet, ResourceServingPortlet {
-   private static final String LOG_CLASS = 
-         DispatcherTests6_SPEC2_19_FwdThenIncludeServletAction.class.getName();
-   private final Logger LOGGER = Logger.getLogger(LOG_CLASS);
-   
+
    private PortletConfig portletConfig = null;
 
    @Override
@@ -62,44 +70,39 @@ public class DispatcherTests6_SPEC2_19_FwdThenIncludeServletAction implements Po
    }
 
    @Override
-   public void processAction(ActionRequest portletReq, ActionResponse portletResp)
-         throws PortletException, IOException {
-      LOGGER.entering(LOG_CLASS, "main portlet processAction entry");
+   public void processAction(ActionRequest portletReq, ActionResponse portletResp) throws PortletException, IOException {
 
       portletResp.setRenderParameters(portletReq.getParameterMap());
       long tid = Thread.currentThread().getId();
       portletReq.setAttribute(THREADID_ATTR, tid);
 
-      StringWriter writer = new StringWriter();
+      new StringWriter();
 
       // Multilevel forward / include
       portletReq.setAttribute(ATTR_DISPATCH_ACTION, "include");
-      String targ = SERVLET_PREFIX + "DispatcherTests6_SPEC2_19_FwdThenIncludeServletAction_servlet" + SERVLET_SUFFIX + "?" + QUERY_STRING;
+      String targ = SERVLET_PREFIX + "DispatcherTests6_SPEC2_19_FwdThenIncludeServletAction_servlet" + EXTRA_PATH + "?"
+            + QUERY_STRING;
       portletReq.setAttribute(ATTR_DISPATCH_TARGET, targ);
 
       // Now do the actual dispatch
       String target = "/IncluderForwarderServlet" + "?" + QUERY_STRING;
-      PortletRequestDispatcher rd = portletConfig.getPortletContext()
-            .getRequestDispatcher(target);
+      PortletRequestDispatcher rd = portletConfig.getPortletContext().getRequestDispatcher(target);
       rd.forward(portletReq, portletResp);
    }
 
    @Override
-   public void serveResource(ResourceRequest portletReq, ResourceResponse portletResp)
-         throws PortletException, IOException {
-      LOGGER.entering(LOG_CLASS, "main portlet serveResource entry");
+   public void serveResource(ResourceRequest portletReq, ResourceResponse portletResp) throws PortletException,
+         IOException {
 
       long tid = Thread.currentThread().getId();
       portletReq.setAttribute(THREADID_ATTR, tid);
 
-      PrintWriter writer = portletResp.getWriter();
+      portletResp.getWriter();
 
    }
 
    @Override
-   public void render(RenderRequest portletReq, RenderResponse portletResp)
-         throws PortletException, IOException {
-      LOGGER.entering(LOG_CLASS, "main portlet render entry");
+   public void render(RenderRequest portletReq, RenderResponse portletResp) throws PortletException, IOException {
 
       long tid = Thread.currentThread().getId();
       portletReq.setAttribute(THREADID_ATTR, tid);
@@ -107,17 +110,19 @@ public class DispatcherTests6_SPEC2_19_FwdThenIncludeServletAction implements Po
       PrintWriter writer = portletResp.getWriter();
 
       PortletSession ps = portletReq.getPortletSession();
-      String msg = (String) ps.getAttribute(RESULT_ATTR_PREFIX + "DispatcherTests6_SPEC2_19_FwdThenIncludeServletAction", APPLICATION_SCOPE);
+      String msg = (String) ps.getAttribute(RESULT_ATTR_PREFIX
+            + "DispatcherTests6_SPEC2_19_FwdThenIncludeServletAction", APPLICATION_SCOPE);
       if (msg != null) {
          writer.write("<p>" + msg + "</p><br/>\n");
-         ps.removeAttribute(RESULT_ATTR_PREFIX + "DispatcherTests6_SPEC2_19_FwdThenIncludeServletAction", APPLICATION_SCOPE);
+         ps.removeAttribute(RESULT_ATTR_PREFIX + "DispatcherTests6_SPEC2_19_FwdThenIncludeServletAction",
+               APPLICATION_SCOPE);
       }
 
       /* TestCase: V2DispatcherTests6_SPEC2_19_FwdThenIncludeServletAction_dispatch1 */
-      /* Details: "In a servlet included by the target of a forward, if the   */
-      /* path provided to getRequestDispatcher method contains query          */
-      /* strings, parameters specified in the query strings must be passed    */
-      /* to the target servlet during a forward"                              */
+      /* Details: "In a servlet included by the target of a forward, if the */
+      /* path provided to getRequestDispatcher method contains query */
+      /* strings, parameters specified in the query strings must be passed */
+      /* to the target servlet during a forward" */
       {
          PortletURL aurl = portletResp.createActionURL();
          aurl.setParameters(portletReq.getPrivateParameterMap());
@@ -126,9 +131,9 @@ public class DispatcherTests6_SPEC2_19_FwdThenIncludeServletAction implements Po
       }
 
       /* TestCase: V2DispatcherTests6_SPEC2_19_FwdThenIncludeServletAction_dispatch2 */
-      /* Details: "In a servlet included by the target of a forward,          */
-      /* parameters specified in the query strings must be aggregated with    */
-      /* the portlet render parameters"                                       */
+      /* Details: "In a servlet included by the target of a forward, */
+      /* parameters specified in the query strings must be aggregated with */
+      /* the portlet render parameters" */
       {
          PortletURL aurl = portletResp.createActionURL();
          aurl.setParameters(portletReq.getPrivateParameterMap());
@@ -137,10 +142,10 @@ public class DispatcherTests6_SPEC2_19_FwdThenIncludeServletAction implements Po
       }
 
       /* TestCase: V2DispatcherTests6_SPEC2_19_FwdThenIncludeServletAction_dispatch3 */
-      /* Details: "In a servlet included by the target of a forward, 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"                            */
+      /* Details: "In a servlet included by the target of a forward, if */
+      /* query string parameters have the same names as render parameter */
+      /* names, the query string parameters appear in the parameter values */
+      /* array before the render parameter values" */
       {
          PortletURL aurl = portletResp.createActionURL();
          aurl.setParameters(portletReq.getPrivateParameterMap());
@@ -149,10 +154,10 @@ public class DispatcherTests6_SPEC2_19_FwdThenIncludeServletAction implements Po
       }
 
       /* TestCase: V2DispatcherTests6_SPEC2_19_FwdThenIncludeServletAction_invoke2 */
-      /* Details: "In a servlet included by the target of a forward,          */
-      /* parameters to the include method for a target servlet can be the     */
-      /* request and response classes from the portlet lifecyle method        */
-      /* initiating the include"                                              */
+      /* Details: "In a servlet included by the target of a forward, */
+      /* parameters to the include method for a target servlet can be the */
+      /* request and response classes from the portlet lifecyle method */
+      /* initiating the include" */
       {
          PortletURL aurl = portletResp.createActionURL();
          aurl.setParameters(portletReq.getPrivateParameterMap());
@@ -161,9 +166,9 @@ public class DispatcherTests6_SPEC2_19_FwdThenIncludeServletAction implements Po
       }
 
       /* TestCase: V2DispatcherTests6_SPEC2_19_FwdThenIncludeServletAction_invoke4 */
-      /* Details: "In a servlet included by the target of a forward, the      */
-      /* portlet container must invoke the target servlet in the same         */
-      /* thread as the PortletRequestDispatcher include invocation"           */
+      /* Details: "In a servlet included by the target of a forward, the */
+      /* portlet container must invoke the target servlet in the same */
+      /* thread as the PortletRequestDispatcher include invocation" */
       {
          PortletURL aurl = portletResp.createActionURL();
          aurl.setParameters(portletReq.getPrivateParameterMap());
@@ -172,9 +177,9 @@ public class DispatcherTests6_SPEC2_19_FwdThenIncludeServletAction implements Po
       }
 
       /* TestCase: V2DispatcherTests6_SPEC2_19_FwdThenIncludeServletAction_invoke7 */
-      /* Details: "In a servlet included by the target of a forward, the      */
-      /* path elements of the request object exposed to the target servlet    */
-      /* must reflect the path used to obtain the RequestDispatcher"          */
+      /* Details: "In a servlet included by the target of a forward, the */
+      /* path elements of the request object exposed to the target servlet */
+      /* must reflect the path used to obtain the RequestDispatcher" */
       {
          PortletURL aurl = portletResp.createActionURL();
          aurl.setParameters(portletReq.getPrivateParameterMap());
@@ -183,10 +188,9 @@ public class DispatcherTests6_SPEC2_19_FwdThenIncludeServletAction implements Po
       }
 
       /* TestCase: V2DispatcherTests6_SPEC2_19_FwdThenIncludeServletAction_attributes1 */
-      /* Details: "In a servlet included by the target of a forward, 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"                          */
+      /* Details: "In a servlet included by the target of a forward, the */
+      /* portlet request attribute javax.servlet.include.request_uri will */
+      /* be set, and reflects the path values of the included servlet." */
       {
          PortletURL aurl = portletResp.createActionURL();
          aurl.setParameters(portletReq.getPrivateParameterMap());
@@ -195,10 +199,9 @@ public class DispatcherTests6_SPEC2_19_FwdThenIncludeServletAction implements Po
       }
 
       /* TestCase: V2DispatcherTests6_SPEC2_19_FwdThenIncludeServletAction_attributes1a */
-      /* Details: "In a servlet included by the target of a forward, 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"                          */
+      /* Details: "In a servlet included by the target of a forward, the */
+      /* servlet request attribute javax.servlet.include.request_uri will */
+      /* be set, and reflects the path values of the included servlet." */
       {
          PortletURL aurl = portletResp.createActionURL();
          aurl.setParameters(portletReq.getPrivateParameterMap());
@@ -207,9 +210,9 @@ public class DispatcherTests6_SPEC2_19_FwdThenIncludeServletAction implements Po
       }
 
       /* TestCase: V2DispatcherTests6_SPEC2_19_FwdThenIncludeServletAction_attributes1b */
-      /* Details: "In a servlet included by the target of a forward, the      */
-      /* portlet request attribute javax.servlet.forward.request_uri will     */
-      /* not be set"                                                          */
+      /* Details: "In a servlet included by the target of a forward, the */
+      /* portlet request attribute javax.servlet.forward.request_uri will */
+      /* not be set" */
       {
          PortletURL aurl = portletResp.createActionURL();
          aurl.setParameters(portletReq.getPrivateParameterMap());
@@ -218,9 +221,9 @@ public class DispatcherTests6_SPEC2_19_FwdThenIncludeServletAction implements Po
       }
 
       /* TestCase: V2DispatcherTests6_SPEC2_19_FwdThenIncludeServletAction_attributes1c */
-      /* Details: "In a servlet included by the target of a forward, the      */
-      /* servlet request attribute javax.servlet.forward.request_uri will     */
-      /* not be set"                                                          */
+      /* Details: "In a servlet included by the target of a forward, the */
+      /* servlet request attribute javax.servlet.forward.request_uri will */
+      /* not be set" */
       {
          PortletURL aurl = portletResp.createActionURL();
          aurl.setParameters(portletReq.getPrivateParameterMap());
@@ -229,11 +232,9 @@ public class DispatcherTests6_SPEC2_19_FwdThenIncludeServletAction implements Po
       }
 
       /* TestCase: V2DispatcherTests6_SPEC2_19_FwdThenIncludeServletAction_attributes2 */
-      /* Details: "In a servlet included by the target of a forward, 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"                                                       */
+      /* Details: "In a servlet included by the target of a forward, the */
+      /* portlet request attribute javax.servlet.include.context_path will */
+      /* be set, and reflects the path values of the included servlet." */
       {
          PortletURL aurl = portletResp.createActionURL();
          aurl.setParameters(portletReq.getPrivateParameterMap());
@@ -242,11 +243,9 @@ public class DispatcherTests6_SPEC2_19_FwdThenIncludeServletAction implements Po
       }
 
       /* TestCase: V2DispatcherTests6_SPEC2_19_FwdThenIncludeServletAction_attributes2a */
-      /* Details: "In a servlet included by the target of a forward, 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"                                                       */
+      /* Details: "In a servlet included by the target of a forward, the */
+      /* servlet request attribute javax.servlet.include.context_path will */
+      /* be set, and reflects the path values of the included servlet." */
       {
          PortletURL aurl = portletResp.createActionURL();
          aurl.setParameters(portletReq.getPrivateParameterMap());
@@ -255,9 +254,9 @@ public class DispatcherTests6_SPEC2_19_FwdThenIncludeServletAction implements Po
       }
 
       /* TestCase: V2DispatcherTests6_SPEC2_19_FwdThenIncludeServletAction_attributes2b */
-      /* Details: "In a servlet included by the target of a forward, the      */
-      /* portlet request attribute javax.servlet.forward.context_path will    */
-      /* not be set"                                                          */
+      /* Details: "In a servlet included by the target of a forward, the */
+      /* portlet request attribute javax.servlet.forward.context_path will */
+      /* not be set" */
       {
          PortletURL aurl = portletResp.createActionURL();
          aurl.setParameters(portletReq.getPrivateParameterMap());
@@ -266,9 +265,9 @@ public class DispatcherTests6_SPEC2_19_FwdThenIncludeServletAction implements Po
       }
 
       /* TestCase: V2DispatcherTests6_SPEC2_19_FwdThenIncludeServletAction_attributes2c */
-      /* Details: "In a servlet included by the target of a forward, the      */
-      /* servlet request attribute javax.servlet.forward.context_path will    */
-      /* not be set"                                                          */
+      /* Details: "In a servlet included by the target of a forward, the */
+      /* servlet request attribute javax.servlet.forward.context_path will */
+      /* not be set" */
       {
          PortletURL aurl = portletResp.createActionURL();
          aurl.setParameters(portletReq.getPrivateParameterMap());
@@ -277,11 +276,9 @@ public class DispatcherTests6_SPEC2_19_FwdThenIncludeServletAction implements Po
       }
 
       /* TestCase: V2DispatcherTests6_SPEC2_19_FwdThenIncludeServletAction_attributes3 */
-      /* Details: "In a servlet included by the target of a forward, 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"                                                       */
+      /* Details: "In a servlet included by the target of a forward, the */
+      /* portlet request attribute javax.servlet.include.servlet_path will */
+      /* be set, and reflects the path values of the included servlet." */
       {
          PortletURL aurl = portletResp.createActionURL();
          aurl.setParameters(portletReq.getPrivateParameterMap());
@@ -290,11 +287,9 @@ public class DispatcherTests6_SPEC2_19_FwdThenIncludeServletAction implements Po
       }
 
       /* TestCase: V2DispatcherTests6_SPEC2_19_FwdThenIncludeServletAction_attributes3a */
-      /* Details: "In a servlet included by the target of a forward, 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"                                                       */
+      /* Details: "In a servlet included by the target of a forward, the */
+      /* servlet request attribute javax.servlet.include.servlet_path will */
+      /* be set, and reflects the path values of the included servlet." */
       {
          PortletURL aurl = portletResp.createActionURL();
          aurl.setParameters(portletReq.getPrivateParameterMap());
@@ -303,9 +298,9 @@ public class DispatcherTests6_SPEC2_19_FwdThenIncludeServletAction implements Po
       }
 
       /* TestCase: V2DispatcherTests6_SPEC2_19_FwdThenIncludeServletAction_attributes3b */
-      /* Details: "In a servlet included by the target of a forward, the      */
-      /* portlet request attribute javax.servlet.forward.servlet_path will    */
-      /* not be set"                                                          */
+      /* Details: "In a servlet included by the target of a forward, the */
+      /* portlet request attribute javax.servlet.forward.servlet_path will */
+      /* not be set" */
       {
          PortletURL aurl = portletResp.createActionURL();
          aurl.setParameters(portletReq.getPrivateParameterMap());
@@ -314,9 +309,9 @@ public class DispatcherTests6_SPEC2_19_FwdThenIncludeServletAction implements Po
       }
 
       /* TestCase: V2DispatcherTests6_SPEC2_19_FwdThenIncludeServletAction_attributes3c */
-      /* Details: "In a servlet included by the target of a forward, the      */
-      /* servlet request attribute javax.servlet.forward.servlet_path will    */
-      /* not be set"                                                          */
+      /* Details: "In a servlet included by the target of a forward, the */
+      /* servlet request attribute javax.servlet.forward.servlet_path will */
+      /* not be set" */
       {
          PortletURL aurl = portletResp.createActionURL();
          aurl.setParameters(portletReq.getPrivateParameterMap());
@@ -325,10 +320,9 @@ public class DispatcherTests6_SPEC2_19_FwdThenIncludeServletAction implements Po
       }
 
       /* TestCase: V2DispatcherTests6_SPEC2_19_FwdThenIncludeServletAction_attributes4 */
-      /* Details: "In a servlet included by the target of a forward, 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"                              */
+      /* Details: "In a servlet included by the target of a forward, the */
+      /* portlet request attribute javax.servlet.include.path_info will be */
+      /* set, and reflects the path values of the included servlet." */
       {
          PortletURL aurl = portletResp.createActionURL();
          aurl.setParameters(portletReq.getPrivateParameterMap());
@@ -337,10 +331,9 @@ public class DispatcherTests6_SPEC2_19_FwdThenIncludeServletAction implements Po
       }
 
       /* TestCase: V2DispatcherTests6_SPEC2_19_FwdThenIncludeServletAction_attributes4a */
-      /* Details: "In a servlet included by the target of a forward, 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"                              */
+      /* Details: "In a servlet included by the target of a forward, the */
+      /* servlet request attribute javax.servlet.include.path_info will be */
+      /* set, and reflects the path values of the included servlet." */
       {
          PortletURL aurl = portletResp.createActionURL();
          aurl.setParameters(portletReq.getPrivateParameterMap());
@@ -349,9 +342,9 @@ public class DispatcherTests6_SPEC2_19_FwdThenIncludeServletAction implements Po
       }
 
       /* TestCase: V2DispatcherTests6_SPEC2_19_FwdThenIncludeServletAction_attributes4b */
-      /* Details: "In a servlet included by the target of a forward, the      */
-      /* portlet request attribute javax.servlet.forward.path_info will not   */
-      /* be set"                                                              */
+      /* Details: "In a servlet included by the target of a forward, the */
+      /* portlet request attribute javax.servlet.forward.path_info will not */
+      /* be set" */
       {
          PortletURL aurl = portletResp.createActionURL();
          aurl.setParameters(portletReq.getPrivateParameterMap());
@@ -360,9 +353,9 @@ public class DispatcherTests6_SPEC2_19_FwdThenIncludeServletAction implements Po
       }
 
       /* TestCase: V2DispatcherTests6_SPEC2_19_FwdThenIncludeServletAction_attributes4c */
-      /* Details: "In a servlet included by the target of a forward, the      */
-      /* servlet request attribute javax.servlet.forward.path_info will not   */
-      /* be set"                                                              */
+      /* Details: "In a servlet included by the target of a forward, the */
+      /* servlet request attribute javax.servlet.forward.path_info will not */
+      /* be set" */
       {
          PortletURL aurl = portletResp.createActionURL();
          aurl.setParameters(portletReq.getPrivateParameterMap());
@@ -371,11 +364,9 @@ public class DispatcherTests6_SPEC2_19_FwdThenIncludeServletAction implements Po
       }
 
       /* TestCase: V2DispatcherTests6_SPEC2_19_FwdThenIncludeServletAction_attributes5 */
-      /* Details: "In a servlet included by the target of a forward, 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"                                                       */
+      /* Details: "In a servlet included by the target of a forward, the */
+      /* portlet request attribute javax.servlet.include.query_string will */
+      /* be set, and reflects the path values of the included servlet." */
       {
          PortletURL aurl = portletResp.createActionURL();
          aurl.setParameters(portletReq.getPrivateParameterMap());
@@ -384,11 +375,9 @@ public class DispatcherTests6_SPEC2_19_FwdThenIncludeServletAction implements Po
       }
 
       /* TestCase: V2DispatcherTests6_SPEC2_19_FwdThenIncludeServletAction_attributes5a */
-      /* Details: "In a servlet included by the target of a forward, 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"                                                       */
+      /* Details: "In a servlet included by the target of a forward, the */
+      /* servlet request attribute javax.servlet.include.query_string will */
+      /* be set, and reflects the path values of the included servlet." */
       {
          PortletURL aurl = portletResp.createActionURL();
          aurl.setParameters(portletReq.getPrivateParameterMap());
@@ -397,9 +386,9 @@ public class DispatcherTests6_SPEC2_19_FwdThenIncludeServletAction implements Po
       }
 
       /* TestCase: V2DispatcherTests6_SPEC2_19_FwdThenIncludeServletAction_attributes5b */
-      /* Details: "In a servlet included by the target of a forward, the      */
-      /* portlet request attribute javax.servlet.forward.query_string will    */
-      /* not be set"                                                          */
+      /* Details: "In a servlet included by the target of a forward, the */
+      /* portlet request attribute javax.servlet.forward.query_string will */
+      /* not be set" */
       {
          PortletURL aurl = portletResp.createActionURL();
          aurl.setParameters(portletReq.getPrivateParameterMap());
@@ -408,9 +397,9 @@ public class DispatcherTests6_SPEC2_19_FwdThenIncludeServletAction implements Po
       }
 
       /* TestCase: V2DispatcherTests6_SPEC2_19_FwdThenIncludeServletAction_attributes5c */
-      /* Details: "In a servlet included by the target of a forward, the      */
-      /* servlet request attribute javax.servlet.forward.query_string will    */
-      /* not be set"                                                          */
+      /* Details: "In a servlet included by the target of a forward, the */
+      /* servlet request attribute javax.servlet.forward.query_string will */
+      /* not be set" */
       {
          PortletURL aurl = portletResp.createActionURL();
          aurl.setParameters(portletReq.getPrivateParameterMap());
@@ -419,9 +408,9 @@ public class DispatcherTests6_SPEC2_19_FwdThenIncludeServletAction implements Po
       }
 
       /* TestCase: V2DispatcherTests6_SPEC2_19_FwdThenIncludeServletAction_attributes6 */
-      /* Details: "In a servlet included by the target of a forward, the      */
-      /* request attribute javax.portlet.config must be set to the            */
-      /* javax.portlet.PortletConfig object"                                  */
+      /* Details: "In a servlet included by the target of a forward, the */
+      /* request attribute javax.portlet.config must be set to the */
+      /* javax.portlet.PortletConfig object" */
       {
          PortletURL aurl = portletResp.createActionURL();
          aurl.setParameters(portletReq.getPrivateParameterMap());
@@ -430,10 +419,10 @@ public class DispatcherTests6_SPEC2_19_FwdThenIncludeServletAction implements Po
       }
 
       /* TestCase: V2DispatcherTests6_SPEC2_19_FwdThenIncludeServletAction_attributes7 */
-      /* Details: "In a servlet included by the target of a forward, for      */
-      /* includes from the processAction method, The request attribute        */
-      /* javax.portlet.request must be set to the                             */
-      /* javax.portlet.ActionRequest object"                                  */
+      /* Details: "In a servlet included by the target of a forward, for */
+      /* includes from the processAction method, The request attribute */
+      /* javax.portlet.request must be set to the */
+      /* javax.portlet.ActionRequest object" */
       {
          PortletURL aurl = portletResp.createActionURL();
          aurl.setParameters(portletReq.getPrivateParameterMap());
@@ -442,10 +431,10 @@ public class DispatcherTests6_SPEC2_19_FwdThenIncludeServletAction implements Po
       }
 
       /* TestCase: V2DispatcherTests6_SPEC2_19_FwdThenIncludeServletAction_attributes8 */
-      /* Details: "In a servlet included by the target of a forward, for      */
-      /* includes from the processAction method, The request attribute        */
-      /* javax.portlet.response must be set to the                            */
-      /* javax.portlet.ActionResponse object"                                 */
+      /* Details: "In a servlet included by the target of a forward, for */
+      /* includes from the processAction method, The request attribute */
+      /* javax.portlet.response must be set to the */
+      /* javax.portlet.ActionResponse object" */
       {
          PortletURL aurl = portletResp.createActionURL();
          aurl.setParameters(portletReq.getPrivateParameterMap());

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/66951fc2/portlet-tck_3.0/V2DispatcherTests6/src/main/java/javax/portlet/tck/portlets/DispatcherTests6_SPEC2_19_FwdThenIncludeServletEvent.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests6/src/main/java/javax/portlet/tck/portlets/DispatcherTests6_SPEC2_19_FwdThenIncludeServletEvent.java b/portlet-tck_3.0/V2DispatcherTests6/src/main/java/javax/portlet/tck/portlets/DispatcherTests6_SPEC2_19_FwdThenIncludeServletEvent.java
index 7e39b56..5d265af 100644
--- a/portlet-tck_3.0/V2DispatcherTests6/src/main/java/javax/portlet/tck/portlets/DispatcherTests6_SPEC2_19_FwdThenIncludeServletEvent.java
+++ b/portlet-tck_3.0/V2DispatcherTests6/src/main/java/javax/portlet/tck/portlets/DispatcherTests6_SPEC2_19_FwdThenIncludeServletEvent.java
@@ -18,43 +18,41 @@
 
 package javax.portlet.tck.portlets;
 
-import java.io.*;
-import java.util.*;
-import java.util.logging.*;
-import static java.util.logging.Logger.*;
+import static javax.portlet.tck.constants.Constants.TCKNAMESPACE;
+import static javax.portlet.tck.constants.Constants.THREADID_ATTR;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+
+import javax.portlet.ActionRequest;
+import javax.portlet.ActionResponse;
+import javax.portlet.Portlet;
+import javax.portlet.PortletConfig;
+import javax.portlet.PortletException;
+import javax.portlet.PortletURL;
+import javax.portlet.RenderRequest;
+import javax.portlet.RenderResponse;
+import javax.portlet.ResourceRequest;
+import javax.portlet.ResourceResponse;
+import javax.portlet.ResourceServingPortlet;
+import javax.portlet.tck.beans.TestButton;
 import javax.xml.namespace.QName;
-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.beans.JSR286DispatcherTestCaseDetails.*;
-import static javax.portlet.tck.constants.Constants.*;
-import static javax.portlet.PortletSession.*;
-import static javax.portlet.ResourceURL.*;
 
 /**
- * This portlet implements several test cases for the JSR 362 TCK. The test case names
- * are defined in the /src/main/resources/xml-resources/additionalTCs.xml
- * file. The build process will integrate the test case names defined in the 
- * additionalTCs.xml file into the complete list of test case names for execution by the driver.
- *
- * This is the main portlet for the test cases. If the test cases call for events, this portlet
- * will initiate the events, but not process them. The processing is done in the companion 
- * portlet DispatcherTests6_SPEC2_19_FwdThenIncludeServletEvent_event
- *
+ * This portlet implements several test cases for the JSR 362 TCK. The test case names are defined in the
+ * /src/main/resources/xml-resources/additionalTCs.xml file. The build process will integrate the test case names
+ * defined in the additionalTCs.xml file into the complete list of test case names for execution by the driver.
+ * 
+ * This is the main portlet for the test cases. If the test cases call for events, this portlet will initiate the
+ * events, but not process them. The processing is done in the companion portlet
+ * DispatcherTests6_SPEC2_19_FwdThenIncludeServletEvent_event
+ * 
  */
 public class DispatcherTests6_SPEC2_19_FwdThenIncludeServletEvent implements Portlet, ResourceServingPortlet {
-   private static final String LOG_CLASS = 
-         DispatcherTests6_SPEC2_19_FwdThenIncludeServletEvent.class.getName();
-   private final Logger LOGGER = Logger.getLogger(LOG_CLASS);
-   
-   private PortletConfig portletConfig = null;
 
    @Override
    public void init(PortletConfig config) throws PortletException {
-      this.portletConfig = config;
    }
 
    @Override
@@ -62,37 +60,31 @@ public class DispatcherTests6_SPEC2_19_FwdThenIncludeServletEvent implements Por
    }
 
    @Override
-   public void processAction(ActionRequest portletReq, ActionResponse portletResp)
-         throws PortletException, IOException {
-      LOGGER.entering(LOG_CLASS, "main portlet processAction entry");
+   public void processAction(ActionRequest portletReq, ActionResponse portletResp) throws PortletException, IOException {
 
       portletResp.setRenderParameters(portletReq.getParameterMap());
       long tid = Thread.currentThread().getId();
       portletReq.setAttribute(THREADID_ATTR, tid);
 
-      StringWriter writer = new StringWriter();
+      new StringWriter();
 
-      QName eventQName = new QName(TCKNAMESPACE,
-             "DispatcherTests6_SPEC2_19_FwdThenIncludeServletEvent");
+      QName eventQName = new QName(TCKNAMESPACE, "DispatcherTests6_SPEC2_19_FwdThenIncludeServletEvent");
       portletResp.setEvent(eventQName, "Hi!");
    }
 
    @Override
-   public void serveResource(ResourceRequest portletReq, ResourceResponse portletResp)
-         throws PortletException, IOException {
-      LOGGER.entering(LOG_CLASS, "main portlet serveResource entry");
+   public void serveResource(ResourceRequest portletReq, ResourceResponse portletResp) throws PortletException,
+         IOException {
 
       long tid = Thread.currentThread().getId();
       portletReq.setAttribute(THREADID_ATTR, tid);
 
-      PrintWriter writer = portletResp.getWriter();
+      portletResp.getWriter();
 
    }
 
    @Override
-   public void render(RenderRequest portletReq, RenderResponse portletResp)
-         throws PortletException, IOException {
-      LOGGER.entering(LOG_CLASS, "main portlet render entry");
+   public void render(RenderRequest portletReq, RenderResponse portletResp) throws PortletException, IOException {
 
       long tid = Thread.currentThread().getId();
       portletReq.setAttribute(THREADID_ATTR, tid);
@@ -100,10 +92,10 @@ public class DispatcherTests6_SPEC2_19_FwdThenIncludeServletEvent implements Por
       PrintWriter writer = portletResp.getWriter();
 
       /* TestCase: V2DispatcherTests6_SPEC2_19_FwdThenIncludeServletEvent_dispatch1 */
-      /* Details: "In a servlet included by the target of a forward, if the   */
-      /* path provided to getRequestDispatcher method contains query          */
-      /* strings, parameters specified in the query strings must be passed    */
-      /* to the target servlet during a forward"                              */
+      /* Details: "In a servlet included by the target of a forward, if the */
+      /* path provided to getRequestDispatcher method contains query */
+      /* strings, parameters specified in the query strings must be passed */
+      /* to the target servlet during a forward" */
       {
          PortletURL aurl = portletResp.createActionURL();
          aurl.setParameters(portletReq.getPrivateParameterMap());
@@ -112,9 +104,9 @@ public class DispatcherTests6_SPEC2_19_FwdThenIncludeServletEvent implements Por
       }
 
       /* TestCase: V2DispatcherTests6_SPEC2_19_FwdThenIncludeServletEvent_dispatch2 */
-      /* Details: "In a servlet included by the target of a forward,          */
-      /* parameters specified in the query strings must be aggregated with    */
-      /* the portlet render parameters"                                       */
+      /* Details: "In a servlet included by the target of a forward, */
+      /* parameters specified in the query strings must be aggregated with */
+      /* the portlet render parameters" */
       {
          PortletURL aurl = portletResp.createActionURL();
          aurl.setParameters(portletReq.getPrivateParameterMap());
@@ -123,10 +115,10 @@ public class DispatcherTests6_SPEC2_19_FwdThenIncludeServletEvent implements Por
       }
 
       /* TestCase: V2DispatcherTests6_SPEC2_19_FwdThenIncludeServletEvent_dispatch3 */
-      /* Details: "In a servlet included by the target of a forward, 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"                            */
+      /* Details: "In a servlet included by the target of a forward, if */
+      /* query string parameters have the same names as render parameter */
+      /* names, the query string parameters appear in the parameter values */
+      /* array before the render parameter values" */
       {
          PortletURL aurl = portletResp.createActionURL();
          aurl.setParameters(portletReq.getPrivateParameterMap());
@@ -135,10 +127,10 @@ public class DispatcherTests6_SPEC2_19_FwdThenIncludeServletEvent implements Por
       }
 
       /* TestCase: V2DispatcherTests6_SPEC2_19_FwdThenIncludeServletEvent_invoke2 */
-      /* Details: "In a servlet included by the target of a forward,          */
-      /* parameters to the include method for a target servlet can be the     */
-      /* request and response classes from the portlet lifecyle method        */
-      /* initiating the include"                                              */
+      /* Details: "In a servlet included by the target of a forward, */
+      /* parameters to the include method for a target servlet can be the */
+      /* request and response classes from the portlet lifecyle method */
+      /* initiating the include" */
       {
          PortletURL aurl = portletResp.createActionURL();
          aurl.setParameters(portletReq.getPrivateParameterMap());
@@ -147,9 +139,9 @@ public class DispatcherTests6_SPEC2_19_FwdThenIncludeServletEvent implements Por
       }
 
       /* TestCase: V2DispatcherTests6_SPEC2_19_FwdThenIncludeServletEvent_invoke4 */
-      /* Details: "In a servlet included by the target of a forward, the      */
-      /* portlet container must invoke the target servlet in the same         */
-      /* thread as the PortletRequestDispatcher include invocation"           */
+      /* Details: "In a servlet included by the target of a forward, the */
+      /* portlet container must invoke the target servlet in the same */
+      /* thread as the PortletRequestDispatcher include invocation" */
       {
          PortletURL aurl = portletResp.createActionURL();
          aurl.setParameters(portletReq.getPrivateParameterMap());
@@ -158,9 +150,9 @@ public class DispatcherTests6_SPEC2_19_FwdThenIncludeServletEvent implements Por
       }
 
       /* TestCase: V2DispatcherTests6_SPEC2_19_FwdThenIncludeServletEvent_invoke7 */
-      /* Details: "In a servlet included by the target of a forward, the      */
-      /* path elements of the request object exposed to the target servlet    */
-      /* must reflect the path used to obtain the RequestDispatcher"          */
+      /* Details: "In a servlet included by the target of a forward, the */
+      /* path elements of the request object exposed to the target servlet */
+      /* must reflect the path used to obtain the RequestDispatcher" */
       {
          PortletURL aurl = portletResp.createActionURL();
          aurl.setParameters(portletReq.getPrivateParameterMap());
@@ -169,10 +161,9 @@ public class DispatcherTests6_SPEC2_19_FwdThenIncludeServletEvent implements Por
       }
 
       /* TestCase: V2DispatcherTests6_SPEC2_19_FwdThenIncludeServletEvent_attributes1 */
-      /* Details: "In a servlet included by the target of a forward, 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"                          */
+      /* Details: "In a servlet included by the target of a forward, the */
+      /* portlet request attribute javax.servlet.include.request_uri will */
+      /* be set, and reflects the path values of the included servlet." */
       {
          PortletURL aurl = portletResp.createActionURL();
          aurl.setParameters(portletReq.getPrivateParameterMap());
@@ -181,10 +172,9 @@ public class DispatcherTests6_SPEC2_19_FwdThenIncludeServletEvent implements Por
       }
 
       /* TestCase: V2DispatcherTests6_SPEC2_19_FwdThenIncludeServletEvent_attributes1a */
-      /* Details: "In a servlet included by the target of a forward, 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"                          */
+      /* Details: "In a servlet included by the target of a forward, the */
+      /* servlet request attribute javax.servlet.include.request_uri will */
+      /* be set, and reflects the path values of the included servlet." */
       {
          PortletURL aurl = portletResp.createActionURL();
          aurl.setParameters(portletReq.getPrivateParameterMap());
@@ -193,9 +183,9 @@ public class DispatcherTests6_SPEC2_19_FwdThenIncludeServletEvent implements Por
       }
 
       /* TestCase: V2DispatcherTests6_SPEC2_19_FwdThenIncludeServletEvent_attributes1b */
-      /* Details: "In a servlet included by the target of a forward, the      */
-      /* portlet request attribute javax.servlet.forward.request_uri will     */
-      /* not be set"                                                          */
+      /* Details: "In a servlet included by the target of a forward, the */
+      /* portlet request attribute javax.servlet.forward.request_uri will */
+      /* not be set" */
       {
          PortletURL aurl = portletResp.createActionURL();
          aurl.setParameters(portletReq.getPrivateParameterMap());
@@ -204,9 +194,9 @@ public class DispatcherTests6_SPEC2_19_FwdThenIncludeServletEvent implements Por
       }
 
       /* TestCase: V2DispatcherTests6_SPEC2_19_FwdThenIncludeServletEvent_attributes1c */
-      /* Details: "In a servlet included by the target of a forward, the      */
-      /* servlet request attribute javax.servlet.forward.request_uri will     */
-      /* not be set"                                                          */
+      /* Details: "In a servlet included by the target of a forward, the */
+      /* servlet request attribute javax.servlet.forward.request_uri will */
+      /* not be set" */
       {
          PortletURL aurl = portletResp.createActionURL();
          aurl.setParameters(portletReq.getPrivateParameterMap());
@@ -215,11 +205,9 @@ public class DispatcherTests6_SPEC2_19_FwdThenIncludeServletEvent implements Por
       }
 
       /* TestCase: V2DispatcherTests6_SPEC2_19_FwdThenIncludeServletEvent_attributes2 */
-      /* Details: "In a servlet included by the target of a forward, 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"                                                       */
+      /* Details: "In a servlet included by the target of a forward, the */
+      /* portlet request attribute javax.servlet.include.context_path will */
+      /* be set, and reflects the path values of the included servlet." */
       {
          PortletURL aurl = portletResp.createActionURL();
          aurl.setParameters(portletReq.getPrivateParameterMap());
@@ -228,11 +216,9 @@ public class DispatcherTests6_SPEC2_19_FwdThenIncludeServletEvent implements Por
       }
 
       /* TestCase: V2DispatcherTests6_SPEC2_19_FwdThenIncludeServletEvent_attributes2a */
-      /* Details: "In a servlet included by the target of a forward, 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"                                                       */
+      /* Details: "In a servlet included by the target of a forward, the */
+      /* servlet request attribute javax.servlet.include.context_path will */
+      /* be set, and reflects the path values of the included servlet." */
       {
          PortletURL aurl = portletResp.createActionURL();
          aurl.setParameters(portletReq.getPrivateParameterMap());
@@ -241,9 +227,9 @@ public class DispatcherTests6_SPEC2_19_FwdThenIncludeServletEvent implements Por
       }
 
       /* TestCase: V2DispatcherTests6_SPEC2_19_FwdThenIncludeServletEvent_attributes2b */
-      /* Details: "In a servlet included by the target of a forward, the      */
-      /* portlet request attribute javax.servlet.forward.context_path will    */
-      /* not be set"                                                          */
+      /* Details: "In a servlet included by the target of a forward, the */
+      /* portlet request attribute javax.servlet.forward.context_path will */
+      /* not be set" */
       {
          PortletURL aurl = portletResp.createActionURL();
          aurl.setParameters(portletReq.getPrivateParameterMap());
@@ -252,9 +238,9 @@ public class DispatcherTests6_SPEC2_19_FwdThenIncludeServletEvent implements Por
       }
 
       /* TestCase: V2DispatcherTests6_SPEC2_19_FwdThenIncludeServletEvent_attributes2c */
-      /* Details: "In a servlet included by the target of a forward, the      */
-      /* servlet request attribute javax.servlet.forward.context_path will    */
-      /* not be set"                                                          */
+      /* Details: "In a servlet included by the target of a forward, the */
+      /* servlet request attribute javax.servlet.forward.context_path will */
+      /* not be set" */
       {
          PortletURL aurl = portletResp.createActionURL();
          aurl.setParameters(portletReq.getPrivateParameterMap());
@@ -263,11 +249,9 @@ public class DispatcherTests6_SPEC2_19_FwdThenIncludeServletEvent implements Por
       }
 
       /* TestCase: V2DispatcherTests6_SPEC2_19_FwdThenIncludeServletEvent_attributes3 */
-      /* Details: "In a servlet included by the target of a forward, 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"                                                       */
+      /* Details: "In a servlet included by the target of a forward, the */
+      /* portlet request attribute javax.servlet.include.servlet_path will */
+      /* be set, and reflects the path values of the included servlet." */
       {
          PortletURL aurl = portletResp.createActionURL();
          aurl.setParameters(portletReq.getPrivateParameterMap());
@@ -276,11 +260,9 @@ public class DispatcherTests6_SPEC2_19_FwdThenIncludeServletEvent implements Por
       }
 
       /* TestCase: V2DispatcherTests6_SPEC2_19_FwdThenIncludeServletEvent_attributes3a */
-      /* Details: "In a servlet included by the target of a forward, 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"                                                       */
+      /* Details: "In a servlet included by the target of a forward, the */
+      /* servlet request attribute javax.servlet.include.servlet_path will */
+      /* be set, and reflects the path values of the included servlet." */
       {
          PortletURL aurl = portletResp.createActionURL();
          aurl.setParameters(portletReq.getPrivateParameterMap());
@@ -289,9 +271,9 @@ public class DispatcherTests6_SPEC2_19_FwdThenIncludeServletEvent implements Por
       }
 
       /* TestCase: V2DispatcherTests6_SPEC2_19_FwdThenIncludeServletEvent_attributes3b */
-      /* Details: "In a servlet included by the target of a forward, the      */
-      /* portlet request attribute javax.servlet.forward.servlet_path will    */
-      /* not be set"                                                          */
+      /* Details: "In a servlet included by the target of a forward, the */
+      /* portlet request attribute javax.servlet.forward.servlet_path will */
+      /* not be set" */
       {
          PortletURL aurl = portletResp.createActionURL();
          aurl.setParameters(portletReq.getPrivateParameterMap());
@@ -300,9 +282,9 @@ public class DispatcherTests6_SPEC2_19_FwdThenIncludeServletEvent implements Por
       }
 
       /* TestCase: V2DispatcherTests6_SPEC2_19_FwdThenIncludeServletEvent_attributes3c */
-      /* Details: "In a servlet included by the target of a forward, the      */
-      /* servlet request attribute javax.servlet.forward.servlet_path will    */
-      /* not be set"                                                          */
+      /* Details: "In a servlet included by the target of a forward, the */
+      /* servlet request attribute javax.servlet.forward.servlet_path will */
+      /* not be set" */
       {
          PortletURL aurl = portletResp.createActionURL();
          aurl.setParameters(portletReq.getPrivateParameterMap());
@@ -311,10 +293,9 @@ public class DispatcherTests6_SPEC2_19_FwdThenIncludeServletEvent implements Por
       }
 
       /* TestCase: V2DispatcherTests6_SPEC2_19_FwdThenIncludeServletEvent_attributes4 */
-      /* Details: "In a servlet included by the target of a forward, 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"                              */
+      /* Details: "In a servlet included by the target of a forward, the */
+      /* portlet request attribute javax.servlet.include.path_info will be */
+      /* set, and reflects the path values of the included servlet." */
       {
          PortletURL aurl = portletResp.createActionURL();
          aurl.setParameters(portletReq.getPrivateParameterMap());
@@ -323,10 +304,9 @@ public class DispatcherTests6_SPEC2_19_FwdThenIncludeServletEvent implements Por
       }
 
       /* TestCase: V2DispatcherTests6_SPEC2_19_FwdThenIncludeServletEvent_attributes4a */
-      /* Details: "In a servlet included by the target of a forward, 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"                              */
+      /* Details: "In a servlet included by the target of a forward, the */
+      /* servlet request attribute javax.servlet.include.path_info will be */
+      /* set, and reflects the path values of the included servlet." */
       {
          PortletURL aurl = portletResp.createActionURL();
          aurl.setParameters(portletReq.getPrivateParameterMap());
@@ -335,9 +315,9 @@ public class DispatcherTests6_SPEC2_19_FwdThenIncludeServletEvent implements Por
       }
 
       /* TestCase: V2DispatcherTests6_SPEC2_19_FwdThenIncludeServletEvent_attributes4b */
-      /* Details: "In a servlet included by the target of a forward, the      */
-      /* portlet request attribute javax.servlet.forward.path_info will not   */
-      /* be set"                                                              */
+      /* Details: "In a servlet included by the target of a forward, the */
+      /* portlet request attribute javax.servlet.forward.path_info will not */
+      /* be set" */
       {
          PortletURL aurl = portletResp.createActionURL();
          aurl.setParameters(portletReq.getPrivateParameterMap());
@@ -346,9 +326,9 @@ public class DispatcherTests6_SPEC2_19_FwdThenIncludeServletEvent implements Por
       }
 
       /* TestCase: V2DispatcherTests6_SPEC2_19_FwdThenIncludeServletEvent_attributes4c */
-      /* Details: "In a servlet included by the target of a forward, the      */
-      /* servlet request attribute javax.servlet.forward.path_info will not   */
-      /* be set"                                                              */
+      /* Details: "In a servlet included by the target of a forward, the */
+      /* servlet request attribute javax.servlet.forward.path_info will not */
+      /* be set" */
       {
          PortletURL aurl = portletResp.createActionURL();
          aurl.setParameters(portletReq.getPrivateParameterMap());
@@ -357,11 +337,9 @@ public class DispatcherTests6_SPEC2_19_FwdThenIncludeServletEvent implements Por
       }
 
       /* TestCase: V2DispatcherTests6_SPEC2_19_FwdThenIncludeServletEvent_attributes5 */
-      /* Details: "In a servlet included by the target of a forward, 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"                                                       */
+      /* Details: "In a servlet included by the target of a forward, the */
+      /* portlet request attribute javax.servlet.include.query_string will */
+      /* be set, and reflects the path values of the included servlet." */
       {
          PortletURL aurl = portletResp.createActionURL();
          aurl.setParameters(portletReq.getPrivateParameterMap());
@@ -370,11 +348,9 @@ public class DispatcherTests6_SPEC2_19_FwdThenIncludeServletEvent implements Por
       }
 
       /* TestCase: V2DispatcherTests6_SPEC2_19_FwdThenIncludeServletEvent_attributes5a */
-      /* Details: "In a servlet included by the target of a forward, 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"                                                       */
+      /* Details: "In a servlet included by the target of a forward, the */
+      /* servlet request attribute javax.servlet.include.query_string will */
+      /* be set, and reflects the path values of the included servlet." */
       {
          PortletURL aurl = portletResp.createActionURL();
          aurl.setParameters(portletReq.getPrivateParameterMap());
@@ -383,9 +359,9 @@ public class DispatcherTests6_SPEC2_19_FwdThenIncludeServletEvent implements Por
       }
 
       /* TestCase: V2DispatcherTests6_SPEC2_19_FwdThenIncludeServletEvent_attributes5b */
-      /* Details: "In a servlet included by the target of a forward, the      */
-      /* portlet request attribute javax.servlet.forward.query_string will    */
-      /* not be set"                                                          */
+      /* Details: "In a servlet included by the target of a forward, the */
+      /* portlet request attribute javax.servlet.forward.query_string will */
+      /* not be set" */
       {
          PortletURL aurl = portletResp.createActionURL();
          aurl.setParameters(portletReq.getPrivateParameterMap());
@@ -394,9 +370,9 @@ public class DispatcherTests6_SPEC2_19_FwdThenIncludeServletEvent implements Por
       }
 
       /* TestCase: V2DispatcherTests6_SPEC2_19_FwdThenIncludeServletEvent_attributes5c */
-      /* Details: "In a servlet included by the target of a forward, the      */
-      /* servlet request attribute javax.servlet.forward.query_string will    */
-      /* not be set"                                                          */
+      /* Details: "In a servlet included by the target of a forward, the */
+      /* servlet request attribute javax.servlet.forward.query_string will */
+      /* not be set" */
       {
          PortletURL aurl = portletResp.createActionURL();
          aurl.setParameters(portletReq.getPrivateParameterMap());
@@ -405,9 +381,9 @@ public class DispatcherTests6_SPEC2_19_FwdThenIncludeServletEvent implements Por
       }
 
       /* TestCase: V2DispatcherTests6_SPEC2_19_FwdThenIncludeServletEvent_attributes6 */
-      /* Details: "In a servlet included by the target of a forward, the      */
-      /* request attribute javax.portlet.config must be set to the            */
-      /* javax.portlet.PortletConfig object"                                  */
+      /* Details: "In a servlet included by the target of a forward, the */
+      /* request attribute javax.portlet.config must be set to the */
+      /* javax.portlet.PortletConfig object" */
       {
          PortletURL aurl = portletResp.createActionURL();
          aurl.setParameters(portletReq.getPrivateParameterMap());
@@ -416,10 +392,10 @@ public class DispatcherTests6_SPEC2_19_FwdThenIncludeServletEvent implements Por
       }
 
       /* TestCase: V2DispatcherTests6_SPEC2_19_FwdThenIncludeServletEvent_attributes7 */
-      /* Details: "In a servlet included by the target of a forward, for      */
-      /* includes from the processEvent method, The request attribute         */
-      /* javax.portlet.request must be set to the                             */
-      /* javax.portlet.EventRequest object"                                   */
+      /* Details: "In a servlet included by the target of a forward, for */
+      /* includes from the processEvent method, The request attribute */
+      /* javax.portlet.request must be set to the */
+      /* javax.portlet.EventRequest object" */
       {
          PortletURL aurl = portletResp.createActionURL();
          aurl.setParameters(portletReq.getPrivateParameterMap());
@@ -428,10 +404,10 @@ public class DispatcherTests6_SPEC2_19_FwdThenIncludeServletEvent implements Por
       }
 
       /* TestCase: V2DispatcherTests6_SPEC2_19_FwdThenIncludeServletEvent_attributes8 */
-      /* Details: "In a servlet included by the target of a forward, for      */
-      /* includes from the processEvent method, The request attribute         */
-      /* javax.portlet.response must be set to the                            */
-      /* javax.portlet.EventResponse object"                                  */
+      /* Details: "In a servlet included by the target of a forward, for */
+      /* includes from the processEvent method, The request attribute */
+      /* javax.portlet.response must be set to the */
+      /* javax.portlet.EventResponse object" */
       {
          PortletURL aurl = portletResp.createActionURL();
          aurl.setParameters(portletReq.getPrivateParameterMap());

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/66951fc2/portlet-tck_3.0/V2DispatcherTests6/src/main/java/javax/portlet/tck/portlets/DispatcherTests6_SPEC2_19_FwdThenIncludeServletEvent_event.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests6/src/main/java/javax/portlet/tck/portlets/DispatcherTests6_SPEC2_19_FwdThenIncludeServletEvent_event.java b/portlet-tck_3.0/V2DispatcherTests6/src/main/java/javax/portlet/tck/portlets/DispatcherTests6_SPEC2_19_FwdThenIncludeServletEvent_event.java
index 4a449e4..bc37f14 100644
--- a/portlet-tck_3.0/V2DispatcherTests6/src/main/java/javax/portlet/tck/portlets/DispatcherTests6_SPEC2_19_FwdThenIncludeServletEvent_event.java
+++ b/portlet-tck_3.0/V2DispatcherTests6/src/main/java/javax/portlet/tck/portlets/DispatcherTests6_SPEC2_19_FwdThenIncludeServletEvent_event.java
@@ -18,30 +18,41 @@
 
 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.*;
-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.*;
-import static javax.portlet.PortletSession.*;
+import static javax.portlet.PortletSession.APPLICATION_SCOPE;
+import static javax.portlet.tck.constants.Constants.ATTR_DISPATCH_ACTION;
+import static javax.portlet.tck.constants.Constants.ATTR_DISPATCH_TARGET;
+import static javax.portlet.tck.constants.Constants.EXTRA_PATH;
+import static javax.portlet.tck.constants.Constants.QUERY_STRING;
+import static javax.portlet.tck.constants.Constants.RESULT_ATTR_PREFIX;
+import static javax.portlet.tck.constants.Constants.SERVLET_PREFIX;
+import static javax.portlet.tck.constants.Constants.THREADID_ATTR;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+
+import javax.portlet.ActionRequest;
+import javax.portlet.ActionResponse;
+import javax.portlet.EventPortlet;
+import javax.portlet.EventRequest;
+import javax.portlet.EventResponse;
+import javax.portlet.Portlet;
+import javax.portlet.PortletConfig;
+import javax.portlet.PortletException;
+import javax.portlet.PortletRequestDispatcher;
+import javax.portlet.RenderRequest;
+import javax.portlet.RenderResponse;
+import javax.portlet.ResourceRequest;
+import javax.portlet.ResourceResponse;
+import javax.portlet.ResourceServingPortlet;
 
 /**
- * This is the event processing portlet for the test cases. This portlet processes events, 
- * but does not publish them. Events are published in the main portlet for the test cases. 
+ * This is the event processing portlet for the test cases. This portlet processes events, but does not publish them.
+ * Events are published in the main portlet for the test cases.
  */
-public class DispatcherTests6_SPEC2_19_FwdThenIncludeServletEvent_event implements Portlet, EventPortlet, ResourceServingPortlet {
-   private static final String LOG_CLASS = 
-         DispatcherTests6_SPEC2_19_FwdThenIncludeServletEvent_event.class.getName();
-   private final Logger LOGGER = Logger.getLogger(LOG_CLASS);
-   
+public class DispatcherTests6_SPEC2_19_FwdThenIncludeServletEvent_event implements Portlet, EventPortlet,
+      ResourceServingPortlet {
+
    private PortletConfig portletConfig = null;
 
    @Override
@@ -54,57 +65,48 @@ public class DispatcherTests6_SPEC2_19_FwdThenIncludeServletEvent_event implemen
    }
 
    @Override
-   public void processAction(ActionRequest portletReq, ActionResponse portletResp)
-         throws PortletException, IOException {
-      LOGGER.entering(LOG_CLASS, "event companion processAction - ERROR!!");
+   public void processAction(ActionRequest portletReq, ActionResponse portletResp) throws PortletException, IOException {
    }
 
    @Override
-   public void serveResource(ResourceRequest portletReq, ResourceResponse portletResp)
-         throws PortletException, IOException {
-      LOGGER.entering(LOG_CLASS, "event companion serveResource - ERROR!!");
+   public void serveResource(ResourceRequest portletReq, ResourceResponse portletResp) throws PortletException,
+         IOException {
    }
 
    @Override
-   public void processEvent(EventRequest portletReq, EventResponse portletResp)
-         throws PortletException, IOException {
-      LOGGER.entering(LOG_CLASS, "event companion processEvent");
-
+   public void processEvent(EventRequest portletReq, EventResponse portletResp) throws PortletException, IOException {
 
       portletResp.setRenderParameters(portletReq);
 
       long tid = Thread.currentThread().getId();
       portletReq.setAttribute(THREADID_ATTR, tid);
 
-      StringWriter writer = new StringWriter();
+      new StringWriter();
 
       // Multilevel forward / include
       portletReq.setAttribute(ATTR_DISPATCH_ACTION, "include");
-      String targ = SERVLET_PREFIX + "DispatcherTests6_SPEC2_19_FwdThenIncludeServletEvent_servlet" + SERVLET_SUFFIX + "?" + QUERY_STRING;
+      String targ = SERVLET_PREFIX + "DispatcherTests6_SPEC2_19_FwdThenIncludeServletEvent_servlet" + EXTRA_PATH + "?"
+            + QUERY_STRING;
       portletReq.setAttribute(ATTR_DISPATCH_TARGET, targ);
 
       // Now do the actual dispatch
       String target = "/IncluderForwarderServlet" + "?" + QUERY_STRING;
-      PortletRequestDispatcher rd = portletConfig.getPortletContext()
-            .getRequestDispatcher(target);
+      PortletRequestDispatcher rd = portletConfig.getPortletContext().getRequestDispatcher(target);
       rd.forward(portletReq, portletResp);
 
    }
 
    @Override
-   public void render(RenderRequest portletReq, RenderResponse portletResp)
-         throws PortletException, IOException {
-      
-      LOGGER.entering(LOG_CLASS, "event companion render");
+   public void render(RenderRequest portletReq, RenderResponse portletResp) throws PortletException, IOException {
 
       portletResp.setContentType("text/html");
       PrintWriter writer = portletResp.getWriter();
       writer.write("<h3>Event Companion Portlet </h3>\n");
       writer.write("<p>DispatcherTests6_SPEC2_19_FwdThenIncludeServletEvent_event</p>\n");
 
-      String msg = (String) portletReq.getPortletSession()
-            .getAttribute(RESULT_ATTR_PREFIX + "DispatcherTests6_SPEC2_19_FwdThenIncludeServletEvent", APPLICATION_SCOPE);
-      msg = (msg==null) ? "Not ready. click test case link." : msg;
+      String msg = (String) portletReq.getPortletSession().getAttribute(
+            RESULT_ATTR_PREFIX + "DispatcherTests6_SPEC2_19_FwdThenIncludeServletEvent", APPLICATION_SCOPE);
+      msg = (msg == null) ? "Not ready. click test case link." : msg;
       writer.write("<p>" + msg + "</p>\n");
 
    }

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/66951fc2/portlet-tck_3.0/V2DispatcherTests6/src/main/java/javax/portlet/tck/portlets/DispatcherTests6_SPEC2_19_FwdThenIncludeServletRender.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests6/src/main/java/javax/portlet/tck/portlets/DispatcherTests6_SPEC2_19_FwdThenIncludeServletRender.java b/portlet-tck_3.0/V2DispatcherTests6/src/main/java/javax/portlet/tck/portlets/DispatcherTests6_SPEC2_19_FwdThenIncludeServletRender.java
index a7f7a11..6fe136c 100644
--- a/portlet-tck_3.0/V2DispatcherTests6/src/main/java/javax/portlet/tck/portlets/DispatcherTests6_SPEC2_19_FwdThenIncludeServletRender.java
+++ b/portlet-tck_3.0/V2DispatcherTests6/src/main/java/javax/portlet/tck/portlets/DispatcherTests6_SPEC2_19_FwdThenIncludeServletRender.java
@@ -18,38 +18,40 @@
 
 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.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
-import javax.portlet.tck.beans.*;
-import javax.portlet.tck.constants.*;
-import static javax.portlet.tck.beans.JSR286DispatcherTestCaseDetails.*;
-import static javax.portlet.tck.constants.Constants.*;
-import static javax.portlet.PortletSession.*;
-import static javax.portlet.ResourceURL.*;
+import static javax.portlet.tck.constants.Constants.ATTR_DISPATCH_ACTION;
+import static javax.portlet.tck.constants.Constants.ATTR_DISPATCH_TARGET;
+import static javax.portlet.tck.constants.Constants.EXTRA_PATH;
+import static javax.portlet.tck.constants.Constants.QUERY_STRING;
+import static javax.portlet.tck.constants.Constants.SERVLET_PREFIX;
+import static javax.portlet.tck.constants.Constants.THREADID_ATTR;
+
+import java.io.IOException;
+import java.io.StringWriter;
+
+import javax.portlet.ActionRequest;
+import javax.portlet.ActionResponse;
+import javax.portlet.Portlet;
+import javax.portlet.PortletConfig;
+import javax.portlet.PortletException;
+import javax.portlet.PortletRequestDispatcher;
+import javax.portlet.RenderRequest;
+import javax.portlet.RenderResponse;
+import javax.portlet.ResourceRequest;
+import javax.portlet.ResourceResponse;
+import javax.portlet.ResourceServingPortlet;
 
 /**
- * This portlet implements several test cases for the JSR 362 TCK. The test case names
- * are defined in the /src/main/resources/xml-resources/additionalTCs.xml
- * file. The build process will integrate the test case names defined in the 
- * additionalTCs.xml file into the complete list of test case names for execution by the driver.
- *
- * This is the main portlet for the test cases. If the test cases call for events, this portlet
- * will initiate the events, but not process them. The processing is done in the companion 
- * portlet DispatcherTests6_SPEC2_19_FwdThenIncludeServletRender_event
- *
+ * This portlet implements several test cases for the JSR 362 TCK. The test case names are defined in the
+ * /src/main/resources/xml-resources/additionalTCs.xml file. The build process will integrate the test case names
+ * defined in the additionalTCs.xml file into the complete list of test case names for execution by the driver.
+ * 
+ * This is the main portlet for the test cases. If the test cases call for events, this portlet will initiate the
+ * events, but not process them. The processing is done in the companion portlet
+ * DispatcherTests6_SPEC2_19_FwdThenIncludeServletRender_event
+ * 
  */
 public class DispatcherTests6_SPEC2_19_FwdThenIncludeServletRender implements Portlet, ResourceServingPortlet {
-   private static final String LOG_CLASS = 
-         DispatcherTests6_SPEC2_19_FwdThenIncludeServletRender.class.getName();
-   private final Logger LOGGER = Logger.getLogger(LOG_CLASS);
-   
+
    private PortletConfig portletConfig = null;
 
    @Override
@@ -62,49 +64,44 @@ public class DispatcherTests6_SPEC2_19_FwdThenIncludeServletRender implements Po
    }
 
    @Override
-   public void processAction(ActionRequest portletReq, ActionResponse portletResp)
-         throws PortletException, IOException {
-      LOGGER.entering(LOG_CLASS, "main portlet processAction entry");
+   public void processAction(ActionRequest portletReq, ActionResponse portletResp) throws PortletException, IOException {
 
       portletResp.setRenderParameters(portletReq.getParameterMap());
       long tid = Thread.currentThread().getId();
       portletReq.setAttribute(THREADID_ATTR, tid);
 
-      StringWriter writer = new StringWriter();
+      new StringWriter();
 
    }
 
    @Override
-   public void serveResource(ResourceRequest portletReq, ResourceResponse portletResp)
-         throws PortletException, IOException {
-      LOGGER.entering(LOG_CLASS, "main portlet serveResource entry");
+   public void serveResource(ResourceRequest portletReq, ResourceResponse portletResp) throws PortletException,
+         IOException {
 
       long tid = Thread.currentThread().getId();
       portletReq.setAttribute(THREADID_ATTR, tid);
 
-      PrintWriter writer = portletResp.getWriter();
+      portletResp.getWriter();
 
    }
 
    @Override
-   public void render(RenderRequest portletReq, RenderResponse portletResp)
-         throws PortletException, IOException {
-      LOGGER.entering(LOG_CLASS, "main portlet render entry");
+   public void render(RenderRequest portletReq, RenderResponse portletResp) throws PortletException, IOException {
 
       long tid = Thread.currentThread().getId();
       portletReq.setAttribute(THREADID_ATTR, tid);
 
-      PrintWriter writer = portletResp.getWriter();
+      portletResp.getWriter();
 
       // Multilevel forward / include
       portletReq.setAttribute(ATTR_DISPATCH_ACTION, "include");
-      String targ = SERVLET_PREFIX + "DispatcherTests6_SPEC2_19_FwdThenIncludeServletRender_servlet" + SERVLET_SUFFIX + "?" + QUERY_STRING;
+      String targ = SERVLET_PREFIX + "DispatcherTests6_SPEC2_19_FwdThenIncludeServletRender_servlet" + EXTRA_PATH + "?"
+            + QUERY_STRING;
       portletReq.setAttribute(ATTR_DISPATCH_TARGET, targ);
 
       // Now do the actual dispatch
       String target = "/IncluderForwarderServlet" + "?" + QUERY_STRING;
-      PortletRequestDispatcher rd = portletConfig.getPortletContext()
-            .getRequestDispatcher(target);
+      PortletRequestDispatcher rd = portletConfig.getPortletContext().getRequestDispatcher(target);
       rd.forward(portletReq, portletResp);
    }
 


Mime
View raw message