portals-pluto-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From msnickl...@apache.org
Subject [24/37] portals-pluto git commit: Cleaned up code by removing unused variables and extraneous log statements.
Date Tue, 14 Jun 2016 15:54:22 GMT
Cleaned up code by removing unused variables and extraneous log statements.


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

Branch: refs/heads/master
Commit: a17e0f6526fea2ddb4b303cd032145084cd08811
Parents: c72c96c
Author: Scott Nicklous <msnicklous@apache.org>
Authored: Tue Jun 14 11:35:41 2016 +0200
Committer: Scott Nicklous <msnicklous@apache.org>
Committed: Tue Jun 14 11:35:41 2016 +0200

----------------------------------------------------------------------
 ...patcherTests4_SPEC2_19_ForwardJSPAction.java |   99 +-
 ...spatcherTests4_SPEC2_19_ForwardJSPEvent.java |   84 +-
 ...erTests4_SPEC2_19_ForwardJSPEvent_event.java |   86 +-
 ...patcherTests4_SPEC2_19_ForwardJSPRender.java |   84 +-
 ...tcherTests4_SPEC2_19_ForwardJSPResource.java |   85 +-
 ...herTests4_SPEC2_19_ForwardServletAction.java |  102 +-
 ...cherTests4_SPEC2_19_ForwardServletEvent.java |   84 +-
 ...sts4_SPEC2_19_ForwardServletEvent_event.java |   92 +-
 ...herTests4_SPEC2_19_ForwardServletRender.java |   87 +-
 ...rTests4_SPEC2_19_ForwardServletResource.java |   88 +-
 ...patcherTests4_SPEC2_19_IncludeJSPAction.java |  108 +-
 ...spatcherTests4_SPEC2_19_IncludeJSPEvent.java |   90 +-
 ...erTests4_SPEC2_19_IncludeJSPEvent_event.java |   89 +-
 ...patcherTests4_SPEC2_19_IncludeJSPRender.java |   87 +-
 ...tcherTests4_SPEC2_19_IncludeJSPResource.java |   88 +-
 ...herTests4_SPEC2_19_IncludeServletAction.java |  111 +-
 ...cherTests4_SPEC2_19_IncludeServletEvent.java |   90 +-
 ...sts4_SPEC2_19_IncludeServletEvent_event.java |   95 +-
 ...herTests4_SPEC2_19_IncludeServletRender.java |   90 +-
 ...rTests4_SPEC2_19_IncludeServletResource.java |   91 +-
 ...4_SPEC2_19_ForwardServletAction_servlet.java |   76 +-
 ...s4_SPEC2_19_ForwardServletEvent_servlet.java |   78 +-
 ...4_SPEC2_19_ForwardServletRender_servlet.java |   75 +-
 ...SPEC2_19_ForwardServletResource_servlet.java |   73 +-
 ...4_SPEC2_19_IncludeServletAction_servlet.java |   88 +-
 ...s4_SPEC2_19_IncludeServletEvent_servlet.java |   90 +-
 ...4_SPEC2_19_IncludeServletRender_servlet.java |   87 +-
 ...SPEC2_19_IncludeServletResource_servlet.java |   83 +-
 .../tck/beans/ActionRequestWrapperChecker.java  |   87 +-
 .../tck/beans/ActionResponseWrapperChecker.java |   56 +-
 .../javax/portlet/tck/beans/ClassChecker.java   |  196 +-
 .../javax/portlet/tck/beans/CompareUtils.java   |  160 +-
 .../tck/beans/EventRequestWrapperChecker.java   |   80 +-
 .../tck/beans/EventResponseWrapperChecker.java  |   55 +-
 .../tck/beans/JSR286ApiTestCaseDetails.java     | 7535 +++++++++++-------
 .../JSR286DispatcherReqRespTestCaseDetails.java | 5852 +++++++++-----
 .../beans/JSR286DispatcherTestCaseDetails.java  | 6028 +++++++++-----
 .../beans/JSR286SignatureTestCaseDetails.java   | 7367 ++++++++++-------
 .../tck/beans/JSR286SpecTestCaseDetails.java    | 3711 +++++----
 .../tck/beans/PortletRequestWrapperChecker.java |   79 +-
 .../beans/PortletResponseWrapperChecker.java    |   39 +-
 .../tck/beans/RenderRequestWrapperChecker.java  |   80 +-
 .../tck/beans/RenderResponseWrapperChecker.java |   76 +-
 .../javax/portlet/tck/beans/ResourceLink.java   |   79 +-
 .../beans/ResourceRequestWrapperChecker.java    |   94 +-
 .../beans/ResourceResponseWrapperChecker.java   |   78 +-
 .../javax/portlet/tck/beans/TckParameters.java  |   22 +-
 .../javax/portlet/tck/beans/TestButton.java     |   57 +-
 .../portlet/tck/beans/TestCaseDetails.java      |  285 +-
 .../java/javax/portlet/tck/beans/TestLink.java  |   53 +-
 .../javax/portlet/tck/beans/TestMessage.java    |  204 +-
 .../tck/beans/TestModule3Definitions.java       |   28 +-
 .../javax/portlet/tck/beans/TestResult.java     |   81 +-
 .../javax/portlet/tck/beans/TestSetupLink.java  |   11 +-
 .../javax/portlet/tck/beans/WrapperChecker.java |   65 +-
 55 files changed, 21424 insertions(+), 13514 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/a17e0f65/portlet-tck_3.0/V2DispatcherTests4/src/main/java/javax/portlet/tck/portlets/DispatcherTests4_SPEC2_19_ForwardJSPAction.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests4/src/main/java/javax/portlet/tck/portlets/DispatcherTests4_SPEC2_19_ForwardJSPAction.java b/portlet-tck_3.0/V2DispatcherTests4/src/main/java/javax/portlet/tck/portlets/DispatcherTests4_SPEC2_19_ForwardJSPAction.java
