portals-pluto-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From msnickl...@apache.org
Subject [06/13] portals-pluto git commit: Cleaned V2WrapperTests from extra logging and imports. Replaced TestButton, TestSetupLink, TestSetup strings with Constants from tck beans.
Date Wed, 29 Jun 2016 05:29:54 GMT
Cleaned V2WrapperTests from extra logging and imports. Replaced TestButton, TestSetupLink, TestSetup strings with Constants from tck beans.


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

Branch: refs/heads/master
Commit: b78fd97cf9b9b49bd7b28f999da49abbdc773c00
Parents: 08851dd
Author: ahmed <mahmedk91@gmail.com>
Authored: Tue Jun 28 16:00:48 2016 +0200
Committer: ahmed <mahmedk91@gmail.com>
Committed: Tue Jun 28 16:00:48 2016 +0200

----------------------------------------------------------------------
 ...perTests_ActionRequestWrapper_ApiAction.java | 324 +++++----
 ...erTests_ActionResponseWrapper_ApiAction.java | 524 ++++++++------
 ...apperTests_EventRequestWrapper_ApiEvent.java | 107 ++-
 ...ests_EventRequestWrapper_ApiEvent_event.java | 140 ++--
 ...pperTests_EventResponseWrapper_ApiEvent.java | 233 ++++---
 ...sts_EventResponseWrapper_ApiEvent_event.java | 326 +++++----
 ...erTests_PortletRequestWrapper_ApiRender.java | 674 ++++++++++++-------
 ...rTests_PortletResponseWrapper_ApiRender.java | 235 ++++---
 ...perTests_RenderRequestWrapper_ApiRender.java | 125 ++--
 ...erTests_RenderResponseWrapper_ApiRender.java | 368 ++++++----
 ...ests_ResourceRequestWrapper_ApiResource.java | 292 +++++---
 ...sts_ResourceResponseWrapper_ApiResource.java | 420 ++++++++----
 12 files changed, 2334 insertions(+), 1434 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/b78fd97c/portlet-tck_3.0/V2WrapperTests/src/main/java/javax/portlet/tck/portlets/WrapperTests_ActionRequestWrapper_ApiAction.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2WrapperTests/src/main/java/javax/portlet/tck/portlets/WrapperTests_ActionRequestWrapper_ApiAction.java b/portlet-tck_3.0/V2WrapperTests/src/main/java/javax/portlet/tck/portlets/WrapperTests_ActionRequestWrapper_ApiAction.java
index fe553f9..af3a066 100644
--- a/portlet-tck_3.0/V2WrapperTests/src/main/java/javax/portlet/tck/portlets/WrapperTests_ActionRequestWrapper_ApiAction.java
+++ b/portlet-tck_3.0/V2WrapperTests/src/main/java/javax/portlet/tck/portlets/WrapperTests_ActionRequestWrapper_ApiAction.java
@@ -18,43 +18,56 @@
 
 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.JSR286ApiTestCaseDetails.*;
-import static javax.portlet.tck.constants.Constants.*;
-import static javax.portlet.PortletSession.*;
-import static javax.portlet.ResourceURL.*;
+import static javax.portlet.tck.beans.JSR286ApiTestCaseDetails.V2WRAPPERTESTS_ACTIONREQUESTWRAPPER_APIACTION_GETCHARACTERENCODING;
+import static javax.portlet.tck.beans.JSR286ApiTestCaseDetails.V2WRAPPERTESTS_ACTIONREQUESTWRAPPER_APIACTION_GETCONTENTLENGTH;
+import static javax.portlet.tck.beans.JSR286ApiTestCaseDetails.V2WRAPPERTESTS_ACTIONREQUESTWRAPPER_APIACTION_GETCONTENTTYPE;
+import static javax.portlet.tck.beans.JSR286ApiTestCaseDetails.V2WRAPPERTESTS_ACTIONREQUESTWRAPPER_APIACTION_GETPORTLETINPUTSTREAM;
+import static javax.portlet.tck.beans.JSR286ApiTestCaseDetails.V2WRAPPERTESTS_ACTIONREQUESTWRAPPER_APIACTION_GETREADER;
+import static javax.portlet.tck.beans.JSR286ApiTestCaseDetails.V2WRAPPERTESTS_ACTIONREQUESTWRAPPER_APIACTION_SETCHARACTERENCODING;
+import static javax.portlet.tck.beans.JSR286ApiTestCaseDetails.V2WRAPPERTESTS_ACTIONREQUESTWRAPPER_APIACTION_GETREQUEST;
+import static javax.portlet.tck.beans.JSR286ApiTestCaseDetails.V2WRAPPERTESTS_ACTIONREQUESTWRAPPER_APIACTION_SETREQUEST;
+import static javax.portlet.tck.beans.JSR286ApiTestCaseDetails.V2WRAPPERTESTS_ACTIONREQUESTWRAPPER_APIACTION_GETMETHOD;
+import static javax.portlet.PortletSession.APPLICATION_SCOPE;
+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.PortletSession;
+import javax.portlet.PortletURL;
+import javax.portlet.RenderRequest;
+import javax.portlet.RenderResponse;
+import javax.portlet.filter.ActionRequestWrapper;
+import javax.portlet.tck.beans.ActionRequestWrapperChecker;
+import javax.portlet.tck.beans.JSR286ApiTestCaseDetails;
+import javax.portlet.tck.beans.TestButton;
+import javax.portlet.tck.beans.TestResult;
+import javax.portlet.tck.constants.Constants;
 
 /**
- * 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 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 WrapperTests_ActionRequestWrapper_ApiAction_event
+ * 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
+ * WrapperTests_ActionRequestWrapper_ApiAction_event
  *
  */
-public class WrapperTests_ActionRequestWrapper_ApiAction implements Portlet, ResourceServingPortlet {
-   private static final String LOG_CLASS = 
-         WrapperTests_ActionRequestWrapper_ApiAction.class.getName();
-   private final Logger LOGGER = Logger.getLogger(LOG_CLASS);
-   
-   private PortletConfig portletConfig = null;
+public class WrapperTests_ActionRequestWrapper_ApiAction implements Portlet {
 
    @Override
    public void init(PortletConfig config) throws PortletException {
-      this.portletConfig = config;
    }
 
    @Override
@@ -62,9 +75,8 @@ public class WrapperTests_ActionRequestWrapper_ApiAction implements Portlet, Res
    }
 
    @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();
@@ -72,129 +84,158 @@ public class WrapperTests_ActionRequestWrapper_ApiAction implements Portlet, Res
 
       StringWriter writer = new StringWriter();
 
-      ActionRequestWrapperChecker wc = new ActionRequestWrapperChecker(portletReq);
+      ActionRequestWrapperChecker wc = new ActionRequestWrapperChecker(
+            portletReq);
       ActionRequestWrapper wpr = new ActionRequestWrapper(portletReq);
       wpr.setRequest(wc);
       JSR286ApiTestCaseDetails tcd = new JSR286ApiTestCaseDetails();
 
       // Create result objects for the tests
 
-      ClassChecker cc = new ClassChecker(ActionRequestWrapper.class);
-
-      /* TestCase: V2WrapperTests_ActionRequestWrapper_ApiAction_getCharacterEncoding */
-      /* Details: "Method getCharacterEncoding(): Calls wrapped method"       */
-      TestResult tr0 = tcd.getTestResultFailed(V2WRAPPERTESTS_ACTIONREQUESTWRAPPER_APIACTION_GETCHARACTERENCODING);
+      /*
+       * TestCase:
+       * V2WrapperTests_ActionRequestWrapper_ApiAction_getCharacterEncoding
+       */
+      /* Details: "Method getCharacterEncoding(): Calls wrapped method" */
+      TestResult tr0 = tcd.getTestResultFailed(
+            V2WRAPPERTESTS_ACTIONREQUESTWRAPPER_APIACTION_GETCHARACTERENCODING);
       try {
          Object[] args = {};
          wc.prepare(tr0, "getCharacterEncoding", args);
          wc.checkRetval(wpr.getCharacterEncoding());
-      } catch(Exception e) {tr0.appendTcDetail(e.toString());}
+      } catch (Exception e) {
+         tr0.appendTcDetail(e.toString());
+      }
       tr0.writeTo(writer);
 
-      /* TestCase: V2WrapperTests_ActionRequestWrapper_ApiAction_getContentLength */
-      /* Details: "Method getContentLength(): Calls wrapped method"           */
-      TestResult tr1 = tcd.getTestResultFailed(V2WRAPPERTESTS_ACTIONREQUESTWRAPPER_APIACTION_GETCONTENTLENGTH);
+      /*
+       * TestCase:
+       * V2WrapperTests_ActionRequestWrapper_ApiAction_getContentLength
+       */
+      /* Details: "Method getContentLength(): Calls wrapped method" */
+      TestResult tr1 = tcd.getTestResultFailed(
+            V2WRAPPERTESTS_ACTIONREQUESTWRAPPER_APIACTION_GETCONTENTLENGTH);
       try {
          Object[] args = {};
          wc.prepare(tr1, "getContentLength", args);
          wc.checkRetval(wpr.getContentLength());
-      } catch(Exception e) {tr1.appendTcDetail(e.toString());}
+      } catch (Exception e) {
+         tr1.appendTcDetail(e.toString());
+      }
       tr1.writeTo(writer);
 
-      /* TestCase: V2WrapperTests_ActionRequestWrapper_ApiAction_getContentType */
-      /* Details: "Method getContentType(): Calls wrapped method"             */
-      TestResult tr2 = tcd.getTestResultFailed(V2WRAPPERTESTS_ACTIONREQUESTWRAPPER_APIACTION_GETCONTENTTYPE);
+      /*
+       * TestCase: V2WrapperTests_ActionRequestWrapper_ApiAction_getContentType
+       */
+      /* Details: "Method getContentType(): Calls wrapped method" */
+      TestResult tr2 = tcd.getTestResultFailed(
+            V2WRAPPERTESTS_ACTIONREQUESTWRAPPER_APIACTION_GETCONTENTTYPE);
       try {
          Object[] args = {};
          wc.prepare(tr2, "getContentType", args);
          wc.checkRetval(wpr.getContentType());
-      } catch(Exception e) {tr2.appendTcDetail(e.toString());}
+      } catch (Exception e) {
+         tr2.appendTcDetail(e.toString());
+      }
       tr2.writeTo(writer);
 
