You are viewing a plain text version of this content. The canonical link for it is here.
Posted to pluto-scm@portals.apache.org by ms...@apache.org on 2014/08/25 11:55:20 UTC

[16/22] began work on generating the additional spec tests and the portlet tab library tests again in order to improve structure and correct problems in test case names.

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/23a1c547/portlet-tck_3.0/V2AddlFilterTests/src/main/java/javax/portlet/tck/portlets/AddlFilterTests_SPEC2_20_Resource.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlFilterTests/src/main/java/javax/portlet/tck/portlets/AddlFilterTests_SPEC2_20_Resource.java b/portlet-tck_3.0/V2AddlFilterTests/src/main/java/javax/portlet/tck/portlets/AddlFilterTests_SPEC2_20_Resource.java
new file mode 100644
index 0000000..56fa7dc
--- /dev/null
+++ b/portlet-tck_3.0/V2AddlFilterTests/src/main/java/javax/portlet/tck/portlets/AddlFilterTests_SPEC2_20_Resource.java
@@ -0,0 +1,242 @@
+/*  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+
+package javax.portlet.tck.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.JSR286SpecTestCaseDetails.*;
+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 AddlFilterTests_SPEC2_20_Resource_event
+ *
+ */
+public class AddlFilterTests_SPEC2_20_Resource implements Portlet, ResourceServingPortlet {
+   private static final String LOG_CLASS = 
+         AddlFilterTests_SPEC2_20_Resource.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
+   public void destroy() {
+   }
+
+   @Override
+   public void processAction(ActionRequest portletReq, ActionResponse portletResp)
+         throws PortletException, IOException {
+      LOGGER.entering(LOG_CLASS, "main portlet processAction entry");
+
+      portletResp.setRenderParameters(portletReq.getParameterMap());
+      long tid = Thread.currentThread().getId();
+      portletReq.setAttribute(THREADID_ATTR, tid);
+
+      StringWriter writer = new StringWriter();
+
+   }
+
+   @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();
+
+      JSR286SpecTestCaseDetails tcd = new JSR286SpecTestCaseDetails();
+
+      // Create result objects for the tests
+
+      /* TestCase: V2AddlFilterTests_SPEC2_20_Resource_filter1                */
+      /* Details: "A filter declaration can be configured in the deployment   */
+      /* descriptor"                                                          */
+      TestResult tr0 = tcd.getTestResultFailed(V2ADDLFILTERTESTS_SPEC2_20_RESOURCE_FILTER1);
+      /* TODO: implement test */
+      tr0.appendTcDetail("Not implemented.");
+      tr0.writeTo(writer);
+
+      /* TestCase: V2AddlFilterTests_SPEC2_20_Resource_filter6                */
+      /* Details: "A filter declaration can contain multiple <lifecycle>      */
+      /* tags for a single filter class"                                      */
+      TestResult tr1 = tcd.getTestResultFailed(V2ADDLFILTERTESTS_SPEC2_20_RESOURCE_FILTER6);
+      /* TODO: implement test */
+      tr1.appendTcDetail("Not implemented.");
+      tr1.writeTo(writer);
+
+      /* TestCase: V2AddlFilterTests_SPEC2_20_Resource_filter7                */
+      /* Details: "The filter declaration can contain initialization          */
+      /* parameters which can be read by the filter through the               */
+      /* FilterConfig object"                                                 */
+      TestResult tr2 = tcd.getTestResultFailed(V2ADDLFILTERTESTS_SPEC2_20_RESOURCE_FILTER7);
+      /* TODO: implement test */
+      tr2.appendTcDetail("Not implemented.");
+      tr2.writeTo(writer);
+
+      /* TestCase: V2AddlFilterTests_SPEC2_20_Resource_filter8                */
+      /* Details: "For each filter declaration, the filter instance must      */
+      /* receive all initialization parameters defined in the filter          */
+      /* declaration"                                                         */
+      TestResult tr3 = tcd.getTestResultFailed(V2ADDLFILTERTESTS_SPEC2_20_RESOURCE_FILTER8);
+      /* TODO: implement test */
+      tr3.appendTcDetail("Not implemented.");
+      tr3.writeTo(writer);
+
+      /* TestCase: V2AddlFilterTests_SPEC2_20_Resource_filter9                */
+      /* Details: "For each filter declaration, the filter instance must      */
+      /* receive only initialization parameters defined in the filter         */
+      /* declaration"                                                         */
+      TestResult tr4 = tcd.getTestResultFailed(V2ADDLFILTERTESTS_SPEC2_20_RESOURCE_FILTER9);
+      /* TODO: implement test */
+      tr4.appendTcDetail("Not implemented.");
+      tr4.writeTo(writer);
+
+      /* TestCase: V2AddlFilterTests_SPEC2_20_Resource_filter10               */
+      /* Details: "For multiple filter declarations for a single filter       */
+      /* class, the filter instance must receive all initialization           */
+      /* parameters defined in the filter declaration"                        */
+      TestResult tr5 = tcd.getTestResultFailed(V2ADDLFILTERTESTS_SPEC2_20_RESOURCE_FILTER10);
+      /* TODO: implement test */
+      tr5.appendTcDetail("Not implemented.");
+      tr5.writeTo(writer);
+
+      /* TestCase: V2AddlFilterTests_SPEC2_20_Resource_filter11               */
+      /* Details: "For multiple filter declarations for a single filter       */
+      /* class, the filter instance must receive only initialization          */
+      /* parameters defined in the filter declaration"                        */
+      TestResult tr6 = tcd.getTestResultFailed(V2ADDLFILTERTESTS_SPEC2_20_RESOURCE_FILTER11);
+      /* TODO: implement test */
+      tr6.appendTcDetail("Not implemented.");
+      tr6.writeTo(writer);
+
+      /* TestCase: V2AddlFilterTests_SPEC2_20_Resource_filter12               */
+      /* Details: "A filter class can appear in multiple filter               */
+      /* declarations"                                                        */
+      TestResult tr7 = tcd.getTestResultFailed(V2ADDLFILTERTESTS_SPEC2_20_RESOURCE_FILTER12);
+      /* TODO: implement test */
+      tr7.appendTcDetail("Not implemented.");
+      tr7.writeTo(writer);
+
+      /* TestCase: V2AddlFilterTests_SPEC2_20_Resource_filter13               */
+      /* Details: "A filter declaration can be mapped to a portlet through    */
+      /* the deployment descriptor <filter-mapping> element"                  */
+      TestResult tr8 = tcd.getTestResultFailed(V2ADDLFILTERTESTS_SPEC2_20_RESOURCE_FILTER13);
+      /* TODO: implement test */
+      tr8.appendTcDetail("Not implemented.");
+      tr8.writeTo(writer);
+
+      /* TestCase: V2AddlFilterTests_SPEC2_20_Resource_filter14               */
+      /* Details: "Filters can be associated with groups of portlets using    */
+      /* the '*' character as a wildcard at the end of a string to indicate   */
+      /* that the filter must be applied to any portlet whose name starts     */
+      /* with the characters before the \"*\" character"                      */
+      TestResult tr9 = tcd.getTestResultFailed(V2ADDLFILTERTESTS_SPEC2_20_RESOURCE_FILTER14);
+      /* TODO: implement test */
+      tr9.appendTcDetail("Not implemented.");
+      tr9.writeTo(writer);
+
+      /* TestCase: V2AddlFilterTests_SPEC2_20_Resource_filter15               */
+      /* Details: "The order the container uses in building the chain of      */
+      /* filters to be applied for a particular request is the order in       */
+      /* which the <portlet-name> matching filter mappings appear in the      */
+      /* deployment descriptor"                                               */
+      TestResult tr10 = tcd.getTestResultFailed(V2ADDLFILTERTESTS_SPEC2_20_RESOURCE_FILTER15);
+      /* TODO: implement test */
+      tr10.appendTcDetail("Not implemented.");
+      tr10.writeTo(writer);
+
+      /* TestCase: V2AddlFilterTests_SPEC2_20_Resource_filter5                */
+      /* Details: "If the filter declaration specifies the <lifecycle> tag    */
+      /* value RESOURCE_PHASE, the ResourceFilter.doFilter method is          */
+      /* called"                                                              */
+      TestResult tr11 = tcd.getTestResultFailed(V2ADDLFILTERTESTS_SPEC2_20_RESOURCE_FILTER5);
+      /* TODO: implement test */
+      tr11.appendTcDetail("Not implemented.");
+      tr11.writeTo(writer);
+
+      /* TestCase: V2AddlFilterTests_SPEC2_20_Resource_filterWrapper7         */
+      /* Details: "An RESOURCE_PHASE filter can wrap the ResourceRequest      */
+      /* object with a custom wrapper"                                        */
+      TestResult tr12 = tcd.getTestResultFailed(V2ADDLFILTERTESTS_SPEC2_20_RESOURCE_FILTERWRAPPER7);
+      /* TODO: implement test */
+      tr12.appendTcDetail("Not implemented.");
+      tr12.writeTo(writer);
+
+      /* TestCase: V2AddlFilterTests_SPEC2_20_Resource_filterWrapper8         */
+      /* Details: "An RESOURCE_PHASE filter can wrap the ResourceResponse     */
+      /* object with a custom wrapper"                                        */
+      TestResult tr13 = tcd.getTestResultFailed(V2ADDLFILTERTESTS_SPEC2_20_RESOURCE_FILTERWRAPPER8);
+      /* TODO: implement test */
+      tr13.appendTcDetail("Not implemented.");
+      tr13.writeTo(writer);
+
+   }
+
+   @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();
+
+      writer.write("<div id=\"AddlFilterTests_SPEC2_20_Resource\">no resource output.</div>\n");
+      ResourceURL resurl = portletResp.createResourceURL();
+      resurl.setCacheability(PAGE);
+      writer.write("<script>\n");
+      writer.write("(function () {\n");
+      writer.write("   var xhr = new XMLHttpRequest();\n");
+      writer.write("   xhr.onreadystatechange=function() {\n");
+      writer.write("      if (xhr.readyState==4 && xhr.status==200) {\n");
+      writer.write("         document.getElementById(\"AddlFilterTests_SPEC2_20_Resource\").innerHTML=xhr.responseText;\n");
+      writer.write("      }\n");
+      writer.write("   };\n");
+      writer.write("   xhr.open(\"GET\",\"" + resurl.toString() + "\",true);\n");
+      writer.write("   xhr.send();\n");
+      writer.write("})();\n");
+      writer.write("</script>\n");
+   }
+
+}

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/23a1c547/portlet-tck_3.0/V2AddlFilterTests/src/main/resources/xml-resources/additionalTCs.xml
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlFilterTests/src/main/resources/xml-resources/additionalTCs.xml b/portlet-tck_3.0/V2AddlFilterTests/src/main/resources/xml-resources/additionalTCs.xml
index 159e559..1bcb620 100644
--- a/portlet-tck_3.0/V2AddlFilterTests/src/main/resources/xml-resources/additionalTCs.xml
+++ b/portlet-tck_3.0/V2AddlFilterTests/src/main/resources/xml-resources/additionalTCs.xml
@@ -17,37 +17,63 @@
     specific language governing permissions and limitations
     under the License.     
 -->