index 5c46da2..e0fb05d 100644
--- a/portlet-tck_3.0/V2DispatcherTests4/src/main/java/javax/portlet/tck/portlets/DispatcherTests4_SPEC2_19_ForwardJSPAction.java
+++ b/portlet-tck_3.0/V2DispatcherTests4/src/main/java/javax/portlet/tck/portlets/DispatcherTests4_SPEC2_19_ForwardJSPAction.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.JSP_PREFIX;
+import static javax.portlet.tck.constants.Constants.JSP_SUFFIX;
+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.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.filter.ActionRequestWrapper;
+import javax.portlet.filter.ActionResponseWrapper;
+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 DispatcherTests4_SPEC2_19_ForwardJSPAction_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
+ * DispatcherTests4_SPEC2_19_ForwardJSPAction_event
+ * 
  */
 public class DispatcherTests4_SPEC2_19_ForwardJSPAction implements Portlet, ResourceServingPortlet {
-   private static final String LOG_CLASS = 
-         DispatcherTests4_SPEC2_19_ForwardJSPAction.class.getName();
-   private final Logger LOGGER = Logger.getLogger(LOG_CLASS);
-   
+
    private PortletConfig portletConfig = null;
 
    @Override
@@ -62,43 +70,37 @@ public class DispatcherTests4_SPEC2_19_ForwardJSPAction implements Portlet, Reso
    }
 
    @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();
 
       // Prereq for: V2DispatcherTests4_SPEC2_19_ForwardJSPAction_invoke3
-      portletReq = new ActionRequestWrapper((ActionRequest)portletReq);
-      portletResp = new ActionResponseWrapper((ActionResponse)portletResp);
+      portletReq = new ActionRequestWrapper(portletReq);
+      portletResp = new ActionResponseWrapper(portletResp);
 
       // Now do the actual dispatch
       String target = JSP_PREFIX + "DispatcherTests4_SPEC2_19_ForwardJSPAction" + JSP_SUFFIX + "?" + 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);
@@ -106,16 +108,17 @@ public class DispatcherTests4_SPEC2_19_ForwardJSPAction implements Portlet, Reso
       PrintWriter writer = portletResp.getWriter();
 
       PortletSession ps = portletReq.getPortletSession();
-      String msg = (String) ps.getAttribute(RESULT_ATTR_PREFIX + "DispatcherTests4_SPEC2_19_ForwardJSPAction", APPLICATION_SCOPE);
+      String msg = (String) ps.getAttribute(RESULT_ATTR_PREFIX + "DispatcherTests4_SPEC2_19_ForwardJSPAction",
+            APPLICATION_SCOPE);
       if (msg != null) {
          writer.write("<p>" + msg + "</p><br/>\n");
          ps.removeAttribute(RESULT_ATTR_PREFIX + "DispatcherTests4_SPEC2_19_ForwardJSPAction", APPLICATION_SCOPE);
       }
 
-      /* TestCase: V2DispatcherTests4_SPEC2_19_ForwardJSPAction_invoke3       */
-      /* Details: "Parameters to the forward method for a target servlet      */
-      /* can be wrapped request and response classes from the portlet         */
-      /* lifecyle method initiating the include"                              */
+      /* TestCase: V2DispatcherTests4_SPEC2_19_ForwardJSPAction_invoke3 */
+      /* Details: "Parameters to the forward method for a target servlet */
+      /* can be wrapped request and response classes from the portlet */
+      /* lifecyle method initiating the include" */
       {
          PortletURL aurl = portletResp.createActionURL();
          aurl.setParameters(portletReq.getPrivateParameterMap());

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/a17e0f65/portlet-tck_3.0/V2DispatcherTests4/src/main/java/javax/portlet/tck/portlets/DispatcherTests4_SPEC2_19_ForwardJSPEvent.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests4/src/main/java/javax/portlet/tck/portlets/DispatcherTests4_SPEC2_19_ForwardJSPEvent.java b/portlet-tck_3.0/V2DispatcherTests4/src/main/java/javax/portlet/tck/portlets/DispatcherTests4_SPEC2_19_ForwardJSPEvent.java
index 09e54a9..83685ba 100644
--- a/portlet-tck_3.0/V2DispatcherTests4/src/main/java/javax/portlet/tck/portlets/DispatcherTests4_SPEC2_19_ForwardJSPEvent.java
+++ b/portlet-tck_3.0/V2DispatcherTests4/src/main/java/javax/portlet/tck/portlets/DispatcherTests4_SPEC2_19_ForwardJSPEvent.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 DispatcherTests4_SPEC2_19_ForwardJSPEvent_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
+ * DispatcherTests4_SPEC2_19_ForwardJSPEvent_event
+ * 
  */
 public class DispatcherTests4_SPEC2_19_ForwardJSPEvent implements Portlet, ResourceServingPortlet {
-   private static final String LOG_CLASS = 
-         DispatcherTests4_SPEC2_19_ForwardJSPEvent.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,47 +60,41 @@ public class DispatcherTests4_SPEC2_19_ForwardJSPEvent implements Portlet, Resou
    }
 
    @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,
-             "DispatcherTests4_SPEC2_19_ForwardJSPEvent");
+      QName eventQName = new QName(TCKNAMESPACE, "DispatcherTests4_SPEC2_19_ForwardJSPEvent");
       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);
 
       PrintWriter writer = portletResp.getWriter();
 