-      /* TestCase: V2WrapperTests_ActionRequestWrapper_ApiAction_getPortletInputStream */
-      /* Details: "Method getPortletInputStream(): Calls wrapped method"      */
-      TestResult tr3 = tcd.getTestResultFailed(V2WRAPPERTESTS_ACTIONREQUESTWRAPPER_APIACTION_GETPORTLETINPUTSTREAM);
+      /*
+       * TestCase:
+       * V2WrapperTests_ActionRequestWrapper_ApiAction_getPortletInputStream
+       */
+      /* Details: "Method getPortletInputStream(): Calls wrapped method" */
+      TestResult tr3 = tcd.getTestResultFailed(
+            V2WRAPPERTESTS_ACTIONREQUESTWRAPPER_APIACTION_GETPORTLETINPUTSTREAM);
       try {
          Object[] args = {};
          wc.prepare(tr3, "getPortletInputStream", args);
          wc.checkRetval(wpr.getPortletInputStream());
-      } catch(Exception e) {tr3.appendTcDetail(e.toString());}
+      } catch (Exception e) {
+         tr3.appendTcDetail(e.toString());
+      }
       tr3.writeTo(writer);
 
-      /* TestCase: V2WrapperTests_ActionRequestWrapper_ApiAction_getReader    */
-      /* Details: "Method getReader(): Calls wrapped method"                  */
-      TestResult tr4 = tcd.getTestResultFailed(V2WRAPPERTESTS_ACTIONREQUESTWRAPPER_APIACTION_GETREADER);
+      /* TestCase: V2WrapperTests_ActionRequestWrapper_ApiAction_getReader */
+      /* Details: "Method getReader(): Calls wrapped method" */
+      TestResult tr4 = tcd.getTestResultFailed(
+            V2WRAPPERTESTS_ACTIONREQUESTWRAPPER_APIACTION_GETREADER);
       try {
          Object[] args = {};
          wc.prepare(tr4, "getReader", args);
          wc.checkRetval(wpr.getReader());
-      } catch(Exception e) {tr4.appendTcDetail(e.toString());}
+      } catch (Exception e) {
+         tr4.appendTcDetail(e.toString());
+      }
       tr4.writeTo(writer);
 
-      /* TestCase: V2WrapperTests_ActionRequestWrapper_ApiAction_setCharacterEncoding */
-      /* Details: "Method setCharacterEncoding(String): Calls wrapped         */
-      /* method"                                                              */
-      TestResult tr5 = tcd.getTestResultFailed(V2WRAPPERTESTS_ACTIONREQUESTWRAPPER_APIACTION_SETCHARACTERENCODING);
+      /*
+       * TestCase:
+       * V2WrapperTests_ActionRequestWrapper_ApiAction_setCharacterEncoding
+       */
+      /* Details: "Method setCharacterEncoding(String): Calls wrapped */
+      /* method" */
+      TestResult tr5 = tcd.getTestResultFailed(
+            V2WRAPPERTESTS_ACTIONREQUESTWRAPPER_APIACTION_SETCHARACTERENCODING);
       try {
          String parm1 = "val1";
-         Object[] args = {parm1};
+         Object[] args = { parm1 };
          wc.prepare(tr5, "setCharacterEncoding", args);
          wpr.setCharacterEncoding(parm1);
-      } catch(Exception e) {tr5.appendTcDetail(e.toString());}
+      } catch (Exception e) {
+         tr5.appendTcDetail(e.toString());
+      }
       tr5.writeTo(writer);
 
-      /* TestCase: V2WrapperTests_ActionRequestWrapper_ApiAction_getRequest   */
-      /* Details: "Method getRequest(): Returns wrapped ActionRequest         */
-      /* object"                                                              */
-      TestResult tr6 = tcd.getTestResultFailed(V2WRAPPERTESTS_ACTIONREQUESTWRAPPER_APIACTION_GETREQUEST);
+      /* TestCase: V2WrapperTests_ActionRequestWrapper_ApiAction_getRequest */
+      /* Details: "Method getRequest(): Returns wrapped ActionRequest */
+      /* object" */
+      TestResult tr6 = tcd.getTestResultFailed(
+            V2WRAPPERTESTS_ACTIONREQUESTWRAPPER_APIACTION_GETREQUEST);
       try {
-         // The retrieved request / response object should be the wrapper checker instance
+         // The retrieved request / response object should be the wrapper
+         // checker instance
          ActionRequest r = wpr.getRequest();
          tr6.setTcSuccess(r == wc);
-      } catch(Exception e) {tr6.appendTcDetail(e.toString());}
+      } catch (Exception e) {
+         tr6.appendTcDetail(e.toString());
+      }
       tr6.writeTo(writer);
 
-      /* TestCase: V2WrapperTests_ActionRequestWrapper_ApiAction_setRequest   */
-      /* Details: "Method setRequest(ActionRequest): Allows wrapped           */
-      /* ActionRequest object to be set"                                      */
-      TestResult tr7 = tcd.getTestResultFailed(V2WRAPPERTESTS_ACTIONREQUESTWRAPPER_APIACTION_SETREQUEST);
+      /* TestCase: V2WrapperTests_ActionRequestWrapper_ApiAction_setRequest */
+      /* Details: "Method setRequest(ActionRequest): Allows wrapped */
+      /* ActionRequest object to be set" */
+      TestResult tr7 = tcd.getTestResultFailed(
+            V2WRAPPERTESTS_ACTIONREQUESTWRAPPER_APIACTION_SETREQUEST);
       try {
-         // tested by method set up 
+         // tested by method set up
          tr7.setTcSuccess(true);
-      } catch(Exception e) {tr7.appendTcDetail(e.toString());}
+      } catch (Exception e) {
+         tr7.appendTcDetail(e.toString());
+      }
       tr7.writeTo(writer);
 