-<!--
-   Defines the test cases for this module.
-   For this module, the test case names are not automatically generated from.
-   the deployment descriptor, so edit this file to add new test cases.
-   This allows a portlet to define multiple test cases.
--->
 <!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
 <properties>
 <!-- JSR 286 API AddlFilterTests test case names and page mappings -->
-<entry key="SPEC2_20_PortletFilter_filter1">V2AddlFilterTests</entry>
-<entry key="SPEC2_20_PortletFilter_filter2">V2AddlFilterTests</entry>
-<entry key="SPEC2_20_PortletFilter_filter3">V2AddlFilterTests</entry>
-<entry key="SPEC2_20_PortletFilter_filter4">V2AddlFilterTests</entry>
-<entry key="SPEC2_20_PortletFilter_filter5">V2AddlFilterTests</entry>
-<entry key="SPEC2_20_PortletFilter_filter6">V2AddlFilterTests</entry>
-<entry key="SPEC2_20_PortletFilter_filter7">V2AddlFilterTests</entry>
-<entry key="SPEC2_20_PortletFilter_filter8">V2AddlFilterTests</entry>
-<entry key="SPEC2_20_PortletFilter_filter9">V2AddlFilterTests</entry>
-<entry key="SPEC2_20_PortletFilter_filter10">V2AddlFilterTests</entry>
-<entry key="SPEC2_20_PortletFilter_filter11">V2AddlFilterTests</entry>
-<entry key="SPEC2_20_PortletFilter_filter12">V2AddlFilterTests</entry>
-<entry key="SPEC2_20_PortletFilter_filter13">V2AddlFilterTests</entry>
-<entry key="SPEC2_20_PortletFilter_filter14">V2AddlFilterTests</entry>
-<entry key="SPEC2_20_PortletFilter_filter15">V2AddlFilterTests</entry>
-<entry key="SPEC2_20_PortletFilter_filterWrapper1">V2AddlFilterTests</entry>
-<entry key="SPEC2_20_PortletFilter_filterWrapper2">V2AddlFilterTests</entry>
-<entry key="SPEC2_20_PortletFilter_filterWrapper3">V2AddlFilterTests</entry>
-<entry key="SPEC2_20_PortletFilter_filterWrapper4">V2AddlFilterTests</entry>
-<entry key="SPEC2_20_PortletFilter_filterWrapper5">V2AddlFilterTests</entry>
-<entry key="SPEC2_20_PortletFilter_filterWrapper6">V2AddlFilterTests</entry>
-<entry key="SPEC2_20_PortletFilter_filterWrapper7">V2AddlFilterTests</entry>
-<entry key="SPEC2_20_PortletFilter_filterWrapper8">V2AddlFilterTests</entry>
-
+<entry key="V2AddlFilterTests_SPEC2_20_Action_filter1">V2AddlFilterTests</entry>
+<entry key="V2AddlFilterTests_SPEC2_20_Action_filter6">V2AddlFilterTests</entry>
+<entry key="V2AddlFilterTests_SPEC2_20_Action_filter7">V2AddlFilterTests</entry>
+<entry key="V2AddlFilterTests_SPEC2_20_Action_filter8">V2AddlFilterTests</entry>
+<entry key="V2AddlFilterTests_SPEC2_20_Action_filter9">V2AddlFilterTests</entry>
+<entry key="V2AddlFilterTests_SPEC2_20_Action_filter10">V2AddlFilterTests</entry>
+<entry key="V2AddlFilterTests_SPEC2_20_Action_filter11">V2AddlFilterTests</entry>
+<entry key="V2AddlFilterTests_SPEC2_20_Action_filter12">V2AddlFilterTests</entry>
+<entry key="V2AddlFilterTests_SPEC2_20_Action_filter13">V2AddlFilterTests</entry>
+<entry key="V2AddlFilterTests_SPEC2_20_Action_filter14">V2AddlFilterTests</entry>
+<entry key="V2AddlFilterTests_SPEC2_20_Action_filter15">V2AddlFilterTests</entry>
+<entry key="V2AddlFilterTests_SPEC2_20_Action_filterWrapper1">V2AddlFilterTests</entry>
+<entry key="V2AddlFilterTests_SPEC2_20_Action_filterWrapper2">V2AddlFilterTests</entry>
+<entry key="V2AddlFilterTests_SPEC2_20_Action_filter2">V2AddlFilterTests</entry>
+<entry key="V2AddlFilterTests_SPEC2_20_Render_filter1">V2AddlFilterTests</entry>
+<entry key="V2AddlFilterTests_SPEC2_20_Render_filter6">V2AddlFilterTests</entry>
+<entry key="V2AddlFilterTests_SPEC2_20_Render_filter7">V2AddlFilterTests</entry>
+<entry key="V2AddlFilterTests_SPEC2_20_Render_filter8">V2AddlFilterTests</entry>
+<entry key="V2AddlFilterTests_SPEC2_20_Render_filter9">V2AddlFilterTests</entry>
+<entry key="V2AddlFilterTests_SPEC2_20_Render_filter10">V2AddlFilterTests</entry>
+<entry key="V2AddlFilterTests_SPEC2_20_Render_filter11">V2AddlFilterTests</entry>
+<entry key="V2AddlFilterTests_SPEC2_20_Render_filter12">V2AddlFilterTests</entry>
+<entry key="V2AddlFilterTests_SPEC2_20_Render_filter13">V2AddlFilterTests</entry>
+<entry key="V2AddlFilterTests_SPEC2_20_Render_filter14">V2AddlFilterTests</entry>
+<entry key="V2AddlFilterTests_SPEC2_20_Render_filter15">V2AddlFilterTests</entry>
+<entry key="V2AddlFilterTests_SPEC2_20_Render_filterWrapper5">V2AddlFilterTests</entry>
+<entry key="V2AddlFilterTests_SPEC2_20_Render_filterWrapper6">V2AddlFilterTests</entry>
+<entry key="V2AddlFilterTests_SPEC2_20_Render_filter3">V2AddlFilterTests</entry>
+<entry key="V2AddlFilterTests_SPEC2_20_Event_filter1">V2AddlFilterTests</entry>
+<entry key="V2AddlFilterTests_SPEC2_20_Event_filter6">V2AddlFilterTests</entry>
+<entry key="V2AddlFilterTests_SPEC2_20_Event_filter7">V2AddlFilterTests</entry>
+<entry key="V2AddlFilterTests_SPEC2_20_Event_filter8">V2AddlFilterTests</entry>
+<entry key="V2AddlFilterTests_SPEC2_20_Event_filter9">V2AddlFilterTests</entry>
+<entry key="V2AddlFilterTests_SPEC2_20_Event_filter10">V2AddlFilterTests</entry>
+<entry key="V2AddlFilterTests_SPEC2_20_Event_filter11">V2AddlFilterTests</entry>
+<entry key="V2AddlFilterTests_SPEC2_20_Event_filter12">V2AddlFilterTests</entry>
+<entry key="V2AddlFilterTests_SPEC2_20_Event_filter13">V2AddlFilterTests</entry>
+<entry key="V2AddlFilterTests_SPEC2_20_Event_filter14">V2AddlFilterTests</entry>
+<entry key="V2AddlFilterTests_SPEC2_20_Event_filter15">V2AddlFilterTests</entry>
+<entry key="V2AddlFilterTests_SPEC2_20_Event_filterWrapper3">V2AddlFilterTests</entry>
+<entry key="V2AddlFilterTests_SPEC2_20_Event_filterWrapper4">V2AddlFilterTests</entry>
+<entry key="V2AddlFilterTests_SPEC2_20_Event_filter4">V2AddlFilterTests</entry>
+<entry key="V2AddlFilterTests_SPEC2_20_Resource_filter1">V2AddlFilterTests</entry>
+<entry key="V2AddlFilterTests_SPEC2_20_Resource_filter6">V2AddlFilterTests</entry>
+<entry key="V2AddlFilterTests_SPEC2_20_Resource_filter7">V2AddlFilterTests</entry>
+<entry key="V2AddlFilterTests_SPEC2_20_Resource_filter8">V2AddlFilterTests</entry>
+<entry key="V2AddlFilterTests_SPEC2_20_Resource_filter9">V2AddlFilterTests</entry>
+<entry key="V2AddlFilterTests_SPEC2_20_Resource_filter10">V2AddlFilterTests</entry>
+<entry key="V2AddlFilterTests_SPEC2_20_Resource_filter11">V2AddlFilterTests</entry>
+<entry key="V2AddlFilterTests_SPEC2_20_Resource_filter12">V2AddlFilterTests</entry>
+<entry key="V2AddlFilterTests_SPEC2_20_Resource_filter13">V2AddlFilterTests</entry>
+<entry key="V2AddlFilterTests_SPEC2_20_Resource_filter14">V2AddlFilterTests</entry>
+<entry key="V2AddlFilterTests_SPEC2_20_Resource_filter15">V2AddlFilterTests</entry>
+<entry key="V2AddlFilterTests_SPEC2_20_Resource_filter5">V2AddlFilterTests</entry>
+<entry key="V2AddlFilterTests_SPEC2_20_Resource_filterWrapper7">V2AddlFilterTests</entry>
+<entry key="V2AddlFilterTests_SPEC2_20_Resource_filterWrapper8">V2AddlFilterTests</entry>
 </properties>

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/23a1c547/portlet-tck_3.0/V2AddlFilterTests/src/main/webapp/WEB-INF/portlet.xml
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlFilterTests/src/main/webapp/WEB-INF/portlet.xml b/portlet-tck_3.0/V2AddlFilterTests/src/main/webapp/WEB-INF/portlet.xml
index 2bd6aef..c768f3f 100644
--- a/portlet-tck_3.0/V2AddlFilterTests/src/main/webapp/WEB-INF/portlet.xml
+++ b/portlet-tck_3.0/V2AddlFilterTests/src/main/webapp/WEB-INF/portlet.xml
@@ -20,30 +20,126 @@
 <portlet-app xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd"
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd"
-   version="2.0" id="javax.portlet-tck-AddlFilterTests">
-
+   xmlns:tck="http://www.apache.org/portals/pluto/portlet-tck_3.0"
+   version="2.0" id="V2AddlFilterTests">
    <portlet>