-      /* TestCase: V2DispatcherTests4_SPEC2_19_ForwardJSPEvent_invoke3        */
-      /* Details: "Parameters to the forward method for a target servlet      */
-      /* can be wrapped request and response classes from the portlet         */
-      /* lifecyle method initiating the include"                              */
+      /* TestCase: V2DispatcherTests4_SPEC2_19_ForwardJSPEvent_invoke3 */
+      /* Details: "Parameters to the forward method for a target servlet */
+      /* can be wrapped request and response classes from the portlet */
+      /* lifecyle method initiating the include" */
       {
          PortletURL aurl = portletResp.createActionURL();
          aurl.setParameters(portletReq.getPrivateParameterMap());

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/a17e0f65/portlet-tck_3.0/V2DispatcherTests4/src/main/java/javax/portlet/tck/portlets/DispatcherTests4_SPEC2_19_ForwardJSPEvent_event.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests4/src/main/java/javax/portlet/tck/portlets/DispatcherTests4_SPEC2_19_ForwardJSPEvent_event.java b/portlet-tck_3.0/V2DispatcherTests4/src/main/java/javax/portlet/tck/portlets/DispatcherTests4_SPEC2_19_ForwardJSPEvent_event.java
index 59f0205..a9012f5 100644
--- a/portlet-tck_3.0/V2DispatcherTests4/src/main/java/javax/portlet/tck/portlets/DispatcherTests4_SPEC2_19_ForwardJSPEvent_event.java
+++ b/portlet-tck_3.0/V2DispatcherTests4/src/main/java/javax/portlet/tck/portlets/DispatcherTests4_SPEC2_19_ForwardJSPEvent_event.java
@@ -18,30 +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.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.JSP_PREFIX;
+import static javax.portlet.tck.constants.Constants.JSP_SUFFIX;
+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.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;
+import javax.portlet.filter.EventRequestWrapper;
+import javax.portlet.filter.EventResponseWrapper;
 
 /**
- * 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 DispatcherTests4_SPEC2_19_ForwardJSPEvent_event implements Portlet, EventPortlet, ResourceServingPortlet {
-   private static final String LOG_CLASS = 
-         DispatcherTests4_SPEC2_19_ForwardJSPEvent_event.class.getName();
-   private final Logger LOGGER = Logger.getLogger(LOG_CLASS);
-   
+
    private PortletConfig portletConfig = null;
 
    @Override
@@ -54,56 +64,48 @@ public class DispatcherTests4_SPEC2_19_ForwardJSPEvent_event implements Portlet,
    }
 
    @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();
 
       // Prereq for: V2DispatcherTests4_SPEC2_19_ForwardJSPEvent_invoke3
-      portletReq = new EventRequestWrapper((EventRequest)portletReq);
-      portletResp = new EventResponseWrapper((EventResponse)portletResp);
+      portletReq = new EventRequestWrapper(portletReq);
+      portletResp = new EventResponseWrapper(portletResp);
 
       // Now do the actual dispatch
       String target = JSP_PREFIX + "DispatcherTests4_SPEC2_19_ForwardJSPEvent" + JSP_SUFFIX + "?" + 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>DispatcherTests4_SPEC2_19_ForwardJSPEvent_event</p>\n");
 
-      String msg = (String) portletReq.getPortletSession()
-            .getAttribute(RESULT_ATTR_PREFIX + "DispatcherTests4_SPEC2_19_ForwardJSPEvent", APPLICATION_SCOPE);
-      msg = (msg==null) ? "Not ready. click test case link." : msg;
+      String msg = (String) portletReq.getPortletSession().getAttribute(
+            RESULT_ATTR_PREFIX + "DispatcherTests4_SPEC2_19_ForwardJSPEvent", 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/a17e0f65/portlet-tck_3.0/V2DispatcherTests4/src/main/java/javax/portlet/tck/portlets/DispatcherTests4_SPEC2_19_ForwardJSPRender.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests4/src/main/java/javax/portlet/tck/portlets/DispatcherTests4_SPEC2_19_ForwardJSPRender.java b/portlet-tck_3.0/V2DispatcherTests4/src/main/java/javax/portlet/tck/portlets/DispatcherTests4_SPEC2_19_ForwardJSPRender.java
index 52365b2..4cadb98 100644
--- a/portlet-tck_3.0/V2DispatcherTests4/src/main/java/javax/portlet/tck/portlets/DispatcherTests4_SPEC2_19_ForwardJSPRender.java
+++ b/portlet-tck_3.0/V2DispatcherTests4/src/main/java/javax/portlet/tck/portlets/DispatcherTests4_SPEC2_19_ForwardJSPRender.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.JSP_PREFIX;
+import static javax.portlet.tck.constants.Constants.JSP_SUFFIX;
+import static javax.portlet.tck.constants.Constants.QUERY_STRING;
+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;
+import javax.portlet.filter.RenderRequestWrapper;
+import javax.portlet.filter.RenderResponseWrapper;
 
 /**
- * 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 DispatcherTests4_SPEC2_19_ForwardJSPRender_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
+ * DispatcherTests4_SPEC2_19_ForwardJSPRender_event
+ * 
  */
 public class DispatcherTests4_SPEC2_19_ForwardJSPRender implements Portlet, ResourceServingPortlet {
-   private static final String LOG_CLASS = 
-         DispatcherTests4_SPEC2_19_ForwardJSPRender.class.getName();
-   private final Logger LOGGER = Logger.getLogger(LOG_CLASS);
-   
+
    private PortletConfig portletConfig = null;
 
    @Override
@@ -62,48 +64,42 @@ public class DispatcherTests4_SPEC2_19_ForwardJSPRender implements Portlet, Reso
    }
 
    @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();
 
       // Prereq for: V2DispatcherTests4_SPEC2_19_ForwardJSPRender_invoke3
-      portletReq = new RenderRequestWrapper((RenderRequest)portletReq);
-      portletResp = new RenderResponseWrapper((RenderResponse)portletResp);
+      portletReq = new RenderRequestWrapper(portletReq);
+      portletResp = new RenderResponseWrapper(portletResp);
 
       // Now do the actual dispatch
       String target = JSP_PREFIX + "DispatcherTests4_SPEC2_19_ForwardJSPRender" + JSP_SUFFIX + "?" + QUERY_STRING;
-      PortletRequestDispatcher rd = portletConfig.getPortletContext()
-            .getRequestDispatcher(target);
+      PortletRequestDispatcher rd = portletConfig.getPortletContext().getRequestDispatcher(target);
       rd.forward(portletReq, portletResp);
    }
 

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/a17e0f65/portlet-tck_3.0/V2DispatcherTests4/src/main/java/javax/portlet/tck/portlets/DispatcherTests4_SPEC2_19_ForwardJSPResource.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests4/src/main/java/javax/portlet/tck/portlets/DispatcherTests4_SPEC2_19_ForwardJSPResource.java b/portlet-tck_3.0/V2DispatcherTests4/src/main/java/javax/portlet/tck/portlets/DispatcherTests4_SPEC2_19_ForwardJSPResource.java
index dae0d0d..c012926 100644
--- a/portlet-tck_3.0/V2DispatcherTests4/src/main/java/javax/portlet/tck/portlets/DispatcherTests4_SPEC2_19_ForwardJSPResource.java
+++ b/portlet-tck_3.0/V2DispatcherTests4/src/main/java/javax/portlet/tck/portlets/DispatcherTests4_SPEC2_19_ForwardJSPResource.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.JSP_PREFIX;
+import static javax.portlet.tck.constants.Constants.JSP_SUFFIX;
+import static javax.portlet.tck.constants.Constants.QUERY_STRING;
+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;
+import javax.portlet.filter.ResourceRequestWrapper;
+import javax.portlet.filter.ResourceResponseWrapper;
 
 /**
- * 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 DispatcherTests4_SPEC2_19_ForwardJSPResource_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
+ * DispatcherTests4_SPEC2_19_ForwardJSPResource_event
+ * 
  */
 public class DispatcherTests4_SPEC2_19_ForwardJSPResource implements Portlet, ResourceServingPortlet {
-   private static final String LOG_CLASS = 
-         DispatcherTests4_SPEC2_19_ForwardJSPResource.class.getName();
-   private final Logger LOGGER = Logger.getLogger(LOG_CLASS);
-   
+
    private PortletConfig portletConfig = null;
 
    @Override
@@ -62,43 +67,37 @@ public class DispatcherTests4_SPEC2_19_ForwardJSPResource implements Portlet, Re
    }
 
    @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();
 
       // Prereq for: V2DispatcherTests4_SPEC2_19_ForwardJSPResource_invoke3