-      /* TestCase: V2WrapperTests_ActionRequestWrapper_ApiAction_getMethod    */
-      /* Details: "Method getMethod(): Calls wrapped method"                  */
-      TestResult tr8 = tcd.getTestResultFailed(V2WRAPPERTESTS_ACTIONREQUESTWRAPPER_APIACTION_GETMETHOD);
+      /* TestCase: V2WrapperTests_ActionRequestWrapper_ApiAction_getMethod */
+      /* Details: "Method getMethod(): Calls wrapped method" */
+      TestResult tr8 = tcd.getTestResultFailed(
+            V2WRAPPERTESTS_ACTIONREQUESTWRAPPER_APIACTION_GETMETHOD);
       try {
          Object[] args = {};
          wc.prepare(tr8, "getMethod", args);
          wc.checkRetval(wpr.getMethod());
-      } catch(Exception e) {tr8.appendTcDetail(e.toString());}
+      } catch (Exception e) {
+         tr8.appendTcDetail(e.toString());
+      }
       tr8.writeTo(writer);
 
       portletReq.getPortletSession().setAttribute(
-                   Constants.RESULT_ATTR_PREFIX + "WrapperTests_ActionRequestWrapper_ApiAction",
-                   writer.toString(), APPLICATION_SCOPE);
-   }
-
-   @Override
-   public void serveResource(ResourceRequest portletReq, ResourceResponse portletResp)
-         throws PortletException, IOException {
-      LOGGER.entering(LOG_CLASS, "main portlet serveResource entry");
-
-      long tid = Thread.currentThread().getId();
-      portletReq.setAttribute(THREADID_ATTR, tid);
-
-      PrintWriter writer = portletResp.getWriter();
-
+            Constants.RESULT_ATTR_PREFIX
+                  + "WrapperTests_ActionRequestWrapper_ApiAction",
+            writer.toString(), APPLICATION_SCOPE);
    }
 
    @Override
    public void render(RenderRequest portletReq, RenderResponse portletResp)
          throws PortletException, IOException {
-      LOGGER.entering(LOG_CLASS, "main portlet render entry");
 
       long tid = Thread.currentThread().getId();
       portletReq.setAttribute(THREADID_ATTR, tid);
@@ -202,93 +243,128 @@ public class WrapperTests_ActionRequestWrapper_ApiAction implements Portlet, Res
       PrintWriter writer = portletResp.getWriter();
 
       PortletSession ps = portletReq.getPortletSession();
-      String msg = (String) ps.getAttribute(RESULT_ATTR_PREFIX + "WrapperTests_ActionRequestWrapper_ApiAction", APPLICATION_SCOPE);
+      String msg = (String) ps.getAttribute(
+            RESULT_ATTR_PREFIX + "WrapperTests_ActionRequestWrapper_ApiAction",
+            APPLICATION_SCOPE);
       if (msg != null) {
          writer.write("<p>" + msg + "</p><br/>\n");
-         ps.removeAttribute(RESULT_ATTR_PREFIX + "WrapperTests_ActionRequestWrapper_ApiAction", APPLICATION_SCOPE);
+         ps.removeAttribute(
+               RESULT_ATTR_PREFIX
+                     + "WrapperTests_ActionRequestWrapper_ApiAction",
+               APPLICATION_SCOPE);
       }
 
-      /* TestCase: V2WrapperTests_ActionRequestWrapper_ApiAction_getCharacterEncoding */
-      /* Details: "Method getCharacterEncoding(): Calls wrapped method"       */
+      /*
+       * TestCase:
+       * V2WrapperTests_ActionRequestWrapper_ApiAction_getCharacterEncoding
+       */
+      /* Details: "Method getCharacterEncoding(): Calls wrapped method" */
       {
          PortletURL aurl = portletResp.createActionURL();
          aurl.setParameters(portletReq.getPrivateParameterMap());
-         TestButton tb = new TestButton("V2WrapperTests_ActionRequestWrapper_ApiAction_getCharacterEncoding", aurl);
+         TestButton tb = new TestButton(
+               "V2WrapperTests_ActionRequestWrapper_ApiAction_getCharacterEncoding",
+               aurl);
          tb.writeTo(writer);
       }
 
-      /* TestCase: V2WrapperTests_ActionRequestWrapper_ApiAction_getContentLength */
-      /* Details: "Method getContentLength(): Calls wrapped method"           */
+      /*
+       * TestCase:
+       * V2WrapperTests_ActionRequestWrapper_ApiAction_getContentLength
+       */
+      /* Details: "Method getContentLength(): Calls wrapped method" */
       {
          PortletURL aurl = portletResp.createActionURL();
          aurl.setParameters(portletReq.getPrivateParameterMap());
-         TestButton tb = new TestButton("V2WrapperTests_ActionRequestWrapper_ApiAction_getContentLength", aurl);
+         TestButton tb = new TestButton(
+               "V2WrapperTests_ActionRequestWrapper_ApiAction_getContentLength",
+               aurl);
          tb.writeTo(writer);
       }
 
-      /* TestCase: V2WrapperTests_ActionRequestWrapper_ApiAction_getContentType */
-      /* Details: "Method getContentType(): Calls wrapped method"             */
+      /*
+       * TestCase: V2WrapperTests_ActionRequestWrapper_ApiAction_getContentType
+       */
+      /* Details: "Method getContentType(): Calls wrapped method" */
       {
          PortletURL aurl = portletResp.createActionURL();
          aurl.setParameters(portletReq.getPrivateParameterMap());
-         TestButton tb = new TestButton("V2WrapperTests_ActionRequestWrapper_ApiAction_getContentType", aurl);
+         TestButton tb = new TestButton(
+               "V2WrapperTests_ActionRequestWrapper_ApiAction_getContentType",
+               aurl);
          tb.writeTo(writer);
       }
 
-      /* TestCase: V2WrapperTests_ActionRequestWrapper_ApiAction_getPortletInputStream */
-      /* Details: "Method getPortletInputStream(): Calls wrapped method"      */
+      /*
+       * TestCase:
+       * V2WrapperTests_ActionRequestWrapper_ApiAction_getPortletInputStream
+       */
+      /* Details: "Method getPortletInputStream(): Calls wrapped method" */
       {
          PortletURL aurl = portletResp.createActionURL();
          aurl.setParameters(portletReq.getPrivateParameterMap());
-         TestButton tb = new TestButton("V2WrapperTests_ActionRequestWrapper_ApiAction_getPortletInputStream", aurl);
+         TestButton tb = new TestButton(
+               "V2WrapperTests_ActionRequestWrapper_ApiAction_getPortletInputStream",
+               aurl);
          tb.writeTo(writer);
       }
 
-      /* TestCase: V2WrapperTests_ActionRequestWrapper_ApiAction_getReader    */
-      /* Details: "Method getReader(): Calls wrapped method"                  */
+      /* TestCase: V2WrapperTests_ActionRequestWrapper_ApiAction_getReader */
+      /* Details: "Method getReader(): Calls wrapped method" */
       {
          PortletURL aurl = portletResp.createActionURL();
          aurl.setParameters(portletReq.getPrivateParameterMap());
-         TestButton tb = new TestButton("V2WrapperTests_ActionRequestWrapper_ApiAction_getReader", aurl);
+         TestButton tb = new TestButton(
+               "V2WrapperTests_ActionRequestWrapper_ApiAction_getReader", aurl);
          tb.writeTo(writer);
       }
 
-      /* TestCase: V2WrapperTests_ActionRequestWrapper_ApiAction_setCharacterEncoding */
-      /* Details: "Method setCharacterEncoding(String): Calls wrapped         */
-      /* method"                                                              */
+      /*
+       * TestCase:
+       * V2WrapperTests_ActionRequestWrapper_ApiAction_setCharacterEncoding
+       */
+      /* Details: "Method setCharacterEncoding(String): Calls wrapped */
+      /* method" */
       {
          PortletURL aurl = portletResp.createActionURL();
          aurl.setParameters(portletReq.getPrivateParameterMap());
-         TestButton tb = new TestButton("V2WrapperTests_ActionRequestWrapper_ApiAction_setCharacterEncoding", aurl);
+         TestButton tb = new TestButton(
+               "V2WrapperTests_ActionRequestWrapper_ApiAction_setCharacterEncoding",
+               aurl);
          tb.writeTo(writer);
       }
 
-      /* TestCase: V2WrapperTests_ActionRequestWrapper_ApiAction_getRequest   */
-      /* Details: "Method getRequest(): Returns wrapped ActionRequest         */
-      /* object"                                                              */
+      /* TestCase: V2WrapperTests_ActionRequestWrapper_ApiAction_getRequest */
+      /* Details: "Method getRequest(): Returns wrapped ActionRequest */
+      /* object" */
       {
          PortletURL aurl = portletResp.createActionURL();
          aurl.setParameters(portletReq.getPrivateParameterMap());
-         TestButton tb = new TestButton("V2WrapperTests_ActionRequestWrapper_ApiAction_getRequest", aurl);
+         TestButton tb = new TestButton(
+               "V2WrapperTests_ActionRequestWrapper_ApiAction_getRequest",
+               aurl);
          tb.writeTo(writer);
       }
 
-      /* TestCase: V2WrapperTests_ActionRequestWrapper_ApiAction_setRequest   */
-      /* Details: "Method setRequest(ActionRequest): Allows wrapped           */
-      /* ActionRequest object to be set"                                      */
+      /* TestCase: V2WrapperTests_ActionRequestWrapper_ApiAction_setRequest */
+      /* Details: "Method setRequest(ActionRequest): Allows wrapped */
+      /* ActionRequest object to be set" */
       {
          PortletURL aurl = portletResp.createActionURL();
          aurl.setParameters(portletReq.getPrivateParameterMap());
-         TestButton tb = new TestButton("V2WrapperTests_ActionRequestWrapper_ApiAction_setRequest", aurl);
+         TestButton tb = new TestButton(
+               "V2WrapperTests_ActionRequestWrapper_ApiAction_setRequest",
+               aurl);
          tb.writeTo(writer);
       }
 
-      /* TestCase: V2WrapperTests_ActionRequestWrapper_ApiAction_getMethod    */
-      /* Details: "Method getMethod(): Calls wrapped method"                  */
+      /* TestCase: V2WrapperTests_ActionRequestWrapper_ApiAction_getMethod */
+      /* Details: "Method getMethod(): Calls wrapped method" */
       {
          PortletURL aurl = portletResp.createActionURL();
          aurl.setParameters(portletReq.getPrivateParameterMap());
-         TestButton tb = new TestButton("V2WrapperTests_ActionRequestWrapper_ApiAction_getMethod", aurl);
+         TestButton tb = new TestButton(
+               "V2WrapperTests_ActionRequestWrapper_ApiAction_getMethod", aurl);
          tb.writeTo(writer);
       }
 

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/b78fd97c/portlet-tck_3.0/V2WrapperTests/src/main/java/javax/portlet/tck/portlets/WrapperTests_ActionResponseWrapper_ApiAction.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2WrapperTests/src/main/java/javax/portlet/tck/portlets/WrapperTests_ActionResponseWrapper_ApiAction.java b/portlet-tck_3.0/V2WrapperTests/src/main/java/javax/portlet/tck/portlets/WrapperTests_ActionResponseWrapper_ApiAction.java
index 89ad5a4..6a12f3d 100644
--- a/portlet-tck_3.0/V2WrapperTests/src/main/java/javax/portlet/tck/portlets/WrapperTests_ActionResponseWrapper_ApiAction.java
+++ b/portlet-tck_3.0/V2WrapperTests/src/main/java/javax/portlet/tck/portlets/WrapperTests_ActionResponseWrapper_ApiAction.java
@@ -18,43 +18,66 @@
 
 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.JSR286ApiTestCaseDetails.*;
-import static javax.portlet.tck.constants.Constants.*;
-import static javax.portlet.PortletSession.*;
-import static javax.portlet.ResourceURL.*;
+import static javax.portlet.tck.beans.JSR286ApiTestCaseDetails.V2WRAPPERTESTS_ACTIONRESPONSEWRAPPER_APIACTION_SENDREDIRECTA;
+import static javax.portlet.tck.beans.JSR286ApiTestCaseDetails.V2WRAPPERTESTS_ACTIONRESPONSEWRAPPER_APIACTION_SENDREDIRECTB;
+import static javax.portlet.tck.beans.JSR286ApiTestCaseDetails.V2WRAPPERTESTS_ACTIONRESPONSEWRAPPER_APIACTION_SETEVENTA;
+import static javax.portlet.tck.beans.JSR286ApiTestCaseDetails.V2WRAPPERTESTS_ACTIONRESPONSEWRAPPER_APIACTION_SETEVENTB;
+import static javax.portlet.tck.beans.JSR286ApiTestCaseDetails.V2WRAPPERTESTS_ACTIONRESPONSEWRAPPER_APIACTION_SETPORTLETMODE;
+import static javax.portlet.tck.beans.JSR286ApiTestCaseDetails.V2WRAPPERTESTS_ACTIONRESPONSEWRAPPER_APIACTION_SETRENDERPARAMETERA;
+import static javax.portlet.tck.beans.JSR286ApiTestCaseDetails.V2WRAPPERTESTS_ACTIONRESPONSEWRAPPER_APIACTION_SETRENDERPARAMETERB;
+import static javax.portlet.tck.beans.JSR286ApiTestCaseDetails.V2WRAPPERTESTS_ACTIONRESPONSEWRAPPER_APIACTION_SETRENDERPARAMETERS;
+import static javax.portlet.tck.beans.JSR286ApiTestCaseDetails.V2WRAPPERTESTS_ACTIONRESPONSEWRAPPER_APIACTION_SETWINDOWSTATE;
+import static javax.portlet.tck.beans.JSR286ApiTestCaseDetails.V2WRAPPERTESTS_ACTIONRESPONSEWRAPPER_APIACTION_GETRESPONSE;
+import static javax.portlet.tck.beans.JSR286ApiTestCaseDetails.V2WRAPPERTESTS_ACTIONRESPONSEWRAPPER_APIACTION_SETRESPONSE;
+import static javax.portlet.tck.beans.JSR286ApiTestCaseDetails.V2WRAPPERTESTS_ACTIONRESPONSEWRAPPER_APIACTION_GETPORTLETMODE;
+import static javax.portlet.tck.beans.JSR286ApiTestCaseDetails.V2WRAPPERTESTS_ACTIONRESPONSEWRAPPER_APIACTION_GETRENDERPARAMETERMAP1;
+import static javax.portlet.tck.beans.JSR286ApiTestCaseDetails.V2WRAPPERTESTS_ACTIONRESPONSEWRAPPER_APIACTION_GETWINDOWSTATE;
+import static javax.portlet.tck.beans.JSR286ApiTestCaseDetails.V2WRAPPERTESTS_ACTIONRESPONSEWRAPPER_APIACTION_REMOVEPUBLICRENDERPARAMETER;
+import static javax.portlet.PortletSession.APPLICATION_SCOPE;
+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 java.util.HashMap;
+import java.util.Map;
+
+import javax.portlet.ActionRequest;
+import javax.portlet.ActionResponse;
+import javax.portlet.Portlet;
+import javax.portlet.PortletConfig;
+import javax.portlet.PortletException;
+import javax.portlet.PortletMode;
+import javax.portlet.PortletSession;
+import javax.portlet.PortletURL;
+import javax.portlet.RenderRequest;
+import javax.portlet.RenderResponse;
+import javax.portlet.WindowState;
+import javax.portlet.filter.ActionResponseWrapper;
+import javax.portlet.tck.beans.ActionResponseWrapperChecker;
+import javax.portlet.tck.beans.JSR286ApiTestCaseDetails;
+import javax.portlet.tck.beans.TestButton;
+import javax.portlet.tck.beans.TestResult;
+import javax.portlet.tck.constants.Constants;
 
 /**
- * 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 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 WrapperTests_ActionResponseWrapper_ApiAction_event
+ * 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
+ * WrapperTests_ActionResponseWrapper_ApiAction_event
  *
  */
-public class WrapperTests_ActionResponseWrapper_ApiAction implements Portlet, ResourceServingPortlet {
-   private static final String LOG_CLASS = 
-         WrapperTests_ActionResponseWrapper_ApiAction.class.getName();
-   private final Logger LOGGER = Logger.getLogger(LOG_CLASS);
-   
-   private PortletConfig portletConfig = null;
+public class WrapperTests_ActionResponseWrapper_ApiAction implements Portlet {
 
    @Override
    public void init(PortletConfig config) throws PortletException {
-      this.portletConfig = config;
    }
 
    @Override
@@ -62,9 +85,8 @@ public class WrapperTests_ActionResponseWrapper_ApiAction 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();
@@ -72,213 +94,273 @@ public class WrapperTests_ActionResponseWrapper_ApiAction implements Portlet, Re
 
       StringWriter writer = new StringWriter();
 
-      ActionResponseWrapperChecker wc = new ActionResponseWrapperChecker(portletResp);
+      ActionResponseWrapperChecker wc = new ActionResponseWrapperChecker(
+            portletResp);
       ActionResponseWrapper wpr = new ActionResponseWrapper(portletResp);
       wpr.setResponse(wc);
       JSR286ApiTestCaseDetails tcd = new JSR286ApiTestCaseDetails();
 
       // Create result objects for the tests
 
-      ClassChecker cc = new ClassChecker(ActionResponseWrapper.class);
-
-      /* TestCase: V2WrapperTests_ActionResponseWrapper_ApiAction_sendRedirectA */
-      /* Details: "Method sendRedirect(String): Calls wrapped method"         */
-      TestResult tr0 = tcd.getTestResultFailed(V2WRAPPERTESTS_ACTIONRESPONSEWRAPPER_APIACTION_SENDREDIRECTA);
+      /*
+       * TestCase: V2WrapperTests_ActionResponseWrapper_ApiAction_sendRedirectA
+       */
+      /* Details: "Method sendRedirect(String): Calls wrapped method" */
+      TestResult tr0 = tcd.getTestResultFailed(
+            V2WRAPPERTESTS_ACTIONRESPONSEWRAPPER_APIACTION_SENDREDIRECTA);
       try {
          String parm1 = "val1";
-         Object[] args = {parm1};
+         Object[] args = { parm1 };
          wc.prepare(tr0, "sendRedirect", args);
          wpr.sendRedirect(parm1);
-      } catch(Exception e) {tr0.appendTcDetail(e.toString());}
+      } catch (Exception e) {
+         tr0.appendTcDetail(e.toString());
+      }
       tr0.writeTo(writer);
 
-      /* TestCase: V2WrapperTests_ActionResponseWrapper_ApiAction_sendRedirectB */
-      /* Details: "Method sendRedirect(String, String): Calls wrapped         */
-      /* method"                                                              */
-      TestResult tr1 = tcd.getTestResultFailed(V2WRAPPERTESTS_ACTIONRESPONSEWRAPPER_APIACTION_SENDREDIRECTB);
+      /*
+       * TestCase: V2WrapperTests_ActionResponseWrapper_ApiAction_sendRedirectB
+       */
+      /* Details: "Method sendRedirect(String, String): Calls wrapped */
+      /* method" */
+      TestResult tr1 = tcd.getTestResultFailed(
+            V2WRAPPERTESTS_ACTIONRESPONSEWRAPPER_APIACTION_SENDREDIRECTB);
       try {
          String parm1 = "val1";
          String parm2 = "val2";
-         Object[] args = {parm1, parm2};
+         Object[] args = { parm1, parm2 };
          wc.prepare(tr1, "sendRedirect", args);
          wpr.sendRedirect(parm1, parm2);
-      } catch(Exception e) {tr1.appendTcDetail(e.toString());}
+      } catch (Exception e) {
+         tr1.appendTcDetail(e.toString());
+      }
       tr1.writeTo(writer);
 
-      /* TestCase: V2WrapperTests_ActionResponseWrapper_ApiAction_setEventA   */
-      /* Details: "Method setEvent(javax.xml.namespace.QName,                 */
-      /* java.io.Serializable): Calls wrapped method"                         */
-      TestResult tr2 = tcd.getTestResultFailed(V2WRAPPERTESTS_ACTIONRESPONSEWRAPPER_APIACTION_SETEVENTA);
+      /* TestCase: V2WrapperTests_ActionResponseWrapper_ApiAction_setEventA */
+      /* Details: "Method setEvent(javax.xml.namespace.QName, */
+      /* java.io.Serializable): Calls wrapped method" */
+      TestResult tr2 = tcd.getTestResultFailed(
+            V2WRAPPERTESTS_ACTIONRESPONSEWRAPPER_APIACTION_SETEVENTA);
       try {
          javax.xml.namespace.QName parm1 = new javax.xml.namespace.QName("bob");
          String parm2 = "val2";
-         Object[] args = {parm1, parm2};
+         Object[] args = { parm1, parm2 };
          wc.prepare(tr2, "setEvent", args);
          wpr.setEvent(parm1, parm2);
-      } catch(Exception e) {tr2.appendTcDetail(e.toString());}
+      } catch (Exception e) {
+         tr2.appendTcDetail(e.toString());
+      }
       tr2.writeTo(writer);
 