-      <portlet-name>AddlFilterTests_SPEC2_20_PortletFilter</portlet-name>
-      <portlet-class>javax.portlet.tck.portlets.AddlFilterTests_SPEC2_20_PortletFilter</portlet-class>
-
-      <init-param>
-         <name>TestParameter</name>
-         <value>TestValue</value>
-      </init-param>
+      <portlet-name>AddlFilterTests_SPEC2_20_Action</portlet-name>
+      <portlet-class>javax.portlet.tck.portlets.AddlFilterTests_SPEC2_20_Action</portlet-class>
+      <expiration-cache>0</expiration-cache>
+      <supports>
+         <mime-type>text/html</mime-type>
+      </supports>
+      <supported-locale>en_US</supported-locale>
+      <portlet-info>
+         <title>AddlFilterTests_SPEC2_20_Action</title>
+      </portlet-info>
+   </portlet>
 
+   <portlet>
+      <portlet-name>AddlFilterTests_SPEC2_20_Render</portlet-name>
+      <portlet-class>javax.portlet.tck.portlets.AddlFilterTests_SPEC2_20_Render</portlet-class>
       <expiration-cache>0</expiration-cache>
+      <supports>
+         <mime-type>text/html</mime-type>
+      </supports>
+      <supported-locale>en_US</supported-locale>
+      <portlet-info>
+         <title>AddlFilterTests_SPEC2_20_Render</title>
+      </portlet-info>
+   </portlet>
 
+   <portlet>
+      <portlet-name>AddlFilterTests_SPEC2_20_Event</portlet-name>
+      <portlet-class>javax.portlet.tck.portlets.AddlFilterTests_SPEC2_20_Event</portlet-class>
+      <expiration-cache>0</expiration-cache>
       <supports>
          <mime-type>text/html</mime-type>
       </supports>
+      <supported-locale>en_US</supported-locale>
+      <portlet-info>
+         <title>AddlFilterTests_SPEC2_20_Event</title>
+      </portlet-info>
+      <supported-publishing-event>
+         <qname>tck:AddlFilterTests_SPEC2_20_Event</qname>
+      </supported-publishing-event>
+   </portlet>
 
+   <portlet>
+      <portlet-name>AddlFilterTests_SPEC2_20_Event_event</portlet-name>
+      <portlet-class>javax.portlet.tck.portlets.AddlFilterTests_SPEC2_20_Event_event</portlet-class>
+      <expiration-cache>0</expiration-cache>
+      <supports>
+         <mime-type>text/html</mime-type>
+      </supports>
       <supported-locale>en_US</supported-locale>
+      <portlet-info>
+         <title>AddlFilterTests_SPEC2_20_Event_event</title>
+      </portlet-info>
+      <supported-processing-event>
+         <qname>tck:AddlFilterTests_SPEC2_20_Event</qname>
+      </supported-processing-event>
+   </portlet>
 
+   <portlet>
+      <portlet-name>AddlFilterTests_SPEC2_20_Resource</portlet-name>
+      <portlet-class>javax.portlet.tck.portlets.AddlFilterTests_SPEC2_20_Resource</portlet-class>
+      <expiration-cache>0</expiration-cache>
+      <supports>
+         <mime-type>text/html</mime-type>
+      </supports>
+      <supported-locale>en_US</supported-locale>
       <portlet-info>
-         <title>AddlFilterTests_SPEC2_20_PortletFilter</title>
+         <title>AddlFilterTests_SPEC2_20_Resource</title>
       </portlet-info>
    </portlet>
 
+   <event-definition>
+      <qname>tck:AddlPortletTests_SPEC2_5_EventHandling</qname>
+      <value-type>java.lang.String</value-type>
+   </event-definition>
+
+   <event-definition>
+      <qname>tck:AddlPortletTests_SPEC2_15_Event</qname>
+      <value-type>java.lang.String</value-type>
+   </event-definition>
+
+   <event-definition>
+      <qname>tck:AddlPortletTests_SPEC2_15_EventEventHandling</qname>
+      <value-type>java.lang.String</value-type>
+   </event-definition>
+
+   <event-definition>
+      <qname>tck:AddlEnvironmentTests_SPEC2_17_EventPreferences</qname>
+      <value-type>java.lang.String</value-type>
+   </event-definition>
+
+   <event-definition>
+      <qname>tck:AddlRequestTests_SPEC2_11_Event</qname>
+      <value-type>java.lang.String</value-type>
+   </event-definition>
+
+   <event-definition>
+      <qname>tck:AddlRequestTests_SPEC2_11_EventAttr</qname>
+      <value-type>java.lang.String</value-type>
+   </event-definition>
+
+   <event-definition>
+      <qname>tck:AddlRequestTests_SPEC2_11_EventReq</qname>
+      <value-type>java.lang.String</value-type>
+   </event-definition>
+
+   <event-definition>
+      <qname>tck:AddlResponseTests_SPEC2_12_Event</qname>
+      <value-type>java.lang.String</value-type>
+   </event-definition>
 
+   <event-definition>
+      <qname>tck:AddlFilterTests_SPEC2_20_Event</qname>
+      <value-type>java.lang.String</value-type>
+   </event-definition>
 
+   <public-render-parameter>
+      <identifier>tckPRP1</identifier>
+      <qname>tck:tckPRP1</qname>
+   </public-render-parameter>
 </portlet-app>

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/23a1c547/portlet-tck_3.0/V2AddlFilterTests/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlFilterTests/src/main/webapp/WEB-INF/web.xml b/portlet-tck_3.0/V2AddlFilterTests/src/main/webapp/WEB-INF/web.xml
index 3c92f0d..c3faf56 100644
--- a/portlet-tck_3.0/V2AddlFilterTests/src/main/webapp/WEB-INF/web.xml
+++ b/portlet-tck_3.0/V2AddlFilterTests/src/main/webapp/WEB-INF/web.xml
@@ -18,6 +18,6 @@
     under the License.     
 -->
 <web-app id="WebApp_ID" version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