-      portletReq = new ResourceRequestWrapper((ResourceRequest)portletReq);
-      portletResp = new ResourceResponseWrapper((ResourceResponse)portletResp);
+      portletReq = new ResourceRequestWrapper(portletReq);
+      portletResp = new ResourceResponseWrapper(portletResp);
 
       // Now do the actual dispatch
       String target = JSP_PREFIX + "DispatcherTests4_SPEC2_19_ForwardJSPResource" + JSP_SUFFIX + "?" + 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/a17e0f65/portlet-tck_3.0/V2DispatcherTests4/src/main/java/javax/portlet/tck/portlets/DispatcherTests4_SPEC2_19_ForwardServletAction.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests4/src/main/java/javax/portlet/tck/portlets/DispatcherTests4_SPEC2_19_ForwardServletAction.java b/portlet-tck_3.0/V2DispatcherTests4/src/main/java/javax/portlet/tck/portlets/DispatcherTests4_SPEC2_19_ForwardServletAction.java
index 6f6d4c6..e18377c 100644
--- a/portlet-tck_3.0/V2DispatcherTests4/src/main/java/javax/portlet/tck/portlets/DispatcherTests4_SPEC2_19_ForwardServletAction.java
+++ b/portlet-tck_3.0/V2DispatcherTests4/src/main/java/javax/portlet/tck/portlets/DispatcherTests4_SPEC2_19_ForwardServletAction.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.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.SERVLET_SUFFIX;
+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.filter.ActionRequestWrapper;
+import javax.portlet.filter.ActionResponseWrapper;
+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 DispatcherTests4_SPEC2_19_ForwardServletAction_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
+ * DispatcherTests4_SPEC2_19_ForwardServletAction_event
+ * 
  */
 public class DispatcherTests4_SPEC2_19_ForwardServletAction implements Portlet, ResourceServingPortlet {
-   private static final String LOG_CLASS = 
-         DispatcherTests4_SPEC2_19_ForwardServletAction.class.getName();
-   private final Logger LOGGER = Logger.getLogger(LOG_CLASS);
-   
+
    private PortletConfig portletConfig = null;
 
    @Override
@@ -62,43 +70,38 @@ public class DispatcherTests4_SPEC2_19_ForwardServletAction implements Portlet,
    }
 
    @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();
 
       // Prereq for: V2DispatcherTests4_SPEC2_19_ForwardServletAction_invoke3
-      portletReq = new ActionRequestWrapper((ActionRequest)portletReq);
-      portletResp = new ActionResponseWrapper((ActionResponse)portletResp);
+      portletReq = new ActionRequestWrapper(portletReq);
+      portletResp = new ActionResponseWrapper(portletResp);
 
       // Now do the actual dispatch