-      /* TestCase: V2WrapperTests_ActionResponseWrapper_ApiAction_setEventB   */
-      /* Details: "Method setEvent(String, java.io.Serializable): Calls       */
-      /* wrapped method"                                                      */
-      TestResult tr3 = tcd.getTestResultFailed(V2WRAPPERTESTS_ACTIONRESPONSEWRAPPER_APIACTION_SETEVENTB);
+      /* TestCase: V2WrapperTests_ActionResponseWrapper_ApiAction_setEventB */
+      /* Details: "Method setEvent(String, java.io.Serializable): Calls */
+      /* wrapped method" */
+      TestResult tr3 = tcd.getTestResultFailed(
+            V2WRAPPERTESTS_ACTIONRESPONSEWRAPPER_APIACTION_SETEVENTB);
       try {
          String parm1 = "val1";
          String parm2 = "val2";
-         Object[] args = {parm1, parm2};
+         Object[] args = { parm1, parm2 };
          wc.prepare(tr3, "setEvent", args);
          wpr.setEvent(parm1, parm2);
-      } catch(Exception e) {tr3.appendTcDetail(e.toString());}
+      } catch (Exception e) {
+         tr3.appendTcDetail(e.toString());
+      }
       tr3.writeTo(writer);
 
-      /* TestCase: V2WrapperTests_ActionResponseWrapper_ApiAction_setPortletMode */
-      /* Details: "Method setPortletMode(PortletMode): Calls wrapped          */
-      /* method"                                                              */
-      TestResult tr4 = tcd.getTestResultFailed(V2WRAPPERTESTS_ACTIONRESPONSEWRAPPER_APIACTION_SETPORTLETMODE);
+      /*
+       * TestCase: V2WrapperTests_ActionResponseWrapper_ApiAction_setPortletMode
+       */
+      /* Details: "Method setPortletMode(PortletMode): Calls wrapped */
+      /* method" */
+      TestResult tr4 = tcd.getTestResultFailed(
+            V2WRAPPERTESTS_ACTIONRESPONSEWRAPPER_APIACTION_SETPORTLETMODE);
       try {
          PortletMode parm1 = PortletMode.EDIT;
-         Object[] args = {parm1};
+         Object[] args = { parm1 };
          wc.prepare(tr4, "setPortletMode", args);
          wpr.setPortletMode(parm1);
-      } catch(Exception e) {tr4.appendTcDetail(e.toString());}
+      } catch (Exception e) {
+         tr4.appendTcDetail(e.toString());
+      }
       tr4.writeTo(writer);
 
-      /* TestCase: V2WrapperTests_ActionResponseWrapper_ApiAction_setRenderParameterA */
-      /* Details: "Method setRenderParameter(String, String): Calls wrapped   */
-      /* method"                                                              */
-      TestResult tr5 = tcd.getTestResultFailed(V2WRAPPERTESTS_ACTIONRESPONSEWRAPPER_APIACTION_SETRENDERPARAMETERA);
+      /*
+       * TestCase:
+       * V2WrapperTests_ActionResponseWrapper_ApiAction_setRenderParameterA
+       */
+      /* Details: "Method setRenderParameter(String, String): Calls wrapped */
+      /* method" */
+      TestResult tr5 = tcd.getTestResultFailed(
+            V2WRAPPERTESTS_ACTIONRESPONSEWRAPPER_APIACTION_SETRENDERPARAMETERA);
       try {
          String parm1 = "val1";
          String parm2 = "val2";
-         Object[] args = {parm1, parm2};
+         Object[] args = { parm1, parm2 };
          wc.prepare(tr5, "setRenderParameter", args);
          wpr.setRenderParameter(parm1, parm2);
-      } catch(Exception e) {tr5.appendTcDetail(e.toString());}
+      } catch (Exception e) {
+         tr5.appendTcDetail(e.toString());
+      }
       tr5.writeTo(writer);
 
-      /* TestCase: V2WrapperTests_ActionResponseWrapper_ApiAction_setRenderParameterB */
-      /* Details: "Method setRenderParameter(String, String[]): Calls         */
-      /* wrapped method"                                                      */
-      TestResult tr6 = tcd.getTestResultFailed(V2WRAPPERTESTS_ACTIONRESPONSEWRAPPER_APIACTION_SETRENDERPARAMETERB);
+      /*
+       * TestCase:
+       * V2WrapperTests_ActionResponseWrapper_ApiAction_setRenderParameterB
+       */
+      /* Details: "Method setRenderParameter(String, String[]): Calls */
+      /* wrapped method" */
+      TestResult tr6 = tcd.getTestResultFailed(
+            V2WRAPPERTESTS_ACTIONRESPONSEWRAPPER_APIACTION_SETRENDERPARAMETERB);
       try {
          String parm1 = "val1";
-         String[] parm2 = {"val1", "val2"};
-         Object[] args = {parm1, parm2};
+         String[] parm2 = { "val1", "val2" };
+         Object[] args = { parm1, parm2 };
          wc.prepare(tr6, "setRenderParameter", args);
          wpr.setRenderParameter(parm1, parm2);
-      } catch(Exception e) {tr6.appendTcDetail(e.toString());}
+      } catch (Exception e) {
+         tr6.appendTcDetail(e.toString());
+      }
       tr6.writeTo(writer);
 