-	<display-name>javax.portlet-tck-AddlFilterTests</display-name>
-</web-app>
+   <display-name>javax.portlet-tck-AddlFilterTests</display-name>
 
+</web-app>

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/23a1c547/portlet-tck_3.0/V2AddlPortletTests/pom.xml
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlPortletTests/pom.xml b/portlet-tck_3.0/V2AddlPortletTests/pom.xml
index 689a5b2..b9f164b 100644
--- a/portlet-tck_3.0/V2AddlPortletTests/pom.xml
+++ b/portlet-tck_3.0/V2AddlPortletTests/pom.xml
@@ -1,123 +1,127 @@
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.     
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-   <modelVersion>4.0.0</modelVersion>
-
-   <parent>
-      <groupId>javax.portlet</groupId>
-      <artifactId>tck</artifactId>
-      <version>3.0-SNAPSHOT</version>
-   </parent>
-
-   <artifactId>tck-V2AddlPortletTests</artifactId>
-   <packaging>war</packaging>
-
-   <dependencies>
-      <dependency>
-         <groupId>javax.portlet</groupId>
-         <artifactId>portlet-api</artifactId>
-      </dependency>
-      <dependency>
-         <groupId>javax.portlet</groupId>
-         <artifactId>tck-common</artifactId>
-         <version>${project.version}</version>
-         <scope>compile</scope>
-      </dependency>
-   </dependencies>
-
-   <properties>
-
-      <!-- This project contains additional test cases to run with the portlets -->
-      <additional.testcase.uri>file:///${basedir}/src/main/resources/xml-resources/additionalTCs.xml</additional.testcase.uri>
-
-      <!-- Set to true for modules that define all test cases in a file (TCs are not generated from the portlet.xml) -->
-      <additional.testcases.only>true</additional.testcases.only>
-
-      <!-- put all portlets from this module on the same page -->
-      <page.file.xsl>plutoMultiPortletPage.xsl</page.file.xsl>
-
-   </properties>
-
-   <build>
-      <finalName>${project.artifactId}</finalName>
-      <plugins>
-         <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-compiler-plugin</artifactId>
-         </plugin>
-         <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-war-plugin</artifactId>
-         </plugin>
-         <!-- Transform the portlet XML into test properties XML file -->
-         <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-dependency-plugin</artifactId>
-         </plugin>
-         <plugin>
-            <groupId>org.codehaus.mojo</groupId>
-            <artifactId>xml-maven-plugin</artifactId>
-         </plugin>
-      </plugins>
-   </build>
-
-
-   <profiles>
-      <profile>
-         <id>pluto</id>
-
-         <dependencies>
-            <dependency>
-               <groupId>javax.servlet</groupId>
-               <artifactId>jstl</artifactId>
-            </dependency>
-            <dependency>
-               <groupId>taglibs</groupId>
-               <artifactId>standard</artifactId>
-            </dependency>
-         </dependencies>
-
-         <build>
-            <plugins>
-               <plugin>
-                  <artifactId>maven-war-plugin</artifactId>
-                  <configuration>
-                     <webXml>${project.build.directory}/pluto-resources/web.xml</webXml>
-                  </configuration>
-               </plugin>
-               <!-- bind 'pluto:assemble' goal to 'generate-resources' lifecycle -->
-               <plugin>
-                  <groupId>org.apache.portals.pluto</groupId>
-                  <artifactId>maven-pluto-plugin</artifactId>
-                  <executions>
-                     <execution>
-                        <phase>generate-resources</phase>
-                        <goals>
-                           <goal>assemble</goal>
-                        </goals>
-                     </execution>
-                  </executions>
-               </plugin>
-            </plugins>
-         </build>
-      </profile>
-   </profiles>
-
-</project>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.     
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+   <modelVersion>4.0.0</modelVersion>
+
+   <parent>
+      <groupId>javax.portlet</groupId>
+      <artifactId>tck</artifactId>
+      <version>3.0-SNAPSHOT</version>
+   </parent>
+
+   <artifactId>tck-V2AddlPortletTests</artifactId>
+   <packaging>war</packaging>
+
+   <dependencies>
+      <dependency>
+         <groupId>javax.portlet</groupId>
+         <artifactId>portlet-api</artifactId>
+      </dependency>
+      <dependency>
+         <groupId>javax.servlet</groupId>
+         <artifactId>servlet-api</artifactId>
+      </dependency>
+      <dependency>
+         <groupId>javax.portlet</groupId>
+         <artifactId>tck-common</artifactId>
+         <version>${project.version}</version>
+         <scope>compile</scope>
+      </dependency>
+   </dependencies>
+
+   <properties>
+
+      <!-- This project contains additional test cases to run with the portlets -->
+      <additional.testcase.uri>file:///${basedir}/src/main/resources/xml-resources/additionalTCs.xml</additional.testcase.uri>
+
+      <!-- Set to true for modules that define all test cases in a file (TCs are not generated from the portlet.xml) -->
+      <additional.testcases.only>true</additional.testcases.only>
+
+      <!-- put all portlets from this module on the same page -->
+      <page.file.xsl>plutoMultiPortletPage.xsl</page.file.xsl>
+
+   </properties>
+
+   <build>
+      <finalName>${project.artifactId}</finalName>
+      <plugins>
+         <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-compiler-plugin</artifactId>
+         </plugin>
+         <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-war-plugin</artifactId>
+         </plugin>
+         <!-- Transform the portlet XML into test properties XML file -->
+         <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-dependency-plugin</artifactId>
+         </plugin>
+         <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>xml-maven-plugin</artifactId>
+         </plugin>
+      </plugins>
+   </build>
+
+
+   <profiles>
+      <profile>
+         <id>pluto</id>
+
+         <dependencies>
+            <dependency>
+               <groupId>javax.servlet</groupId>
+               <artifactId>jstl</artifactId>
+            </dependency>
+            <dependency>
+               <groupId>taglibs</groupId>
+               <artifactId>standard</artifactId>
+            </dependency>
+         </dependencies>
+
+         <build>
+            <plugins>
+               <plugin>
+                  <artifactId>maven-war-plugin</artifactId>
+                  <configuration>
+                     <webXml>${project.build.directory}/pluto-resources/web.xml</webXml>
+                  </configuration>
+               </plugin>
+               <!-- bind 'pluto:assemble' goal to 'generate-resources' lifecycle -->
+               <plugin>
+                  <groupId>org.apache.portals.pluto</groupId>
+                  <artifactId>maven-pluto-plugin</artifactId>
+                  <executions>
+                     <execution>
+                        <phase>generate-resources</phase>
+                        <goals>
+                           <goal>assemble</goal>
+                        </goals>
+                     </execution>
+                  </executions>
+               </plugin>
+            </plugins>
+         </build>
+      </profile>
+   </profiles>
+
+</project>

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/23a1c547/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_13_ResourceServing.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_13_ResourceServing.java b/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_13_ResourceServing.java
index b2a027e..480ca98 100644
--- a/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_13_ResourceServing.java
+++ b/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_13_ResourceServing.java
@@ -18,29 +18,34 @@
 
 package javax.portlet.tck.portlets;
 
-import java.io.IOException;
-import java.io.PrintWriter;
-
-import java.util.Enumeration;
-import java.util.Locale;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
+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.portlet.tck.beans.ClassChecker;
-import javax.portlet.tck.beans.TestCaseDetails;
-import javax.portlet.tck.beans.JSR286SpecTestCaseDetails;
+import javax.servlet.*;
+import javax.servlet.http.*;
+import javax.portlet.tck.beans.*;
+import javax.portlet.tck.constants.*;
 import static javax.portlet.tck.beans.JSR286SpecTestCaseDetails.*;
-import javax.portlet.tck.beans.TestResult;
+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 AddlPortletTests_SPEC2_13_ResourceServing_event
+ *
  */