-      String target = SERVLET_PREFIX + "DispatcherTests4_SPEC2_19_ForwardServletAction_servlet" + SERVLET_SUFFIX + "?" + QUERY_STRING;
-      PortletRequestDispatcher rd = portletConfig.getPortletContext()
-            .getRequestDispatcher(target);
+      String target = SERVLET_PREFIX + "DispatcherTests4_SPEC2_19_ForwardServletAction_servlet" + SERVLET_SUFFIX + "?"
+            + QUERY_STRING;
+      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);
@@ -106,16 +109,17 @@ public class DispatcherTests4_SPEC2_19_ForwardServletAction implements Portlet,
       PrintWriter writer = portletResp.getWriter();
 
       PortletSession ps = portletReq.getPortletSession();
-      String msg = (String) ps.getAttribute(RESULT_ATTR_PREFIX + "DispatcherTests4_SPEC2_19_ForwardServletAction", APPLICATION_SCOPE);
+      String msg = (String) ps.getAttribute(RESULT_ATTR_PREFIX + "DispatcherTests4_SPEC2_19_ForwardServletAction",
+            APPLICATION_SCOPE);
       if (msg != null) {
          writer.write("<p>" + msg + "</p><br/>\n");
          ps.removeAttribute(RESULT_ATTR_PREFIX + "DispatcherTests4_SPEC2_19_ForwardServletAction", APPLICATION_SCOPE);
       }
 
-      /* TestCase: V2DispatcherTests4_SPEC2_19_ForwardServletAction_invoke3   */
-      /* Details: "Parameters to the forward method for a target servlet      */
-      /* can be wrapped request and response classes from the portlet         */
-      /* lifecyle method initiating the include"                              */
+      /* TestCase: V2DispatcherTests4_SPEC2_19_ForwardServletAction_invoke3 */
+      /* Details: "Parameters to the forward method for a target servlet */
+      /* can be wrapped request and response classes from the portlet */
+      /* lifecyle method initiating the include" */
       {
          PortletURL aurl = portletResp.createActionURL();
          aurl.setParameters(portletReq.getPrivateParameterMap());

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/a17e0f65/portlet-tck_3.0/V2DispatcherTests4/src/main/java/javax/portlet/tck/portlets/DispatcherTests4_SPEC2_19_ForwardServletEvent.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests4/src/main/java/javax/portlet/tck/portlets/DispatcherTests4_SPEC2_19_ForwardServletEvent.java b/portlet-tck_3.0/V2DispatcherTests4/src/main/java/javax/portlet/tck/portlets/DispatcherTests4_SPEC2_19_ForwardServletEvent.java
index 6fe4bcc..d4e78c4 100644
--- a/portlet-tck_3.0/V2DispatcherTests4/src/main/java/javax/portlet/tck/portlets/DispatcherTests4_SPEC2_19_ForwardServletEvent.java
+++ b/portlet-tck_3.0/V2DispatcherTests4/src/main/java/javax/portlet/tck/portlets/DispatcherTests4_SPEC2_19_ForwardServletEvent.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 DispatcherTests4_SPEC2_19_ForwardServletEvent_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
+ * DispatcherTests4_SPEC2_19_ForwardServletEvent_event
+ * 
  */
 public class DispatcherTests4_SPEC2_19_ForwardServletEvent implements Portlet, ResourceServingPortlet {
-   private static final String LOG_CLASS = 
-         DispatcherTests4_SPEC2_19_ForwardServletEvent.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,47 +60,41 @@ public class DispatcherTests4_SPEC2_19_ForwardServletEvent implements Portlet, R
    }
 
    @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,
-             "DispatcherTests4_SPEC2_19_ForwardServletEvent");
+      QName eventQName = new QName(TCKNAMESPACE, "DispatcherTests4_SPEC2_19_ForwardServletEvent");
       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);
 
       PrintWriter writer = portletResp.getWriter();
 