-      /* TestCase: V2WrapperTests_ActionResponseWrapper_ApiAction_setRenderParameters */
-      /* Details: "Method setRenderParameters(java.util.Map): Calls wrapped   */
-      /* method"                                                              */
-      TestResult tr7 = tcd.getTestResultFailed(V2WRAPPERTESTS_ACTIONRESPONSEWRAPPER_APIACTION_SETRENDERPARAMETERS);
+      /*
+       * TestCase:
+       * V2WrapperTests_ActionResponseWrapper_ApiAction_setRenderParameters
+       */
+      /* Details: "Method setRenderParameters(java.util.Map): Calls wrapped */
+      /* method" */
+      TestResult tr7 = tcd.getTestResultFailed(
+            V2WRAPPERTESTS_ACTIONRESPONSEWRAPPER_APIACTION_SETRENDERPARAMETERS);
       try {
          Map<String, String[]> parm1 = new HashMap<String, String[]>();
-         parm1.put("iparm1", new String[] {"val3", "val4"});
-         parm1.put("iparm2", new String[] {"val5", "val6"});
-         Object[] args = {parm1};
+         parm1.put("iparm1", new String[] { "val3", "val4" });
+         parm1.put("iparm2", new String[] { "val5", "val6" });
+         Object[] args = { parm1 };
          wc.prepare(tr7, "setRenderParameters", args);
          wpr.setRenderParameters(parm1);
-      } catch(Exception e) {tr7.appendTcDetail(e.toString());}
+      } catch (Exception e) {
+         tr7.appendTcDetail(e.toString());
+      }
       tr7.writeTo(writer);
 
-      /* TestCase: V2WrapperTests_ActionResponseWrapper_ApiAction_setWindowState */
-      /* Details: "Method setWindowState(WindowState): Calls wrapped          */
-      /* method"                                                              */
-      TestResult tr8 = tcd.getTestResultFailed(V2WRAPPERTESTS_ACTIONRESPONSEWRAPPER_APIACTION_SETWINDOWSTATE);
+      /*
+       * TestCase: V2WrapperTests_ActionResponseWrapper_ApiAction_setWindowState
+       */
+      /* Details: "Method setWindowState(WindowState): Calls wrapped */
+      /* method" */
+      TestResult tr8 = tcd.getTestResultFailed(
+            V2WRAPPERTESTS_ACTIONRESPONSEWRAPPER_APIACTION_SETWINDOWSTATE);
       try {
          WindowState parm1 = WindowState.NORMAL;
-         Object[] args = {parm1};
+         Object[] args = { parm1 };
          wc.prepare(tr8, "setWindowState", args);
          wpr.setWindowState(parm1);
-      } catch(Exception e) {tr8.appendTcDetail(e.toString());}
+      } catch (Exception e) {
+         tr8.appendTcDetail(e.toString());
+      }
       tr8.writeTo(writer);
 
       /* TestCase: V2WrapperTests_ActionResponseWrapper_ApiAction_getResponse */
-      /* Details: "Method getResponse(): Returns wrapped ActionResponse       */
-      /* object"                                                              */
-      TestResult tr9 = tcd.getTestResultFailed(V2WRAPPERTESTS_ACTIONRESPONSEWRAPPER_APIACTION_GETRESPONSE);
+      /* Details: "Method getResponse(): Returns wrapped ActionResponse */
+      /* object" */
+      TestResult tr9 = tcd.getTestResultFailed(
+            V2WRAPPERTESTS_ACTIONRESPONSEWRAPPER_APIACTION_GETRESPONSE);
       try {
-         // The retrieved request / response object should be the wrapper checker instance
+         // The retrieved request / response object should be the wrapper
+         // checker instance
          ActionResponse r = wpr.getResponse();
          tr9.setTcSuccess(r == wc);
-      } catch(Exception e) {tr9.appendTcDetail(e.toString());}
+      } catch (Exception e) {
+         tr9.appendTcDetail(e.toString());
+      }
       tr9.writeTo(writer);
 
       /* TestCase: V2WrapperTests_ActionResponseWrapper_ApiAction_setResponse */
-      /* Details: "Method setResponse(ActionResponse): Allows wrapped         */
-      /* ActionResponse object to be set"                                     */
-      TestResult tr10 = tcd.getTestResultFailed(V2WRAPPERTESTS_ACTIONRESPONSEWRAPPER_APIACTION_SETRESPONSE);
+      /* Details: "Method setResponse(ActionResponse): Allows wrapped */
+      /* ActionResponse object to be set" */
+      TestResult tr10 = tcd.getTestResultFailed(
+            V2WRAPPERTESTS_ACTIONRESPONSEWRAPPER_APIACTION_SETRESPONSE);
       try {
-         // tested by method set up 
+         // tested by method set up
          tr10.setTcSuccess(true);
-      } catch(Exception e) {tr10.appendTcDetail(e.toString());}
+      } catch (Exception e) {
+         tr10.appendTcDetail(e.toString());
+      }
       tr10.writeTo(writer);
 
-      /* TestCase: V2WrapperTests_ActionResponseWrapper_ApiAction_getPortletMode */
-      /* Details: "Method getPortletMode(): Calls wrapped method"             */
-      TestResult tr11 = tcd.getTestResultFailed(V2WRAPPERTESTS_ACTIONRESPONSEWRAPPER_APIACTION_GETPORTLETMODE);
+      /*
+       * TestCase: V2WrapperTests_ActionResponseWrapper_ApiAction_getPortletMode
+       */
+      /* Details: "Method getPortletMode(): Calls wrapped method" */
+      TestResult tr11 = tcd.getTestResultFailed(
+            V2WRAPPERTESTS_ACTIONRESPONSEWRAPPER_APIACTION_GETPORTLETMODE);
       try {
          Object[] args = {};
          wc.prepare(tr11, "getPortletMode", args);
          wc.checkRetval(wpr.getPortletMode());
-      } catch(Exception e) {tr11.appendTcDetail(e.toString());}
+      } catch (Exception e) {
+         tr11.appendTcDetail(e.toString());
+      }
       tr11.writeTo(writer);
 
-      /* TestCase: V2WrapperTests_ActionResponseWrapper_ApiAction_getRenderParameterMap1 */
-      /* Details: "Method getRenderParameterMap(): Calls wrapped method"      */
-      TestResult tr12 = tcd.getTestResultFailed(V2WRAPPERTESTS_ACTIONRESPONSEWRAPPER_APIACTION_GETRENDERPARAMETERMAP1);
+      /*
+       * TestCase:
+       * V2WrapperTests_ActionResponseWrapper_ApiAction_getRenderParameterMap1
+       */
+      /* Details: "Method getRenderParameterMap(): Calls wrapped method" */
+      TestResult tr12 = tcd.getTestResultFailed(
+            V2WRAPPERTESTS_ACTIONRESPONSEWRAPPER_APIACTION_GETRENDERPARAMETERMAP1);
       try {
          Object[] args = {};
          wc.prepare(tr12, "getRenderParameterMap", args);
          wc.checkRetval(wpr.getRenderParameterMap());
-      } catch(Exception e) {tr12.appendTcDetail(e.toString());}
+      } catch (Exception e) {
+         tr12.appendTcDetail(e.toString());
+      }
       tr12.writeTo(writer);
 
-      /* TestCase: V2WrapperTests_ActionResponseWrapper_ApiAction_getWindowState */
-      /* Details: "Method getWindowState(): Calls wrapped method"             */
-      TestResult tr13 = tcd.getTestResultFailed(V2WRAPPERTESTS_ACTIONRESPONSEWRAPPER_APIACTION_GETWINDOWSTATE);
+      /*
+       * TestCase: V2WrapperTests_ActionResponseWrapper_ApiAction_getWindowState
+       */
+      /* Details: "Method getWindowState(): Calls wrapped method" */
+      TestResult tr13 = tcd.getTestResultFailed(
+            V2WRAPPERTESTS_ACTIONRESPONSEWRAPPER_APIACTION_GETWINDOWSTATE);
       try {
          Object[] args = {};
          wc.prepare(tr13, "getWindowState", args);
          wc.checkRetval(wpr.getWindowState());
-      } catch(Exception e) {tr13.appendTcDetail(e.toString());}
+      } catch (Exception e) {
+         tr13.appendTcDetail(e.toString());
+      }
       tr13.writeTo(writer);
 