-public class AddlPortletTests_SPEC2_13_ResourceServing implements Portlet {
+public class AddlPortletTests_SPEC2_13_ResourceServing implements Portlet, ResourceServingPortlet {
    private static final String LOG_CLASS = 
          AddlPortletTests_SPEC2_13_ResourceServing.class.getName();
    private final Logger LOGGER = Logger.getLogger(LOG_CLASS);
@@ -57,121 +62,120 @@ public class AddlPortletTests_SPEC2_13_ResourceServing implements Portlet {
    }
 
    @Override
-   public void processAction(ActionRequest actionRequest, ActionResponse actionResponse)
+   public void processAction(ActionRequest portletReq, ActionResponse portletResp)
          throws PortletException, IOException {
+      LOGGER.entering(LOG_CLASS, "main portlet processAction entry");
+
+      portletResp.setRenderParameters(portletReq.getParameterMap());
+      long tid = Thread.currentThread().getId();
+      portletReq.setAttribute(THREADID_ATTR, tid);
+
+      StringWriter writer = new StringWriter();
+
    }
 
    @Override
-   public void render(RenderRequest renderRequest, RenderResponse renderResponse)
+   public void serveResource(ResourceRequest portletReq, ResourceResponse portletResp)
          throws PortletException, IOException {
-      
-      if (LOGGER.isLoggable(Level.FINE)) {
-         LOGGER.logp(Level.FINE, LOG_CLASS, "render", "Entry");
-      }
-
-      PrintWriter writer = renderResponse.getWriter();
-      JSR286SpecTestCaseDetails tcd = new JSR286SpecTestCaseDetails();
-
-      // Create result objects for the tests
+      LOGGER.entering(LOG_CLASS, "main portlet serveResource entry");
 
-      /* TestCase: SPEC2_13_ResourceServing_properties3                       */
-      /* Details: "The setProperty method can set HTTP header values to be    */
-      /* transported back to the client"                                      */
-      TestResult tr0 = tcd.getTestResultFailed(SPEC2_13_RESOURCESERVING_PROPERTIES3);
-      /* TODO: implement test */
+      long tid = Thread.currentThread().getId();
+      portletReq.setAttribute(THREADID_ATTR, tid);
 
-      /* TestCase: SPEC2_13_ResourceServing_properties4                       */
-      /* Details: "If the setProperty method is called after the response     */
-      /* has been committed, the property will not be transported back to     */
-      /* the client"                                                          */
-      TestResult tr1 = tcd.getTestResultFailed(SPEC2_13_RESOURCESERVING_PROPERTIES4);
-      /* TODO: implement test */
+      PrintWriter writer = portletResp.getWriter();
 
-      /* TestCase: SPEC2_13_ResourceServing_properties7                       */
-      /* Details: "The addProperty method can add HTTP header values to be    */
-      /* transported back to the client"                                      */
-      TestResult tr2 = tcd.getTestResultFailed(SPEC2_13_RESOURCESERVING_PROPERTIES7);
-      /* TODO: implement test */
+      JSR286SpecTestCaseDetails tcd = new JSR286SpecTestCaseDetails();
 
-      /* TestCase: SPEC2_13_ResourceServing_properties8                       */
-      /* Details: "If the addProperty method is called after the response     */
-      /* has been committed, the property will not be transported back to     */
-      /* the client"                                                          */
-      TestResult tr3 = tcd.getTestResultFailed(SPEC2_13_RESOURCESERVING_PROPERTIES8);
-      /* TODO: implement test */
+      // Create result objects for the tests
 
-      /* TestCase: SPEC2_13_ResourceServing_resourceURLs2                     */
+      /* TestCase: V2AddlPortletTests_SPEC2_13_ResourceServing_resourceURLs2  */
       /* Details: "When a resource URL is invoked, the portlet container      */
       /* must not call the processAction method"                              */
-      TestResult tr4 = tcd.getTestResultFailed(SPEC2_13_RESOURCESERVING_RESOURCEURLS2);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_13_ResourceServing_resourceURLs3                     */
-      /* Details: "When a resource URL is invoked, the portlet container      */
-      /* must not call the processEvent method"                               */
-      TestResult tr5 = tcd.getTestResultFailed(SPEC2_13_RESOURCESERVING_RESOURCEURLS3);
+      TestResult tr0 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_13_RESOURCESERVING_RESOURCEURLS2);
       /* TODO: implement test */
+      tr0.appendTcDetail("Not implemented.");
+      tr0.writeTo(writer);
 
-      /* TestCase: SPEC2_13_ResourceServing_resourceURLs4                     */
+      /* TestCase: V2AddlPortletTests_SPEC2_13_ResourceServing_resourceURLs4  */
       /* Details: "After a resource URL has been created, the portlet mode    */
       /* set on the resource URL cannot be changed"                           */
-      TestResult tr6 = tcd.getTestResultFailed(SPEC2_13_RESOURCESERVING_RESOURCEURLS4);
+      TestResult tr1 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_13_RESOURCESERVING_RESOURCEURLS4);
       /* TODO: implement test */
+      tr1.appendTcDetail("Not implemented.");
+      tr1.writeTo(writer);
 
-      /* TestCase: SPEC2_13_ResourceServing_resourceURLs5                     */
+      /* TestCase: V2AddlPortletTests_SPEC2_13_ResourceServing_resourceURLs5  */
       /* Details: "After a resource URL has been created, the window state    */
       /* set on the resource URL cannot be changed"                           */
-      TestResult tr7 = tcd.getTestResultFailed(SPEC2_13_RESOURCESERVING_RESOURCEURLS5);
+      TestResult tr2 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_13_RESOURCESERVING_RESOURCEURLS5);
       /* TODO: implement test */
+      tr2.appendTcDetail("Not implemented.");
+      tr2.writeTo(writer);
 
-      /* TestCase: SPEC2_13_ResourceServing_resourceURLs6                     */
+      /* TestCase: V2AddlPortletTests_SPEC2_13_ResourceServing_resourceURLs6  */
       /* Details: "After a resource URL has been created, the render          */
       /* parameters set on the resource URL cannot be changed"                */
-      TestResult tr8 = tcd.getTestResultFailed(SPEC2_13_RESOURCESERVING_RESOURCEURLS6);
+      TestResult tr3 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_13_RESOURCESERVING_RESOURCEURLS6);
       /* TODO: implement test */
+      tr3.appendTcDetail("Not implemented.");
+      tr3.writeTo(writer);
 
-      /* TestCase: SPEC2_13_ResourceServing_resourceURLs7                     */
+      /* TestCase: V2AddlPortletTests_SPEC2_13_ResourceServing_resourceURLs7  */
       /* Details: "After a resource URL has been created, a parameter set     */
       /* on the resource URL is a resource parameter, not a render            */
       /* parameter"                                                           */
-      TestResult tr9 = tcd.getTestResultFailed(SPEC2_13_RESOURCESERVING_RESOURCEURLS7);
+      TestResult tr4 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_13_RESOURCESERVING_RESOURCEURLS7);
       /* TODO: implement test */
+      tr4.appendTcDetail("Not implemented.");
+      tr4.writeTo(writer);
 
-      /* TestCase: SPEC2_13_ResourceServing_resourceURLs8                     */
+      /* TestCase: V2AddlPortletTests_SPEC2_13_ResourceServing_resourceURLs8  */
       /* Details: "After a resource URL has been created, a parameter set     */
       /* on the URL with the same name as an exsisting render parameter       */
       /* results in a multivalued parameter containing both the resource      */
       /* pramaeter values and the render parameter values"                    */
-      TestResult tr10 = tcd.getTestResultFailed(SPEC2_13_RESOURCESERVING_RESOURCEURLS8);
+      TestResult tr5 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_13_RESOURCESERVING_RESOURCEURLS8);
       /* TODO: implement test */
+      tr5.appendTcDetail("Not implemented.");
+      tr5.writeTo(writer);
 
-      /* TestCase: SPEC2_13_ResourceServing_resourceURLs9                     */
+      /* TestCase: V2AddlPortletTests_SPEC2_13_ResourceServing_resourceURLs9  */
       /* Details: "In the resulting multivalued parameter after a resource    */
       /* parameter is added with the same name as a render parameter, the     */
       /* the render parameter values must be the last entries in the          */
       /* parameter value array"                                               */
-      TestResult tr11 = tcd.getTestResultFailed(SPEC2_13_RESOURCESERVING_RESOURCEURLS9);
+      TestResult tr6 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_13_RESOURCESERVING_RESOURCEURLS9);
       /* TODO: implement test */
-
-
-
-      // Write the results to the output stream
-
-      tr0.writeTo(writer);
-      tr1.writeTo(writer);
-      tr2.writeTo(writer);
-      tr3.writeTo(writer);
-      tr4.writeTo(writer);
-      tr5.writeTo(writer);
+      tr6.appendTcDetail("Not implemented.");
       tr6.writeTo(writer);
-      tr7.writeTo(writer);
-      tr8.writeTo(writer);
-      tr9.writeTo(writer);
-      tr10.writeTo(writer);
-      tr11.writeTo(writer);
 
+   }
 
+   @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();
+
+      writer.write("<div id=\"AddlPortletTests_SPEC2_13_ResourceServing\">no resource output.</div>\n");
+      ResourceURL resurl = portletResp.createResourceURL();
+      resurl.setCacheability(PAGE);
+      writer.write("<script>\n");
+      writer.write("(function () {\n");
+      writer.write("   var xhr = new XMLHttpRequest();\n");
+      writer.write("   xhr.onreadystatechange=function() {\n");
+      writer.write("      if (xhr.readyState==4 && xhr.status==200) {\n");
+      writer.write("         document.getElementById(\"AddlPortletTests_SPEC2_13_ResourceServing\").innerHTML=xhr.responseText;\n");
+      writer.write("      }\n");
+      writer.write("   };\n");
+      writer.write("   xhr.open(\"GET\",\"" + resurl.toString() + "\",true);\n");
+      writer.write("   xhr.send();\n");
+      writer.write("})();\n");
+      writer.write("</script>\n");
    }
 
 }