-      /* TestCase: V2DispatcherTests4_SPEC2_19_ForwardServletEvent_invoke3    */
-      /* Details: "Parameters to the forward method for a target servlet      */
-      /* can be wrapped request and response classes from the portlet         */
-      /* lifecyle method initiating the include"                              */
+      /* TestCase: V2DispatcherTests4_SPEC2_19_ForwardServletEvent_invoke3 */
+      /* Details: "Parameters to the forward method for a target servlet */
+      /* can be wrapped request and response classes from the portlet */
+      /* lifecyle method initiating the include" */
       {
          PortletURL aurl = portletResp.createActionURL();
          aurl.setParameters(portletReq.getPrivateParameterMap());

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/a17e0f65/portlet-tck_3.0/V2DispatcherTests4/src/main/java/javax/portlet/tck/portlets/DispatcherTests4_SPEC2_19_ForwardServletEvent_event.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests4/src/main/java/javax/portlet/tck/portlets/DispatcherTests4_SPEC2_19_ForwardServletEvent_event.java b/portlet-tck_3.0/V2DispatcherTests4/src/main/java/javax/portlet/tck/portlets/DispatcherTests4_SPEC2_19_ForwardServletEvent_event.java
index 25aa350..b8390dd 100644
--- a/portlet-tck_3.0/V2DispatcherTests4/src/main/java/javax/portlet/tck/portlets/DispatcherTests4_SPEC2_19_ForwardServletEvent_event.java
+++ b/portlet-tck_3.0/V2DispatcherTests4/src/main/java/javax/portlet/tck/portlets/DispatcherTests4_SPEC2_19_ForwardServletEvent_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.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.SERVLET_SUFFIX;
+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;
+import javax.portlet.filter.EventRequestWrapper;
+import javax.portlet.filter.EventResponseWrapper;
 
 /**
- * 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 DispatcherTests4_SPEC2_19_ForwardServletEvent_event implements Portlet, EventPortlet, ResourceServingPortlet {
-   private static final String LOG_CLASS = 
-         DispatcherTests4_SPEC2_19_ForwardServletEvent_event.class.getName();
-   private final Logger LOGGER = Logger.getLogger(LOG_CLASS);
-   
+public class DispatcherTests4_SPEC2_19_ForwardServletEvent_event implements Portlet, EventPortlet,
+      ResourceServingPortlet {
+
    private PortletConfig portletConfig = null;
 
    @Override
@@ -54,56 +65,49 @@ public class DispatcherTests4_SPEC2_19_ForwardServletEvent_event implements Port
    }
 
    @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();
 
       // Prereq for: V2DispatcherTests4_SPEC2_19_ForwardServletEvent_invoke3
-      portletReq = new EventRequestWrapper((EventRequest)portletReq);
-      portletResp = new EventResponseWrapper((EventResponse)portletResp);
+      portletReq = new EventRequestWrapper(portletReq);
+      portletResp = new EventResponseWrapper(portletResp);
 
       // Now do the actual dispatch
-      String target = SERVLET_PREFIX + "DispatcherTests4_SPEC2_19_ForwardServletEvent_servlet" + SERVLET_SUFFIX + "?" + QUERY_STRING;
-      PortletRequestDispatcher rd = portletConfig.getPortletContext()
-            .getRequestDispatcher(target);
+      String target = SERVLET_PREFIX + "DispatcherTests4_SPEC2_19_ForwardServletEvent_servlet" + SERVLET_SUFFIX + "?"
+            + QUERY_STRING;
+      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>DispatcherTests4_SPEC2_19_ForwardServletEvent_event</p>\n");
 
-      String msg = (String) portletReq.getPortletSession()
-            .getAttribute(RESULT_ATTR_PREFIX + "DispatcherTests4_SPEC2_19_ForwardServletEvent", APPLICATION_SCOPE);
-      msg = (msg==null) ? "Not ready. click test case link." : msg;
+      String msg = (String) portletReq.getPortletSession().getAttribute(
+            RESULT_ATTR_PREFIX + "DispatcherTests4_SPEC2_19_ForwardServletEvent", 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/a17e0f65/portlet-tck_3.0/V2DispatcherTests4/src/main/java/javax/portlet/tck/portlets/DispatcherTests4_SPEC2_19_ForwardServletRender.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests4/src/main/java/javax/portlet/tck/portlets/DispatcherTests4_SPEC2_19_ForwardServletRender.java b/portlet-tck_3.0/V2DispatcherTests4/src/main/java/javax/portlet/tck/portlets/DispatcherTests4_SPEC2_19_ForwardServletRender.java
index 7cad8f7..2bea972 100644
--- a/portlet-tck_3.0/V2DispatcherTests4/src/main/java/javax/portlet/tck/portlets/DispatcherTests4_SPEC2_19_ForwardServletRender.java
+++ b/portlet-tck_3.0/V2DispatcherTests4/src/main/java/javax/portlet/tck/portlets/DispatcherTests4_SPEC2_19_ForwardServletRender.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.QUERY_STRING;
+import static javax.portlet.tck.constants.Constants.SERVLET_PREFIX;
+import static javax.portlet.tck.constants.Constants.SERVLET_SUFFIX;
+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;
+import javax.portlet.filter.RenderRequestWrapper;
+import javax.portlet.filter.RenderResponseWrapper;
 
 /**
- * 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 DispatcherTests4_SPEC2_19_ForwardServletRender_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
+ * DispatcherTests4_SPEC2_19_ForwardServletRender_event
+ * 
  */
 public class DispatcherTests4_SPEC2_19_ForwardServletRender implements Portlet, ResourceServingPortlet {
-   private static final String LOG_CLASS = 
-         DispatcherTests4_SPEC2_19_ForwardServletRender.class.getName();
-   private final Logger LOGGER = Logger.getLogger(LOG_CLASS);
-   
+
    private PortletConfig portletConfig = null;
 
    @Override
@@ -62,48 +64,43 @@ public class DispatcherTests4_SPEC2_19_ForwardServletRender implements Portlet,
    }
 
    @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();
 
       // Prereq for: V2DispatcherTests4_SPEC2_19_ForwardServletRender_invoke3
-      portletReq = new RenderRequestWrapper((RenderRequest)portletReq);
-      portletResp = new RenderResponseWrapper((RenderResponse)portletResp);
+      portletReq = new RenderRequestWrapper(portletReq);
+      portletResp = new RenderResponseWrapper(portletResp);
 
       // Now do the actual dispatch
-      String target = SERVLET_PREFIX + "DispatcherTests4_SPEC2_19_ForwardServletRender_servlet" + SERVLET_SUFFIX + "?" + QUERY_STRING;
-      PortletRequestDispatcher rd = portletConfig.getPortletContext()
-            .getRequestDispatcher(target);
+      String target = SERVLET_PREFIX + "DispatcherTests4_SPEC2_19_ForwardServletRender_servlet" + SERVLET_SUFFIX + "?"
+            + QUERY_STRING;
+      PortletRequestDispatcher rd = portletConfig.getPortletContext().getRequestDispatcher(target);
       rd.forward(portletReq, portletResp);
    }
 

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/a17e0f65/portlet-tck_3.0/V2DispatcherTests4/src/main/java/javax/portlet/tck/portlets/DispatcherTests4_SPEC2_19_ForwardServletResource.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests4/src/main/java/javax/portlet/tck/portlets/DispatcherTests4_SPEC2_19_ForwardServletResource.java b/portlet-tck_3.0/V2DispatcherTests4/src/main/java/javax/portlet/tck/portlets/DispatcherTests4_SPEC2_19_ForwardServletResource.java
index 242e556..c2910c1 100644
--- a/portlet-tck_3.0/V2DispatcherTests4/src/main/java/javax/portlet/tck/portlets/DispatcherTests4_SPEC2_19_ForwardServletResource.java
+++ b/portlet-tck_3.0/V2DispatcherTests4/src/main/java/javax/portlet/tck/portlets/DispatcherTests4_SPEC2_19_ForwardServletResource.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.QUERY_STRING;
+import static javax.portlet.tck.constants.Constants.SERVLET_PREFIX;
+import static javax.portlet.tck.constants.Constants.SERVLET_SUFFIX;
+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;
+import javax.portlet.filter.ResourceRequestWrapper;
+import javax.portlet.filter.ResourceResponseWrapper;
 
 /**
- * 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 DispatcherTests4_SPEC2_19_ForwardServletResource_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
+ * DispatcherTests4_SPEC2_19_ForwardServletResource_event
+ * 
  */
 public class DispatcherTests4_SPEC2_19_ForwardServletResource implements Portlet, ResourceServingPortlet {
-   private static final String LOG_CLASS = 
-         DispatcherTests4_SPEC2_19_ForwardServletResource.class.getName();
-   private final Logger LOGGER = Logger.getLogger(LOG_CLASS);
-   
+
    private PortletConfig portletConfig = null;
 
    @Override
@@ -62,43 +67,38 @@ public class DispatcherTests4_SPEC2_19_ForwardServletResource implements Portlet
    }
 
    @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();
 
       // Prereq for: V2DispatcherTests4_SPEC2_19_ForwardServletResource_invoke3