-      /* TestCase: V2WrapperTests_ActionResponseWrapper_ApiAction_removePublicRenderParameter */
-      /* Details: "Method removePublicRenderParameter(String): Calls          */
-      /* wrapped method"                                                      */
-      TestResult tr14 = tcd.getTestResultFailed(V2WRAPPERTESTS_ACTIONRESPONSEWRAPPER_APIACTION_REMOVEPUBLICRENDERPARAMETER);
+      /*
+       * TestCase:
+       * V2WrapperTests_ActionResponseWrapper_ApiAction_removePublicRenderParameter
+       */
+      /* Details: "Method removePublicRenderParameter(String): Calls */
+      /* wrapped method" */
+      TestResult tr14 = tcd.getTestResultFailed(
+            V2WRAPPERTESTS_ACTIONRESPONSEWRAPPER_APIACTION_REMOVEPUBLICRENDERPARAMETER);
       try {
          String parm1 = "val1";
-         Object[] args = {parm1};
+         Object[] args = { parm1 };
          wc.prepare(tr14, "removePublicRenderParameter", args);
          wpr.removePublicRenderParameter(parm1);
-      } catch(Exception e) {tr14.appendTcDetail(e.toString());}
+      } catch (Exception e) {
+         tr14.appendTcDetail(e.toString());
+      }
       tr14.writeTo(writer);
 
       portletReq.getPortletSession().setAttribute(
-                   Constants.RESULT_ATTR_PREFIX + "WrapperTests_ActionResponseWrapper_ApiAction",
-                   writer.toString(), APPLICATION_SCOPE);
-   }
-
-   @Override
-   public void serveResource(ResourceRequest portletReq, ResourceResponse portletResp)
-         throws PortletException, IOException {
-      LOGGER.entering(LOG_CLASS, "main portlet serveResource entry");
-
-      long tid = Thread.currentThread().getId();
-      portletReq.setAttribute(THREADID_ATTR, tid);
-
-      PrintWriter writer = portletResp.getWriter();
-
+            Constants.RESULT_ATTR_PREFIX
+                  + "WrapperTests_ActionResponseWrapper_ApiAction",
+            writer.toString(), APPLICATION_SCOPE);
    }
 
    @Override
    public void render(RenderRequest portletReq, RenderResponse portletResp)
          throws PortletException, IOException {
-      LOGGER.entering(LOG_CLASS, "main portlet render entry");
 
       long tid = Thread.currentThread().getId();
       portletReq.setAttribute(THREADID_ATTR, tid);
@@ -286,155 +368,217 @@ public class WrapperTests_ActionResponseWrapper_ApiAction implements Portlet, Re
       PrintWriter writer = portletResp.getWriter();
 
       PortletSession ps = portletReq.getPortletSession();
-      String msg = (String) ps.getAttribute(RESULT_ATTR_PREFIX + "WrapperTests_ActionResponseWrapper_ApiAction", APPLICATION_SCOPE);
+      String msg = (String) ps.getAttribute(
+            RESULT_ATTR_PREFIX + "WrapperTests_ActionResponseWrapper_ApiAction",
+            APPLICATION_SCOPE);
       if (msg != null) {
          writer.write("<p>" + msg + "</p><br/>\n");
-         ps.removeAttribute(RESULT_ATTR_PREFIX + "WrapperTests_ActionResponseWrapper_ApiAction", APPLICATION_SCOPE);
+         ps.removeAttribute(
+               RESULT_ATTR_PREFIX
+                     + "WrapperTests_ActionResponseWrapper_ApiAction",
+               APPLICATION_SCOPE);
       }
 
-      /* TestCase: V2WrapperTests_ActionResponseWrapper_ApiAction_sendRedirectA */
-      /* Details: "Method sendRedirect(String): Calls wrapped method"         */
+      /*
+       * TestCase: V2WrapperTests_ActionResponseWrapper_ApiAction_sendRedirectA
+       */
+      /* Details: "Method sendRedirect(String): Calls wrapped method" */
       {
          PortletURL aurl = portletResp.createActionURL();
          aurl.setParameters(portletReq.getPrivateParameterMap());
-         TestButton tb = new TestButton("V2WrapperTests_ActionResponseWrapper_ApiAction_sendRedirectA", aurl);
+         TestButton tb = new TestButton(
+               "V2WrapperTests_ActionResponseWrapper_ApiAction_sendRedirectA",
+               aurl);
          tb.writeTo(writer);
       }
 
-      /* TestCase: V2WrapperTests_ActionResponseWrapper_ApiAction_sendRedirectB */
-      /* Details: "Method sendRedirect(String, String): Calls wrapped         */
-      /* method"                                                              */
+      /*
+       * TestCase: V2WrapperTests_ActionResponseWrapper_ApiAction_sendRedirectB
+       */
+      /* Details: "Method sendRedirect(String, String): Calls wrapped */
+      /* method" */
       {
          PortletURL aurl = portletResp.createActionURL();
          aurl.setParameters(portletReq.getPrivateParameterMap());
-         TestButton tb = new TestButton("V2WrapperTests_ActionResponseWrapper_ApiAction_sendRedirectB", aurl);
+         TestButton tb = new TestButton(
+               "V2WrapperTests_ActionResponseWrapper_ApiAction_sendRedirectB",
+               aurl);
          tb.writeTo(writer);
       }
 
-      /* TestCase: V2WrapperTests_ActionResponseWrapper_ApiAction_setEventA   */
-      /* Details: "Method setEvent(javax.xml.namespace.QName,                 */
-      /* java.io.Serializable): Calls wrapped method"                         */
+      /* TestCase: V2WrapperTests_ActionResponseWrapper_ApiAction_setEventA */
+      /* Details: "Method setEvent(javax.xml.namespace.QName, */
+      /* java.io.Serializable): Calls wrapped method" */
       {
          PortletURL aurl = portletResp.createActionURL();
          aurl.setParameters(portletReq.getPrivateParameterMap());
-         TestButton tb = new TestButton("V2WrapperTests_ActionResponseWrapper_ApiAction_setEventA", aurl);
+         TestButton tb = new TestButton(
+               "V2WrapperTests_ActionResponseWrapper_ApiAction_setEventA",
+               aurl);
          tb.writeTo(writer);
       }
 
-      /* TestCase: V2WrapperTests_ActionResponseWrapper_ApiAction_setEventB   */
-      /* Details: "Method setEvent(String, java.io.Serializable): Calls       */
-      /* wrapped method"                                                      */
+      /* TestCase: V2WrapperTests_ActionResponseWrapper_ApiAction_setEventB */
+      /* Details: "Method setEvent(String, java.io.Serializable): Calls */
+      /* wrapped method" */
       {
          PortletURL aurl = portletResp.createActionURL();
          aurl.setParameters(portletReq.getPrivateParameterMap());
-         TestButton tb = new TestButton("V2WrapperTests_ActionResponseWrapper_ApiAction_setEventB", aurl);
+         TestButton tb = new TestButton(
+               "V2WrapperTests_ActionResponseWrapper_ApiAction_setEventB",
+               aurl);
          tb.writeTo(writer);
       }
 
-      /* TestCase: V2WrapperTests_ActionResponseWrapper_ApiAction_setPortletMode */
-      /* Details: "Method setPortletMode(PortletMode): Calls wrapped          */
-      /* method"                                                              */
+      /*
+       * TestCase: V2WrapperTests_ActionResponseWrapper_ApiAction_setPortletMode
+       */
+      /* Details: "Method setPortletMode(PortletMode): Calls wrapped */
+      /* method" */
       {
          PortletURL aurl = portletResp.createActionURL();
          aurl.setParameters(portletReq.getPrivateParameterMap());
-         TestButton tb = new TestButton("V2WrapperTests_ActionResponseWrapper_ApiAction_setPortletMode", aurl);
+         TestButton tb = new TestButton(
+               "V2WrapperTests_ActionResponseWrapper_ApiAction_setPortletMode",
+               aurl);
          tb.writeTo(writer);
       }
 
-      /* TestCase: V2WrapperTests_ActionResponseWrapper_ApiAction_setRenderParameterA */
-      /* Details: "Method setRenderParameter(String, String): Calls wrapped   */
-      /* method"                                                              */
+      /*
+       * TestCase:
+       * V2WrapperTests_ActionResponseWrapper_ApiAction_setRenderParameterA
+       */
+      /* Details: "Method setRenderParameter(String, String): Calls wrapped */
+      /* method" */
       {
          PortletURL aurl = portletResp.createActionURL();
          aurl.setParameters(portletReq.getPrivateParameterMap());
-         TestButton tb = new TestButton("V2WrapperTests_ActionResponseWrapper_ApiAction_setRenderParameterA", aurl);
+         TestButton tb = new TestButton(
+               "V2WrapperTests_ActionResponseWrapper_ApiAction_setRenderParameterA",
+               aurl);
          tb.writeTo(writer);
       }
 
-      /* TestCase: V2WrapperTests_ActionResponseWrapper_ApiAction_setRenderParameterB */
-      /* Details: "Method setRenderParameter(String, String[]): Calls         */
-      /* wrapped method"                                                      */
+      /*
+       * TestCase:
+       * V2WrapperTests_ActionResponseWrapper_ApiAction_setRenderParameterB
+       */
+      /* Details: "Method setRenderParameter(String, String[]): Calls */
+      /* wrapped method" */
       {
          PortletURL aurl = portletResp.createActionURL();
          aurl.setParameters(portletReq.getPrivateParameterMap());
-         TestButton tb = new TestButton("V2WrapperTests_ActionResponseWrapper_ApiAction_setRenderParameterB", aurl);
+         TestButton tb = new TestButton(
+               "V2WrapperTests_ActionResponseWrapper_ApiAction_setRenderParameterB",
+               aurl);
          tb.writeTo(writer);
       }
 
-      /* TestCase: V2WrapperTests_ActionResponseWrapper_ApiAction_setRenderParameters */
-      /* Details: "Method setRenderParameters(java.util.Map): Calls wrapped   */
-      /* method"                                                              */
+      /*
+       * TestCase:
+       * V2WrapperTests_ActionResponseWrapper_ApiAction_setRenderParameters
+       */
+      /* Details: "Method setRenderParameters(java.util.Map): Calls wrapped */
+      /* method" */
       {
          PortletURL aurl = portletResp.createActionURL();
          aurl.setParameters(portletReq.getPrivateParameterMap());
-         TestButton tb = new TestButton("V2WrapperTests_ActionResponseWrapper_ApiAction_setRenderParameters", aurl);
+         TestButton tb = new TestButton(
+               "V2WrapperTests_ActionResponseWrapper_ApiAction_setRenderParameters",
+               aurl);
          tb.writeTo(writer);
       }
 
-      /* TestCase: V2WrapperTests_ActionResponseWrapper_ApiAction_setWindowState */
-      /* Details: "Method setWindowState(WindowState): Calls wrapped          */
-      /* method"                                                              */
+      /*
+       * TestCase: V2WrapperTests_ActionResponseWrapper_ApiAction_setWindowState
+       */
+      /* Details: "Method setWindowState(WindowState): Calls wrapped */
+      /* method" */
       {
          PortletURL aurl = portletResp.createActionURL();
          aurl.setParameters(portletReq.getPrivateParameterMap());
-         TestButton tb = new TestButton("V2WrapperTests_ActionResponseWrapper_ApiAction_setWindowState", aurl);
+         TestButton tb = new TestButton(
+               "V2WrapperTests_ActionResponseWrapper_ApiAction_setWindowState",
+               aurl);
          tb.writeTo(writer);
       }
 
       /* TestCase: V2WrapperTests_ActionResponseWrapper_ApiAction_getResponse */
-      /* Details: "Method getResponse(): Returns wrapped ActionResponse       */
-      /* object"                                                              */
+      /* Details: "Method getResponse(): Returns wrapped ActionResponse */
+      /* object" */
       {
          PortletURL aurl = portletResp.createActionURL();
          aurl.setParameters(portletReq.getPrivateParameterMap());
-         TestButton tb = new TestButton("V2WrapperTests_ActionResponseWrapper_ApiAction_getResponse", aurl);
+         TestButton tb = new TestButton(
+               "V2WrapperTests_ActionResponseWrapper_ApiAction_getResponse",
+               aurl);
          tb.writeTo(writer);
       }
 
       /* TestCase: V2WrapperTests_ActionResponseWrapper_ApiAction_setResponse */
-      /* Details: "Method setResponse(ActionResponse): Allows wrapped         */
-      /* ActionResponse object to be set"                                     */
+      /* Details: "Method setResponse(ActionResponse): Allows wrapped */
+      /* ActionResponse object to be set" */
       {
          PortletURL aurl = portletResp.createActionURL();
          aurl.setParameters(portletReq.getPrivateParameterMap());
-         TestButton tb = new TestButton("V2WrapperTests_ActionResponseWrapper_ApiAction_setResponse", aurl);
+         TestButton tb = new TestButton(
+               "V2WrapperTests_ActionResponseWrapper_ApiAction_setResponse",
+               aurl);
          tb.writeTo(writer);
       }
 
-      /* TestCase: V2WrapperTests_ActionResponseWrapper_ApiAction_getPortletMode */
-      /* Details: "Method getPortletMode(): Calls wrapped method"             */
+      /*
+       * TestCase: V2WrapperTests_ActionResponseWrapper_ApiAction_getPortletMode
+       */
+      /* Details: "Method getPortletMode(): Calls wrapped method" */
       {
          PortletURL aurl = portletResp.createActionURL();
          aurl.setParameters(portletReq.getPrivateParameterMap());
-         TestButton tb = new TestButton("V2WrapperTests_ActionResponseWrapper_ApiAction_getPortletMode", aurl);
+         TestButton tb = new TestButton(
+               "V2WrapperTests_ActionResponseWrapper_ApiAction_getPortletMode",
+               aurl);
          tb.writeTo(writer);
       }
 
-      /* TestCase: V2WrapperTests_ActionResponseWrapper_ApiAction_getRenderParameterMap1 */
-      /* Details: "Method getRenderParameterMap(): Calls wrapped method"      */
+      /*
+       * TestCase:
+       * V2WrapperTests_ActionResponseWrapper_ApiAction_getRenderParameterMap1
+       */
+      /* Details: "Method getRenderParameterMap(): Calls wrapped method" */
       {
          PortletURL aurl = portletResp.createActionURL();
          aurl.setParameters(portletReq.getPrivateParameterMap());
-         TestButton tb = new TestButton("V2WrapperTests_ActionResponseWrapper_ApiAction_getRenderParameterMap1", aurl);
+         TestButton tb = new TestButton(
+               "V2WrapperTests_ActionResponseWrapper_ApiAction_getRenderParameterMap1",
+               aurl);
          tb.writeTo(writer);
       }
 
-      /* TestCase: V2WrapperTests_ActionResponseWrapper_ApiAction_getWindowState */
-      /* Details: "Method getWindowState(): Calls wrapped method"             */
+      /*
+       * TestCase: V2WrapperTests_ActionResponseWrapper_ApiAction_getWindowState
+       */
+      /* Details: "Method getWindowState(): Calls wrapped method" */
       {
          PortletURL aurl = portletResp.createActionURL();
          aurl.setParameters(portletReq.getPrivateParameterMap());
-         TestButton tb = new TestButton("V2WrapperTests_ActionResponseWrapper_ApiAction_getWindowState", aurl);
+         TestButton tb = new TestButton(
+               "V2WrapperTests_ActionResponseWrapper_ApiAction_getWindowState",
+               aurl);
          tb.writeTo(writer);
       }
 
-      /* TestCase: V2WrapperTests_ActionResponseWrapper_ApiAction_removePublicRenderParameter */
-      /* Details: "Method removePublicRenderParameter(String): Calls          */
-      /* wrapped method"                                                      */
+      /*
+       * TestCase:
+       * V2WrapperTests_ActionResponseWrapper_ApiAction_removePublicRenderParameter
+       */
+      /* Details: "Method removePublicRenderParameter(String): Calls */
+      /* wrapped method" */
       {
          PortletURL aurl = portletResp.createActionURL();
          aurl.setParameters(portletReq.getPrivateParameterMap());
-         TestButton tb = new TestButton("V2WrapperTests_ActionResponseWrapper_ApiAction_removePublicRenderParameter", aurl);
+         TestButton tb = new TestButton(
+               "V2WrapperTests_ActionResponseWrapper_ApiAction_removePublicRenderParameter",
+               aurl);
          tb.writeTo(writer);
       }
 

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/b78fd97c/portlet-tck_3.0/V2WrapperTests/src/main/java/javax/portlet/tck/portlets/WrapperTests_EventRequestWrapper_ApiEvent.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2WrapperTests/src/main/java/javax/portlet/tck/portlets/WrapperTests_EventRequestWrapper_ApiEvent.java b/portlet-tck_3.0/V2WrapperTests/src/main/java/javax/portlet/tck/portlets/WrapperTests_EventRequestWrapper_ApiEvent.java
index aebe1f1..4da206d 100644
--- a/portlet-tck_3.0/V2WrapperTests/src/main/java/javax/portlet/tck/portlets/WrapperTests_EventRequestWrapper_ApiEvent.java
+++ b/portlet-tck_3.0/V2WrapperTests/src/main/java/javax/portlet/tck/portlets/WrapperTests_EventRequestWrapper_ApiEvent.java
@@ -18,43 +18,40 @@
 
 package javax.portlet.tck.portlets;
 
-import java.io.*;
-import java.util.*;
-import java.util.logging.*;
-import static java.util.logging.Logger.*;
+import java.io.IOException;
+import java.io.PrintWriter;
+
+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.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.JSR286ApiTestCaseDetails.*;
-import static javax.portlet.tck.constants.Constants.*;
-import static javax.portlet.PortletSession.*;
-import static javax.portlet.ResourceURL.*;
+
+import static javax.portlet.tck.constants.Constants.THREADID_ATTR;
+import static javax.portlet.tck.constants.Constants.TCKNAMESPACE;
 
 /**
- * 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 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 WrapperTests_EventRequestWrapper_ApiEvent_event
+ * 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
+ * WrapperTests_EventRequestWrapper_ApiEvent_event
  *
  */
-public class WrapperTests_EventRequestWrapper_ApiEvent implements Portlet, ResourceServingPortlet {
-   private static final String LOG_CLASS = 
-         WrapperTests_EventRequestWrapper_ApiEvent.class.getName();
-   private final Logger LOGGER = Logger.getLogger(LOG_CLASS);
-   
-   private PortletConfig portletConfig = null;
+public class WrapperTests_EventRequestWrapper_ApiEvent implements Portlet {
 
    @Override
    public void init(PortletConfig config) throws PortletException {
-      this.portletConfig = config;
    }
 
    @Override
@@ -62,78 +59,66 @@ public class WrapperTests_EventRequestWrapper_ApiEvent 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();
-
       QName eventQName = new QName(TCKNAMESPACE,
-             "WrapperTests_EventRequestWrapper_ApiEvent");
+            "WrapperTests_EventRequestWrapper_ApiEvent");
       portletResp.setEvent(eventQName, "Hi!");
    }
 
    @Override
-   public void serveResource(ResourceRequest portletReq, ResourceResponse portletResp)
-         throws PortletException, IOException {
-      LOGGER.entering(LOG_CLASS, "main portlet serveResource entry");
-
-      long tid = Thread.currentThread().getId();
-      portletReq.setAttribute(THREADID_ATTR, tid);
-
-      PrintWriter writer = portletResp.getWriter();
-
-   }
-
-   @Override
    public void render(RenderRequest portletReq, RenderResponse portletResp)
          throws PortletException, IOException {
-      LOGGER.entering(LOG_CLASS, "main portlet render entry");
 
       long tid = Thread.currentThread().getId();
       portletReq.setAttribute(THREADID_ATTR, tid);
 
       PrintWriter writer = portletResp.getWriter();
 
-      /* TestCase: V2WrapperTests_EventRequestWrapper_ApiEvent_getRequest     */
-      /* Details: "Method getRequest(): Returns wrapped EventRequest          */
-      /* object"                                                              */
+      /* TestCase: V2WrapperTests_EventRequestWrapper_ApiEvent_getRequest */
+      /* Details: "Method getRequest(): Returns wrapped EventRequest */
+      /* object" */
       {
          PortletURL aurl = portletResp.createActionURL();
          aurl.setParameters(portletReq.getPrivateParameterMap());
-         TestButton tb = new TestButton("V2WrapperTests_EventRequestWrapper_ApiEvent_getRequest", aurl);
+         TestButton tb = new TestButton(
+               "V2WrapperTests_EventRequestWrapper_ApiEvent_getRequest", aurl);
          tb.writeTo(writer);
       }
 
-      /* TestCase: V2WrapperTests_EventRequestWrapper_ApiEvent_setRequest     */
-      /* Details: "Method setRequest(EventRequest): Allows wrapped            */
-      /* EventRequest object to be set"                                       */
+      /* TestCase: V2WrapperTests_EventRequestWrapper_ApiEvent_setRequest */
+      /* Details: "Method setRequest(EventRequest): Allows wrapped */
+      /* EventRequest object to be set" */
       {
          PortletURL aurl = portletResp.createActionURL();
          aurl.setParameters(portletReq.getPrivateParameterMap());
-         TestButton tb = new TestButton("V2WrapperTests_EventRequestWrapper_ApiEvent_setRequest", aurl);
+         TestButton tb = new TestButton(
+               "V2WrapperTests_EventRequestWrapper_ApiEvent_setRequest", aurl);
          tb.writeTo(writer);
       }
 
-      /* TestCase: V2WrapperTests_EventRequestWrapper_ApiEvent_getEvent1      */
-      /* Details: "Method getEvent(): Calls wrapped method"                   */
+      /* TestCase: V2WrapperTests_EventRequestWrapper_ApiEvent_getEvent1 */
+      /* Details: "Method getEvent(): Calls wrapped method" */
       {
          PortletURL aurl = portletResp.createActionURL();
          aurl.setParameters(portletReq.getPrivateParameterMap());
-         TestButton tb = new TestButton("V2WrapperTests_EventRequestWrapper_ApiEvent_getEvent1", aurl);
+         TestButton tb = new TestButton(
+               "V2WrapperTests_EventRequestWrapper_ApiEvent_getEvent1", aurl);
          tb.writeTo(writer);
       }
 
-      /* TestCase: V2WrapperTests_EventRequestWrapper_ApiEvent_getMethod      */
-      /* Details: "Method getMethod(): Calls wrapped method"                  */
+      /* TestCase: V2WrapperTests_EventRequestWrapper_ApiEvent_getMethod */
+      /* Details: "Method getMethod(): Calls wrapped method" */
       {
          PortletURL aurl = portletResp.createActionURL();
          aurl.setParameters(portletReq.getPrivateParameterMap());
-         TestButton tb = new TestButton("V2WrapperTests_EventRequestWrapper_ApiEvent_getMethod", aurl);
+         TestButton tb = new TestButton(
+               "V2WrapperTests_EventRequestWrapper_ApiEvent_getMethod", aurl);
          tb.writeTo(writer);
       }
 

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/b78fd97c/portlet-tck_3.0/V2WrapperTests/src/main/java/javax/portlet/tck/portlets/WrapperTests_EventRequestWrapper_ApiEvent_event.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2WrapperTests/src/main/java/javax/portlet/tck/portlets/WrapperTests_EventRequestWrapper_ApiEvent_event.java b/portlet-tck_3.0/V2WrapperTests/src/main/java/javax/portlet/tck/portlets/WrapperTests_EventRequestWrapper_ApiEvent_event.java
index c611aa2..9b3bf13 100644
--- a/portlet-tck_3.0/V2WrapperTests/src/main/java/javax/portlet/tck/portlets/WrapperTests_EventRequestWrapper_ApiEvent_event.java
+++ b/portlet-tck_3.0/V2WrapperTests/src/main/java/javax/portlet/tck/portlets/WrapperTests_EventRequestWrapper_ApiEvent_event.java
@@ -18,35 +18,44 @@
 
 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.JSR286ApiTestCaseDetails.*;
-import static javax.portlet.PortletSession.*;
+import static javax.portlet.tck.beans.JSR286ApiTestCaseDetails.V2WRAPPERTESTS_EVENTREQUESTWRAPPER_APIEVENT_GETREQUEST;
+import static javax.portlet.tck.beans.JSR286ApiTestCaseDetails.V2WRAPPERTESTS_EVENTREQUESTWRAPPER_APIEVENT_SETREQUEST;
+import static javax.portlet.tck.beans.JSR286ApiTestCaseDetails.V2WRAPPERTESTS_EVENTREQUESTWRAPPER_APIEVENT_GETEVENT1;
+import static javax.portlet.tck.beans.JSR286ApiTestCaseDetails.V2WRAPPERTESTS_EVENTREQUESTWRAPPER_APIEVENT_GETMETHOD;
+import static javax.portlet.PortletSession.APPLICATION_SCOPE;
+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.RenderRequest;
+import javax.portlet.RenderResponse;
+import javax.portlet.filter.EventRequestWrapper;
+import javax.portlet.tck.beans.EventRequestWrapperChecker;
+import javax.portlet.tck.beans.JSR286ApiTestCaseDetails;
+import javax.portlet.tck.beans.TestResult;
+import javax.portlet.tck.constants.Constants;
 
 /**
- * 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 WrapperTests_EventRequestWrapper_ApiEvent_event implements Portlet, EventPortlet, ResourceServingPortlet {
-   private static final String LOG_CLASS = 
-         WrapperTests_EventRequestWrapper_ApiEvent_event.class.getName();
-   private final Logger LOGGER = Logger.getLogger(LOG_CLASS);
-   
-   private PortletConfig portletConfig = null;
+public class WrapperTests_EventRequestWrapper_ApiEvent_event
+      implements Portlet, EventPortlet {
 
    @Override
    public void init(PortletConfig config) throws PortletException {
-      this.portletConfig = config;
    }
 
    @Override
@@ -54,22 +63,13 @@ public class WrapperTests_EventRequestWrapper_ApiEvent_event implements Portlet,
    }
 
    @Override
-   public void processAction(ActionRequest portletReq, ActionResponse portletResp)
-         throws PortletException, IOException {
-      LOGGER.entering(LOG_CLASS, "event companion processAction - ERROR!!");
-   }
-
-   @Override
-   public void serveResource(ResourceRequest portletReq, ResourceResponse portletResp)
-         throws PortletException, IOException {
-      LOGGER.entering(LOG_CLASS, "event companion serveResource - ERROR!!");
+   public void processAction(ActionRequest portletReq,
+         ActionResponse portletResp) throws PortletException, IOException {
    }
 
    @Override
    public void processEvent(EventRequest portletReq, EventResponse portletResp)
          throws PortletException, IOException {
-      LOGGER.entering(LOG_CLASS, "event companion processEvent");
-
 
       portletResp.setRenderParameters(portletReq);
 
@@ -78,76 +78,88 @@ public class WrapperTests_EventRequestWrapper_ApiEvent_event implements Portlet,
 
       StringWriter writer = new StringWriter();
 
-      EventRequestWrapperChecker wc = new EventRequestWrapperChecker(portletReq);
+      EventRequestWrapperChecker wc = new EventRequestWrapperChecker(
+            portletReq);
       EventRequestWrapper wpr = new EventRequestWrapper(portletReq);
       wpr.setRequest(wc);
       JSR286ApiTestCaseDetails tcd = new JSR286ApiTestCaseDetails();
 
       // Create result objects for the tests
 
-      ClassChecker cc = new ClassChecker(EventRequestWrapper.class);
-
-      /* TestCase: V2WrapperTests_EventRequestWrapper_ApiEvent_getRequest     */
-      /* Details: "Method getRequest(): Returns wrapped EventRequest          */
-      /* object"                                                              */
-      TestResult tr0 = tcd.getTestResultFailed(V2WRAPPERTESTS_EVENTREQUESTWRAPPER_APIEVENT_GETREQUEST);
+      /* TestCase: V2WrapperTests_EventRequestWrapper_ApiEvent_getRequest */
+      /* Details: "Method getRequest(): Returns wrapped EventRequest */
+      /* object" */
+      TestResult tr0 = tcd.getTestResultFailed(
+            V2WRAPPERTESTS_EVENTREQUESTWRAPPER_APIEVENT_GETREQUEST);
       try {
-         // The retrieved request / response object should be the wrapper checker instance
+         // The retrieved request / response object should be the wrapper
+         // checker instance
          EventRequest r = wpr.getRequest();
          tr0.setTcSuccess(r == wc);
-      } catch(Exception e) {tr0.appendTcDetail(e.toString());}
+      } catch (Exception e) {
+         tr0.appendTcDetail(e.toString());
+      }
       tr0.writeTo(writer);
 
-      /* TestCase: V2WrapperTests_EventRequestWrapper_ApiEvent_setRequest     */
-      /* Details: "Method setRequest(EventRequest): Allows wrapped            */
-      /* EventRequest object to be set"                                       */
-      TestResult tr1 = tcd.getTestResultFailed(V2WRAPPERTESTS_EVENTREQUESTWRAPPER_APIEVENT_SETREQUEST);
+      /* TestCase: V2WrapperTests_EventRequestWrapper_ApiEvent_setRequest */
+      /* Details: "Method setRequest(EventRequest): Allows wrapped */
+      /* EventRequest object to be set" */
+      TestResult tr1 = tcd.getTestResultFailed(
+            V2WRAPPERTESTS_EVENTREQUESTWRAPPER_APIEVENT_SETREQUEST);
       try {
-         // tested by method set up 
+         // tested by method set up
          tr1.setTcSuccess(true);
-      } catch(Exception e) {tr1.appendTcDetail(e.toString());}
+      } catch (Exception e) {
+         tr1.appendTcDetail(e.toString());
+      }
       tr1.writeTo(writer);
 