-

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/23a1c547/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_13_ResourceServingCache.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_13_ResourceServingCache.java b/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_13_ResourceServingCache.java
index b8abf60..eb538ff 100644
--- a/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_13_ResourceServingCache.java
+++ b/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_13_ResourceServingCache.java
@@ -18,29 +18,34 @@
 
 package javax.portlet.tck.portlets;
 
-import java.io.IOException;
-import java.io.PrintWriter;
-
-import java.util.Enumeration;
-import java.util.Locale;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
+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.portlet.tck.beans.ClassChecker;
-import javax.portlet.tck.beans.TestCaseDetails;
-import javax.portlet.tck.beans.JSR286SpecTestCaseDetails;
+import javax.servlet.*;
+import javax.servlet.http.*;
+import javax.portlet.tck.beans.*;
+import javax.portlet.tck.constants.*;
 import static javax.portlet.tck.beans.JSR286SpecTestCaseDetails.*;
-import javax.portlet.tck.beans.TestResult;
+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 AddlPortletTests_SPEC2_13_ResourceServingCache_event
+ *
  */
-public class AddlPortletTests_SPEC2_13_ResourceServingCache implements Portlet {
+public class AddlPortletTests_SPEC2_13_ResourceServingCache implements Portlet, ResourceServingPortlet {
    private static final String LOG_CLASS = 
          AddlPortletTests_SPEC2_13_ResourceServingCache.class.getName();
    private final Logger LOGGER = Logger.getLogger(LOG_CLASS);
@@ -57,258 +62,317 @@ public class AddlPortletTests_SPEC2_13_ResourceServingCache implements Portlet {
    }
 
    @Override
-   public void processAction(ActionRequest actionRequest, ActionResponse actionResponse)
+   public void processAction(ActionRequest portletReq, ActionResponse portletResp)
          throws PortletException, IOException {
+      LOGGER.entering(LOG_CLASS, "main portlet processAction entry");
+
+      portletResp.setRenderParameters(portletReq.getParameterMap());
+      long tid = Thread.currentThread().getId();
+      portletReq.setAttribute(THREADID_ATTR, tid);
+
+      StringWriter writer = new StringWriter();
+
    }
 
    @Override
-   public void render(RenderRequest renderRequest, RenderResponse renderResponse)
+   public void serveResource(ResourceRequest portletReq, ResourceResponse portletResp)
          throws PortletException, IOException {
-      
-      if (LOGGER.isLoggable(Level.FINE)) {
-         LOGGER.logp(Level.FINE, LOG_CLASS, "render", "Entry");
-      }
+      LOGGER.entering(LOG_CLASS, "main portlet serveResource entry");
+
+      long tid = Thread.currentThread().getId();
+      portletReq.setAttribute(THREADID_ATTR, tid);
+
+      PrintWriter writer = portletResp.getWriter();
 
-      PrintWriter writer = renderResponse.getWriter();
       JSR286SpecTestCaseDetails tcd = new JSR286SpecTestCaseDetails();
 
       // Create result objects for the tests
 
-      /* TestCase: SPEC2_13_ResourceServingCache_caching1                     */
+      /* TestCase: V2AddlPortletTests_SPEC2_13_ResourceServingCache_caching1  */
       /* Details: "If portlet URLs are included in the markup, portals /      */
       /* portlet containers must create correct portlet URLs for all          */
       /* text-based markup types."                                            */
-      TestResult tr0 = tcd.getTestResultFailed(SPEC2_13_RESOURCESERVINGCACHE_CACHING1);
+      TestResult tr0 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_13_RESOURCESERVINGCACHE_CACHING1);
       /* TODO: implement test */
+      tr0.appendTcDetail("Not implemented.");
+      tr0.writeTo(writer);
 
-      /* TestCase: SPEC2_13_ResourceServingCache_caching2                     */
+      /* TestCase: V2AddlPortletTests_SPEC2_13_ResourceServingCache_caching2  */
       /* Details: "The portlet can use the setCacheability method to set      */
       /* the cache level for the ResourceURL"                                 */
-      TestResult tr1 = tcd.getTestResultFailed(SPEC2_13_RESOURCESERVINGCACHE_CACHING2);
+      TestResult tr1 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_13_RESOURCESERVINGCACHE_CACHING2);
       /* TODO: implement test */
+      tr1.appendTcDetail("Not implemented.");
+      tr1.writeTo(writer);
 
-      /* TestCase: SPEC2_13_ResourceServingCache_caching3                     */
+      /* TestCase: V2AddlPortletTests_SPEC2_13_ResourceServingCache_caching3  */
       /* Details: "If the cache level is not set, a generated resource URL    */
       /* has the cacheability of the request in which it was created"         */
-      TestResult tr2 = tcd.getTestResultFailed(SPEC2_13_RESOURCESERVINGCACHE_CACHING3);
+      TestResult tr2 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_13_RESOURCESERVINGCACHE_CACHING3);
       /* TODO: implement test */
+      tr2.appendTcDetail("Not implemented.");
+      tr2.writeTo(writer);
 
-      /* TestCase: SPEC2_13_ResourceServingCache_cachingFULL1                 */
+      /* TestCase: V2AddlPortletTests_SPEC2_13_ResourceServingCache_cachingFULL1 */
       /* Details: "If the cache level is set to FULL, the resource URL does   */
       /* not contain the current render parameters"                           */
-      TestResult tr3 = tcd.getTestResultFailed(SPEC2_13_RESOURCESERVINGCACHE_CACHINGFULL1);
+      TestResult tr3 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_13_RESOURCESERVINGCACHE_CACHINGFULL1);
       /* TODO: implement test */
+      tr3.appendTcDetail("Not implemented.");
+      tr3.writeTo(writer);
 
-      /* TestCase: SPEC2_13_ResourceServingCache_cachingFULL2                 */
+      /* TestCase: V2AddlPortletTests_SPEC2_13_ResourceServingCache_cachingFULL2 */
       /* Details: "If the cache level is set to FULL, the resource URL does   */
       /* not contain the current portlet mode"                                */
-      TestResult tr4 = tcd.getTestResultFailed(SPEC2_13_RESOURCESERVINGCACHE_CACHINGFULL2);
+      TestResult tr4 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_13_RESOURCESERVINGCACHE_CACHINGFULL2);
       /* TODO: implement test */
+      tr4.appendTcDetail("Not implemented.");
+      tr4.writeTo(writer);
 
-      /* TestCase: SPEC2_13_ResourceServingCache_cachingFULL3                 */
+      /* TestCase: V2AddlPortletTests_SPEC2_13_ResourceServingCache_cachingFULL3 */
       /* Details: "If the cache level is set to FULL, the resource URL does   */
       /* not contain the current window state"                                */
-      TestResult tr5 = tcd.getTestResultFailed(SPEC2_13_RESOURCESERVINGCACHE_CACHINGFULL3);
+      TestResult tr5 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_13_RESOURCESERVINGCACHE_CACHINGFULL3);
       /* TODO: implement test */
+      tr5.appendTcDetail("Not implemented.");
+      tr5.writeTo(writer);
 
-      /* TestCase: SPEC2_13_ResourceServingCache_cachingFULL4                 */
+      /* TestCase: V2AddlPortletTests_SPEC2_13_ResourceServingCache_cachingFULL4 */
       /* Details: "If the cache level is set to FULL, the resource URL does   */
       /* not contain the current page state"                                  */
-      TestResult tr6 = tcd.getTestResultFailed(SPEC2_13_RESOURCESERVINGCACHE_CACHINGFULL4);
+      TestResult tr6 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_13_RESOURCESERVINGCACHE_CACHINGFULL4);
       /* TODO: implement test */
+      tr6.appendTcDetail("Not implemented.");
+      tr6.writeTo(writer);
 
-      /* TestCase: SPEC2_13_ResourceServingCache_cachingFULL5                 */
+      /* TestCase: V2AddlPortletTests_SPEC2_13_ResourceServingCache_cachingFULL5 */
       /* Details: "In a resource request resulting from triggering a          */
       /* resource URL with cacheability set to FULL, a resource URL with      */
       /* cacheability set to FULL may be generated"                           */
-      TestResult tr7 = tcd.getTestResultFailed(SPEC2_13_RESOURCESERVINGCACHE_CACHINGFULL5);
+      TestResult tr7 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_13_RESOURCESERVINGCACHE_CACHINGFULL5);
       /* TODO: implement test */
+      tr7.appendTcDetail("Not implemented.");
+      tr7.writeTo(writer);
 
-      /* TestCase: SPEC2_13_ResourceServingCache_cachingFULL6                 */
+      /* TestCase: V2AddlPortletTests_SPEC2_13_ResourceServingCache_cachingFULL6 */
       /* Details: "In a resource request resulting from triggering a          */
       /* resource URL with cacheability set to FULL, setting cacheability     */
       /* on a resource URL to PORTLET results in an an                        */
       /* IllegalStateException"                                               */