-      portletReq = new ResourceRequestWrapper((ResourceRequest)portletReq);
-      portletResp = new ResourceResponseWrapper((ResourceResponse)portletResp);
+      portletReq = new ResourceRequestWrapper(portletReq);
+      portletResp = new ResourceResponseWrapper(portletResp);
 
       // Now do the actual dispatch
-      String target = SERVLET_PREFIX + "DispatcherTests4_SPEC2_19_ForwardServletResource_servlet" + SERVLET_SUFFIX + "?" + QUERY_STRING;
-      PortletRequestDispatcher rd = portletConfig.getPortletContext()
-            .getRequestDispatcher(target);
+      String target = SERVLET_PREFIX + "DispatcherTests4_SPEC2_19_ForwardServletResource_servlet" + SERVLET_SUFFIX
+            + "?" + QUERY_STRING;
+      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/a17e0f65/portlet-tck_3.0/V2DispatcherTests4/src/main/java/javax/portlet/tck/portlets/DispatcherTests4_SPEC2_19_IncludeJSPAction.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests4/src/main/java/javax/portlet/tck/portlets/DispatcherTests4_SPEC2_19_IncludeJSPAction.java b/portlet-tck_3.0/V2DispatcherTests4/src/main/java/javax/portlet/tck/portlets/DispatcherTests4_SPEC2_19_IncludeJSPAction.java
index 04d5add..f57c5ee 100644
--- a/portlet-tck_3.0/V2DispatcherTests4/src/main/java/javax/portlet/tck/portlets/DispatcherTests4_SPEC2_19_IncludeJSPAction.java
+++ b/portlet-tck_3.0/V2DispatcherTests4/src/main/java/javax/portlet/tck/portlets/DispatcherTests4_SPEC2_19_IncludeJSPAction.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.JSP_PREFIX;
+import static javax.portlet.tck.constants.Constants.JSP_SUFFIX;
+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.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.filter.ActionRequestWrapper;
+import javax.portlet.filter.ActionResponseWrapper;
+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 DispatcherTests4_SPEC2_19_IncludeJSPAction_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
+ * DispatcherTests4_SPEC2_19_IncludeJSPAction_event
+ * 
  */
 public class DispatcherTests4_SPEC2_19_IncludeJSPAction implements Portlet, ResourceServingPortlet {
-   private static final String LOG_CLASS = 
-         DispatcherTests4_SPEC2_19_IncludeJSPAction.class.getName();
-   private final Logger LOGGER = Logger.getLogger(LOG_CLASS);
-   
+
    private PortletConfig portletConfig = null;
 
    @Override
@@ -62,52 +70,45 @@ public class DispatcherTests4_SPEC2_19_IncludeJSPAction implements Portlet, Reso
    }
 
    @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();
 
       // Prereq for: V2DispatcherTests4_SPEC2_19_IncludeJSPAction_invoke3
-      portletReq = new ActionRequestWrapper((ActionRequest)portletReq);
-      portletResp = new ActionResponseWrapper((ActionResponse)portletResp);
+      portletReq = new ActionRequestWrapper(portletReq);
+      portletResp = new ActionResponseWrapper(portletResp);
 
       {
          // Prereq for: V2DispatcherTests4_SPEC2_19_IncludeJSPAction_invoke8
          // include the multiple include portlet
          String target = "/MultipleIncludeServlet?" + QUERY_STRING;
-         PortletRequestDispatcher rd = portletConfig.getPortletContext()
-               .getRequestDispatcher(target);
+         PortletRequestDispatcher rd = portletConfig.getPortletContext().getRequestDispatcher(target);
          rd.include(portletReq, portletResp);
       }
 
       // Now do the actual dispatch
       String target = JSP_PREFIX + "DispatcherTests4_SPEC2_19_IncludeJSPAction" + JSP_SUFFIX + "?" + QUERY_STRING;
-      PortletRequestDispatcher rd = portletConfig.getPortletContext()
-            .getRequestDispatcher(target);
+      PortletRequestDispatcher rd = portletConfig.getPortletContext().getRequestDispatcher(target);
       rd.include(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);