-      /* TestCase: V2WrapperTests_EventRequestWrapper_ApiEvent_getEvent1      */
-      /* Details: "Method getEvent(): Calls wrapped method"                   */
-      TestResult tr2 = tcd.getTestResultFailed(V2WRAPPERTESTS_EVENTREQUESTWRAPPER_APIEVENT_GETEVENT1);
+      /* TestCase: V2WrapperTests_EventRequestWrapper_ApiEvent_getEvent1 */
+      /* Details: "Method getEvent(): Calls wrapped method" */
+      TestResult tr2 = tcd.getTestResultFailed(
+            V2WRAPPERTESTS_EVENTREQUESTWRAPPER_APIEVENT_GETEVENT1);
       try {
          Object[] args = {};
          wc.prepare(tr2, "getEvent", args);
          wc.checkRetval(wpr.getEvent());
-      } catch(Exception e) {tr2.appendTcDetail(e.toString());}
+      } catch (Exception e) {
+         tr2.appendTcDetail(e.toString());
+      }
       tr2.writeTo(writer);
 
-      /* TestCase: V2WrapperTests_EventRequestWrapper_ApiEvent_getMethod      */
-      /* Details: "Method getMethod(): Calls wrapped method"                  */
-      TestResult tr3 = tcd.getTestResultFailed(V2WRAPPERTESTS_EVENTREQUESTWRAPPER_APIEVENT_GETMETHOD);
+      /* TestCase: V2WrapperTests_EventRequestWrapper_ApiEvent_getMethod */
+      /* Details: "Method getMethod(): Calls wrapped method" */
+      TestResult tr3 = tcd.getTestResultFailed(
+            V2WRAPPERTESTS_EVENTREQUESTWRAPPER_APIEVENT_GETMETHOD);
       try {
          Object[] args = {};
          wc.prepare(tr3, "getMethod", args);
          wc.checkRetval(wpr.getMethod());
-      } catch(Exception e) {tr3.appendTcDetail(e.toString());}
+      } catch (Exception e) {
+         tr3.appendTcDetail(e.toString());
+      }
       tr3.writeTo(writer);
 
       portletReq.getPortletSession().setAttribute(
-                   Constants.RESULT_ATTR_PREFIX + "WrapperTests_EventRequestWrapper_ApiEvent",
-                   writer.toString(), APPLICATION_SCOPE);
+            Constants.RESULT_ATTR_PREFIX
+                  + "WrapperTests_EventRequestWrapper_ApiEvent",
+            writer.toString(), APPLICATION_SCOPE);
 
    }
 
    @Override
    public void render(RenderRequest portletReq, RenderResponse portletResp)
          throws PortletException, IOException {
-      
-      LOGGER.entering(LOG_CLASS, "event companion render");
 
       portletResp.setContentType("text/html");
       PrintWriter writer = portletResp.getWriter();
       writer.write("<h3>Event Companion Portlet </h3>\n");
       writer.write("<p>WrapperTests_EventRequestWrapper_ApiEvent_event</p>\n");
 
-      String msg = (String) portletReq.getPortletSession()
-            .getAttribute(RESULT_ATTR_PREFIX + "WrapperTests_EventRequestWrapper_ApiEvent", APPLICATION_SCOPE);
-      msg = (msg==null) ? "Not ready. click test case link." : msg;
+      String msg = (String) portletReq.getPortletSession().getAttribute(
+            RESULT_ATTR_PREFIX + "WrapperTests_EventRequestWrapper_ApiEvent",
+            APPLICATION_SCOPE);
+      msg = (msg == null) ? "Not ready. click test case link." : msg;
       writer.write("<p>" + msg + "</p>\n");
 
    }


Mime
View raw message