-      TestResult tr8 = tcd.getTestResultFailed(SPEC2_13_RESOURCESERVINGCACHE_CACHINGFULL6);
+      TestResult tr8 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_13_RESOURCESERVINGCACHE_CACHINGFULL6);
       /* TODO: implement test */
+      tr8.appendTcDetail("Not implemented.");
+      tr8.writeTo(writer);
 
-      /* TestCase: SPEC2_13_ResourceServingCache_cachingFULL7                 */
+      /* TestCase: V2AddlPortletTests_SPEC2_13_ResourceServingCache_cachingFULL7 */
       /* Details: "In a resource request resulting from triggering a          */
       /* resource URL with cacheability set to FULL, setting cacheability     */
       /* on a resource URL to PAGE results in an an IllegalStateException"    */
-      TestResult tr9 = tcd.getTestResultFailed(SPEC2_13_RESOURCESERVINGCACHE_CACHINGFULL7);
+      TestResult tr9 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_13_RESOURCESERVINGCACHE_CACHINGFULL7);
       /* TODO: implement test */
+      tr9.appendTcDetail("Not implemented.");
+      tr9.writeTo(writer);
 
-      /* TestCase: SPEC2_13_ResourceServingCache_cachingFULL8                 */
+      /* TestCase: V2AddlPortletTests_SPEC2_13_ResourceServingCache_cachingFULL8 */
       /* Details: "In a resource request resulting from triggering a          */
       /* resource URL with cacheability set to FULL, an attempt to create a   */
       /* render URL results in an an IllegalStateException"                   */
-      TestResult tr10 = tcd.getTestResultFailed(SPEC2_13_RESOURCESERVINGCACHE_CACHINGFULL8);
+      TestResult tr10 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_13_RESOURCESERVINGCACHE_CACHINGFULL8);
       /* TODO: implement test */
+      tr10.appendTcDetail("Not implemented.");
+      tr10.writeTo(writer);
 
-      /* TestCase: SPEC2_13_ResourceServingCache_cachingFULL9                 */
+      /* TestCase: V2AddlPortletTests_SPEC2_13_ResourceServingCache_cachingFULL9 */
       /* Details: "In a resource request resulting from triggering a          */
       /* resource URL with cacheability set to FULL, an attempt to create     */
       /* an action URL results in an an IllegalStateException"                */
-      TestResult tr11 = tcd.getTestResultFailed(SPEC2_13_RESOURCESERVINGCACHE_CACHINGFULL9);
+      TestResult tr11 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_13_RESOURCESERVINGCACHE_CACHINGFULL9);
       /* TODO: implement test */
+      tr11.appendTcDetail("Not implemented.");
+      tr11.writeTo(writer);
 
-      /* TestCase: SPEC2_13_ResourceServingCache_cachingPORTLET1              */
+      /* TestCase: V2AddlPortletTests_SPEC2_13_ResourceServingCache_cachingPORTLET1 */
       /* Details: "If the cache level is set to PORTLET, the resource URL     */
       /* contains the current render parameters"                              */
-      TestResult tr12 = tcd.getTestResultFailed(SPEC2_13_RESOURCESERVINGCACHE_CACHINGPORTLET1);
+      TestResult tr12 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_13_RESOURCESERVINGCACHE_CACHINGPORTLET1);
       /* TODO: implement test */
+      tr12.appendTcDetail("Not implemented.");
+      tr12.writeTo(writer);
 
-      /* TestCase: SPEC2_13_ResourceServingCache_cachingPORTLET2              */
+      /* TestCase: V2AddlPortletTests_SPEC2_13_ResourceServingCache_cachingPORTLET2 */
       /* Details: "If the cache level is set to PORTLET, the resource URL     */
       /* contains the current portlet mode"                                   */
-      TestResult tr13 = tcd.getTestResultFailed(SPEC2_13_RESOURCESERVINGCACHE_CACHINGPORTLET2);
+      TestResult tr13 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_13_RESOURCESERVINGCACHE_CACHINGPORTLET2);
       /* TODO: implement test */
+      tr13.appendTcDetail("Not implemented.");
+      tr13.writeTo(writer);
 
-      /* TestCase: SPEC2_13_ResourceServingCache_cachingPORTLET3              */
+      /* TestCase: V2AddlPortletTests_SPEC2_13_ResourceServingCache_cachingPORTLET3 */
       /* Details: "If the cache level is set to PORTLET, the resource URL     */
       /* contains the current window state"                                   */
-      TestResult tr14 = tcd.getTestResultFailed(SPEC2_13_RESOURCESERVINGCACHE_CACHINGPORTLET3);
+      TestResult tr14 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_13_RESOURCESERVINGCACHE_CACHINGPORTLET3);
       /* TODO: implement test */
+      tr14.appendTcDetail("Not implemented.");
+      tr14.writeTo(writer);
 
-      /* TestCase: SPEC2_13_ResourceServingCache_cachingPORTLET4              */
+      /* TestCase: V2AddlPortletTests_SPEC2_13_ResourceServingCache_cachingPORTLET4 */
       /* Details: "If the cache level is set to PORTLET, the resource URL     */
       /* does not contain the current page state"                             */
-      TestResult tr15 = tcd.getTestResultFailed(SPEC2_13_RESOURCESERVINGCACHE_CACHINGPORTLET4);
+      TestResult tr15 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_13_RESOURCESERVINGCACHE_CACHINGPORTLET4);
       /* TODO: implement test */
+      tr15.appendTcDetail("Not implemented.");
+      tr15.writeTo(writer);
 
-      /* TestCase: SPEC2_13_ResourceServingCache_cachingPORTLET5              */
+      /* TestCase: V2AddlPortletTests_SPEC2_13_ResourceServingCache_cachingPORTLET5 */
       /* Details: "In a resource request resulting from triggering a          */
       /* resource URL with cacheability set to PORTLET, a resource URL with   */
       /* cacheability set to FULL may be generated"                           */
-      TestResult tr16 = tcd.getTestResultFailed(SPEC2_13_RESOURCESERVINGCACHE_CACHINGPORTLET5);
+      TestResult tr16 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_13_RESOURCESERVINGCACHE_CACHINGPORTLET5);
       /* TODO: implement test */
+      tr16.appendTcDetail("Not implemented.");
+      tr16.writeTo(writer);
 
-      /* TestCase: SPEC2_13_ResourceServingCache_cachingPORTLET6              */
+      /* TestCase: V2AddlPortletTests_SPEC2_13_ResourceServingCache_cachingPORTLET6 */
       /* Details: "In a resource request resulting from triggering a          */
       /* resource URL with cacheability set to PORTLET, a resource URL with   */
       /* cacheability set to PORTLET may be generated"                        */
-      TestResult tr17 = tcd.getTestResultFailed(SPEC2_13_RESOURCESERVINGCACHE_CACHINGPORTLET6);
+      TestResult tr17 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_13_RESOURCESERVINGCACHE_CACHINGPORTLET6);
       /* TODO: implement test */
+      tr17.appendTcDetail("Not implemented.");
+      tr17.writeTo(writer);
 
-      /* TestCase: SPEC2_13_ResourceServingCache_cachingPORTLET7              */
+      /* TestCase: V2AddlPortletTests_SPEC2_13_ResourceServingCache_cachingPORTLET7 */
       /* Details: "In a resource request resulting from triggering a          */
       /* resource URL with cacheability set to PORTLET, setting               */
       /* cacheability on a resource URL to PAGE results in an an              */
       /* IllegalStateException"                                               */
-      TestResult tr18 = tcd.getTestResultFailed(SPEC2_13_RESOURCESERVINGCACHE_CACHINGPORTLET7);
+      TestResult tr18 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_13_RESOURCESERVINGCACHE_CACHINGPORTLET7);
       /* TODO: implement test */
+      tr18.appendTcDetail("Not implemented.");
+      tr18.writeTo(writer);
 
-      /* TestCase: SPEC2_13_ResourceServingCache_cachingPORTLET8              */
+      /* TestCase: V2AddlPortletTests_SPEC2_13_ResourceServingCache_cachingPORTLET8 */
       /* Details: "In a resource request resulting from triggering a          */
       /* resource URL with cacheability set to PORTLET, an attempt to         */
       /* create a render URL results in an an IllegalStateException"          */
-      TestResult tr19 = tcd.getTestResultFailed(SPEC2_13_RESOURCESERVINGCACHE_CACHINGPORTLET8);
+      TestResult tr19 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_13_RESOURCESERVINGCACHE_CACHINGPORTLET8);
       /* TODO: implement test */
+      tr19.appendTcDetail("Not implemented.");
+      tr19.writeTo(writer);
 
-      /* TestCase: SPEC2_13_ResourceServingCache_cachingPORTLET9              */
+      /* TestCase: V2AddlPortletTests_SPEC2_13_ResourceServingCache_cachingPORTLET9 */
       /* Details: "In a resource request resulting from triggering a          */
       /* resource URL with cacheability set to PORTLET, an attempt to         */
       /* create an action URL results in an an IllegalStateException"         */