@@ -115,16 +116,17 @@ public class DispatcherTests4_SPEC2_19_IncludeJSPAction implements Portlet, Reso
       PrintWriter writer = portletResp.getWriter();
 
       PortletSession ps = portletReq.getPortletSession();
-      String msg = (String) ps.getAttribute(RESULT_ATTR_PREFIX + "DispatcherTests4_SPEC2_19_IncludeJSPAction", APPLICATION_SCOPE);
+      String msg = (String) ps.getAttribute(RESULT_ATTR_PREFIX + "DispatcherTests4_SPEC2_19_IncludeJSPAction",
+            APPLICATION_SCOPE);
       if (msg != null) {
          writer.write("<p>" + msg + "</p><br/>\n");
          ps.removeAttribute(RESULT_ATTR_PREFIX + "DispatcherTests4_SPEC2_19_IncludeJSPAction", APPLICATION_SCOPE);
       }
 
-      /* TestCase: V2DispatcherTests4_SPEC2_19_IncludeJSPAction_invoke3       */
-      /* Details: "Parameters to the include method for a target servlet      */
-      /* can be wrapped request and response classes from the portlet         */
-      /* lifecyle method initiating the include"                              */
+      /* TestCase: V2DispatcherTests4_SPEC2_19_IncludeJSPAction_invoke3 */
+      /* Details: "Parameters to the include method for a target servlet */
+      /* can be wrapped request and response classes from the portlet */
+      /* lifecyle method initiating the include" */
       {
          PortletURL aurl = portletResp.createActionURL();
          aurl.setParameters(portletReq.getPrivateParameterMap());
@@ -132,9 +134,9 @@ public class DispatcherTests4_SPEC2_19_IncludeJSPAction implements Portlet, Reso
          tb.writeTo(writer);
       }
 
-      /* TestCase: V2DispatcherTests4_SPEC2_19_IncludeJSPAction_invoke8       */
-      /* Details: "The portlet can include multiple servlets during the       */
-      /* same lifecycle method"                                               */
+      /* TestCase: V2DispatcherTests4_SPEC2_19_IncludeJSPAction_invoke8 */
+      /* Details: "The portlet can include multiple servlets during the */
+      /* same lifecycle method" */
       {
          PortletURL aurl = portletResp.createActionURL();
          aurl.setParameters(portletReq.getPrivateParameterMap());

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/a17e0f65/portlet-tck_3.0/V2DispatcherTests4/src/main/java/javax/portlet/tck/portlets/DispatcherTests4_SPEC2_19_IncludeJSPEvent.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests4/src/main/java/javax/portlet/tck/portlets/DispatcherTests4_SPEC2_19_IncludeJSPEvent.java b/portlet-tck_3.0/V2DispatcherTests4/src/main/java/javax/portlet/tck/portlets/DispatcherTests4_SPEC2_19_IncludeJSPEvent.java
index 58ce066..9f5a9fc 100644
--- a/portlet-tck_3.0/V2DispatcherTests4/src/main/java/javax/portlet/tck/portlets/DispatcherTests4_SPEC2_19_IncludeJSPEvent.java
+++ b/portlet-tck_3.0/V2DispatcherTests4/src/main/java/javax/portlet/tck/portlets/DispatcherTests4_SPEC2_19_IncludeJSPEvent.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 DispatcherTests4_SPEC2_19_IncludeJSPEvent_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
+ * DispatcherTests4_SPEC2_19_IncludeJSPEvent_event
+ * 
  */
 public class DispatcherTests4_SPEC2_19_IncludeJSPEvent implements Portlet, ResourceServingPortlet {
-   private static final String LOG_CLASS = 
-         DispatcherTests4_SPEC2_19_IncludeJSPEvent.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,47 +60,41 @@ public class DispatcherTests4_SPEC2_19_IncludeJSPEvent implements Portlet, Resou
    }
 
    @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,
-             "DispatcherTests4_SPEC2_19_IncludeJSPEvent");
+      QName eventQName = new QName(TCKNAMESPACE, "DispatcherTests4_SPEC2_19_IncludeJSPEvent");
       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);
 
       PrintWriter writer = portletResp.getWriter();
 
-      /* TestCase: V2DispatcherTests4_SPEC2_19_IncludeJSPEvent_invoke3        */
-      /* Details: "Parameters to the include method for a target servlet      */
-      /* can be wrapped request and response classes from the portlet         */
-      /* lifecyle method initiating the include"                              */
+      /* TestCase: V2DispatcherTests4_SPEC2_19_IncludeJSPEvent_invoke3 */
+      /* Details: "Parameters to the include method for a target servlet */
+      /* can be wrapped request and response classes from the portlet */
+      /* lifecyle method initiating the include" */
       {
          PortletURL aurl = portletResp.createActionURL();
          aurl.setParameters(portletReq.getPrivateParameterMap());
@@ -110,9 +102,9 @@ public class DispatcherTests4_SPEC2_19_IncludeJSPEvent implements Portlet, Resou
          tb.writeTo(writer);
       }
 
-      /* TestCase: V2DispatcherTests4_SPEC2_19_IncludeJSPEvent_invoke8        */
-      /* Details: "The portlet can include multiple servlets during the       */
-      /* same lifecycle method"                                               */
+      /* TestCase: V2DispatcherTests4_SPEC2_19_IncludeJSPEvent_invoke8 */
+      /* Details: "The portlet can include multiple servlets during the */
+      /* same lifecycle method" */
       {
          PortletURL aurl = portletResp.createActionURL();
          aurl.setParameters(portletReq.getPrivateParameterMap());


Mime
View raw message