-      TestResult tr20 = tcd.getTestResultFailed(SPEC2_13_RESOURCESERVINGCACHE_CACHINGPORTLET9);
+      TestResult tr20 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_13_RESOURCESERVINGCACHE_CACHINGPORTLET9);
       /* TODO: implement test */
+      tr20.appendTcDetail("Not implemented.");
+      tr20.writeTo(writer);
 
-      /* TestCase: SPEC2_13_ResourceServingCache_cachingPAGE1                 */
+      /* TestCase: V2AddlPortletTests_SPEC2_13_ResourceServingCache_cachingPAGE1 */
       /* Details: "If the cache level is set to PAGE, the resource URL        */
       /* contains the current render parameters"                              */
-      TestResult tr21 = tcd.getTestResultFailed(SPEC2_13_RESOURCESERVINGCACHE_CACHINGPAGE1);
+      TestResult tr21 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_13_RESOURCESERVINGCACHE_CACHINGPAGE1);
       /* TODO: implement test */
+      tr21.appendTcDetail("Not implemented.");
+      tr21.writeTo(writer);
 
-      /* TestCase: SPEC2_13_ResourceServingCache_cachingPAGE2                 */
+      /* TestCase: V2AddlPortletTests_SPEC2_13_ResourceServingCache_cachingPAGE2 */
       /* Details: "If the cache level is set to PAGE, the resource URL        */
       /* contains the current PAGE mode"                                      */
-      TestResult tr22 = tcd.getTestResultFailed(SPEC2_13_RESOURCESERVINGCACHE_CACHINGPAGE2);
+      TestResult tr22 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_13_RESOURCESERVINGCACHE_CACHINGPAGE2);
       /* TODO: implement test */
+      tr22.appendTcDetail("Not implemented.");
+      tr22.writeTo(writer);
 
-      /* TestCase: SPEC2_13_ResourceServingCache_cachingPAGE3                 */
+      /* TestCase: V2AddlPortletTests_SPEC2_13_ResourceServingCache_cachingPAGE3 */
       /* Details: "If the cache level is set to PAGE, the resource URL        */
       /* contains the current window state"                                   */
-      TestResult tr23 = tcd.getTestResultFailed(SPEC2_13_RESOURCESERVINGCACHE_CACHINGPAGE3);
+      TestResult tr23 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_13_RESOURCESERVINGCACHE_CACHINGPAGE3);
       /* TODO: implement test */
+      tr23.appendTcDetail("Not implemented.");
+      tr23.writeTo(writer);
 
-      /* TestCase: SPEC2_13_ResourceServingCache_cachingPAGE4                 */
+      /* TestCase: V2AddlPortletTests_SPEC2_13_ResourceServingCache_cachingPAGE4 */
       /* Details: "If the cache level is set to PAGE, the resource URL        */
       /* contains the current page state"                                     */
-      TestResult tr24 = tcd.getTestResultFailed(SPEC2_13_RESOURCESERVINGCACHE_CACHINGPAGE4);
+      TestResult tr24 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_13_RESOURCESERVINGCACHE_CACHINGPAGE4);
       /* TODO: implement test */
+      tr24.appendTcDetail("Not implemented.");
+      tr24.writeTo(writer);
 
-      /* TestCase: SPEC2_13_ResourceServingCache_cachingPAGE5                 */
+      /* TestCase: V2AddlPortletTests_SPEC2_13_ResourceServingCache_cachingPAGE5 */
       /* Details: "In a resource request resulting from triggering a          */
       /* resource URL with cacheability set to PAGE, a resource URL with      */
       /* cacheability set to FULL may be generated"                           */
-      TestResult tr25 = tcd.getTestResultFailed(SPEC2_13_RESOURCESERVINGCACHE_CACHINGPAGE5);
+      TestResult tr25 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_13_RESOURCESERVINGCACHE_CACHINGPAGE5);
       /* TODO: implement test */
+      tr25.appendTcDetail("Not implemented.");
+      tr25.writeTo(writer);
 
-      /* TestCase: SPEC2_13_ResourceServingCache_cachingPAGE6                 */
+      /* TestCase: V2AddlPortletTests_SPEC2_13_ResourceServingCache_cachingPAGE6 */
       /* Details: "In a resource request resulting from triggering a          */
       /* resource URL with cacheability set to PAGE, a resource URL with      */
       /* cacheability set to PORTLET may be generated"                        */
-      TestResult tr26 = tcd.getTestResultFailed(SPEC2_13_RESOURCESERVINGCACHE_CACHINGPAGE6);
+      TestResult tr26 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_13_RESOURCESERVINGCACHE_CACHINGPAGE6);
       /* TODO: implement test */
+      tr26.appendTcDetail("Not implemented.");
+      tr26.writeTo(writer);
 
-      /* TestCase: SPEC2_13_ResourceServingCache_cachingPAGE7                 */
+      /* TestCase: V2AddlPortletTests_SPEC2_13_ResourceServingCache_cachingPAGE7 */
       /* Details: "In a resource request resulting from triggering a          */
       /* resource URL with cacheability set to PAGE, a resource URL with      */
       /* cacheability set to PAGE may be generated"                           */
-      TestResult tr27 = tcd.getTestResultFailed(SPEC2_13_RESOURCESERVINGCACHE_CACHINGPAGE7);
+      TestResult tr27 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_13_RESOURCESERVINGCACHE_CACHINGPAGE7);
       /* TODO: implement test */
+      tr27.appendTcDetail("Not implemented.");
+      tr27.writeTo(writer);
 
-      /* TestCase: SPEC2_13_ResourceServingCache_cachingPAGE8                 */
+      /* TestCase: V2AddlPortletTests_SPEC2_13_ResourceServingCache_cachingPAGE8 */
       /* Details: "In a resource request resulting from triggering a          */
       /* resource URL with cacheability set to PAGE, a render URL may be      */
       /* generated"                                                           */
-      TestResult tr28 = tcd.getTestResultFailed(SPEC2_13_RESOURCESERVINGCACHE_CACHINGPAGE8);
+      TestResult tr28 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_13_RESOURCESERVINGCACHE_CACHINGPAGE8);
       /* TODO: implement test */
+      tr28.appendTcDetail("Not implemented.");
+      tr28.writeTo(writer);
 
-      /* TestCase: SPEC2_13_ResourceServingCache_cachingPAGE9                 */
+      /* TestCase: V2AddlPortletTests_SPEC2_13_ResourceServingCache_cachingPAGE9 */
       /* Details: "In a resource request resulting from triggering a          */
       /* resource URL with cacheability set to PAGE, an action URL may be     */
       /* generated"                                                           */
-      TestResult tr29 = tcd.getTestResultFailed(SPEC2_13_RESOURCESERVINGCACHE_CACHINGPAGE9);
+      TestResult tr29 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_13_RESOURCESERVINGCACHE_CACHINGPAGE9);
       /* TODO: implement test */
-
-
-
-      // Write the results to the output stream
-
-      tr0.writeTo(writer);
-      tr1.writeTo(writer);
-      tr2.writeTo(writer);
-      tr3.writeTo(writer);
-      tr4.writeTo(writer);
-      tr5.writeTo(writer);
-      tr6.writeTo(writer);
-      tr7.writeTo(writer);
-      tr8.writeTo(writer);
-      tr9.writeTo(writer);
-      tr10.writeTo(writer);
-      tr11.writeTo(writer);
-      tr12.writeTo(writer);
-      tr13.writeTo(writer);
-      tr14.writeTo(writer);
-      tr15.writeTo(writer);
-      tr16.writeTo(writer);
-      tr17.writeTo(writer);
-      tr18.writeTo(writer);
-      tr19.writeTo(writer);
-      tr20.writeTo(writer);
-      tr21.writeTo(writer);
-      tr22.writeTo(writer);
-      tr23.writeTo(writer);
-      tr24.writeTo(writer);
-      tr25.writeTo(writer);
-      tr26.writeTo(writer);
-      tr27.writeTo(writer);
-      tr28.writeTo(writer);
+      tr29.appendTcDetail("Not implemented.");
       tr29.writeTo(writer);
 
+   }
 
+   @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();
+
+      writer.write("<div id=\"AddlPortletTests_SPEC2_13_ResourceServingCache\">no resource output.</div>\n");
+      ResourceURL resurl = portletResp.createResourceURL();
+      resurl.setCacheability(PAGE);
+      writer.write("<script>\n");
+      writer.write("(function () {\n");
+      writer.write("   var xhr = new XMLHttpRequest();\n");
+      writer.write("   xhr.onreadystatechange=function() {\n");
+      writer.write("      if (xhr.readyState==4 && xhr.status==200) {\n");
+      writer.write("         document.getElementById(\"AddlPortletTests_SPEC2_13_ResourceServingCache\").innerHTML=xhr.responseText;\n");
+      writer.write("      }\n");
+      writer.write("   };\n");
+      writer.write("   xhr.open(\"GET\",\"" + resurl.toString() + "\",true);\n");
+      writer.write("   xhr.send();\n");
+      writer.write("})();\n");
+      writer.write("</script>\n");
    }
 
 }
-