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:05 UTC

[01/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.

Repository: portals-pluto
Updated Branches:
  refs/heads/master e531b0b70 -> 8bf37be80


http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/23a1c547/portlet-tck_3.0/deploy/pom.xml
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/deploy/pom.xml b/portlet-tck_3.0/deploy/pom.xml
index 484d0eb..13af381 100644
--- a/portlet-tck_3.0/deploy/pom.xml
+++ b/portlet-tck_3.0/deploy/pom.xml
@@ -161,6 +161,18 @@
       </dependency>
       <dependency>
          <groupId>${project.groupId}</groupId>
+         <artifactId>tck-V2PortletTagLibraryTests2</artifactId>
+         <version>${project.version}</version>
+         <type>war</type>
+      </dependency>
+      <dependency>
+         <groupId>${project.groupId}</groupId>
+         <artifactId>tck-V2PortletTagLibraryTests3</artifactId>
+         <version>${project.version}</version>
+         <type>war</type>
+      </dependency>
+      <dependency>
+         <groupId>${project.groupId}</groupId>
          <artifactId>tck-V2DispatcherTests</artifactId>
          <version>${project.version}</version>
          <type>war</type>

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/23a1c547/portlet-tck_3.0/driver/pom.xml
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/driver/pom.xml b/portlet-tck_3.0/driver/pom.xml
index 6bf318a..50a4cb2 100644
--- a/portlet-tck_3.0/driver/pom.xml
+++ b/portlet-tck_3.0/driver/pom.xml
@@ -171,6 +171,18 @@
       </dependency>
       <dependency>
          <groupId>${project.groupId}</groupId>
+         <artifactId>tck-V2PortletTagLibraryTests2</artifactId>
+         <version>${project.version}</version>
+         <type>war</type>
+      </dependency>
+      <dependency>
+         <groupId>${project.groupId}</groupId>
+         <artifactId>tck-V2PortletTagLibraryTests3</artifactId>
+         <version>${project.version}</version>
+         <type>war</type>
+      </dependency>
+      <dependency>
+         <groupId>${project.groupId}</groupId>
          <artifactId>tck-V2DispatcherTests</artifactId>
          <version>${project.version}</version>
          <type>war</type>
@@ -284,6 +296,8 @@
                         tck-V2AddlResponseTests,
                         tck-V2AddlUrlTests,
                         tck-V2PortletTagLibraryTests,
+                        tck-V2PortletTagLibraryTests2,
+                        tck-V2PortletTagLibraryTests3,
                         tck-V2DispatcherReqRespTests1,
                         tck-V2DispatcherReqRespTests2,
                         tck-V2DispatcherReqRespTests3,

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/23a1c547/portlet-tck_3.0/driver/src/main/resources/xml-resources/pageFiles.xml
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/driver/src/main/resources/xml-resources/pageFiles.xml b/portlet-tck_3.0/driver/src/main/resources/xml-resources/pageFiles.xml
index c94326d..9b244c4 100644
--- a/portlet-tck_3.0/driver/src/main/resources/xml-resources/pageFiles.xml
+++ b/portlet-tck_3.0/driver/src/main/resources/xml-resources/pageFiles.xml
@@ -41,6 +41,8 @@
    <fl:file>tck-V2AddlResponseTests-pages.xml</fl:file>
    <fl:file>tck-V2AddlUrlTests-pages.xml</fl:file>
    <fl:file>tck-V2PortletTagLibraryTests-pages.xml</fl:file>
+   <fl:file>tck-V2PortletTagLibraryTests2-pages.xml</fl:file>
+   <fl:file>tck-V2PortletTagLibraryTests3-pages.xml</fl:file>
    <fl:file>tck-V2DispatcherTests-pages.xml</fl:file>
    <fl:file>tck-V2DispatcherTests2-pages.xml</fl:file>
    <fl:file>tck-V2DispatcherTests3S-pages.xml</fl:file>

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/23a1c547/portlet-tck_3.0/driver/src/main/resources/xml-resources/testFiles.xml
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/driver/src/main/resources/xml-resources/testFiles.xml b/portlet-tck_3.0/driver/src/main/resources/xml-resources/testFiles.xml
index c622647..4129ad2 100644
--- a/portlet-tck_3.0/driver/src/main/resources/xml-resources/testFiles.xml
+++ b/portlet-tck_3.0/driver/src/main/resources/xml-resources/testFiles.xml
@@ -41,6 +41,8 @@
    <fl:file>tck-V2AddlResponseTests-tests.xml</fl:file>
    <fl:file>tck-V2AddlUrlTests-tests.xml</fl:file>
    <fl:file>tck-V2PortletTagLibraryTests-tests.xml</fl:file>
+   <fl:file>tck-V2PortletTagLibraryTests2-tests.xml</fl:file>
+   <fl:file>tck-V2PortletTagLibraryTests3-tests.xml</fl:file>
    <fl:file>tck-V2DispatcherTests-tests.xml</fl:file>
    <fl:file>tck-V2DispatcherTests2-tests.xml</fl:file>
    <fl:file>tck-V2DispatcherTests3S-tests.xml</fl:file>

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/23a1c547/portlet-tck_3.0/pom.xml
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/pom.xml b/portlet-tck_3.0/pom.xml
index d603a26..bba7f36 100644
--- a/portlet-tck_3.0/pom.xml
+++ b/portlet-tck_3.0/pom.xml
@@ -139,6 +139,8 @@
       <module>V2AddlResponseTests</module>
       <module>V2AddlUrlTests</module>
       <module>V2PortletTagLibraryTests</module>
+      <module>V2PortletTagLibraryTests2</module>
+      <module>V2PortletTagLibraryTests3</module>
       <module>V2DispatcherTests</module>
       <module>V2DispatcherTests2</module>
       <module>V2DispatcherTests3S</module>


[13/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.

Posted by ms...@apache.org.
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_6_RenderConfig2.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_6_RenderConfig2.java b/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_6_RenderConfig2.java
new file mode 100644
index 0000000..870b2a4
--- /dev/null
+++ b/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_6_RenderConfig2.java
@@ -0,0 +1,132 @@
+/*  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 AddlPortletTests_SPEC2_6_RenderConfig2_event
+ *
+ */
+public class AddlPortletTests_SPEC2_6_RenderConfig2 implements Portlet, ResourceServingPortlet {
+   private static final String LOG_CLASS = 
+         AddlPortletTests_SPEC2_6_RenderConfig2.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();
+
+   }
+
+   @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();
+
+      JSR286SpecTestCaseDetails tcd = new JSR286SpecTestCaseDetails();
+
+      // Create result objects for the tests
+
+      /* TestCase: V2AddlPortletTests_SPEC2_6_RenderConfig2_getResourceBundle8 */
+      /* Details: "If no resource bundle is defined, the value defined in     */
+      /* the deployment descriptor <title> element is returned by the         */
+      /* corresponding getString method call"                                 */
+      TestResult tr0 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_6_RENDERCONFIG2_GETRESOURCEBUNDLE8);
+      /* TODO: implement test */
+      tr0.appendTcDetail("Not implemented.");
+      tr0.writeTo(writer);
+
+      /* TestCase: V2AddlPortletTests_SPEC2_6_RenderConfig2_getResourceBundle9 */
+      /* Details: "If no resource bundle is defined, the value defined in     */
+      /* the deployment descriptor <short-title> element is returned by the   */
+      /* corresponding getString method call"                                 */
+      TestResult tr1 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_6_RENDERCONFIG2_GETRESOURCEBUNDLE9);
+      /* TODO: implement test */
+      tr1.appendTcDetail("Not implemented.");
+      tr1.writeTo(writer);
+
+      /* TestCase: V2AddlPortletTests_SPEC2_6_RenderConfig2_getResourceBundle10 */
+      /* Details: "If no resource bundle is defined, the value defined in     */
+      /* the deployment descriptor <keywords> element is returned by the      */
+      /* corresponding getString method call"                                 */
+      TestResult tr2 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_6_RENDERCONFIG2_GETRESOURCEBUNDLE10);
+      /* TODO: implement test */
+      tr2.appendTcDetail("Not implemented.");
+      tr2.writeTo(writer);
+
+   }
+
+}

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_6_RenderConfig3.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_6_RenderConfig3.java b/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_6_RenderConfig3.java
new file mode 100644
index 0000000..425e7fa
--- /dev/null
+++ b/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_6_RenderConfig3.java
@@ -0,0 +1,135 @@
+/*  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 AddlPortletTests_SPEC2_6_RenderConfig3_event
+ *
+ */
+public class AddlPortletTests_SPEC2_6_RenderConfig3 implements Portlet, ResourceServingPortlet {
+   private static final String LOG_CLASS = 
+         AddlPortletTests_SPEC2_6_RenderConfig3.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();
+
+   }
+
+   @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();
+
+      JSR286SpecTestCaseDetails tcd = new JSR286SpecTestCaseDetails();
+
+      // Create result objects for the tests
+
+      /* TestCase: V2AddlPortletTests_SPEC2_6_RenderConfig3_getResourceBundle5 */
+      /* Details: "If the resource bundle does not contain a                  */
+      /* \"javax.portlet.title\" property, the value defined in the           */
+      /* deployment descriptor <title> element is returned by the             */
+      /* corresponding getString method call"                                 */
+      TestResult tr0 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_6_RENDERCONFIG3_GETRESOURCEBUNDLE5);
+      /* TODO: implement test */
+      tr0.appendTcDetail("Not implemented.");
+      tr0.writeTo(writer);
+
+      /* TestCase: V2AddlPortletTests_SPEC2_6_RenderConfig3_getResourceBundle6 */
+      /* Details: "If the resource bundle does not contain a                  */
+      /* \"javax.portlet.short-title\" property, the value defined in the     */
+      /* deployment descriptor <short-title> element is returned by the       */
+      /* corresponding getString method call"                                 */
+      TestResult tr1 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_6_RENDERCONFIG3_GETRESOURCEBUNDLE6);
+      /* TODO: implement test */
+      tr1.appendTcDetail("Not implemented.");
+      tr1.writeTo(writer);
+
+      /* TestCase: V2AddlPortletTests_SPEC2_6_RenderConfig3_getResourceBundle7 */
+      /* Details: "If the resource bundle does not contain a                  */
+      /* \"javax.portlet.keywords\" property, the value defined in the        */
+      /* deployment descriptor <keywords> element is returned by the          */
+      /* corresponding getString method call"                                 */
+      TestResult tr2 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_6_RENDERCONFIG3_GETRESOURCEBUNDLE7);
+      /* TODO: implement test */
+      tr2.appendTcDetail("Not implemented.");
+      tr2.writeTo(writer);
+
+   }
+
+}

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_8_PortletModes.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_8_PortletModes.java b/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_8_PortletModes.java
index 69157e5..0ac459e 100644
--- a/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_8_PortletModes.java
+++ b/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_8_PortletModes.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_8_PortletModes_event
+ *
  */
-public class AddlPortletTests_SPEC2_8_PortletModes implements Portlet {
+public class AddlPortletTests_SPEC2_8_PortletModes implements Portlet, ResourceServingPortlet {
    private static final String LOG_CLASS = 
          AddlPortletTests_SPEC2_8_PortletModes.class.getName();
    private final Logger LOGGER = Logger.getLogger(LOG_CLASS);
@@ -57,100 +62,123 @@ public class AddlPortletTests_SPEC2_8_PortletModes 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();
+
+   }
+
+   @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();
 
-      PrintWriter writer = renderResponse.getWriter();
       JSR286SpecTestCaseDetails tcd = new JSR286SpecTestCaseDetails();
 
       // Create result objects for the tests
 
-      /* TestCase: SPEC2_8_PortletModes_declaringPortletModes1                */
+      /* TestCase: V2AddlPortletTests_SPEC2_8_PortletModes_declaringPortletModes1 */
       /* Details: "Support for the VIEW mode does not need to be declared     */
       /* in the deployment descriptor"                                        */
-      TestResult tr0 = tcd.getTestResultFailed(SPEC2_8_PORTLETMODES_DECLARINGPORTLETMODES1);
+      TestResult tr0 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_8_PORTLETMODES_DECLARINGPORTLETMODES1);
       /* TODO: implement test */
+      tr0.appendTcDetail("Not implemented.");
+      tr0.writeTo(writer);
 
-      /* TestCase: SPEC2_8_PortletModes_declaringPortletModes2                */
+      /* TestCase: V2AddlPortletTests_SPEC2_8_PortletModes_declaringPortletModes2 */
       /* Details: "Support for the HELP mode must be declared in the          */
       /* deployment descriptor"                                               */
-      TestResult tr1 = tcd.getTestResultFailed(SPEC2_8_PORTLETMODES_DECLARINGPORTLETMODES2);
+      TestResult tr1 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_8_PORTLETMODES_DECLARINGPORTLETMODES2);
       /* TODO: implement test */
+      tr1.appendTcDetail("Not implemented.");
+      tr1.writeTo(writer);
 
-      /* TestCase: SPEC2_8_PortletModes_declaringPortletModes3                */
+      /* TestCase: V2AddlPortletTests_SPEC2_8_PortletModes_declaringPortletModes3 */
       /* Details: "A custom portlet mode may be declared in the deployment    */
       /* descriptor"                                                          */
-      TestResult tr2 = tcd.getTestResultFailed(SPEC2_8_PORTLETMODES_DECLARINGPORTLETMODES3);
+      TestResult tr2 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_8_PORTLETMODES_DECLARINGPORTLETMODES3);
       /* TODO: implement test */
+      tr2.appendTcDetail("Not implemented.");
+      tr2.writeTo(writer);
 
-      /* TestCase: SPEC2_8_PortletModes_declaringPortletModes4                */
+      /* TestCase: V2AddlPortletTests_SPEC2_8_PortletModes_declaringPortletModes4 */
       /* Details: "A custom portlet mode with                                 */
       /* <portal-managed>false</portal-managed> may be declared in the        */
       /* deployment descriptor"                                               */
-      TestResult tr3 = tcd.getTestResultFailed(SPEC2_8_PORTLETMODES_DECLARINGPORTLETMODES4);
+      TestResult tr3 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_8_PORTLETMODES_DECLARINGPORTLETMODES4);
       /* TODO: implement test */
+      tr3.appendTcDetail("Not implemented.");
+      tr3.writeTo(writer);
 
-      /* TestCase: SPEC2_8_PortletModes_declaringPortletModes5                */
+      /* TestCase: V2AddlPortletTests_SPEC2_8_PortletModes_declaringPortletModes5 */
       /* Details: "The PortletRequest.isPortletModeAllowed method must        */
       /* return FALSE for a custom portlet mode with                          */
       /* <portal-managed>true</portal-managed> that is not supported by the   */
       /* portlet container"                                                   */
-      TestResult tr4 = tcd.getTestResultFailed(SPEC2_8_PORTLETMODES_DECLARINGPORTLETMODES5);
+      TestResult tr4 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_8_PORTLETMODES_DECLARINGPORTLETMODES5);
       /* TODO: implement test */
+      tr4.appendTcDetail("Not implemented.");
+      tr4.writeTo(writer);
 
-      /* TestCase: SPEC2_8_PortletModes_declaringPortletModes6                */
+      /* TestCase: V2AddlPortletTests_SPEC2_8_PortletModes_declaringPortletModes6 */
       /* Details: "The portlet container must ignore all custom portlet       */
       /* modes in the deployment descriptor with                              */
       /* <portal-managed>true</portal-managed> that is not supported by the   */
       /* portlet container"                                                   */
-      TestResult tr5 = tcd.getTestResultFailed(SPEC2_8_PORTLETMODES_DECLARINGPORTLETMODES6);
+      TestResult tr5 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_8_PORTLETMODES_DECLARINGPORTLETMODES6);
       /* TODO: implement test */
+      tr5.appendTcDetail("Not implemented.");
+      tr5.writeTo(writer);
 
-      /* TestCase: SPEC2_8_PortletModes_declaringPortletModes7                */
+      /* TestCase: V2AddlPortletTests_SPEC2_8_PortletModes_declaringPortletModes7 */
       /* Details: "A custom portlet mode with                                 */
       /* <portal-managed>false</portal-managed> corresponds to the VIEW       */
       /* mode from the portal point of view"                                  */
-      TestResult tr6 = tcd.getTestResultFailed(SPEC2_8_PORTLETMODES_DECLARINGPORTLETMODES7);
+      TestResult tr6 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_8_PORTLETMODES_DECLARINGPORTLETMODES7);
       /* TODO: implement test */
+      tr6.appendTcDetail("Not implemented.");
+      tr6.writeTo(writer);
 
-      /* TestCase: SPEC2_8_PortletModes_declaringPortletModes8                */
+      /* TestCase: V2AddlPortletTests_SPEC2_8_PortletModes_declaringPortletModes8 */
       /* Details: "A custom portlet mode can have a localized decoration      */
       /* name in the resource bundle with the name of                         */
       /* javax.portlet.app.custom-portlet-mode.<name>.decoration-name"        */
-      TestResult tr7 = tcd.getTestResultFailed(SPEC2_8_PORTLETMODES_DECLARINGPORTLETMODES8);
+      TestResult tr7 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_8_PORTLETMODES_DECLARINGPORTLETMODES8);
       /* TODO: implement test */
+      tr7.appendTcDetail("Not implemented.");
+      tr7.writeTo(writer);
 
-      /* TestCase: SPEC2_8_PortletModes_declaringPortletModes9                */
+      /* TestCase: V2AddlPortletTests_SPEC2_8_PortletModes_declaringPortletModes9 */
       /* Details: "The portlet must not be invoked in a mode that has not     */
       /* been declared to be supported for a given markup type"               */
-      TestResult tr8 = tcd.getTestResultFailed(SPEC2_8_PORTLETMODES_DECLARINGPORTLETMODES9);
+      TestResult tr8 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_8_PORTLETMODES_DECLARINGPORTLETMODES9);
       /* 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.appendTcDetail("Not implemented.");
       tr8.writeTo(writer);
 
-
    }
 
 }
-

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_9_WindowStates.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_9_WindowStates.java b/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_9_WindowStates.java
index b341387..6a23bf2 100644
--- a/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_9_WindowStates.java
+++ b/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_9_WindowStates.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_9_WindowStates_event
+ *
  */
-public class AddlPortletTests_SPEC2_9_WindowStates implements Portlet {
+public class AddlPortletTests_SPEC2_9_WindowStates implements Portlet, ResourceServingPortlet {
    private static final String LOG_CLASS = 
          AddlPortletTests_SPEC2_9_WindowStates.class.getName();
    private final Logger LOGGER = Logger.getLogger(LOG_CLASS);
@@ -57,82 +62,103 @@ public class AddlPortletTests_SPEC2_9_WindowStates 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();
+
+   }
+
+   @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();
 
-      PrintWriter writer = renderResponse.getWriter();
       JSR286SpecTestCaseDetails tcd = new JSR286SpecTestCaseDetails();
 
       // Create result objects for the tests
 
-      /* TestCase: SPEC2_9_WindowStates_declaringWindowStates1                */
+      /* TestCase: V2AddlPortletTests_SPEC2_9_WindowStates_declaringWindowStates1 */
       /* Details: "Support for the NORMAL window state does not need to be    */
       /* declared in the deployment descriptor"                               */
-      TestResult tr0 = tcd.getTestResultFailed(SPEC2_9_WINDOWSTATES_DECLARINGWINDOWSTATES1);
+      TestResult tr0 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_9_WINDOWSTATES_DECLARINGWINDOWSTATES1);
       /* TODO: implement test */
+      tr0.appendTcDetail("Not implemented.");
+      tr0.writeTo(writer);
 
-      /* TestCase: SPEC2_9_WindowStates_declaringWindowStates2                */
+      /* TestCase: V2AddlPortletTests_SPEC2_9_WindowStates_declaringWindowStates2 */
       /* Details: "Support for the MINIMIZED window state does not need to    */
       /* be declared in the deployment descriptor"                            */
-      TestResult tr1 = tcd.getTestResultFailed(SPEC2_9_WINDOWSTATES_DECLARINGWINDOWSTATES2);
+      TestResult tr1 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_9_WINDOWSTATES_DECLARINGWINDOWSTATES2);
       /* TODO: implement test */
+      tr1.appendTcDetail("Not implemented.");
+      tr1.writeTo(writer);
 
-      /* TestCase: SPEC2_9_WindowStates_declaringWindowStates3                */
+      /* TestCase: V2AddlPortletTests_SPEC2_9_WindowStates_declaringWindowStates3 */
       /* Details: "Support for the MAXIMIZED window state does not need to    */
       /* be declared in the deployment descriptor"                            */
-      TestResult tr2 = tcd.getTestResultFailed(SPEC2_9_WINDOWSTATES_DECLARINGWINDOWSTATES3);
+      TestResult tr2 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_9_WINDOWSTATES_DECLARINGWINDOWSTATES3);
       /* TODO: implement test */
+      tr2.appendTcDetail("Not implemented.");
+      tr2.writeTo(writer);
 
-      /* TestCase: SPEC2_9_WindowStates_declaringWindowStates4                */
+      /* TestCase: V2AddlPortletTests_SPEC2_9_WindowStates_declaringWindowStates4 */
       /* Details: "A custom window state may be declared in the deployment    */
       /* descriptor"                                                          */
-      TestResult tr3 = tcd.getTestResultFailed(SPEC2_9_WINDOWSTATES_DECLARINGWINDOWSTATES4);
+      TestResult tr3 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_9_WINDOWSTATES_DECLARINGWINDOWSTATES4);
       /* TODO: implement test */
+      tr3.appendTcDetail("Not implemented.");
+      tr3.writeTo(writer);
 
-      /* TestCase: SPEC2_9_WindowStates_declaringWindowStates5                */
+      /* TestCase: V2AddlPortletTests_SPEC2_9_WindowStates_declaringWindowStates5 */
       /* Details: "The PortletRequest.isWindowStateAllowed method must        */
       /* return FALSE for a custom window state that is not supported by      */
       /* the portlet container"                                               */
-      TestResult tr4 = tcd.getTestResultFailed(SPEC2_9_WINDOWSTATES_DECLARINGWINDOWSTATES5);
+      TestResult tr4 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_9_WINDOWSTATES_DECLARINGWINDOWSTATES5);
       /* TODO: implement test */
+      tr4.appendTcDetail("Not implemented.");
+      tr4.writeTo(writer);
 
-      /* TestCase: SPEC2_9_WindowStates_declaringWindowStates6                */
+      /* TestCase: V2AddlPortletTests_SPEC2_9_WindowStates_declaringWindowStates6 */
       /* Details: "The portlet container must ignore all custom window        */
       /* states in the deployment descriptor that are not supported by the    */
       /* portal"                                                              */
-      TestResult tr5 = tcd.getTestResultFailed(SPEC2_9_WINDOWSTATES_DECLARINGWINDOWSTATES6);
+      TestResult tr5 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_9_WINDOWSTATES_DECLARINGWINDOWSTATES6);
       /* TODO: implement test */
+      tr5.appendTcDetail("Not implemented.");
+      tr5.writeTo(writer);
 
-      /* TestCase: SPEC2_9_WindowStates_declaringWindowStates7                */
+      /* TestCase: V2AddlPortletTests_SPEC2_9_WindowStates_declaringWindowStates7 */
       /* Details: "The portlet must not be invoked in a window state other    */
       /* than NORMAL, MINIMIZED, or MAXIMIZED that has not been declared to   */
       /* be supported for a given markup type"                                */
-      TestResult tr6 = tcd.getTestResultFailed(SPEC2_9_WINDOWSTATES_DECLARINGWINDOWSTATES7);
+      TestResult tr6 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_9_WINDOWSTATES_DECLARINGWINDOWSTATES7);
       /* 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);
 
-
    }
 
 }
-

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/23a1c547/portlet-tck_3.0/V2AddlPortletTests/src/main/resources/xml-resources/additionalTCs.xml
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlPortletTests/src/main/resources/xml-resources/additionalTCs.xml b/portlet-tck_3.0/V2AddlPortletTests/src/main/resources/xml-resources/additionalTCs.xml
index 4c64d10..94a4b6f 100644
--- a/portlet-tck_3.0/V2AddlPortletTests/src/main/resources/xml-resources/additionalTCs.xml
+++ b/portlet-tck_3.0/V2AddlPortletTests/src/main/resources/xml-resources/additionalTCs.xml
@@ -17,144 +17,126 @@
     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 AddlPortletTests test case names and page mappings -->
-<entry key="SPEC2_2_Compatibility_deployJSR168_1">V2AddlPortletTests</entry>
-<entry key="SPEC2_2_Compatibility_deployJSR168_2">V2AddlPortletTests</entry>
-<entry key="SPEC2_5_Initialization_initialization6">V2AddlPortletTests</entry>
-<entry key="SPEC2_5_RequestHandling_action2">V2AddlPortletTests</entry>
-<entry key="SPEC2_5_RequestHandling_action5">V2AddlPortletTests</entry>
-<entry key="SPEC2_5_RequestHandling_action6">V2AddlPortletTests</entry>
-<entry key="SPEC2_5_RequestHandling_action7">V2AddlPortletTests</entry>
-<entry key="SPEC2_5_RequestHandling_render1">V2AddlPortletTests</entry>
-<entry key="SPEC2_5_RequestHandling_render3">V2AddlPortletTests</entry>
-<entry key="SPEC2_5_RequestHandling_resource1">V2AddlPortletTests</entry>
-<entry key="SPEC2_5_RequestHandling_resource3">V2AddlPortletTests</entry>
-<entry key="SPEC2_5_RequestHandling_exception1">V2AddlPortletTests</entry>
-<entry key="SPEC2_5_RequestHandling_exception2">V2AddlPortletTests</entry>
-<entry key="SPEC2_5_RequestHandling_exception4">V2AddlPortletTests</entry>
-<entry key="SPEC2_5_RequestHandling_exception5">V2AddlPortletTests</entry>
-<entry key="SPEC2_5_GenericPortlet_actionDispatching2">V2AddlPortletTests</entry>
-<entry key="SPEC2_5_GenericPortlet_eventDispatching1">V2AddlPortletTests</entry>
-<entry key="SPEC2_5_GenericPortlet_eventDispatching2">V2AddlPortletTests</entry>
-<entry key="SPEC2_5_GenericPortlet_renderDispatching8">V2AddlPortletTests</entry>
-<entry key="SPEC2_5_GenericPortlet_renderDispatching9">V2AddlPortletTests</entry>
-<entry key="SPEC2_6_Config_getResourceBundle1">V2AddlPortletTests</entry>
-<entry key="SPEC2_6_Config_getResourceBundle2">V2AddlPortletTests</entry>
-<entry key="SPEC2_6_Config_getResourceBundle3">V2AddlPortletTests</entry>
-<entry key="SPEC2_6_Config_getResourceBundle4">V2AddlPortletTests</entry>
-<entry key="SPEC2_6_Config_getResourceBundle5">V2AddlPortletTests</entry>
-<entry key="SPEC2_6_Config_getResourceBundle6">V2AddlPortletTests</entry>
-<entry key="SPEC2_6_Config_getResourceBundle7">V2AddlPortletTests</entry>
-<entry key="SPEC2_6_Config_getResourceBundle8">V2AddlPortletTests</entry>
-<entry key="SPEC2_6_Config_getResourceBundle9">V2AddlPortletTests</entry>
-<entry key="SPEC2_6_Config_getResourceBundle10">V2AddlPortletTests</entry>
-<entry key="SPEC2_6_Config_getPublishingEventQnames3">V2AddlPortletTests</entry>
-<entry key="SPEC2_6_Config_getPublishingEventQnames4">V2AddlPortletTests</entry>
-<entry key="SPEC2_6_Config_getProcessingEventQnames3">V2AddlPortletTests</entry>
-<entry key="SPEC2_6_Config_getProcessingEventQnames4">V2AddlPortletTests</entry>
-<entry key="SPEC2_6_Config_getContainerRuntimeOptions6">V2AddlPortletTests</entry>
-<entry key="SPEC2_6_Config_getContainerRuntimeOptions7">V2AddlPortletTests</entry>
-<entry key="SPEC2_6_Config_getContainerRuntimeOptions8">V2AddlPortletTests</entry>
-<entry key="SPEC2_6_Config_getContainerRuntimeOptions9">V2AddlPortletTests</entry>
-<entry key="SPEC2_8_PortletModes_declaringPortletModes1">V2AddlPortletTests</entry>
-<entry key="SPEC2_8_PortletModes_declaringPortletModes2">V2AddlPortletTests</entry>
-<entry key="SPEC2_8_PortletModes_declaringPortletModes3">V2AddlPortletTests</entry>
-<entry key="SPEC2_8_PortletModes_declaringPortletModes4">V2AddlPortletTests</entry>
-<entry key="SPEC2_8_PortletModes_declaringPortletModes5">V2AddlPortletTests</entry>
-<entry key="SPEC2_8_PortletModes_declaringPortletModes6">V2AddlPortletTests</entry>
-<entry key="SPEC2_8_PortletModes_declaringPortletModes7">V2AddlPortletTests</entry>
-<entry key="SPEC2_8_PortletModes_declaringPortletModes8">V2AddlPortletTests</entry>
-<entry key="SPEC2_8_PortletModes_declaringPortletModes9">V2AddlPortletTests</entry>
-<entry key="SPEC2_9_WindowStates_declaringWindowStates1">V2AddlPortletTests</entry>
-<entry key="SPEC2_9_WindowStates_declaringWindowStates2">V2AddlPortletTests</entry>
-<entry key="SPEC2_9_WindowStates_declaringWindowStates3">V2AddlPortletTests</entry>
-<entry key="SPEC2_9_WindowStates_declaringWindowStates4">V2AddlPortletTests</entry>
-<entry key="SPEC2_9_WindowStates_declaringWindowStates5">V2AddlPortletTests</entry>
-<entry key="SPEC2_9_WindowStates_declaringWindowStates6">V2AddlPortletTests</entry>
-<entry key="SPEC2_9_WindowStates_declaringWindowStates7">V2AddlPortletTests</entry>
-<entry key="SPEC2_13_ResourceServing_properties3">V2AddlPortletTests</entry>
-<entry key="SPEC2_13_ResourceServing_properties4">V2AddlPortletTests</entry>
-<entry key="SPEC2_13_ResourceServing_properties7">V2AddlPortletTests</entry>
-<entry key="SPEC2_13_ResourceServing_properties8">V2AddlPortletTests</entry>
-<entry key="SPEC2_13_ResourceServing_resourceURLs2">V2AddlPortletTests</entry>
-<entry key="SPEC2_13_ResourceServing_resourceURLs3">V2AddlPortletTests</entry>
-<entry key="SPEC2_13_ResourceServing_resourceURLs4">V2AddlPortletTests</entry>
-<entry key="SPEC2_13_ResourceServing_resourceURLs5">V2AddlPortletTests</entry>
-<entry key="SPEC2_13_ResourceServing_resourceURLs6">V2AddlPortletTests</entry>
-<entry key="SPEC2_13_ResourceServing_resourceURLs7">V2AddlPortletTests</entry>
-<entry key="SPEC2_13_ResourceServing_resourceURLs8">V2AddlPortletTests</entry>
-<entry key="SPEC2_13_ResourceServing_resourceURLs9">V2AddlPortletTests</entry>
-<entry key="SPEC2_13_ResourceServingCache_caching1">V2AddlPortletTests</entry>
-<entry key="SPEC2_13_ResourceServingCache_caching2">V2AddlPortletTests</entry>
-<entry key="SPEC2_13_ResourceServingCache_caching3">V2AddlPortletTests</entry>
-<entry key="SPEC2_13_ResourceServingCache_cachingFULL1">V2AddlPortletTests</entry>
-<entry key="SPEC2_13_ResourceServingCache_cachingFULL2">V2AddlPortletTests</entry>
-<entry key="SPEC2_13_ResourceServingCache_cachingFULL3">V2AddlPortletTests</entry>
-<entry key="SPEC2_13_ResourceServingCache_cachingFULL4">V2AddlPortletTests</entry>
-<entry key="SPEC2_13_ResourceServingCache_cachingFULL5">V2AddlPortletTests</entry>
-<entry key="SPEC2_13_ResourceServingCache_cachingFULL6">V2AddlPortletTests</entry>
-<entry key="SPEC2_13_ResourceServingCache_cachingFULL7">V2AddlPortletTests</entry>
-<entry key="SPEC2_13_ResourceServingCache_cachingFULL8">V2AddlPortletTests</entry>
-<entry key="SPEC2_13_ResourceServingCache_cachingFULL9">V2AddlPortletTests</entry>
-<entry key="SPEC2_13_ResourceServingCache_cachingPORTLET1">V2AddlPortletTests</entry>
-<entry key="SPEC2_13_ResourceServingCache_cachingPORTLET2">V2AddlPortletTests</entry>
-<entry key="SPEC2_13_ResourceServingCache_cachingPORTLET3">V2AddlPortletTests</entry>
-<entry key="SPEC2_13_ResourceServingCache_cachingPORTLET4">V2AddlPortletTests</entry>
-<entry key="SPEC2_13_ResourceServingCache_cachingPORTLET5">V2AddlPortletTests</entry>
-<entry key="SPEC2_13_ResourceServingCache_cachingPORTLET6">V2AddlPortletTests</entry>
-<entry key="SPEC2_13_ResourceServingCache_cachingPORTLET7">V2AddlPortletTests</entry>
-<entry key="SPEC2_13_ResourceServingCache_cachingPORTLET8">V2AddlPortletTests</entry>
-<entry key="SPEC2_13_ResourceServingCache_cachingPORTLET9">V2AddlPortletTests</entry>
-<entry key="SPEC2_13_ResourceServingCache_cachingPAGE1">V2AddlPortletTests</entry>
-<entry key="SPEC2_13_ResourceServingCache_cachingPAGE2">V2AddlPortletTests</entry>
-<entry key="SPEC2_13_ResourceServingCache_cachingPAGE3">V2AddlPortletTests</entry>
-<entry key="SPEC2_13_ResourceServingCache_cachingPAGE4">V2AddlPortletTests</entry>
-<entry key="SPEC2_13_ResourceServingCache_cachingPAGE5">V2AddlPortletTests</entry>
-<entry key="SPEC2_13_ResourceServingCache_cachingPAGE6">V2AddlPortletTests</entry>
-<entry key="SPEC2_13_ResourceServingCache_cachingPAGE7">V2AddlPortletTests</entry>
-<entry key="SPEC2_13_ResourceServingCache_cachingPAGE8">V2AddlPortletTests</entry>
-<entry key="SPEC2_13_ResourceServingCache_cachingPAGE9">V2AddlPortletTests</entry>
-<entry key="SPEC2_15_Event_event1">V2AddlPortletTests</entry>
-<entry key="SPEC2_15_Event_event2">V2AddlPortletTests</entry>
-<entry key="SPEC2_15_Event_event3">V2AddlPortletTests</entry>
-<entry key="SPEC2_15_Event_event4">V2AddlPortletTests</entry>
-<entry key="SPEC2_15_Event_event5">V2AddlPortletTests</entry>
-<entry key="SPEC2_15_Event_event6">V2AddlPortletTests</entry>
-<entry key="SPEC2_15_Event_event7">V2AddlPortletTests</entry>
-<entry key="SPEC2_15_Event_event8">V2AddlPortletTests</entry>
-<entry key="SPEC2_15_Event_event9">V2AddlPortletTests</entry>
-<entry key="SPEC2_15_Event_event10">V2AddlPortletTests</entry>
-<entry key="SPEC2_15_Event_event11">V2AddlPortletTests</entry>
-<entry key="SPEC2_15_Event_event12">V2AddlPortletTests</entry>
-<entry key="SPEC2_15_Event_event13">V2AddlPortletTests</entry>
-<entry key="SPEC2_15_Event_event14">V2AddlPortletTests</entry>
-<entry key="SPEC2_15_Event_event15">V2AddlPortletTests</entry>
-<entry key="SPEC2_15_Event_event16">V2AddlPortletTests</entry>
-<entry key="SPEC2_15_Event_eventProcessAction1">V2AddlPortletTests</entry>
-<entry key="SPEC2_15_Event_eventProcessAction2">V2AddlPortletTests</entry>
-<entry key="SPEC2_15_Event_eventProcessAction3">V2AddlPortletTests</entry>
-<entry key="SPEC2_15_Event_eventProcessAction4">V2AddlPortletTests</entry>
-<entry key="SPEC2_15_Event_eventProcessAction5">V2AddlPortletTests</entry>
-<entry key="SPEC2_15_Event_eventProcessAction6">V2AddlPortletTests</entry>
-<entry key="SPEC2_15_Event_eventProcessAction7">V2AddlPortletTests</entry>
-<entry key="SPEC2_15_Event_eventProcessAction8">V2AddlPortletTests</entry>
-<entry key="SPEC2_15_Event_eventProcessAction9">V2AddlPortletTests</entry>
-<entry key="SPEC2_15_Event_eventProcessEvent1">V2AddlPortletTests</entry>
-<entry key="SPEC2_15_Event_eventProcessEvent2">V2AddlPortletTests</entry>
-<entry key="SPEC2_15_Event_eventProcessEvent3">V2AddlPortletTests</entry>
-<entry key="SPEC2_15_Event_eventProcessEvent4">V2AddlPortletTests</entry>
-<entry key="SPEC2_15_Event_eventProcessEvent5">V2AddlPortletTests</entry>
-<entry key="SPEC2_15_Event_eventProcessEvent6">V2AddlPortletTests</entry>
-<entry key="SPEC2_15_Event_eventProcessEvent7">V2AddlPortletTests</entry>
-<entry key="SPEC2_15_Event_eventProcessEvent8">V2AddlPortletTests</entry>
-<entry key="SPEC2_15_Event_eventProcessEvent9">V2AddlPortletTests</entry>
-
+<entry key="V2AddlPortletTests_SPEC2_2_Compatibility_deployJSR168_1">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_2_Compatibility_deployJSR168_2">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_5_Initialization_initialization6">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_5_ActionHandling_action5">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_5_ActionHandling_action6">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_5_ActionHandling_action7">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_5_ActionHandling_exception1">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_5_ActionHandling_exception2">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_5_RenderHandling_render1">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_5_ResourceHandling_resource1">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_5_EventHandling_exception4">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_5_EventHandling_exception5">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_5_RenderGenericPortlet_actionDispatching2">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_5_RenderGenericPortlet_eventDispatching1">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_5_RenderGenericPortlet_eventDispatching2">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_5_RenderGenericPortlet_renderDispatching8">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_5_RenderGenericPortlet_renderDispatching9">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_6_RenderConfig_getResourceBundle1">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_6_RenderConfig_getResourceBundle2">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_6_RenderConfig_getResourceBundle3">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_6_RenderConfig_getResourceBundle4">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_6_RenderConfig_getPublishingEventQnames3">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_6_RenderConfig_getPublishingEventQnames4">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_6_RenderConfig_getProcessingEventQnames3">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_6_RenderConfig_getProcessingEventQnames4">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_6_RenderConfig_getContainerRuntimeOptions6">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_6_RenderConfig_getContainerRuntimeOptions7">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_6_RenderConfig_getContainerRuntimeOptions8">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_6_RenderConfig_getContainerRuntimeOptions9">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_6_RenderConfig2_getResourceBundle8">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_6_RenderConfig2_getResourceBundle9">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_6_RenderConfig2_getResourceBundle10">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_6_RenderConfig3_getResourceBundle5">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_6_RenderConfig3_getResourceBundle6">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_6_RenderConfig3_getResourceBundle7">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_8_PortletModes_declaringPortletModes1">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_8_PortletModes_declaringPortletModes2">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_8_PortletModes_declaringPortletModes3">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_8_PortletModes_declaringPortletModes4">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_8_PortletModes_declaringPortletModes5">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_8_PortletModes_declaringPortletModes6">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_8_PortletModes_declaringPortletModes7">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_8_PortletModes_declaringPortletModes8">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_8_PortletModes_declaringPortletModes9">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_9_WindowStates_declaringWindowStates1">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_9_WindowStates_declaringWindowStates2">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_9_WindowStates_declaringWindowStates3">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_9_WindowStates_declaringWindowStates4">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_9_WindowStates_declaringWindowStates5">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_9_WindowStates_declaringWindowStates6">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_9_WindowStates_declaringWindowStates7">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_13_ResourceServing_resourceURLs2">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_13_ResourceServing_resourceURLs4">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_13_ResourceServing_resourceURLs5">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_13_ResourceServing_resourceURLs6">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_13_ResourceServing_resourceURLs7">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_13_ResourceServing_resourceURLs8">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_13_ResourceServing_resourceURLs9">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_13_ResourceServingCache_caching1">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_13_ResourceServingCache_caching2">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_13_ResourceServingCache_caching3">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_13_ResourceServingCache_cachingFULL1">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_13_ResourceServingCache_cachingFULL2">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_13_ResourceServingCache_cachingFULL3">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_13_ResourceServingCache_cachingFULL4">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_13_ResourceServingCache_cachingFULL5">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_13_ResourceServingCache_cachingFULL6">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_13_ResourceServingCache_cachingFULL7">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_13_ResourceServingCache_cachingFULL8">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_13_ResourceServingCache_cachingFULL9">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_13_ResourceServingCache_cachingPORTLET1">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_13_ResourceServingCache_cachingPORTLET2">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_13_ResourceServingCache_cachingPORTLET3">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_13_ResourceServingCache_cachingPORTLET4">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_13_ResourceServingCache_cachingPORTLET5">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_13_ResourceServingCache_cachingPORTLET6">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_13_ResourceServingCache_cachingPORTLET7">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_13_ResourceServingCache_cachingPORTLET8">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_13_ResourceServingCache_cachingPORTLET9">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_13_ResourceServingCache_cachingPAGE1">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_13_ResourceServingCache_cachingPAGE2">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_13_ResourceServingCache_cachingPAGE3">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_13_ResourceServingCache_cachingPAGE4">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_13_ResourceServingCache_cachingPAGE5">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_13_ResourceServingCache_cachingPAGE6">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_13_ResourceServingCache_cachingPAGE7">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_13_ResourceServingCache_cachingPAGE8">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_13_ResourceServingCache_cachingPAGE9">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_15_Event_event1">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_15_RenderEventHandling_event2">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_15_RenderEventHandling_event3">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_15_RenderEventHandling_event4">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_15_EventEventHandling_event5">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_15_EventEventHandling_event6">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_15_EventEventHandling_event7">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_15_EventEventHandling_event8">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_15_EventEventHandling_event9">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_15_EventEventHandling_event10">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_15_EventEventHandling_event11">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_15_EventEventHandling_event15">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_15_EventEventHandling_event16">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_15_EventEventHandling_eventProcessEvent1">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_15_EventEventHandling_eventProcessEvent2">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_15_EventEventHandling_eventProcessEvent3">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_15_EventEventHandling_eventProcessEvent4">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_15_EventEventHandling_eventProcessEvent5">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_15_EventEventHandling_eventProcessEvent6">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_15_EventEventHandling_eventProcessEvent7">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_15_EventEventHandling_eventProcessEvent8">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_15_EventEventHandling_eventProcessEvent9">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_15_ActionEventHandling_eventProcessAction1">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_15_ActionEventHandling_eventProcessAction2">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_15_ActionEventHandling_eventProcessAction3">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_15_ActionEventHandling_eventProcessAction4">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_15_ActionEventHandling_eventProcessAction5">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_15_ActionEventHandling_eventProcessAction6">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_15_ActionEventHandling_eventProcessAction7">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_15_ActionEventHandling_eventProcessAction8">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_15_ActionEventHandling_eventProcessAction9">V2AddlPortletTests</entry>
 </properties>

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/23a1c547/portlet-tck_3.0/V2AddlPortletTests/src/main/webapp/WEB-INF/portlet.xml
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlPortletTests/src/main/webapp/WEB-INF/portlet.xml b/portlet-tck_3.0/V2AddlPortletTests/src/main/webapp/WEB-INF/portlet.xml
index 06a6912..f98f7e7 100644
--- a/portlet-tck_3.0/V2AddlPortletTests/src/main/webapp/WEB-INF/portlet.xml
+++ b/portlet-tck_3.0/V2AddlPortletTests/src/main/webapp/WEB-INF/portlet.xml
@@ -20,25 +20,16 @@
 <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-AddlPortletTests">
-
+   xmlns:tck="http://www.apache.org/portals/pluto/portlet-tck_3.0"
+   version="2.0" id="V2AddlPortletTests">
    <portlet>
       <portlet-name>AddlPortletTests_SPEC2_2_Compatibility</portlet-name>
       <portlet-class>javax.portlet.tck.portlets.AddlPortletTests_SPEC2_2_Compatibility</portlet-class>
-
-      <init-param>
-         <name>TestParameter</name>
-         <value>TestValue</value>
-      </init-param>
-
       <expiration-cache>0</expiration-cache>
-
       <supports>
          <mime-type>text/html</mime-type>
       </supports>
-
       <supported-locale>en_US</supported-locale>
-
       <portlet-info>
          <title>AddlPortletTests_SPEC2_2_Compatibility</title>
       </portlet-info>
@@ -47,108 +38,147 @@
    <portlet>
       <portlet-name>AddlPortletTests_SPEC2_5_Initialization</portlet-name>
       <portlet-class>javax.portlet.tck.portlets.AddlPortletTests_SPEC2_5_Initialization</portlet-class>
-
-      <init-param>
-         <name>TestParameter</name>
-         <value>TestValue</value>
-      </init-param>
-
       <expiration-cache>0</expiration-cache>
-
       <supports>
          <mime-type>text/html</mime-type>
       </supports>
-
       <supported-locale>en_US</supported-locale>
-
       <portlet-info>
          <title>AddlPortletTests_SPEC2_5_Initialization</title>
       </portlet-info>
    </portlet>
 
    <portlet>
-      <portlet-name>AddlPortletTests_SPEC2_5_RequestHandling</portlet-name>
-      <portlet-class>javax.portlet.tck.portlets.AddlPortletTests_SPEC2_5_RequestHandling</portlet-class>
-
-      <init-param>
-         <name>TestParameter</name>
-         <value>TestValue</value>
-      </init-param>
-
+      <portlet-name>AddlPortletTests_SPEC2_5_ActionHandling</portlet-name>
+      <portlet-class>javax.portlet.tck.portlets.AddlPortletTests_SPEC2_5_ActionHandling</portlet-class>
       <expiration-cache>0</expiration-cache>
-
       <supports>
          <mime-type>text/html</mime-type>
       </supports>
-
       <supported-locale>en_US</supported-locale>
-
       <portlet-info>
-         <title>AddlPortletTests_SPEC2_5_RequestHandling</title>
+         <title>AddlPortletTests_SPEC2_5_ActionHandling</title>
       </portlet-info>
    </portlet>
 
    <portlet>
-      <portlet-name>AddlPortletTests_SPEC2_5_GenericPortlet</portlet-name>
-      <portlet-class>javax.portlet.tck.portlets.AddlPortletTests_SPEC2_5_GenericPortlet</portlet-class>
-
-      <init-param>
-         <name>TestParameter</name>
-         <value>TestValue</value>
-      </init-param>
-
+      <portlet-name>AddlPortletTests_SPEC2_5_RenderHandling</portlet-name>
+      <portlet-class>javax.portlet.tck.portlets.AddlPortletTests_SPEC2_5_RenderHandling</portlet-class>
       <expiration-cache>0</expiration-cache>
-
       <supports>
          <mime-type>text/html</mime-type>
       </supports>
-
       <supported-locale>en_US</supported-locale>
+      <portlet-info>
+         <title>AddlPortletTests_SPEC2_5_RenderHandling</title>
+      </portlet-info>
+   </portlet>
 
+   <portlet>
+      <portlet-name>AddlPortletTests_SPEC2_5_ResourceHandling</portlet-name>
+      <portlet-class>javax.portlet.tck.portlets.AddlPortletTests_SPEC2_5_ResourceHandling</portlet-class>
+      <expiration-cache>0</expiration-cache>
+      <supports>
+         <mime-type>text/html</mime-type>
+      </supports>
+      <supported-locale>en_US</supported-locale>
       <portlet-info>
-         <title>AddlPortletTests_SPEC2_5_GenericPortlet</title>
+         <title>AddlPortletTests_SPEC2_5_ResourceHandling</title>
       </portlet-info>
    </portlet>
 
    <portlet>
-      <portlet-name>AddlPortletTests_SPEC2_6_Config</portlet-name>
-      <portlet-class>javax.portlet.tck.portlets.AddlPortletTests_SPEC2_6_Config</portlet-class>
+      <portlet-name>AddlPortletTests_SPEC2_5_EventHandling</portlet-name>
+      <portlet-class>javax.portlet.tck.portlets.AddlPortletTests_SPEC2_5_EventHandling</portlet-class>
+      <expiration-cache>0</expiration-cache>
+      <supports>
+         <mime-type>text/html</mime-type>
+      </supports>
+      <supported-locale>en_US</supported-locale>
+      <portlet-info>
+         <title>AddlPortletTests_SPEC2_5_EventHandling</title>
+      </portlet-info>
+      <supported-publishing-event>
+         <qname>tck:AddlPortletTests_SPEC2_5_EventHandling</qname>
+      </supported-publishing-event>
+   </portlet>
 
-      <init-param>
-         <name>TestParameter</name>
-         <value>TestValue</value>
-      </init-param>
+   <portlet>
+      <portlet-name>AddlPortletTests_SPEC2_5_EventHandling_event</portlet-name>
+      <portlet-class>javax.portlet.tck.portlets.AddlPortletTests_SPEC2_5_EventHandling_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>AddlPortletTests_SPEC2_5_EventHandling_event</title>
+      </portlet-info>
+      <supported-processing-event>
+         <qname>tck:AddlPortletTests_SPEC2_5_EventHandling</qname>
+      </supported-processing-event>
+   </portlet>
 
+   <portlet>
+      <portlet-name>AddlPortletTests_SPEC2_5_RenderGenericPortlet</portlet-name>
+      <portlet-class>javax.portlet.tck.portlets.AddlPortletTests_SPEC2_5_RenderGenericPortlet</portlet-class>
       <expiration-cache>0</expiration-cache>
+      <supports>
+         <mime-type>text/html</mime-type>
+      </supports>
+      <supported-locale>en_US</supported-locale>
+      <portlet-info>
+         <title>AddlPortletTests_SPEC2_5_RenderGenericPortlet</title>
+      </portlet-info>
+   </portlet>
 
+   <portlet>
+      <portlet-name>AddlPortletTests_SPEC2_6_RenderConfig</portlet-name>
+      <portlet-class>javax.portlet.tck.portlets.AddlPortletTests_SPEC2_6_RenderConfig</portlet-class>
+      <expiration-cache>0</expiration-cache>
       <supports>
          <mime-type>text/html</mime-type>
       </supports>
+      <supported-locale>en_US</supported-locale>
+      <portlet-info>
+         <title>AddlPortletTests_SPEC2_6_RenderConfig</title>
+      </portlet-info>
+   </portlet>
 
+   <portlet>
+      <portlet-name>AddlPortletTests_SPEC2_6_RenderConfig2</portlet-name>
+      <portlet-class>javax.portlet.tck.portlets.AddlPortletTests_SPEC2_6_RenderConfig2</portlet-class>
+      <expiration-cache>0</expiration-cache>
+      <supports>
+         <mime-type>text/html</mime-type>
+      </supports>
       <supported-locale>en_US</supported-locale>
+      <portlet-info>
+         <title>AddlPortletTests_SPEC2_6_RenderConfig2</title>
+      </portlet-info>
+   </portlet>
 
+   <portlet>
+      <portlet-name>AddlPortletTests_SPEC2_6_RenderConfig3</portlet-name>
+      <portlet-class>javax.portlet.tck.portlets.AddlPortletTests_SPEC2_6_RenderConfig3</portlet-class>
+      <expiration-cache>0</expiration-cache>
+      <supports>
+         <mime-type>text/html</mime-type>
+      </supports>
+      <supported-locale>en_US</supported-locale>
       <portlet-info>
-         <title>AddlPortletTests_SPEC2_6_Config</title>
+         <title>AddlPortletTests_SPEC2_6_RenderConfig3</title>
       </portlet-info>
    </portlet>
 
    <portlet>
       <portlet-name>AddlPortletTests_SPEC2_8_PortletModes</portlet-name>
       <portlet-class>javax.portlet.tck.portlets.AddlPortletTests_SPEC2_8_PortletModes</portlet-class>
-
-      <init-param>
-         <name>TestParameter</name>
-         <value>TestValue</value>
-      </init-param>
-
       <expiration-cache>0</expiration-cache>
-
       <supports>
          <mime-type>text/html</mime-type>
       </supports>
-
       <supported-locale>en_US</supported-locale>
-
       <portlet-info>
          <title>AddlPortletTests_SPEC2_8_PortletModes</title>
       </portlet-info>
@@ -157,20 +187,11 @@
    <portlet>
       <portlet-name>AddlPortletTests_SPEC2_9_WindowStates</portlet-name>
       <portlet-class>javax.portlet.tck.portlets.AddlPortletTests_SPEC2_9_WindowStates</portlet-class>
-
-      <init-param>
-         <name>TestParameter</name>
-         <value>TestValue</value>
-      </init-param>
-
       <expiration-cache>0</expiration-cache>
-
       <supports>
          <mime-type>text/html</mime-type>
       </supports>
-
       <supported-locale>en_US</supported-locale>
-
       <portlet-info>
          <title>AddlPortletTests_SPEC2_9_WindowStates</title>
       </portlet-info>
@@ -179,20 +200,11 @@
    <portlet>
       <portlet-name>AddlPortletTests_SPEC2_13_ResourceServing</portlet-name>
       <portlet-class>javax.portlet.tck.portlets.AddlPortletTests_SPEC2_13_ResourceServing</portlet-class>
-
-      <init-param>
-         <name>TestParameter</name>
-         <value>TestValue</value>
-      </init-param>
-
       <expiration-cache>0</expiration-cache>
-
       <supports>
          <mime-type>text/html</mime-type>
       </supports>
-
       <supported-locale>en_US</supported-locale>
-
       <portlet-info>
          <title>AddlPortletTests_SPEC2_13_ResourceServing</title>
       </portlet-info>
@@ -201,20 +213,11 @@
    <portlet>
       <portlet-name>AddlPortletTests_SPEC2_13_ResourceServingCache</portlet-name>
       <portlet-class>javax.portlet.tck.portlets.AddlPortletTests_SPEC2_13_ResourceServingCache</portlet-class>
-
-      <init-param>
-         <name>TestParameter</name>
-         <value>TestValue</value>
-      </init-param>
-
       <expiration-cache>0</expiration-cache>
-
       <supports>
          <mime-type>text/html</mime-type>
       </supports>
-
       <supported-locale>en_US</supported-locale>
-
       <portlet-info>
          <title>AddlPortletTests_SPEC2_13_ResourceServingCache</title>
       </portlet-info>
@@ -223,25 +226,110 @@
    <portlet>
       <portlet-name>AddlPortletTests_SPEC2_15_Event</portlet-name>
       <portlet-class>javax.portlet.tck.portlets.AddlPortletTests_SPEC2_15_Event</portlet-class>
-
-      <init-param>
-         <name>TestParameter</name>
-         <value>TestValue</value>
-      </init-param>
-
       <expiration-cache>0</expiration-cache>
+      <supports>
+         <mime-type>text/html</mime-type>
+      </supports>
+      <supported-locale>en_US</supported-locale>
+      <portlet-info>
+         <title>AddlPortletTests_SPEC2_15_Event</title>
+      </portlet-info>
+      <supported-publishing-event>
+         <qname>tck:AddlPortletTests_SPEC2_15_Event</qname>
+      </supported-publishing-event>
+   </portlet>
 
+   <portlet>
+      <portlet-name>AddlPortletTests_SPEC2_15_Event_event</portlet-name>
+      <portlet-class>javax.portlet.tck.portlets.AddlPortletTests_SPEC2_15_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>AddlPortletTests_SPEC2_15_Event_event</title>
+      </portlet-info>
+      <supported-processing-event>
+         <qname>tck:AddlPortletTests_SPEC2_15_Event</qname>
+      </supported-processing-event>
+   </portlet>
 
+   <portlet>
+      <portlet-name>AddlPortletTests_SPEC2_15_RenderEventHandling</portlet-name>
+      <portlet-class>javax.portlet.tck.portlets.AddlPortletTests_SPEC2_15_RenderEventHandling</portlet-class>
+      <expiration-cache>0</expiration-cache>
+      <supports>
+         <mime-type>text/html</mime-type>
+      </supports>
       <supported-locale>en_US</supported-locale>
+      <portlet-info>
+         <title>AddlPortletTests_SPEC2_15_RenderEventHandling</title>
+      </portlet-info>
+   </portlet>
 
+   <portlet>
+      <portlet-name>AddlPortletTests_SPEC2_15_EventEventHandling</portlet-name>
+      <portlet-class>javax.portlet.tck.portlets.AddlPortletTests_SPEC2_15_EventEventHandling</portlet-class>
+      <expiration-cache>0</expiration-cache>
+      <supports>
+         <mime-type>text/html</mime-type>
+      </supports>
+      <supported-locale>en_US</supported-locale>
       <portlet-info>
-         <title>AddlPortletTests_SPEC2_15_Event</title>
+         <title>AddlPortletTests_SPEC2_15_EventEventHandling</title>
       </portlet-info>
+      <supported-publishing-event>
+         <qname>tck:AddlPortletTests_SPEC2_15_EventEventHandling</qname>
+      </supported-publishing-event>
    </portlet>
 
+   <portlet>
+      <portlet-name>AddlPortletTests_SPEC2_15_EventEventHandling_event</portlet-name>
+      <portlet-class>javax.portlet.tck.portlets.AddlPortletTests_SPEC2_15_EventEventHandling_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>AddlPortletTests_SPEC2_15_EventEventHandling_event</title>
+      </portlet-info>
+      <supported-processing-event>
+         <qname>tck:AddlPortletTests_SPEC2_15_EventEventHandling</qname>
+      </supported-processing-event>
+   </portlet>
 
+   <portlet>
+      <portlet-name>AddlPortletTests_SPEC2_15_ActionEventHandling</portlet-name>
+      <portlet-class>javax.portlet.tck.portlets.AddlPortletTests_SPEC2_15_ActionEventHandling</portlet-class>
+      <expiration-cache>0</expiration-cache>
+      <supports>
+         <mime-type>text/html</mime-type>
+      </supports>
+      <supported-locale>en_US</supported-locale>
+      <portlet-info>
+         <title>AddlPortletTests_SPEC2_15_ActionEventHandling</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>
+
+   <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/V2AddlPortletTests/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlPortletTests/src/main/webapp/WEB-INF/web.xml b/portlet-tck_3.0/V2AddlPortletTests/src/main/webapp/WEB-INF/web.xml
index d3f543a..bb82e3b 100644
--- a/portlet-tck_3.0/V2AddlPortletTests/src/main/webapp/WEB-INF/web.xml
+++ b/portlet-tck_3.0/V2AddlPortletTests/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-AddlPortletTests</display-name>
-</web-app>
+   <display-name>javax.portlet-tck-AddlPortletTests</display-name>
 
+</web-app>

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/23a1c547/portlet-tck_3.0/V2AddlRequestTests/pom.xml
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlRequestTests/pom.xml b/portlet-tck_3.0/V2AddlRequestTests/pom.xml
index 8fcbd0d..7ab1cef 100644
--- a/portlet-tck_3.0/V2AddlRequestTests/pom.xml
+++ b/portlet-tck_3.0/V2AddlRequestTests/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-V2AddlRequestTests</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-V2AddlRequestTests</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>


[14/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.

Posted by ms...@apache.org.
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_5_ActionHandling.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_5_ActionHandling.java b/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_5_ActionHandling.java
new file mode 100644
index 0000000..1dc5dd0
--- /dev/null
+++ b/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_5_ActionHandling.java
@@ -0,0 +1,213 @@
+/*  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 AddlPortletTests_SPEC2_5_ActionHandling_event
+ *
+ */
+public class AddlPortletTests_SPEC2_5_ActionHandling implements Portlet, ResourceServingPortlet {
+   private static final String LOG_CLASS = 
+         AddlPortletTests_SPEC2_5_ActionHandling.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();
+
+      JSR286SpecTestCaseDetails tcd = new JSR286SpecTestCaseDetails();
+
+      // Create result objects for the tests
+
+      /* TestCase: V2AddlPortletTests_SPEC2_5_ActionHandling_action5          */
+      /* Details: "If the portlet issues a redirect during action             */
+      /* processing, the portlet container allows the processAction method    */
+      /* to complete"                                                         */
+      TestResult tr0 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_5_ACTIONHANDLING_ACTION5);
+      /* TODO: implement test */
+      tr0.appendTcDetail("Not implemented.");
+      tr0.writeTo(writer);
+
+      /* TestCase: V2AddlPortletTests_SPEC2_5_ActionHandling_action6          */
+      /* Details: "If the portlet issues a redirect during action             */
+      /* processing, the portlet container must send the redirect back to     */
+      /* the user agent and finalize the request processing."                 */
+      TestResult tr1 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_5_ACTIONHANDLING_ACTION6);
+      /* TODO: implement test */
+      tr1.appendTcDetail("Not implemented.");
+      tr1.writeTo(writer);
+
+      /* TestCase: V2AddlPortletTests_SPEC2_5_ActionHandling_action7          */
+      /* Details: "If the portlet issues a redirect during action             */
+      /* processing, events that were set are not processed"                  */
+      TestResult tr2 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_5_ACTIONHANDLING_ACTION7);
+      /* TODO: implement test */
+      tr2.appendTcDetail("Not implemented.");
+      tr2.writeTo(writer);
+
+      /* TestCase: V2AddlPortletTests_SPEC2_5_ActionHandling_exception1       */
+      /* Details: "If the portlet throws an PortletException in               */
+      /* processAction, all operations on the ActionResponse, including set   */
+      /* events, must be ignored"                                             */
+      TestResult tr3 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_5_ACTIONHANDLING_EXCEPTION1);
+      /* TODO: implement test */
+      tr3.appendTcDetail("Not implemented.");
+      tr3.writeTo(writer);
+
+      /* TestCase: V2AddlPortletTests_SPEC2_5_ActionHandling_exception2       */
+      /* Details: "If the portlet throws a RuntimeException in                */
+      /* processAction, all operations on the ActionResponse, including set   */
+      /* events, must be ignored"                                             */
+      TestResult tr4 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_5_ACTIONHANDLING_EXCEPTION2);
+      /* TODO: implement test */
+      tr4.appendTcDetail("Not implemented.");
+      tr4.writeTo(writer);
+
+      portletReq.getPortletSession().setAttribute(
+                   Constants.RESULT_ATTR_PREFIX + "AddlPortletTests_SPEC2_5_ActionHandling",
+                   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();
+
+   }
+
+   @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();
+
+      PortletSession ps = portletReq.getPortletSession();
+      String msg = (String) ps.getAttribute(RESULT_ATTR_PREFIX + "AddlPortletTests_SPEC2_5_ActionHandling", APPLICATION_SCOPE);
+      if (msg != null) {
+         writer.write("<p>" + msg + "</p><br/>\n");
+         ps.removeAttribute(RESULT_ATTR_PREFIX + "AddlPortletTests_SPEC2_5_ActionHandling", APPLICATION_SCOPE);
+      }
+
+      /* TestCase: V2AddlPortletTests_SPEC2_5_ActionHandling_action5          */
+      /* Details: "If the portlet issues a redirect during action             */
+      /* processing, the portlet container allows the processAction method    */
+      /* to complete"                                                         */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2AddlPortletTests_SPEC2_5_ActionHandling_action5", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2AddlPortletTests_SPEC2_5_ActionHandling_action6          */
+      /* Details: "If the portlet issues a redirect during action             */
+      /* processing, the portlet container must send the redirect back to     */
+      /* the user agent and finalize the request processing."                 */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2AddlPortletTests_SPEC2_5_ActionHandling_action6", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2AddlPortletTests_SPEC2_5_ActionHandling_action7          */
+      /* Details: "If the portlet issues a redirect during action             */
+      /* processing, events that were set are not processed"                  */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2AddlPortletTests_SPEC2_5_ActionHandling_action7", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2AddlPortletTests_SPEC2_5_ActionHandling_exception1       */
+      /* Details: "If the portlet throws an PortletException in               */
+      /* processAction, all operations on the ActionResponse, including set   */
+      /* events, must be ignored"                                             */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2AddlPortletTests_SPEC2_5_ActionHandling_exception1", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2AddlPortletTests_SPEC2_5_ActionHandling_exception2       */
+      /* Details: "If the portlet throws a RuntimeException in                */
+      /* processAction, all operations on the ActionResponse, including set   */
+      /* events, must be ignored"                                             */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2AddlPortletTests_SPEC2_5_ActionHandling_exception2", aurl);
+         tb.writeTo(writer);
+      }
+
+   }
+
+}

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_5_EventHandling.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_5_EventHandling.java b/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_5_EventHandling.java
new file mode 100644
index 0000000..c9fb1db
--- /dev/null
+++ b/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_5_EventHandling.java
@@ -0,0 +1,126 @@
+/*  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 AddlPortletTests_SPEC2_5_EventHandling_event
+ *
+ */
+public class AddlPortletTests_SPEC2_5_EventHandling implements Portlet, ResourceServingPortlet {
+   private static final String LOG_CLASS = 
+         AddlPortletTests_SPEC2_5_EventHandling.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();
+
+      QName eventQName = new QName(TCKNAMESPACE,
+             "AddlPortletTests_SPEC2_5_EventHandling");
+      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: V2AddlPortletTests_SPEC2_5_EventHandling_exception4        */
+      /* Details: "If the portlet throws an PortletException in               */
+      /* processEvent, all operations on the EventResponse, including set     */
+      /* events, must be ignored"                                             */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2AddlPortletTests_SPEC2_5_EventHandling_exception4", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2AddlPortletTests_SPEC2_5_EventHandling_exception5        */
+      /* Details: "If the portlet throws a RuntimeException in                */
+      /* processEvent, all operations on the EventResponse, including set     */
+      /* events, must be ignored"                                             */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2AddlPortletTests_SPEC2_5_EventHandling_exception5", aurl);
+         tb.writeTo(writer);
+      }
+
+   }
+
+}

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_5_EventHandling_event.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_5_EventHandling_event.java b/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_5_EventHandling_event.java
new file mode 100644
index 0000000..3db4030
--- /dev/null
+++ b/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_5_EventHandling_event.java
@@ -0,0 +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.
+ */
+
+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.JSR286SpecTestCaseDetails.*;
+import static javax.portlet.PortletSession.*;
+
+/**
+ * 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 AddlPortletTests_SPEC2_5_EventHandling_event implements Portlet, EventPortlet, ResourceServingPortlet {
+   private static final String LOG_CLASS = 
+         AddlPortletTests_SPEC2_5_EventHandling_event.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, "event companion processAction - ERROR!!");
+   }
+
+   @Override
+   public void serveResource(ResourceRequest portletReq, ResourceResponse portletResp)
+         throws PortletException, IOException {
+      LOGGER.entering(LOG_CLASS, "event companion serveResource - ERROR!!");
+   }
+
+   @Override
+   public void processEvent(EventRequest portletReq, EventResponse portletResp)
+         throws PortletException, IOException {
+      LOGGER.entering(LOG_CLASS, "event companion processEvent");
+
+
+      portletResp.setRenderParameters(portletReq);
+
+      long tid = Thread.currentThread().getId();
+      portletReq.setAttribute(THREADID_ATTR, tid);
+
+      StringWriter writer = new StringWriter();
+
+      JSR286SpecTestCaseDetails tcd = new JSR286SpecTestCaseDetails();
+
+      // Create result objects for the tests
+
+      /* TestCase: V2AddlPortletTests_SPEC2_5_EventHandling_exception4        */
+      /* Details: "If the portlet throws an PortletException in               */
+      /* processEvent, all operations on the EventResponse, including set     */
+      /* events, must be ignored"                                             */
+      TestResult tr0 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_5_EVENTHANDLING_EXCEPTION4);
+      /* TODO: implement test */
+      tr0.appendTcDetail("Not implemented.");
+      tr0.writeTo(writer);
+
+      /* TestCase: V2AddlPortletTests_SPEC2_5_EventHandling_exception5        */
+      /* Details: "If the portlet throws a RuntimeException in                */
+      /* processEvent, all operations on the EventResponse, including set     */
+      /* events, must be ignored"                                             */
+      TestResult tr1 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_5_EVENTHANDLING_EXCEPTION5);
+      /* TODO: implement test */
+      tr1.appendTcDetail("Not implemented.");
+      tr1.writeTo(writer);
+
+      portletReq.getPortletSession().setAttribute(
+                   Constants.RESULT_ATTR_PREFIX + "AddlPortletTests_SPEC2_5_EventHandling",
+                   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>AddlPortletTests_SPEC2_5_EventHandling_event</p>\n");
+
+      String msg = (String) portletReq.getPortletSession()
+            .getAttribute(RESULT_ATTR_PREFIX + "AddlPortletTests_SPEC2_5_EventHandling", APPLICATION_SCOPE);
+      msg = (msg==null) ? "Not ready. click test case link." : msg;
+      writer.write("<p>" + msg + "</p>\n");
+
+   }
+
+}

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/23a1c547/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_5_GenericPortlet.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_5_GenericPortlet.java b/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_5_GenericPortlet.java
deleted file mode 100644
index cb67c5e..0000000
--- a/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_5_GenericPortlet.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*  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.IOException;
-import java.io.PrintWriter;
-
-import java.util.Enumeration;
-import java.util.Locale;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-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 static javax.portlet.tck.beans.JSR286SpecTestCaseDetails.*;
-import javax.portlet.tck.beans.TestResult;
-
-/**
- * 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.
- */
-public class AddlPortletTests_SPEC2_5_GenericPortlet implements Portlet {
-   private static final String LOG_CLASS = 
-         AddlPortletTests_SPEC2_5_GenericPortlet.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 actionRequest, ActionResponse actionResponse)
-         throws PortletException, IOException {
-   }
-
-   @Override
-   public void render(RenderRequest renderRequest, RenderResponse renderResponse)
-         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
-
-      /* TestCase: SPEC2_5_GenericPortlet_actionDispatching2                  */
-      /* Details: "If the ActionRequest.ACTION_NAME parameter is not set on   */
-      /* the action URL, the GenericPortlet processAction method will throw   */
-      /* a PortletException"                                                  */
-      TestResult tr0 = tcd.getTestResultFailed(SPEC2_5_GENERICPORTLET_ACTIONDISPATCHING2);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_5_GenericPortlet_eventDispatching1                   */
-      /* Details: "The GenericPortlet processEvent method will dispatch the   */
-      /* request to a subclass method annotated with the tag                  */
-      /* @ProcessEvent(qname=<eventname>), where <eventname> must be in the   */
-      /* format provided by Qname.toString()"                                 */
-      TestResult tr1 = tcd.getTestResultFailed(SPEC2_5_GENERICPORTLET_EVENTDISPATCHING1);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_5_GenericPortlet_eventDispatching2                   */
-      /* Details: "The GenericPortlet processEvent method will dispatch the   */
-      /* request to a subclass method annotated with the tag                  */
-      /* @ProcessEvent(name=<event_name_local_part>)"                         */
-      TestResult tr2 = tcd.getTestResultFailed(SPEC2_5_GENERICPORTLET_EVENTDISPATCHING2);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_5_GenericPortlet_renderDispatching8                  */
-      /* Details: "getTitle - If a ResourceBundle containing the title        */
-      /* string is defined in the deployment descriptor, that title string    */
-      /* will be used"                                                        */
-      TestResult tr3 = tcd.getTestResultFailed(SPEC2_5_GENERICPORTLET_RENDERDISPATCHING8);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_5_GenericPortlet_renderDispatching9                  */
-      /* Details: "getTitle - If a ResourceBundle containing the title        */
-      /* string is not defined in the deployment descriptor, the title        */
-      /* defined in the portlet descriptor <title> element is used"           */
-      TestResult tr4 = tcd.getTestResultFailed(SPEC2_5_GENERICPORTLET_RENDERDISPATCHING9);
-      /* 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);
-
-
-   }
-
-}
-

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_5_Initialization.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_5_Initialization.java b/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_5_Initialization.java
index 1ef9d42..9c3dfea 100644
--- a/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_5_Initialization.java
+++ b/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_5_Initialization.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_5_Initialization_event
+ *
  */
-public class AddlPortletTests_SPEC2_5_Initialization implements Portlet {
+public class AddlPortletTests_SPEC2_5_Initialization implements Portlet, ResourceServingPortlet {
    private static final String LOG_CLASS = 
          AddlPortletTests_SPEC2_5_Initialization.class.getName();
    private final Logger LOGGER = Logger.getLogger(LOG_CLASS);
@@ -57,37 +62,52 @@ public class AddlPortletTests_SPEC2_5_Initialization 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 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 renderRequest, RenderResponse renderResponse)
+   public void render(RenderRequest portletReq, RenderResponse portletResp)
          throws PortletException, IOException {
-      
-      if (LOGGER.isLoggable(Level.FINE)) {
-         LOGGER.logp(Level.FINE, LOG_CLASS, "render", "Entry");
-      }
+      LOGGER.entering(LOG_CLASS, "main portlet render 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_5_Initialization_initialization6                     */
+      /* TestCase: V2AddlPortletTests_SPEC2_5_Initialization_initialization6  */
       /* Details: "A RuntimeException thrown during initialization must be    */
       /* handled as a PortletException"                                       */
-      TestResult tr0 = tcd.getTestResultFailed(SPEC2_5_INITIALIZATION_INITIALIZATION6);
+      TestResult tr0 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_5_INITIALIZATION_INITIALIZATION6);
       /* TODO: implement test */
-
-
-
-      // Write the results to the output stream
-
+      tr0.appendTcDetail("Not implemented.");
       tr0.writeTo(writer);
 
-
    }
 
 }
-

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_5_RenderGenericPortlet.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_5_RenderGenericPortlet.java b/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_5_RenderGenericPortlet.java
new file mode 100644
index 0000000..f163888
--- /dev/null
+++ b/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_5_RenderGenericPortlet.java
@@ -0,0 +1,151 @@
+/*  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 AddlPortletTests_SPEC2_5_RenderGenericPortlet_event
+ *
+ */
+public class AddlPortletTests_SPEC2_5_RenderGenericPortlet implements Portlet, ResourceServingPortlet {
+   private static final String LOG_CLASS = 
+         AddlPortletTests_SPEC2_5_RenderGenericPortlet.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();
+
+   }
+
+   @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();
+
+      JSR286SpecTestCaseDetails tcd = new JSR286SpecTestCaseDetails();
+
+      // Create result objects for the tests
+
+      /* TestCase: V2AddlPortletTests_SPEC2_5_RenderGenericPortlet_actionDispatching2 */
+      /* Details: "If the ActionRequest.ACTION_NAME parameter is not set on   */
+      /* the action URL, the GenericPortlet processAction method will throw   */
+      /* a PortletException"                                                  */
+      TestResult tr0 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_5_RENDERGENERICPORTLET_ACTIONDISPATCHING2);
+      /* TODO: implement test */
+      tr0.appendTcDetail("Not implemented.");
+      tr0.writeTo(writer);
+
+      /* TestCase: V2AddlPortletTests_SPEC2_5_RenderGenericPortlet_eventDispatching1 */
+      /* Details: "The GenericPortlet processEvent method will dispatch the   */
+      /* request to a subclass method annotated with the tag                  */
+      /* @ProcessEvent(qname=<eventname>), where <eventname> must be in the   */
+      /* format provided by Qname.toString()"                                 */
+      TestResult tr1 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_5_RENDERGENERICPORTLET_EVENTDISPATCHING1);
+      /* TODO: implement test */
+      tr1.appendTcDetail("Not implemented.");
+      tr1.writeTo(writer);
+
+      /* TestCase: V2AddlPortletTests_SPEC2_5_RenderGenericPortlet_eventDispatching2 */
+      /* Details: "The GenericPortlet processEvent method will dispatch the   */
+      /* request to a subclass method annotated with the tag                  */
+      /* @ProcessEvent(name=<event_name_local_part>)"                         */
+      TestResult tr2 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_5_RENDERGENERICPORTLET_EVENTDISPATCHING2);
+      /* TODO: implement test */
+      tr2.appendTcDetail("Not implemented.");
+      tr2.writeTo(writer);
+
+      /* TestCase: V2AddlPortletTests_SPEC2_5_RenderGenericPortlet_renderDispatching8 */
+      /* Details: "getTitle - If a ResourceBundle containing the title        */
+      /* string is defined in the deployment descriptor, that title string    */
+      /* will be used"                                                        */
+      TestResult tr3 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_5_RENDERGENERICPORTLET_RENDERDISPATCHING8);
+      /* TODO: implement test */
+      tr3.appendTcDetail("Not implemented.");
+      tr3.writeTo(writer);
+
+      /* TestCase: V2AddlPortletTests_SPEC2_5_RenderGenericPortlet_renderDispatching9 */
+      /* Details: "getTitle - If a ResourceBundle containing the title        */
+      /* string is not defined in the deployment descriptor, the title        */
+      /* defined in the portlet descriptor <title> element is used"           */
+      TestResult tr4 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_5_RENDERGENERICPORTLET_RENDERDISPATCHING9);
+      /* TODO: implement test */
+      tr4.appendTcDetail("Not implemented.");
+      tr4.writeTo(writer);
+
+   }
+
+}

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_5_RenderHandling.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_5_RenderHandling.java b/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_5_RenderHandling.java
new file mode 100644
index 0000000..d140015
--- /dev/null
+++ b/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_5_RenderHandling.java
@@ -0,0 +1,114 @@
+/*  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 AddlPortletTests_SPEC2_5_RenderHandling_event
+ *
+ */
+public class AddlPortletTests_SPEC2_5_RenderHandling implements Portlet, ResourceServingPortlet {
+   private static final String LOG_CLASS = 
+         AddlPortletTests_SPEC2_5_RenderHandling.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();
+
+   }
+
+   @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();
+
+      JSR286SpecTestCaseDetails tcd = new JSR286SpecTestCaseDetails();
+
+      // Create result objects for the tests
+
+      /* TestCase: V2AddlPortletTests_SPEC2_5_RenderHandling_render1          */
+      /* Details: "If the client request is triggered by a render URL, the    */
+      /* portlet container must invoke the render method for all portlets     */
+      /* on the page that do not have valid cache entries"                    */
+      TestResult tr0 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_5_RENDERHANDLING_RENDER1);
+      /* TODO: implement test */
+      tr0.appendTcDetail("Not implemented.");
+      tr0.writeTo(writer);
+
+   }
+
+}

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_5_RequestHandling.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_5_RequestHandling.java b/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_5_RequestHandling.java
deleted file mode 100644
index 860d82f..0000000
--- a/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_5_RequestHandling.java
+++ /dev/null
@@ -1,181 +0,0 @@
-/*  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.IOException;
-import java.io.PrintWriter;
-
-import java.util.Enumeration;
-import java.util.Locale;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-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 static javax.portlet.tck.beans.JSR286SpecTestCaseDetails.*;
-import javax.portlet.tck.beans.TestResult;
-
-/**
- * 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.
- */
-public class AddlPortletTests_SPEC2_5_RequestHandling implements Portlet {
-   private static final String LOG_CLASS = 
-         AddlPortletTests_SPEC2_5_RequestHandling.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 actionRequest, ActionResponse actionResponse)
-         throws PortletException, IOException {
-   }
-
-   @Override
-   public void render(RenderRequest renderRequest, RenderResponse renderResponse)
-         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
-
-      /* TestCase: SPEC2_5_RequestHandling_action2                            */
-      /* Details: "During action processing, the portlet container waits      */
-      /* for the processAction method to complete before processing any       */
-      /* events that were set"                                                */
-      TestResult tr0 = tcd.getTestResultFailed(SPEC2_5_REQUESTHANDLING_ACTION2);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_5_RequestHandling_action5                            */
-      /* Details: "If the portlet issues a redirect during action             */
-      /* processing, the portlet container allows the processAction method    */
-      /* to complete"                                                         */
-      TestResult tr1 = tcd.getTestResultFailed(SPEC2_5_REQUESTHANDLING_ACTION5);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_5_RequestHandling_action6                            */
-      /* Details: "If the portlet issues a redirect during action             */
-      /* processing, the portlet container must send the redirect back to     */
-      /* the user agent and finalize the request processing."                 */
-      TestResult tr2 = tcd.getTestResultFailed(SPEC2_5_REQUESTHANDLING_ACTION6);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_5_RequestHandling_action7                            */
-      /* Details: "If the portlet issues a redirect during action             */
-      /* processing, events that were set are not processed"                  */
-      TestResult tr3 = tcd.getTestResultFailed(SPEC2_5_REQUESTHANDLING_ACTION7);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_5_RequestHandling_render1                            */
-      /* Details: "If the client request is triggered by a render URL, the    */
-      /* portlet container must invoke the render method for all portlets     */
-      /* on the page that do not have valid cache entries"                    */
-      TestResult tr4 = tcd.getTestResultFailed(SPEC2_5_REQUESTHANDLING_RENDER1);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_5_RequestHandling_render3                            */
-      /* Details: "If the client request is triggered by a render URL, the    */
-      /* portlet container must not invoke the processAction method for any   */
-      /* portlet on the page"                                                 */
-      TestResult tr5 = tcd.getTestResultFailed(SPEC2_5_REQUESTHANDLING_RENDER3);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_5_RequestHandling_resource1                          */
-      /* Details: "If the client request is triggered by a resource URL,      */
-      /* the portlet container must invoke the serveResource method for the   */
-      /* target portlet if its content does not have a valid cache entry"     */
-      TestResult tr6 = tcd.getTestResultFailed(SPEC2_5_REQUESTHANDLING_RESOURCE1);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_5_RequestHandling_resource3                          */
-      /* Details: "If the client request is triggered by a resource URL,      */
-      /* the portlet container must not invoke the processAction method for   */
-      /* any portlet on the page"                                             */
-      TestResult tr7 = tcd.getTestResultFailed(SPEC2_5_REQUESTHANDLING_RESOURCE3);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_5_RequestHandling_exception1                         */
-      /* Details: "If the portlet throws an PortletException in               */
-      /* processAction, all operations on the ActionResponse, including set   */
-      /* events, must be ignored"                                             */
-      TestResult tr8 = tcd.getTestResultFailed(SPEC2_5_REQUESTHANDLING_EXCEPTION1);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_5_RequestHandling_exception2                         */
-      /* Details: "If the portlet throws a RuntimeException in                */
-      /* processAction, all operations on the ActionResponse, including set   */
-      /* events, must be ignored"                                             */
-      TestResult tr9 = tcd.getTestResultFailed(SPEC2_5_REQUESTHANDLING_EXCEPTION2);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_5_RequestHandling_exception4                         */
-      /* Details: "If the portlet throws an PortletException in               */
-      /* processEvent, all operations on the EventResponse, including set     */
-      /* events, must be ignored"                                             */
-      TestResult tr10 = tcd.getTestResultFailed(SPEC2_5_REQUESTHANDLING_EXCEPTION4);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_5_RequestHandling_exception5                         */
-      /* Details: "If the portlet throws a RuntimeException in                */
-      /* processEvent, all operations on the EventResponse, including set     */
-      /* events, must be ignored"                                             */
-      TestResult tr11 = tcd.getTestResultFailed(SPEC2_5_REQUESTHANDLING_EXCEPTION5);
-      /* 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);
-
-
-   }
-
-}
-

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_5_ResourceHandling.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_5_ResourceHandling.java b/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_5_ResourceHandling.java
new file mode 100644
index 0000000..a12c044
--- /dev/null
+++ b/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_5_ResourceHandling.java
@@ -0,0 +1,129 @@
+/*  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 AddlPortletTests_SPEC2_5_ResourceHandling_event
+ *
+ */
+public class AddlPortletTests_SPEC2_5_ResourceHandling implements Portlet, ResourceServingPortlet {
+   private static final String LOG_CLASS = 
+         AddlPortletTests_SPEC2_5_ResourceHandling.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: V2AddlPortletTests_SPEC2_5_ResourceHandling_resource1      */
+      /* Details: "If the client request is triggered by a resource URL,      */
+      /* the portlet container must invoke the serveResource method for the   */
+      /* target portlet if its content does not have a valid cache entry"     */
+      TestResult tr0 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_5_RESOURCEHANDLING_RESOURCE1);
+      /* TODO: implement test */
+      tr0.appendTcDetail("Not implemented.");
+      tr0.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_5_ResourceHandling\">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_5_ResourceHandling\").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_6_Config.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_6_Config.java b/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_6_Config.java
deleted file mode 100644
index 47e03bd..0000000
--- a/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_6_Config.java
+++ /dev/null
@@ -1,239 +0,0 @@
-/*  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.IOException;
-import java.io.PrintWriter;
-
-import java.util.Enumeration;
-import java.util.Locale;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-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 static javax.portlet.tck.beans.JSR286SpecTestCaseDetails.*;
-import javax.portlet.tck.beans.TestResult;
-
-/**
- * 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.
- */
-public class AddlPortletTests_SPEC2_6_Config implements Portlet {
-   private static final String LOG_CLASS = 
-         AddlPortletTests_SPEC2_6_Config.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 actionRequest, ActionResponse actionResponse)
-         throws PortletException, IOException {
-   }
-
-   @Override
-   public void render(RenderRequest renderRequest, RenderResponse renderResponse)
-         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
-
-      /* TestCase: SPEC2_6_Config_getResourceBundle1                          */
-      /* Details: "The resource bundle defined in the deployment descriptor   */
-      /* <resource-bundle> element can be obtained through the                */
-      /* PortletConfig object"                                                */
-      TestResult tr0 = tcd.getTestResultFailed(SPEC2_6_CONFIG_GETRESOURCEBUNDLE1);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_6_Config_getResourceBundle2                          */
-      /* Details: "If the resource bundle contains a                          */
-      /* \"javax.portlet.title\" property, the value defined in the bundle    */
-      /* is returned by the corresponding getString method call"              */
-      TestResult tr1 = tcd.getTestResultFailed(SPEC2_6_CONFIG_GETRESOURCEBUNDLE2);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_6_Config_getResourceBundle3                          */
-      /* Details: "If the resource bundle contains a                          */
-      /* \"javax.portlet.short-title\" property, the value defined in the     */
-      /* bundle is returned by the corresponding getString method call"       */
-      TestResult tr2 = tcd.getTestResultFailed(SPEC2_6_CONFIG_GETRESOURCEBUNDLE3);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_6_Config_getResourceBundle4                          */
-      /* Details: "If the resource bundle contains a                          */
-      /* \"javax.portlet.keywords\" property, the value defined in the        */
-      /* bundle is returned by the corresponding getString method call"       */
-      TestResult tr3 = tcd.getTestResultFailed(SPEC2_6_CONFIG_GETRESOURCEBUNDLE4);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_6_Config_getResourceBundle5                          */
-      /* Details: "If the resource bundle does not contain a                  */
-      /* \"javax.portlet.title\" property, the value defined in the           */
-      /* deployment descriptor <title> element is returned by the             */
-      /* corresponding getString method call"                                 */
-      TestResult tr4 = tcd.getTestResultFailed(SPEC2_6_CONFIG_GETRESOURCEBUNDLE5);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_6_Config_getResourceBundle6                          */
-      /* Details: "If the resource bundle does not contain a                  */
-      /* \"javax.portlet.short-title\" property, the value defined in the     */
-      /* deployment descriptor <short-title> element is returned by the       */
-      /* corresponding getString method call"                                 */
-      TestResult tr5 = tcd.getTestResultFailed(SPEC2_6_CONFIG_GETRESOURCEBUNDLE6);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_6_Config_getResourceBundle7                          */
-      /* Details: "If the resource bundle does not contain a                  */
-      /* \"javax.portlet.keywords\" property, the value defined in the        */
-      /* deployment descriptor <keywords> element is returned by the          */
-      /* corresponding getString method call"                                 */
-      TestResult tr6 = tcd.getTestResultFailed(SPEC2_6_CONFIG_GETRESOURCEBUNDLE7);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_6_Config_getResourceBundle8                          */
-      /* Details: "If no resource bundle is defined, the value defined in     */
-      /* the deployment descriptor <title> element is returned by the         */
-      /* corresponding getString method call"                                 */
-      TestResult tr7 = tcd.getTestResultFailed(SPEC2_6_CONFIG_GETRESOURCEBUNDLE8);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_6_Config_getResourceBundle9                          */
-      /* Details: "If no resource bundle is defined, the value defined in     */
-      /* the deployment descriptor <short-title> element is returned by the   */
-      /* corresponding getString method call"                                 */
-      TestResult tr8 = tcd.getTestResultFailed(SPEC2_6_CONFIG_GETRESOURCEBUNDLE9);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_6_Config_getResourceBundle10                         */
-      /* Details: "If no resource bundle is defined, the value defined in     */
-      /* the deployment descriptor <keywords> element is returned by the      */
-      /* corresponding getString method call"                                 */
-      TestResult tr9 = tcd.getTestResultFailed(SPEC2_6_CONFIG_GETRESOURCEBUNDLE10);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_6_Config_getPublishingEventQnames3                   */
-      /* Details: "getPublishingEventQnames - If the event was defined        */
-      /* using the <name> element rather than the <qname> element, default    */
-      /* namespace defined with the <default-namespace> element must be       */
-      /* added as the event namespace"                                        */
-      TestResult tr10 = tcd.getTestResultFailed(SPEC2_6_CONFIG_GETPUBLISHINGEVENTQNAMES3);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_6_Config_getPublishingEventQnames4                   */
-      /* Details: "getPublishingEventQnames - If the event was defined        */
-      /* using the <name> element rather than the <qname> element and there   */
-      /* is no default namespace defined, the value                           */
-      /* XMLConstants.NULL_NS_URI must be added as the event namespace"       */
-      TestResult tr11 = tcd.getTestResultFailed(SPEC2_6_CONFIG_GETPUBLISHINGEVENTQNAMES4);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_6_Config_getProcessingEventQnames3                   */
-      /* Details: "getProcessingEventQnames - If the event was defined        */
-      /* using the <name> element rather than the <qname> element, default    */
-      /* namespace defined with the <default-namespace> element must be       */
-      /* added as the event namespace"                                        */
-      TestResult tr12 = tcd.getTestResultFailed(SPEC2_6_CONFIG_GETPROCESSINGEVENTQNAMES3);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_6_Config_getProcessingEventQnames4                   */
-      /* Details: "getProcessingEventQnames - If the event was defined        */
-      /* using the <name> element rather than the <qname> element and there   */
-      /* is no default namespace defined, the value                           */
-      /* XMLConstants.NULL_NS_URI must be added as the event namespace"       */
-      TestResult tr13 = tcd.getTestResultFailed(SPEC2_6_CONFIG_GETPROCESSINGEVENTQNAMES4);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_6_Config_getContainerRuntimeOptions6                 */
-      /* Details: "The returned Map contains values defined in the            */
-      /* deployment descriptor <container-runtime-option> elements at the     */
-      /* portlet application level"                                           */
-      TestResult tr14 = tcd.getTestResultFailed(SPEC2_6_CONFIG_GETCONTAINERRUNTIMEOPTIONS6);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_6_Config_getContainerRuntimeOptions7                 */
-      /* Details: "The returned Map contains values defined in the            */
-      /* deployment descriptor <container-runtime-option> elements at the     */
-      /* portlet level"                                                       */
-      TestResult tr15 = tcd.getTestResultFailed(SPEC2_6_CONFIG_GETCONTAINERRUNTIMEOPTIONS7);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_6_Config_getContainerRuntimeOptions8                 */
-      /* Details: "If the deployment descriptor contains                      */
-      /* <container-runtime-option> elements defined at both the portlet      */
-      /* and the portlet application levels, the returned Map contains a      */
-      /* merger of all values"                                                */
-      TestResult tr16 = tcd.getTestResultFailed(SPEC2_6_CONFIG_GETCONTAINERRUNTIMEOPTIONS8);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_6_Config_getContainerRuntimeOptions9                 */
-      /* Details: "If the deployment descriptor contains                      */
-      /* <container-runtime-option> elements of the same name defined at      */
-      /* both the portlet and the portlet application levels, the returned    */
-      /* Map contains a the value defined at the portlet level"               */
-      TestResult tr17 = tcd.getTestResultFailed(SPEC2_6_CONFIG_GETCONTAINERRUNTIMEOPTIONS9);
-      /* 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);
-
-
-   }
-
-}
-

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_6_RenderConfig.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_6_RenderConfig.java b/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_6_RenderConfig.java
new file mode 100644
index 0000000..edc593b
--- /dev/null
+++ b/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_6_RenderConfig.java
@@ -0,0 +1,219 @@
+/*  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 AddlPortletTests_SPEC2_6_RenderConfig_event
+ *
+ */
+public class AddlPortletTests_SPEC2_6_RenderConfig implements Portlet, ResourceServingPortlet {
+   private static final String LOG_CLASS = 
+         AddlPortletTests_SPEC2_6_RenderConfig.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();
+
+   }
+
+   @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();
+
+      JSR286SpecTestCaseDetails tcd = new JSR286SpecTestCaseDetails();
+
+      // Create result objects for the tests
+
+      /* TestCase: V2AddlPortletTests_SPEC2_6_RenderConfig_getResourceBundle1 */
+      /* Details: "The resource bundle defined in the deployment descriptor   */
+      /* <resource-bundle> element can be obtained through the                */
+      /* PortletConfig object"                                                */
+      TestResult tr0 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_6_RENDERCONFIG_GETRESOURCEBUNDLE1);
+      /* TODO: implement test */
+      tr0.appendTcDetail("Not implemented.");
+      tr0.writeTo(writer);
+
+      /* TestCase: V2AddlPortletTests_SPEC2_6_RenderConfig_getResourceBundle2 */
+      /* Details: "If the resource bundle contains a                          */
+      /* \"javax.portlet.title\" property, the value defined in the bundle    */
+      /* is returned by the corresponding getString method call"              */
+      TestResult tr1 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_6_RENDERCONFIG_GETRESOURCEBUNDLE2);
+      /* TODO: implement test */
+      tr1.appendTcDetail("Not implemented.");
+      tr1.writeTo(writer);
+
+      /* TestCase: V2AddlPortletTests_SPEC2_6_RenderConfig_getResourceBundle3 */
+      /* Details: "If the resource bundle contains a                          */
+      /* \"javax.portlet.short-title\" property, the value defined in the     */
+      /* bundle is returned by the corresponding getString method call"       */
+      TestResult tr2 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_6_RENDERCONFIG_GETRESOURCEBUNDLE3);
+      /* TODO: implement test */
+      tr2.appendTcDetail("Not implemented.");
+      tr2.writeTo(writer);
+
+      /* TestCase: V2AddlPortletTests_SPEC2_6_RenderConfig_getResourceBundle4 */
+      /* Details: "If the resource bundle contains a                          */
+      /* \"javax.portlet.keywords\" property, the value defined in the        */
+      /* bundle is returned by the corresponding getString method call"       */
+      TestResult tr3 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_6_RENDERCONFIG_GETRESOURCEBUNDLE4);
+      /* TODO: implement test */
+      tr3.appendTcDetail("Not implemented.");
+      tr3.writeTo(writer);
+
+      /* TestCase: V2AddlPortletTests_SPEC2_6_RenderConfig_getPublishingEventQnames3 */
+      /* Details: "getPublishingEventQnames - If the event was defined        */
+      /* using the <name> element rather than the <qname> element, default    */
+      /* namespace defined with the <default-namespace> element must be       */
+      /* added as the event namespace"                                        */
+      TestResult tr4 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_6_RENDERCONFIG_GETPUBLISHINGEVENTQNAMES3);
+      /* TODO: implement test */
+      tr4.appendTcDetail("Not implemented.");
+      tr4.writeTo(writer);
+
+      /* TestCase: V2AddlPortletTests_SPEC2_6_RenderConfig_getPublishingEventQnames4 */
+      /* Details: "getPublishingEventQnames - If the event was defined        */
+      /* using the <name> element rather than the <qname> element and there   */
+      /* is no default namespace defined, the value                           */
+      /* XMLConstants.NULL_NS_URI must be added as the event namespace"       */
+      TestResult tr5 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_6_RENDERCONFIG_GETPUBLISHINGEVENTQNAMES4);
+      /* TODO: implement test */
+      tr5.appendTcDetail("Not implemented.");
+      tr5.writeTo(writer);
+
+      /* TestCase: V2AddlPortletTests_SPEC2_6_RenderConfig_getProcessingEventQnames3 */
+      /* Details: "getProcessingEventQnames - If the event was defined        */
+      /* using the <name> element rather than the <qname> element, default    */
+      /* namespace defined with the <default-namespace> element must be       */
+      /* added as the event namespace"                                        */
+      TestResult tr6 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_6_RENDERCONFIG_GETPROCESSINGEVENTQNAMES3);
+      /* TODO: implement test */
+      tr6.appendTcDetail("Not implemented.");
+      tr6.writeTo(writer);
+
+      /* TestCase: V2AddlPortletTests_SPEC2_6_RenderConfig_getProcessingEventQnames4 */
+      /* Details: "getProcessingEventQnames - If the event was defined        */
+      /* using the <name> element rather than the <qname> element and there   */
+      /* is no default namespace defined, the value                           */
+      /* XMLConstants.NULL_NS_URI must be added as the event namespace"       */
+      TestResult tr7 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_6_RENDERCONFIG_GETPROCESSINGEVENTQNAMES4);
+      /* TODO: implement test */
+      tr7.appendTcDetail("Not implemented.");
+      tr7.writeTo(writer);
+
+      /* TestCase: V2AddlPortletTests_SPEC2_6_RenderConfig_getContainerRuntimeOptions6 */
+      /* Details: "The returned Map contains values defined in the            */
+      /* deployment descriptor <container-runtime-option> elements at the     */
+      /* portlet application level"                                           */
+      TestResult tr8 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_6_RENDERCONFIG_GETCONTAINERRUNTIMEOPTIONS6);
+      /* TODO: implement test */
+      tr8.appendTcDetail("Not implemented.");
+      tr8.writeTo(writer);
+
+      /* TestCase: V2AddlPortletTests_SPEC2_6_RenderConfig_getContainerRuntimeOptions7 */
+      /* Details: "The returned Map contains values defined in the            */
+      /* deployment descriptor <container-runtime-option> elements at the     */
+      /* portlet level"                                                       */
+      TestResult tr9 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_6_RENDERCONFIG_GETCONTAINERRUNTIMEOPTIONS7);
+      /* TODO: implement test */
+      tr9.appendTcDetail("Not implemented.");
+      tr9.writeTo(writer);
+
+      /* TestCase: V2AddlPortletTests_SPEC2_6_RenderConfig_getContainerRuntimeOptions8 */
+      /* Details: "If the deployment descriptor contains                      */
+      /* <container-runtime-option> elements defined at both the portlet      */
+      /* and the portlet application levels, the returned Map contains a      */
+      /* merger of all values"                                                */
+      TestResult tr10 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_6_RENDERCONFIG_GETCONTAINERRUNTIMEOPTIONS8);
+      /* TODO: implement test */
+      tr10.appendTcDetail("Not implemented.");
+      tr10.writeTo(writer);
+
+      /* TestCase: V2AddlPortletTests_SPEC2_6_RenderConfig_getContainerRuntimeOptions9 */
+      /* Details: "If the deployment descriptor contains                      */
+      /* <container-runtime-option> elements of the same name defined at      */
+      /* both the portlet and the portlet application levels, the returned    */
+      /* Map contains a the value defined at the portlet level"               */
+      TestResult tr11 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_6_RENDERCONFIG_GETCONTAINERRUNTIMEOPTIONS9);
+      /* TODO: implement test */
+      tr11.appendTcDetail("Not implemented.");
+      tr11.writeTo(writer);
+
+   }
+
+}


[09/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.

Posted by ms...@apache.org.
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/23a1c547/portlet-tck_3.0/V2AddlResponseTests/src/main/java/javax/portlet/tck/portlets/AddlResponseTests_SPEC2_12_ResponseContent.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlResponseTests/src/main/java/javax/portlet/tck/portlets/AddlResponseTests_SPEC2_12_ResponseContent.java b/portlet-tck_3.0/V2AddlResponseTests/src/main/java/javax/portlet/tck/portlets/AddlResponseTests_SPEC2_12_ResponseContent.java
deleted file mode 100644
index 1c4350b..0000000
--- a/portlet-tck_3.0/V2AddlResponseTests/src/main/java/javax/portlet/tck/portlets/AddlResponseTests_SPEC2_12_ResponseContent.java
+++ /dev/null
@@ -1,146 +0,0 @@
-/*  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.IOException;
-import java.io.PrintWriter;
-
-import java.util.Enumeration;
-import java.util.Locale;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-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 static javax.portlet.tck.beans.JSR286SpecTestCaseDetails.*;
-import javax.portlet.tck.beans.TestResult;
-
-/**
- * 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.
- */
-public class AddlResponseTests_SPEC2_12_ResponseContent implements Portlet {
-   private static final String LOG_CLASS = 
-         AddlResponseTests_SPEC2_12_ResponseContent.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 actionRequest, ActionResponse actionResponse)
-         throws PortletException, IOException {
-   }
-
-   @Override
-   public void render(RenderRequest renderRequest, RenderResponse renderResponse)
-         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
-
-      /* TestCase: SPEC2_12_ResponseContent_contentType5                      */
-      /* Details: "If the setContentType method is not called before the      */
-      /* getWriter or getPortletOutputStream method is used, the portlet      */
-      /* container uses the content type returned by                          */
-      /* getResponseContentType"                                              */
-      TestResult tr0 = tcd.getTestResultFailed(SPEC2_12_RESPONSECONTENT_CONTENTTYPE5);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_12_ResponseContent_buffering9                        */
-      /* Details: "If the reset method is used after the response has been    */
-      /* committed, the response and its buffer must remain unchanged"        */
-      TestResult tr1 = tcd.getTestResultFailed(SPEC2_12_RESPONSECONTENT_BUFFERING9);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_12_ResponseContent_buffering10                       */
-      /* Details: "The resetBuffer method clears data in the buffer when      */
-      /* the response is not committed"                                       */
-      TestResult tr2 = tcd.getTestResultFailed(SPEC2_12_RESPONSECONTENT_BUFFERING10);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_12_ResponseContent_buffering11                       */
-      /* Details: "The resetBuffer method does not clear any properties set   */
-      /* before use of the resetBuffer method"                                */
-      TestResult tr3 = tcd.getTestResultFailed(SPEC2_12_RESPONSECONTENT_BUFFERING11);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_12_ResponseContent_buffering13                       */
-      /* Details: "If the resetBuffer method is used after the response has   */
-      /* been committed, the response and its buffer must remain unchanged"   */
-      TestResult tr4 = tcd.getTestResultFailed(SPEC2_12_RESPONSECONTENT_BUFFERING13);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_12_ResponseContent_characterEncoding2                */
-      /* Details: "The character encoding can be set via the setLocale        */
-      /* method and a locale-encoding-mapping-list mapping in the web.xml     */
-      /* deployment descriptor"                                               */
-      TestResult tr5 = tcd.getTestResultFailed(SPEC2_12_RESPONSECONTENT_CHARACTERENCODING2);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_12_ResponseContent_characterEncoding3                */
-      /* Details: "The character encoding can be set via the setContentType   */
-      /* method if the given content type string provides a value for the     */
-      /* charset attribute"                                                   */
-      TestResult tr6 = tcd.getTestResultFailed(SPEC2_12_RESPONSECONTENT_CHARACTERENCODING3);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_12_ResponseContent_characterEncoding4                */
-      /* Details: "If the portlet does not set the character encoding, the    */
-      /* portlet container uses UTF-8 as the default character encoding"      */
-      TestResult tr7 = tcd.getTestResultFailed(SPEC2_12_RESPONSECONTENT_CHARACTERENCODING4);
-      /* 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);
-
-
-   }
-
-}
-

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/23a1c547/portlet-tck_3.0/V2AddlResponseTests/src/main/java/javax/portlet/tck/portlets/AddlResponseTests_SPEC2_12_ResponseProperties.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlResponseTests/src/main/java/javax/portlet/tck/portlets/AddlResponseTests_SPEC2_12_ResponseProperties.java b/portlet-tck_3.0/V2AddlResponseTests/src/main/java/javax/portlet/tck/portlets/AddlResponseTests_SPEC2_12_ResponseProperties.java
deleted file mode 100644
index 24c59cb..0000000
--- a/portlet-tck_3.0/V2AddlResponseTests/src/main/java/javax/portlet/tck/portlets/AddlResponseTests_SPEC2_12_ResponseProperties.java
+++ /dev/null
@@ -1,220 +0,0 @@
-/*  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.IOException;
-import java.io.PrintWriter;
-
-import java.util.Enumeration;
-import java.util.Locale;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-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 static javax.portlet.tck.beans.JSR286SpecTestCaseDetails.*;
-import javax.portlet.tck.beans.TestResult;
-
-/**
- * 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.
- */
-public class AddlResponseTests_SPEC2_12_ResponseProperties implements Portlet {
-   private static final String LOG_CLASS = 
-         AddlResponseTests_SPEC2_12_ResponseProperties.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 actionRequest, ActionResponse actionResponse)
-         throws PortletException, IOException {
-   }
-
-   @Override
-   public void render(RenderRequest renderRequest, RenderResponse renderResponse)
-         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
-
-      /* TestCase: SPEC2_12_ResponseProperties_namespace2                     */
-      /* Details: "The String returned by the getNamespace method must be     */
-      /* unique on the portal page"                                           */
-      TestResult tr0 = tcd.getTestResultFailed(SPEC2_12_RESPONSEPROPERTIES_NAMESPACE2);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_12_ResponseProperties_namespace4                     */
-      /* Details: "The String returned by the getNamespace method must be a   */
-      /* valid Java identifier"                                               */
-      TestResult tr1 = tcd.getTestResultFailed(SPEC2_12_RESPONSEPROPERTIES_NAMESPACE4);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_12_ResponseProperties_cookie1                        */
-      /* Details: "Cookies set during the Action phase should be available    */
-      /* to the portlet during the Render phase"                              */
-      TestResult tr2 = tcd.getTestResultFailed(SPEC2_12_RESPONSEPROPERTIES_COOKIE1);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_12_ResponseProperties_cookie2                        */
-      /* Details: "Cookies set during the Action phase should be available    */
-      /* to the portlet during the Resource phase"                            */
-      TestResult tr3 = tcd.getTestResultFailed(SPEC2_12_RESPONSEPROPERTIES_COOKIE2);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_12_ResponseProperties_cookie3                        */
-      /* Details: "Cookies set during the Action phase should be available    */
-      /* to the portlet during the Event phase"                               */
-      TestResult tr4 = tcd.getTestResultFailed(SPEC2_12_RESPONSEPROPERTIES_COOKIE3);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_12_ResponseProperties_cookie4                        */
-      /* Details: "Cookies set during the Action phase should be available    */
-      /* to the portlet during a subsequent request triggered by a URL"       */
-      TestResult tr5 = tcd.getTestResultFailed(SPEC2_12_RESPONSEPROPERTIES_COOKIE4);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_12_ResponseProperties_cookie5                        */
-      /* Details: "Cookies set during the Event phase should be available     */
-      /* to the portlet during the Render phase"                              */
-      TestResult tr6 = tcd.getTestResultFailed(SPEC2_12_RESPONSEPROPERTIES_COOKIE5);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_12_ResponseProperties_cookie6                        */
-      /* Details: "Cookies set during the Event phase should be available     */
-      /* to the portlet during the Resource phase"                            */
-      TestResult tr7 = tcd.getTestResultFailed(SPEC2_12_RESPONSEPROPERTIES_COOKIE6);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_12_ResponseProperties_cookie7                        */
-      /* Details: "Cookies set during the Event phase should be available     */
-      /* to the portlet during a subsequent request triggered by a URL"       */
-      TestResult tr8 = tcd.getTestResultFailed(SPEC2_12_RESPONSEPROPERTIES_COOKIE7);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_12_ResponseProperties_cookie8                        */
-      /* Details: "Cookies set during the Render phase should be available    */
-      /* to the portlet during the Resource phase"                            */
-      TestResult tr9 = tcd.getTestResultFailed(SPEC2_12_RESPONSEPROPERTIES_COOKIE8);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_12_ResponseProperties_cookie9                        */
-      /* Details: "Cookies set during the Render phase should be available    */
-      /* to the portlet during a subsequent Action phase"                     */
-      TestResult tr10 = tcd.getTestResultFailed(SPEC2_12_RESPONSEPROPERTIES_COOKIE9);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_12_ResponseProperties_cookie10                       */
-      /* Details: "Cookies set during the Render phase should be available    */
-      /* to the portlet during a subsequent Render phase"                     */
-      TestResult tr11 = tcd.getTestResultFailed(SPEC2_12_RESPONSEPROPERTIES_COOKIE10);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_12_ResponseProperties_cookie11                       */
-      /* Details: "Cookies set during the Render phase should be available    */
-      /* to the portlet during a subsequent request triggered by a URL"       */
-      TestResult tr12 = tcd.getTestResultFailed(SPEC2_12_RESPONSEPROPERTIES_COOKIE11);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_12_ResponseProperties_cookie12                       */
-      /* Details: "Cookies set during the Render phase after the response     */
-      /* has been committed are ignored"                                      */
-      TestResult tr13 = tcd.getTestResultFailed(SPEC2_12_RESPONSEPROPERTIES_COOKIE12);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_12_ResponseProperties_cookie13                       */
-      /* Details: "Cookies set during the Resource phase should be            */
-      /* available to the portlet during a subsequent Action phase"           */
-      TestResult tr14 = tcd.getTestResultFailed(SPEC2_12_RESPONSEPROPERTIES_COOKIE13);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_12_ResponseProperties_cookie14                       */
-      /* Details: "Cookies set during the Resource phase should be            */
-      /* available to the portlet during a subsequent Resource phase"         */
-      TestResult tr15 = tcd.getTestResultFailed(SPEC2_12_RESPONSEPROPERTIES_COOKIE14);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_12_ResponseProperties_cookie15                       */
-      /* Details: "Cookies set during the Resource phase should be            */
-      /* available to the portlet during a subsequent Render phase"           */
-      TestResult tr16 = tcd.getTestResultFailed(SPEC2_12_RESPONSEPROPERTIES_COOKIE15);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_12_ResponseProperties_cookie16                       */
-      /* Details: "Cookies set during the Resource phase should be            */
-      /* available to the portlet during a subsequent request triggered by    */
-      /* a URL"                                                               */
-      TestResult tr17 = tcd.getTestResultFailed(SPEC2_12_RESPONSEPROPERTIES_COOKIE16);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_12_ResponseProperties_cookie17                       */
-      /* Details: "Cookies set during the Resource phase after the response   */
-      /* has been committed are ignored"                                      */
-      TestResult tr18 = tcd.getTestResultFailed(SPEC2_12_RESPONSEPROPERTIES_COOKIE17);
-      /* 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);
-
-
-   }
-
-}
-

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/23a1c547/portlet-tck_3.0/V2AddlResponseTests/src/main/java/javax/portlet/tck/portlets/AddlResponseTests_SPEC2_12_ResponseRedirect.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlResponseTests/src/main/java/javax/portlet/tck/portlets/AddlResponseTests_SPEC2_12_ResponseRedirect.java b/portlet-tck_3.0/V2AddlResponseTests/src/main/java/javax/portlet/tck/portlets/AddlResponseTests_SPEC2_12_ResponseRedirect.java
deleted file mode 100644
index fa37a84..0000000
--- a/portlet-tck_3.0/V2AddlResponseTests/src/main/java/javax/portlet/tck/portlets/AddlResponseTests_SPEC2_12_ResponseRedirect.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*  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.IOException;
-import java.io.PrintWriter;
-
-import java.util.Enumeration;
-import java.util.Locale;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-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 static javax.portlet.tck.beans.JSR286SpecTestCaseDetails.*;
-import javax.portlet.tck.beans.TestResult;
-
-/**
- * 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.
- */
-public class AddlResponseTests_SPEC2_12_ResponseRedirect implements Portlet {
-   private static final String LOG_CLASS = 
-         AddlResponseTests_SPEC2_12_ResponseRedirect.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 actionRequest, ActionResponse actionResponse)
-         throws PortletException, IOException {
-   }
-
-   @Override
-   public void render(RenderRequest renderRequest, RenderResponse renderResponse)
-         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
-
-      /* TestCase: SPEC2_12_ResponseRedirect_redirect1                        */
-      /* Details: "If a relative path is supplied to the sendRedirect         */
-      /* method, an IllegalArgumentException must be thrown"                  */
-      TestResult tr0 = tcd.getTestResultFailed(SPEC2_12_RESPONSEREDIRECT_REDIRECT1);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_12_ResponseRedirect_redirect12                       */
-      /* Details: "If a new private render parameter value is set on the      */
-      /* ActionResponse before the redirect, the new private render           */
-      /* parameter value must be set on the attached render URL"              */
-      TestResult tr1 = tcd.getTestResultFailed(SPEC2_12_RESPONSEREDIRECT_REDIRECT12);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_12_ResponseRedirect_redirect14                       */
-      /* Details: "If a new public render parameter value is set on the       */
-      /* ActionResponse before the redirect, the new public render            */
-      /* parameter value must be set on the attached render URL"              */
-      TestResult tr2 = tcd.getTestResultFailed(SPEC2_12_RESPONSEREDIRECT_REDIRECT14);
-      /* TODO: implement test */
-
-
-
-      // Write the results to the output stream
-
-      tr0.writeTo(writer);
-      tr1.writeTo(writer);
-      tr2.writeTo(writer);
-
-
-   }
-
-}
-

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/23a1c547/portlet-tck_3.0/V2AddlResponseTests/src/main/resources/xml-resources/additionalTCs.xml
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlResponseTests/src/main/resources/xml-resources/additionalTCs.xml b/portlet-tck_3.0/V2AddlResponseTests/src/main/resources/xml-resources/additionalTCs.xml
index e6c3edf..d37eb51 100644
--- a/portlet-tck_3.0/V2AddlResponseTests/src/main/resources/xml-resources/additionalTCs.xml
+++ b/portlet-tck_3.0/V2AddlResponseTests/src/main/resources/xml-resources/additionalTCs.xml
@@ -17,44 +17,35 @@
     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 AddlResponseTests test case names and page mappings -->
-<entry key="SPEC2_12_ResponseProperties_namespace2">V2AddlResponseTests</entry>
-<entry key="SPEC2_12_ResponseProperties_namespace4">V2AddlResponseTests</entry>
-<entry key="SPEC2_12_ResponseProperties_cookie1">V2AddlResponseTests</entry>
-<entry key="SPEC2_12_ResponseProperties_cookie2">V2AddlResponseTests</entry>
-<entry key="SPEC2_12_ResponseProperties_cookie3">V2AddlResponseTests</entry>
-<entry key="SPEC2_12_ResponseProperties_cookie4">V2AddlResponseTests</entry>
-<entry key="SPEC2_12_ResponseProperties_cookie5">V2AddlResponseTests</entry>
-<entry key="SPEC2_12_ResponseProperties_cookie6">V2AddlResponseTests</entry>
-<entry key="SPEC2_12_ResponseProperties_cookie7">V2AddlResponseTests</entry>
-<entry key="SPEC2_12_ResponseProperties_cookie8">V2AddlResponseTests</entry>
-<entry key="SPEC2_12_ResponseProperties_cookie9">V2AddlResponseTests</entry>
-<entry key="SPEC2_12_ResponseProperties_cookie10">V2AddlResponseTests</entry>
-<entry key="SPEC2_12_ResponseProperties_cookie11">V2AddlResponseTests</entry>
-<entry key="SPEC2_12_ResponseProperties_cookie12">V2AddlResponseTests</entry>
-<entry key="SPEC2_12_ResponseProperties_cookie13">V2AddlResponseTests</entry>
-<entry key="SPEC2_12_ResponseProperties_cookie14">V2AddlResponseTests</entry>
-<entry key="SPEC2_12_ResponseProperties_cookie15">V2AddlResponseTests</entry>
-<entry key="SPEC2_12_ResponseProperties_cookie16">V2AddlResponseTests</entry>
-<entry key="SPEC2_12_ResponseProperties_cookie17">V2AddlResponseTests</entry>
-<entry key="SPEC2_12_ResponseRedirect_redirect1">V2AddlResponseTests</entry>
-<entry key="SPEC2_12_ResponseRedirect_redirect12">V2AddlResponseTests</entry>
-<entry key="SPEC2_12_ResponseRedirect_redirect14">V2AddlResponseTests</entry>
-<entry key="SPEC2_12_ResponseContent_contentType5">V2AddlResponseTests</entry>
-<entry key="SPEC2_12_ResponseContent_buffering9">V2AddlResponseTests</entry>
-<entry key="SPEC2_12_ResponseContent_buffering10">V2AddlResponseTests</entry>
-<entry key="SPEC2_12_ResponseContent_buffering11">V2AddlResponseTests</entry>
-<entry key="SPEC2_12_ResponseContent_buffering13">V2AddlResponseTests</entry>
-<entry key="SPEC2_12_ResponseContent_characterEncoding2">V2AddlResponseTests</entry>
-<entry key="SPEC2_12_ResponseContent_characterEncoding3">V2AddlResponseTests</entry>
-<entry key="SPEC2_12_ResponseContent_characterEncoding4">V2AddlResponseTests</entry>
-
+<entry key="V2AddlResponseTests_SPEC2_12_Action_cookie1">V2AddlResponseTests</entry>
+<entry key="V2AddlResponseTests_SPEC2_12_Action_cookie2">V2AddlResponseTests</entry>
+<entry key="V2AddlResponseTests_SPEC2_12_Action_cookie3">V2AddlResponseTests</entry>
+<entry key="V2AddlResponseTests_SPEC2_12_Action_cookie4">V2AddlResponseTests</entry>
+<entry key="V2AddlResponseTests_SPEC2_12_Action_redirect1">V2AddlResponseTests</entry>
+<entry key="V2AddlResponseTests_SPEC2_12_Action_redirect12">V2AddlResponseTests</entry>
+<entry key="V2AddlResponseTests_SPEC2_12_Action_redirect14">V2AddlResponseTests</entry>
+<entry key="V2AddlResponseTests_SPEC2_12_Event_cookie5">V2AddlResponseTests</entry>
+<entry key="V2AddlResponseTests_SPEC2_12_Event_cookie6">V2AddlResponseTests</entry>
+<entry key="V2AddlResponseTests_SPEC2_12_Event_cookie7">V2AddlResponseTests</entry>
+<entry key="V2AddlResponseTests_SPEC2_12_Render_cookie8">V2AddlResponseTests</entry>
+<entry key="V2AddlResponseTests_SPEC2_12_Render_cookie9">V2AddlResponseTests</entry>
+<entry key="V2AddlResponseTests_SPEC2_12_Render_cookie10">V2AddlResponseTests</entry>
+<entry key="V2AddlResponseTests_SPEC2_12_Render_cookie11">V2AddlResponseTests</entry>
+<entry key="V2AddlResponseTests_SPEC2_12_Render_cookie12">V2AddlResponseTests</entry>
+<entry key="V2AddlResponseTests_SPEC2_12_Render_contentType5">V2AddlResponseTests</entry>
+<entry key="V2AddlResponseTests_SPEC2_12_Render_characterEncoding2">V2AddlResponseTests</entry>
+<entry key="V2AddlResponseTests_SPEC2_12_Render_characterEncoding3">V2AddlResponseTests</entry>
+<entry key="V2AddlResponseTests_SPEC2_12_Render_characterEncoding4">V2AddlResponseTests</entry>
+<entry key="V2AddlResponseTests_SPEC2_12_Resource_cookie13">V2AddlResponseTests</entry>
+<entry key="V2AddlResponseTests_SPEC2_12_Resource_cookie14">V2AddlResponseTests</entry>
+<entry key="V2AddlResponseTests_SPEC2_12_Resource_cookie15">V2AddlResponseTests</entry>
+<entry key="V2AddlResponseTests_SPEC2_12_Resource_cookie16">V2AddlResponseTests</entry>
+<entry key="V2AddlResponseTests_SPEC2_12_Resource_cookie17">V2AddlResponseTests</entry>
+<entry key="V2AddlResponseTests_SPEC2_12_Resource_contentType5">V2AddlResponseTests</entry>
+<entry key="V2AddlResponseTests_SPEC2_12_Resource_characterEncoding2">V2AddlResponseTests</entry>
+<entry key="V2AddlResponseTests_SPEC2_12_Resource_characterEncoding3">V2AddlResponseTests</entry>
+<entry key="V2AddlResponseTests_SPEC2_12_Resource_characterEncoding4">V2AddlResponseTests</entry>
 </properties>

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/23a1c547/portlet-tck_3.0/V2AddlResponseTests/src/main/webapp/WEB-INF/portlet.xml
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlResponseTests/src/main/webapp/WEB-INF/portlet.xml b/portlet-tck_3.0/V2AddlResponseTests/src/main/webapp/WEB-INF/portlet.xml
index 4706c10..a4b95b4 100644
--- a/portlet-tck_3.0/V2AddlResponseTests/src/main/webapp/WEB-INF/portlet.xml
+++ b/portlet-tck_3.0/V2AddlResponseTests/src/main/webapp/WEB-INF/portlet.xml
@@ -20,74 +20,121 @@
 <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-AddlResponseTests">
-
+   xmlns:tck="http://www.apache.org/portals/pluto/portlet-tck_3.0"
+   version="2.0" id="V2AddlResponseTests">
    <portlet>
-      <portlet-name>AddlResponseTests_SPEC2_12_ResponseProperties</portlet-name>
-      <portlet-class>javax.portlet.tck.portlets.AddlResponseTests_SPEC2_12_ResponseProperties</portlet-class>
-
-      <init-param>
-         <name>TestParameter</name>
-         <value>TestValue</value>
-      </init-param>
-
+      <portlet-name>AddlResponseTests_SPEC2_12_Action</portlet-name>
+      <portlet-class>javax.portlet.tck.portlets.AddlResponseTests_SPEC2_12_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>AddlResponseTests_SPEC2_12_ResponseProperties</title>
+         <title>AddlResponseTests_SPEC2_12_Action</title>
       </portlet-info>
    </portlet>
 
    <portlet>
-      <portlet-name>AddlResponseTests_SPEC2_12_ResponseRedirect</portlet-name>
-      <portlet-class>javax.portlet.tck.portlets.AddlResponseTests_SPEC2_12_ResponseRedirect</portlet-class>
-
-      <init-param>
-         <name>TestParameter</name>
-         <value>TestValue</value>
-      </init-param>
-
+      <portlet-name>AddlResponseTests_SPEC2_12_Event</portlet-name>
+      <portlet-class>javax.portlet.tck.portlets.AddlResponseTests_SPEC2_12_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>AddlResponseTests_SPEC2_12_ResponseRedirect</title>
+         <title>AddlResponseTests_SPEC2_12_Event</title>
       </portlet-info>
+      <supported-publishing-event>
+         <qname>tck:AddlResponseTests_SPEC2_12_Event</qname>
+      </supported-publishing-event>
    </portlet>
 
    <portlet>
-      <portlet-name>AddlResponseTests_SPEC2_12_ResponseContent</portlet-name>
-      <portlet-class>javax.portlet.tck.portlets.AddlResponseTests_SPEC2_12_ResponseContent</portlet-class>
-
-      <init-param>
-         <name>TestParameter</name>
-         <value>TestValue</value>
-      </init-param>
-
+      <portlet-name>AddlResponseTests_SPEC2_12_Event_event</portlet-name>
+      <portlet-class>javax.portlet.tck.portlets.AddlResponseTests_SPEC2_12_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>AddlResponseTests_SPEC2_12_ResponseContent</title>
+         <title>AddlResponseTests_SPEC2_12_Event_event</title>
       </portlet-info>
+      <supported-processing-event>
+         <qname>tck:AddlResponseTests_SPEC2_12_Event</qname>
+      </supported-processing-event>
    </portlet>
 
+   <portlet>
+      <portlet-name>AddlResponseTests_SPEC2_12_Render</portlet-name>
+      <portlet-class>javax.portlet.tck.portlets.AddlResponseTests_SPEC2_12_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>AddlResponseTests_SPEC2_12_Render</title>
+      </portlet-info>
+   </portlet>
 
+   <portlet>
+      <portlet-name>AddlResponseTests_SPEC2_12_Resource</portlet-name>
+      <portlet-class>javax.portlet.tck.portlets.AddlResponseTests_SPEC2_12_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>AddlResponseTests_SPEC2_12_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>
+
+   <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/V2AddlResponseTests/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlResponseTests/src/main/webapp/WEB-INF/web.xml b/portlet-tck_3.0/V2AddlResponseTests/src/main/webapp/WEB-INF/web.xml
index 1e994b7..b8aaed4 100644
--- a/portlet-tck_3.0/V2AddlResponseTests/src/main/webapp/WEB-INF/web.xml
+++ b/portlet-tck_3.0/V2AddlResponseTests/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-AddlResponseTests</display-name>
-</web-app>
+   <display-name>javax.portlet-tck-AddlResponseTests</display-name>
 
+</web-app>

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/23a1c547/portlet-tck_3.0/V2AddlUrlTests/pom.xml
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlUrlTests/pom.xml b/portlet-tck_3.0/V2AddlUrlTests/pom.xml
index 949c534..e2dd565 100644
--- a/portlet-tck_3.0/V2AddlUrlTests/pom.xml
+++ b/portlet-tck_3.0/V2AddlUrlTests/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-V2AddlUrlTests</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-V2AddlUrlTests</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/V2AddlUrlTests/src/main/java/javax/portlet/tck/portlets/AddlUrlTests_SPEC2_7_Url.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlUrlTests/src/main/java/javax/portlet/tck/portlets/AddlUrlTests_SPEC2_7_Url.java b/portlet-tck_3.0/V2AddlUrlTests/src/main/java/javax/portlet/tck/portlets/AddlUrlTests_SPEC2_7_Url.java
deleted file mode 100644
index 2e3ef7c..0000000
--- a/portlet-tck_3.0/V2AddlUrlTests/src/main/java/javax/portlet/tck/portlets/AddlUrlTests_SPEC2_7_Url.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/*  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.IOException;
-import java.io.PrintWriter;
-
-import java.util.Enumeration;
-import java.util.Locale;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-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 static javax.portlet.tck.beans.JSR286SpecTestCaseDetails.*;
-import javax.portlet.tck.beans.TestResult;
-
-/**
- * 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.
- */
-public class AddlUrlTests_SPEC2_7_Url implements Portlet {
-   private static final String LOG_CLASS = 
-         AddlUrlTests_SPEC2_7_Url.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 actionRequest, ActionResponse actionResponse)
-         throws PortletException, IOException {
-   }
-
-   @Override
-   public void render(RenderRequest renderRequest, RenderResponse renderResponse)
-         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
-
-      /* TestCase: SPEC2_7_Url_portletMode1                                   */
-      /* Details: "The portlet may not set a portlet mode that is not         */
-      /* defined as supported in the deployment descriptor on a portlet       */
-      /* URL"                                                                 */
-      TestResult tr0 = tcd.getTestResultFailed(SPEC2_7_URL_PORTLETMODE1);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_7_Url_portletMode2                                   */
-      /* Details: "The portlet may not set a portlet mode on a portlet URL    */
-      /* that it is not allowed to use"                                       */
-      TestResult tr1 = tcd.getTestResultFailed(SPEC2_7_URL_PORTLETMODE2);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_7_Url_portletMode4                                   */
-      /* Details: "If the portlet mode is not set, the URL must have the      */
-      /* portlet mode set for the current request as default"                 */
-      TestResult tr2 = tcd.getTestResultFailed(SPEC2_7_URL_PORTLETMODE4);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_7_Url_windowState1                                   */
-      /* Details: "The portlet may not set a window state that is not         */
-      /* defined as supported in the deployment descriptor on a portlet       */
-      /* URL"                                                                 */
-      TestResult tr3 = tcd.getTestResultFailed(SPEC2_7_URL_WINDOWSTATE1);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_7_Url_windowState2                                   */
-      /* Details: "The portlet may not set a window state on a portlet URL    */
-      /* that it is not allowed to use"                                       */
-      TestResult tr4 = tcd.getTestResultFailed(SPEC2_7_URL_WINDOWSTATE2);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_7_Url_windowState4                                   */
-      /* Details: "If the window state is not set, the URL must have the      */
-      /* window state set for the current request as default"                 */
-      TestResult tr5 = tcd.getTestResultFailed(SPEC2_7_URL_WINDOWSTATE4);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_7_Url_setSecure1                                     */
-      /* Details: "If setSecure is called with the parameter set to TRUE,     */
-      /* the transport for the request triggered by the URL must be secure"   */
-      TestResult tr6 = tcd.getTestResultFailed(SPEC2_7_URL_SETSECURE1);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_7_Url_setSecure3                                     */
-      /* Details: "If setSecure is not called, the transport for the          */
-      /* request triggered by the URL should be at the same security level    */
-      /* as the current request"                                              */
-      TestResult tr7 = tcd.getTestResultFailed(SPEC2_7_URL_SETSECURE3);
-      /* 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);
-
-
-   }
-
-}
-

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/23a1c547/portlet-tck_3.0/V2AddlUrlTests/src/main/java/javax/portlet/tck/portlets/AddlUrlTests_SPEC2_7_UrlAction.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlUrlTests/src/main/java/javax/portlet/tck/portlets/AddlUrlTests_SPEC2_7_UrlAction.java b/portlet-tck_3.0/V2AddlUrlTests/src/main/java/javax/portlet/tck/portlets/AddlUrlTests_SPEC2_7_UrlAction.java
index 33c32ce..0d200b2 100644
--- a/portlet-tck_3.0/V2AddlUrlTests/src/main/java/javax/portlet/tck/portlets/AddlUrlTests_SPEC2_7_UrlAction.java
+++ b/portlet-tck_3.0/V2AddlUrlTests/src/main/java/javax/portlet/tck/portlets/AddlUrlTests_SPEC2_7_UrlAction.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 AddlUrlTests_SPEC2_7_UrlAction_event
+ *
  */
-public class AddlUrlTests_SPEC2_7_UrlAction implements Portlet {
+public class AddlUrlTests_SPEC2_7_UrlAction implements Portlet, ResourceServingPortlet {
    private static final String LOG_CLASS = 
          AddlUrlTests_SPEC2_7_UrlAction.class.getName();
    private final Logger LOGGER = Logger.getLogger(LOG_CLASS);
@@ -57,90 +62,206 @@ public class AddlUrlTests_SPEC2_7_UrlAction 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");
 
-   @Override
-   public void render(RenderRequest renderRequest, RenderResponse renderResponse)
-         throws PortletException, IOException {
-      
-      if (LOGGER.isLoggable(Level.FINE)) {
-         LOGGER.logp(Level.FINE, LOG_CLASS, "render", "Entry");
-      }
+      portletResp.setRenderParameters(portletReq.getParameterMap());
+      long tid = Thread.currentThread().getId();
+      portletReq.setAttribute(THREADID_ATTR, tid);
+
+      StringWriter writer = new StringWriter();
 
-      PrintWriter writer = renderResponse.getWriter();
       JSR286SpecTestCaseDetails tcd = new JSR286SpecTestCaseDetails();
 
       // Create result objects for the tests
 
-      /* TestCase: SPEC2_7_UrlAction_actionURL1                               */
+      /* TestCase: V2AddlUrlTests_SPEC2_7_UrlAction_actionURL1                */
       /* Details: "When a action URL is triggered, the processAction method   */
       /* must be invoked"                                                     */
-      TestResult tr0 = tcd.getTestResultFailed(SPEC2_7_URLACTION_ACTIONURL1);
+      TestResult tr0 = tcd.getTestResultFailed(V2ADDLURLTESTS_SPEC2_7_URLACTION_ACTIONURL1);
       /* TODO: implement test */
+      tr0.appendTcDetail("Not implemented.");
+      tr0.writeTo(writer);
 
-      /* TestCase: SPEC2_7_UrlAction_actionURL2                               */
+      /* TestCase: V2AddlUrlTests_SPEC2_7_UrlAction_actionURL2                */
       /* Details: "When action parameters are set on a action URL, those      */
       /* parameters must become action parameters of the request resulting    */
       /* from triggering the actionURL"                                       */
-      TestResult tr1 = tcd.getTestResultFailed(SPEC2_7_URLACTION_ACTIONURL2);
+      TestResult tr1 = tcd.getTestResultFailed(V2ADDLURLTESTS_SPEC2_7_URLACTION_ACTIONURL2);
       /* TODO: implement test */
+      tr1.appendTcDetail("Not implemented.");
+      tr1.writeTo(writer);
 
-      /* TestCase: SPEC2_7_UrlAction_actionURL3                               */
+      /* TestCase: V2AddlUrlTests_SPEC2_7_UrlAction_actionURL3                */
       /* Details: "When action parameters are set on a action URL, those      */
       /* parameters must become action parameters of the request resulting    */
       /* from triggering the actionURL"                                       */
-      TestResult tr2 = tcd.getTestResultFailed(SPEC2_7_URLACTION_ACTIONURL3);
+      TestResult tr2 = tcd.getTestResultFailed(V2ADDLURLTESTS_SPEC2_7_URLACTION_ACTIONURL3);
       /* TODO: implement test */
+      tr2.appendTcDetail("Not implemented.");
+      tr2.writeTo(writer);
 
-      /* TestCase: SPEC2_7_UrlAction_actionURL4                               */
+      /* TestCase: V2AddlUrlTests_SPEC2_7_UrlAction_actionURL4                */
       /* Details: "Action parameters can be set on the action URL through     */
       /* the setParameter(String, String) method"                             */
-      TestResult tr3 = tcd.getTestResultFailed(SPEC2_7_URLACTION_ACTIONURL4);
+      TestResult tr3 = tcd.getTestResultFailed(V2ADDLURLTESTS_SPEC2_7_URLACTION_ACTIONURL4);
       /* TODO: implement test */
+      tr3.appendTcDetail("Not implemented.");
+      tr3.writeTo(writer);
 
-      /* TestCase: SPEC2_7_UrlAction_actionURL5                               */
+      /* TestCase: V2AddlUrlTests_SPEC2_7_UrlAction_actionURL5                */
       /* Details: "Action parameters can be set on the action URL through     */
       /* the setParameter(String, String[]) method"                           */
-      TestResult tr4 = tcd.getTestResultFailed(SPEC2_7_URLACTION_ACTIONURL5);
+      TestResult tr4 = tcd.getTestResultFailed(V2ADDLURLTESTS_SPEC2_7_URLACTION_ACTIONURL5);
       /* TODO: implement test */
+      tr4.appendTcDetail("Not implemented.");
+      tr4.writeTo(writer);
 
-      /* TestCase: SPEC2_7_UrlAction_actionURL6                               */
+      /* TestCase: V2AddlUrlTests_SPEC2_7_UrlAction_actionURL6                */
       /* Details: "Action parameters can be set on the action URL through     */
       /* the setParameterMap(Map<String, String[]>) method"                   */
-      TestResult tr5 = tcd.getTestResultFailed(SPEC2_7_URLACTION_ACTIONURL6);
+      TestResult tr5 = tcd.getTestResultFailed(V2ADDLURLTESTS_SPEC2_7_URLACTION_ACTIONURL6);
       /* TODO: implement test */
+      tr5.appendTcDetail("Not implemented.");
+      tr5.writeTo(writer);
 
-      /* TestCase: SPEC2_7_UrlAction_actionURL7                               */
+      /* TestCase: V2AddlUrlTests_SPEC2_7_UrlAction_actionURL7                */
       /* Details: "If a parameter with an existing name is set through one    */
       /* of the setParameter methods, the existing value is repalced with     */
       /* the new value"                                                       */
-      TestResult tr6 = tcd.getTestResultFailed(SPEC2_7_URLACTION_ACTIONURL7);
+      TestResult tr6 = tcd.getTestResultFailed(V2ADDLURLTESTS_SPEC2_7_URLACTION_ACTIONURL7);
       /* TODO: implement test */
+      tr6.appendTcDetail("Not implemented.");
+      tr6.writeTo(writer);
 
-      /* TestCase: SPEC2_7_UrlAction_actionURL8                               */
+      /* TestCase: V2AddlUrlTests_SPEC2_7_UrlAction_actionURL8                */
       /* Details: "When an action URL is created, render parameters from      */
       /* the current request are not automatically copied to the new action   */
       /* URL"                                                                 */
-      TestResult tr7 = tcd.getTestResultFailed(SPEC2_7_URLACTION_ACTIONURL8);
+      TestResult tr7 = tcd.getTestResultFailed(V2ADDLURLTESTS_SPEC2_7_URLACTION_ACTIONURL8);
       /* TODO: implement test */
+      tr7.appendTcDetail("Not implemented.");
+      tr7.writeTo(writer);
 
+      portletReq.getPortletSession().setAttribute(
+                   Constants.RESULT_ATTR_PREFIX + "AddlUrlTests_SPEC2_7_UrlAction",
+                   writer.toString(), APPLICATION_SCOPE);
+   }
 
+   @Override
+   public void serveResource(ResourceRequest portletReq, ResourceResponse portletResp)
+         throws PortletException, IOException {
+      LOGGER.entering(LOG_CLASS, "main portlet serveResource entry");
 
-      // Write the results to the output stream
+      long tid = Thread.currentThread().getId();
+      portletReq.setAttribute(THREADID_ATTR, tid);
 
-      tr0.writeTo(writer);
-      tr1.writeTo(writer);
-      tr2.writeTo(writer);
-      tr3.writeTo(writer);
-      tr4.writeTo(writer);
-      tr5.writeTo(writer);
-      tr6.writeTo(writer);
-      tr7.writeTo(writer);
+      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();
+
+      PortletSession ps = portletReq.getPortletSession();
+      String msg = (String) ps.getAttribute(RESULT_ATTR_PREFIX + "AddlUrlTests_SPEC2_7_UrlAction", APPLICATION_SCOPE);
+      if (msg != null) {
+         writer.write("<p>" + msg + "</p><br/>\n");
+         ps.removeAttribute(RESULT_ATTR_PREFIX + "AddlUrlTests_SPEC2_7_UrlAction", APPLICATION_SCOPE);
+      }
+
+      /* TestCase: V2AddlUrlTests_SPEC2_7_UrlAction_actionURL1                */
+      /* Details: "When a action URL is triggered, the processAction method   */
+      /* must be invoked"                                                     */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2AddlUrlTests_SPEC2_7_UrlAction_actionURL1", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2AddlUrlTests_SPEC2_7_UrlAction_actionURL2                */
+      /* Details: "When action parameters are set on a action URL, those      */
+      /* parameters must become action parameters of the request resulting    */
+      /* from triggering the actionURL"                                       */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2AddlUrlTests_SPEC2_7_UrlAction_actionURL2", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2AddlUrlTests_SPEC2_7_UrlAction_actionURL3                */
+      /* Details: "When action parameters are set on a action URL, those      */
+      /* parameters must become action parameters of the request resulting    */
+      /* from triggering the actionURL"                                       */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2AddlUrlTests_SPEC2_7_UrlAction_actionURL3", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2AddlUrlTests_SPEC2_7_UrlAction_actionURL4                */
+      /* Details: "Action parameters can be set on the action URL through     */
+      /* the setParameter(String, String) method"                             */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2AddlUrlTests_SPEC2_7_UrlAction_actionURL4", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2AddlUrlTests_SPEC2_7_UrlAction_actionURL5                */
+      /* Details: "Action parameters can be set on the action URL through     */
+      /* the setParameter(String, String[]) method"                           */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2AddlUrlTests_SPEC2_7_UrlAction_actionURL5", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2AddlUrlTests_SPEC2_7_UrlAction_actionURL6                */
+      /* Details: "Action parameters can be set on the action URL through     */
+      /* the setParameterMap(Map<String, String[]>) method"                   */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2AddlUrlTests_SPEC2_7_UrlAction_actionURL6", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2AddlUrlTests_SPEC2_7_UrlAction_actionURL7                */
+      /* Details: "If a parameter with an existing name is set through one    */
+      /* of the setParameter methods, the existing value is repalced with     */
+      /* the new value"                                                       */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2AddlUrlTests_SPEC2_7_UrlAction_actionURL7", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2AddlUrlTests_SPEC2_7_UrlAction_actionURL8                */
+      /* Details: "When an action URL is created, render parameters from      */
+      /* the current request are not automatically copied to the new action   */
+      /* URL"                                                                 */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2AddlUrlTests_SPEC2_7_UrlAction_actionURL8", aurl);
+         tb.writeTo(writer);
+      }
 
    }
 
 }
-

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/23a1c547/portlet-tck_3.0/V2AddlUrlTests/src/main/java/javax/portlet/tck/portlets/AddlUrlTests_SPEC2_7_UrlListener.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlUrlTests/src/main/java/javax/portlet/tck/portlets/AddlUrlTests_SPEC2_7_UrlListener.java b/portlet-tck_3.0/V2AddlUrlTests/src/main/java/javax/portlet/tck/portlets/AddlUrlTests_SPEC2_7_UrlListener.java
index e5275e6..94dc019 100644
--- a/portlet-tck_3.0/V2AddlUrlTests/src/main/java/javax/portlet/tck/portlets/AddlUrlTests_SPEC2_7_UrlListener.java
+++ b/portlet-tck_3.0/V2AddlUrlTests/src/main/java/javax/portlet/tck/portlets/AddlUrlTests_SPEC2_7_UrlListener.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 AddlUrlTests_SPEC2_7_UrlListener_event
+ *
  */
-public class AddlUrlTests_SPEC2_7_UrlListener implements Portlet {
+public class AddlUrlTests_SPEC2_7_UrlListener implements Portlet, ResourceServingPortlet {
    private static final String LOG_CLASS = 
          AddlUrlTests_SPEC2_7_UrlListener.class.getName();
    private final Logger LOGGER = Logger.getLogger(LOG_CLASS);
@@ -57,38 +62,53 @@ public class AddlUrlTests_SPEC2_7_UrlListener 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 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 renderRequest, RenderResponse renderResponse)
+   public void render(RenderRequest portletReq, RenderResponse portletResp)
          throws PortletException, IOException {
-      
-      if (LOGGER.isLoggable(Level.FINE)) {
-         LOGGER.logp(Level.FINE, LOG_CLASS, "render", "Entry");
-      }
+      LOGGER.entering(LOG_CLASS, "main portlet render 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_7_UrlListener_portletURLGenerationListener6          */
+      /* TestCase: V2AddlUrlTests_SPEC2_7_UrlListener_portletURLGenerationListener6 */
       /* Details: "If more than one listener is registered the portlet        */
       /* container must chain the listeners in the order of how they appear   */
       /* in the deployment descriptor"                                        */
-      TestResult tr0 = tcd.getTestResultFailed(SPEC2_7_URLLISTENER_PORTLETURLGENERATIONLISTENER6);
+      TestResult tr0 = tcd.getTestResultFailed(V2ADDLURLTESTS_SPEC2_7_URLLISTENER_PORTLETURLGENERATIONLISTENER6);
       /* TODO: implement test */
-
-
-
-      // Write the results to the output stream
-
+      tr0.appendTcDetail("Not implemented.");
       tr0.writeTo(writer);
 
-
    }
 
 }
-

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/23a1c547/portlet-tck_3.0/V2AddlUrlTests/src/main/java/javax/portlet/tck/portlets/AddlUrlTests_SPEC2_7_UrlRender.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlUrlTests/src/main/java/javax/portlet/tck/portlets/AddlUrlTests_SPEC2_7_UrlRender.java b/portlet-tck_3.0/V2AddlUrlTests/src/main/java/javax/portlet/tck/portlets/AddlUrlTests_SPEC2_7_UrlRender.java
index ef19f2c..afe75e0 100644
--- a/portlet-tck_3.0/V2AddlUrlTests/src/main/java/javax/portlet/tck/portlets/AddlUrlTests_SPEC2_7_UrlRender.java
+++ b/portlet-tck_3.0/V2AddlUrlTests/src/main/java/javax/portlet/tck/portlets/AddlUrlTests_SPEC2_7_UrlRender.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 AddlUrlTests_SPEC2_7_UrlRender_event
+ *
  */
-public class AddlUrlTests_SPEC2_7_UrlRender implements Portlet {
+public class AddlUrlTests_SPEC2_7_UrlRender implements Portlet, ResourceServingPortlet {
    private static final String LOG_CLASS = 
          AddlUrlTests_SPEC2_7_UrlRender.class.getName();
    private final Logger LOGGER = Logger.getLogger(LOG_CLASS);
@@ -57,118 +62,203 @@ public class AddlUrlTests_SPEC2_7_UrlRender 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 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 renderRequest, RenderResponse renderResponse)
+   public void render(RenderRequest portletReq, RenderResponse portletResp)
          throws PortletException, IOException {
-      
-      if (LOGGER.isLoggable(Level.FINE)) {
-         LOGGER.logp(Level.FINE, LOG_CLASS, "render", "Entry");
-      }
+      LOGGER.entering(LOG_CLASS, "main portlet render 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_7_UrlRender_renderURL0                               */
-      /* Details: "When a render URL is triggered, the processAction method   */
-      /* must not be invoked"                                                 */
-      TestResult tr0 = tcd.getTestResultFailed(SPEC2_7_URLRENDER_RENDERURL0);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_7_UrlRender_renderURL1                               */
+      /* TestCase: V2AddlUrlTests_SPEC2_7_UrlRender_renderURL1                */
       /* Details: "When a render URL is triggered, the render method must     */
       /* be invoked"                                                          */
-      TestResult tr1 = tcd.getTestResultFailed(SPEC2_7_URLRENDER_RENDERURL1);
+      TestResult tr0 = tcd.getTestResultFailed(V2ADDLURLTESTS_SPEC2_7_URLRENDER_RENDERURL1);
       /* TODO: implement test */
+      tr0.appendTcDetail("Not implemented.");
+      tr0.writeTo(writer);
 
-      /* TestCase: SPEC2_7_UrlRender_renderURL2                               */
+      /* TestCase: V2AddlUrlTests_SPEC2_7_UrlRender_renderURL2                */
       /* Details: "When render parameters are set on a render URL, those      */
       /* parameters must become render parameters of the request resulting    */
       /* from triggering the renderURL"                                       */
-      TestResult tr2 = tcd.getTestResultFailed(SPEC2_7_URLRENDER_RENDERURL2);
+      TestResult tr1 = tcd.getTestResultFailed(V2ADDLURLTESTS_SPEC2_7_URLRENDER_RENDERURL2);
       /* TODO: implement test */
+      tr1.appendTcDetail("Not implemented.");
+      tr1.writeTo(writer);
 
-      /* TestCase: SPEC2_7_UrlRender_renderURL3                               */
+      /* TestCase: V2AddlUrlTests_SPEC2_7_UrlRender_renderURL3                */
       /* Details: "When render parameters are set on a render URL, those      */
       /* parameters must become render parameters of the request resulting    */
       /* from triggering the renderURL"                                       */
-      TestResult tr3 = tcd.getTestResultFailed(SPEC2_7_URLRENDER_RENDERURL3);
+      TestResult tr2 = tcd.getTestResultFailed(V2ADDLURLTESTS_SPEC2_7_URLRENDER_RENDERURL3);
       /* TODO: implement test */
+      tr2.appendTcDetail("Not implemented.");
+      tr2.writeTo(writer);
 
-      /* TestCase: SPEC2_7_UrlRender_renderURL4                               */
+      /* TestCase: V2AddlUrlTests_SPEC2_7_UrlRender_renderURL4                */
       /* Details: "Private render parameters can be set on the render URL     */
       /* through the setParameter(String, String) method"                     */
-      TestResult tr4 = tcd.getTestResultFailed(SPEC2_7_URLRENDER_RENDERURL4);
+      TestResult tr3 = tcd.getTestResultFailed(V2ADDLURLTESTS_SPEC2_7_URLRENDER_RENDERURL4);
       /* TODO: implement test */
+      tr3.appendTcDetail("Not implemented.");
+      tr3.writeTo(writer);
 
-      /* TestCase: SPEC2_7_UrlRender_renderURL5                               */
+      /* TestCase: V2AddlUrlTests_SPEC2_7_UrlRender_renderURL5                */
       /* Details: "Private render parameters can be set on the render URL     */
       /* through the setParameter(String, String[]) method"                   */
-      TestResult tr5 = tcd.getTestResultFailed(SPEC2_7_URLRENDER_RENDERURL5);
+      TestResult tr4 = tcd.getTestResultFailed(V2ADDLURLTESTS_SPEC2_7_URLRENDER_RENDERURL5);
       /* TODO: implement test */
+      tr4.appendTcDetail("Not implemented.");
+      tr4.writeTo(writer);
 
-      /* TestCase: SPEC2_7_UrlRender_renderURL6                               */
+      /* TestCase: V2AddlUrlTests_SPEC2_7_UrlRender_renderURL6                */
       /* Details: "Private render parameters can be set on the render URL     */
       /* through the setParameterMap(Map<String, String[]>) method"           */
-      TestResult tr6 = tcd.getTestResultFailed(SPEC2_7_URLRENDER_RENDERURL6);
+      TestResult tr5 = tcd.getTestResultFailed(V2ADDLURLTESTS_SPEC2_7_URLRENDER_RENDERURL6);
       /* TODO: implement test */
+      tr5.appendTcDetail("Not implemented.");
+      tr5.writeTo(writer);
 
-      /* TestCase: SPEC2_7_UrlRender_renderURL7                               */
+      /* TestCase: V2AddlUrlTests_SPEC2_7_UrlRender_renderURL7                */
       /* Details: "Public render parameters can be set on the render URL      */
       /* through the setParameter(String, String) method"                     */
-      TestResult tr7 = tcd.getTestResultFailed(SPEC2_7_URLRENDER_RENDERURL7);
+      TestResult tr6 = tcd.getTestResultFailed(V2ADDLURLTESTS_SPEC2_7_URLRENDER_RENDERURL7);
       /* TODO: implement test */
+      tr6.appendTcDetail("Not implemented.");
+      tr6.writeTo(writer);
 
-      /* TestCase: SPEC2_7_UrlRender_renderURL8                               */
+      /* TestCase: V2AddlUrlTests_SPEC2_7_UrlRender_renderURL8                */
       /* Details: "Public render parameters can be set on the render URL      */
       /* through the setParameter(String, String[]) method"                   */
-      TestResult tr8 = tcd.getTestResultFailed(SPEC2_7_URLRENDER_RENDERURL8);
+      TestResult tr7 = tcd.getTestResultFailed(V2ADDLURLTESTS_SPEC2_7_URLRENDER_RENDERURL8);
       /* TODO: implement test */
+      tr7.appendTcDetail("Not implemented.");
+      tr7.writeTo(writer);
 
-      /* TestCase: SPEC2_7_UrlRender_renderURL9                               */
+      /* TestCase: V2AddlUrlTests_SPEC2_7_UrlRender_renderURL9                */
       /* Details: "Public render parameters can be set on the render URL      */
       /* through the setParameterMap(Map<String, String[]>) method"           */
-      TestResult tr9 = tcd.getTestResultFailed(SPEC2_7_URLRENDER_RENDERURL9);
+      TestResult tr8 = tcd.getTestResultFailed(V2ADDLURLTESTS_SPEC2_7_URLRENDER_RENDERURL9);
       /* TODO: implement test */
+      tr8.appendTcDetail("Not implemented.");
+      tr8.writeTo(writer);
 
-      /* TestCase: SPEC2_7_UrlRender_renderURL10                              */
+      /* TestCase: V2AddlUrlTests_SPEC2_7_UrlRender_renderURL10               */
       /* Details: "If a parameter with an existing name is set through one    */
       /* of the setParameter methods, the existing value is repalced with     */
       /* the new value"                                                       */
-      TestResult tr10 = tcd.getTestResultFailed(SPEC2_7_URLRENDER_RENDERURL10);
+      TestResult tr9 = tcd.getTestResultFailed(V2ADDLURLTESTS_SPEC2_7_URLRENDER_RENDERURL10);
       /* TODO: implement test */
+      tr9.appendTcDetail("Not implemented.");
+      tr9.writeTo(writer);
 
-      /* TestCase: SPEC2_7_UrlRender_renderURL11                              */
+      /* TestCase: V2AddlUrlTests_SPEC2_7_UrlRender_renderURL11               */
       /* Details: "When a render URL is created, render parameters from the   */
       /* current request are not automatically copied to the new render       */
       /* URL"                                                                 */
-      TestResult tr11 = tcd.getTestResultFailed(SPEC2_7_URLRENDER_RENDERURL11);
+      TestResult tr10 = tcd.getTestResultFailed(V2ADDLURLTESTS_SPEC2_7_URLRENDER_RENDERURL11);
       /* TODO: implement test */
+      tr10.appendTcDetail("Not implemented.");
+      tr10.writeTo(writer);
 
+      /* TestCase: V2AddlUrlTests_SPEC2_7_UrlRender_portletMode1              */
+      /* Details: "The portlet may not set a portlet mode that is not         */
+      /* defined as supported in the deployment descriptor on a portlet       */
+      /* URL"                                                                 */
+      TestResult tr11 = tcd.getTestResultFailed(V2ADDLURLTESTS_SPEC2_7_URLRENDER_PORTLETMODE1);
+      /* TODO: implement test */
+      tr11.appendTcDetail("Not implemented.");
+      tr11.writeTo(writer);
 
+      /* TestCase: V2AddlUrlTests_SPEC2_7_UrlRender_portletMode2              */
+      /* Details: "The portlet may not set a portlet mode on a portlet URL    */
+      /* that it is not allowed to use"                                       */
+      TestResult tr12 = tcd.getTestResultFailed(V2ADDLURLTESTS_SPEC2_7_URLRENDER_PORTLETMODE2);
+      /* TODO: implement test */
+      tr12.appendTcDetail("Not implemented.");
+      tr12.writeTo(writer);
 
-      // Write the results to the output stream
+      /* TestCase: V2AddlUrlTests_SPEC2_7_UrlRender_portletMode4              */
+      /* Details: "If the portlet mode is not set, the URL must have the      */
+      /* portlet mode set for the current request as default"                 */
+      TestResult tr13 = tcd.getTestResultFailed(V2ADDLURLTESTS_SPEC2_7_URLRENDER_PORTLETMODE4);
+      /* TODO: implement test */
+      tr13.appendTcDetail("Not implemented.");
+      tr13.writeTo(writer);
 
-      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);
+      /* TestCase: V2AddlUrlTests_SPEC2_7_UrlRender_windowState1              */
+      /* Details: "The portlet may not set a window state that is not         */
+      /* defined as supported in the deployment descriptor on a portlet       */
+      /* URL"                                                                 */
+      TestResult tr14 = tcd.getTestResultFailed(V2ADDLURLTESTS_SPEC2_7_URLRENDER_WINDOWSTATE1);
+      /* TODO: implement test */
+      tr14.appendTcDetail("Not implemented.");
+      tr14.writeTo(writer);
+
+      /* TestCase: V2AddlUrlTests_SPEC2_7_UrlRender_windowState2              */
+      /* Details: "The portlet may not set a window state on a portlet URL    */
+      /* that it is not allowed to use"                                       */
+      TestResult tr15 = tcd.getTestResultFailed(V2ADDLURLTESTS_SPEC2_7_URLRENDER_WINDOWSTATE2);
+      /* TODO: implement test */
+      tr15.appendTcDetail("Not implemented.");
+      tr15.writeTo(writer);
+
+      /* TestCase: V2AddlUrlTests_SPEC2_7_UrlRender_windowState4              */
+      /* Details: "If the window state is not set, the URL must have the      */
+      /* window state set for the current request as default"                 */
+      TestResult tr16 = tcd.getTestResultFailed(V2ADDLURLTESTS_SPEC2_7_URLRENDER_WINDOWSTATE4);
+      /* TODO: implement test */
+      tr16.appendTcDetail("Not implemented.");
+      tr16.writeTo(writer);
 
+      /* TestCase: V2AddlUrlTests_SPEC2_7_UrlRender_setSecure1                */
+      /* Details: "If setSecure is called with the parameter set to TRUE,     */
+      /* the transport for the request triggered by the URL must be secure"   */
+      TestResult tr17 = tcd.getTestResultFailed(V2ADDLURLTESTS_SPEC2_7_URLRENDER_SETSECURE1);
+      /* TODO: implement test */
+      tr17.appendTcDetail("Not implemented.");
+      tr17.writeTo(writer);
+
+      /* TestCase: V2AddlUrlTests_SPEC2_7_UrlRender_setSecure3                */
+      /* Details: "If setSecure is not called, the transport for the          */
+      /* request triggered by the URL should be at the same security level    */
+      /* as the current request"                                              */
+      TestResult tr18 = tcd.getTestResultFailed(V2ADDLURLTESTS_SPEC2_7_URLRENDER_SETSECURE3);
+      /* TODO: implement test */
+      tr18.appendTcDetail("Not implemented.");
+      tr18.writeTo(writer);
 
    }
 
 }
-


[17/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.

Posted by ms...@apache.org.
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/23a1c547/portlet-tck_3.0/V2AddlFilterTests/pom.xml
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlFilterTests/pom.xml b/portlet-tck_3.0/V2AddlFilterTests/pom.xml
index 87654b6..ce905c7 100644
--- a/portlet-tck_3.0/V2AddlFilterTests/pom.xml
+++ b/portlet-tck_3.0/V2AddlFilterTests/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-V2AddlFilterTests</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-V2AddlFilterTests</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/V2AddlFilterTests/src/main/java/javax/portlet/tck/portlets/AddlFilterTests_SPEC2_20_Action.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlFilterTests/src/main/java/javax/portlet/tck/portlets/AddlFilterTests_SPEC2_20_Action.java b/portlet-tck_3.0/V2AddlFilterTests/src/main/java/javax/portlet/tck/portlets/AddlFilterTests_SPEC2_20_Action.java
new file mode 100644
index 0000000..9f443d8
--- /dev/null
+++ b/portlet-tck_3.0/V2AddlFilterTests/src/main/java/javax/portlet/tck/portlets/AddlFilterTests_SPEC2_20_Action.java
@@ -0,0 +1,385 @@
+/*  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_Action_event
+ *
+ */
+public class AddlFilterTests_SPEC2_20_Action implements Portlet, ResourceServingPortlet {
+   private static final String LOG_CLASS = 
+         AddlFilterTests_SPEC2_20_Action.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();
+
+      JSR286SpecTestCaseDetails tcd = new JSR286SpecTestCaseDetails();
+
+      // Create result objects for the tests
+
+      /* TestCase: V2AddlFilterTests_SPEC2_20_Action_filter1                  */
+      /* Details: "A filter declaration can be configured in the deployment   */
+      /* descriptor"                                                          */
+      TestResult tr0 = tcd.getTestResultFailed(V2ADDLFILTERTESTS_SPEC2_20_ACTION_FILTER1);
+      /* TODO: implement test */
+      tr0.appendTcDetail("Not implemented.");
+      tr0.writeTo(writer);
+
+      /* TestCase: V2AddlFilterTests_SPEC2_20_Action_filter6                  */
+      /* Details: "A filter declaration can contain multiple <lifecycle>      */
+      /* tags for a single filter class"                                      */
+      TestResult tr1 = tcd.getTestResultFailed(V2ADDLFILTERTESTS_SPEC2_20_ACTION_FILTER6);
+      /* TODO: implement test */
+      tr1.appendTcDetail("Not implemented.");
+      tr1.writeTo(writer);
+
+      /* TestCase: V2AddlFilterTests_SPEC2_20_Action_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_ACTION_FILTER7);
+      /* TODO: implement test */
+      tr2.appendTcDetail("Not implemented.");
+      tr2.writeTo(writer);
+
+      /* TestCase: V2AddlFilterTests_SPEC2_20_Action_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_ACTION_FILTER8);
+      /* TODO: implement test */
+      tr3.appendTcDetail("Not implemented.");
+      tr3.writeTo(writer);
+
+      /* TestCase: V2AddlFilterTests_SPEC2_20_Action_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_ACTION_FILTER9);
+      /* TODO: implement test */
+      tr4.appendTcDetail("Not implemented.");
+      tr4.writeTo(writer);
+
+      /* TestCase: V2AddlFilterTests_SPEC2_20_Action_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_ACTION_FILTER10);
+      /* TODO: implement test */
+      tr5.appendTcDetail("Not implemented.");
+      tr5.writeTo(writer);
+
+      /* TestCase: V2AddlFilterTests_SPEC2_20_Action_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_ACTION_FILTER11);
+      /* TODO: implement test */
+      tr6.appendTcDetail("Not implemented.");
+      tr6.writeTo(writer);
+
+      /* TestCase: V2AddlFilterTests_SPEC2_20_Action_filter12                 */
+      /* Details: "A filter class can appear in multiple filter               */
+      /* declarations"                                                        */
+      TestResult tr7 = tcd.getTestResultFailed(V2ADDLFILTERTESTS_SPEC2_20_ACTION_FILTER12);
+      /* TODO: implement test */
+      tr7.appendTcDetail("Not implemented.");
+      tr7.writeTo(writer);
+
+      /* TestCase: V2AddlFilterTests_SPEC2_20_Action_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_ACTION_FILTER13);
+      /* TODO: implement test */
+      tr8.appendTcDetail("Not implemented.");
+      tr8.writeTo(writer);
+
+      /* TestCase: V2AddlFilterTests_SPEC2_20_Action_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_ACTION_FILTER14);
+      /* TODO: implement test */
+      tr9.appendTcDetail("Not implemented.");
+      tr9.writeTo(writer);
+
+      /* TestCase: V2AddlFilterTests_SPEC2_20_Action_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_ACTION_FILTER15);
+      /* TODO: implement test */
+      tr10.appendTcDetail("Not implemented.");
+      tr10.writeTo(writer);
+
+      /* TestCase: V2AddlFilterTests_SPEC2_20_Action_filterWrapper1           */
+      /* Details: "An ACTION_PHASE filter can wrap the ActionRequest object   */
+      /* with a custom wrapper"                                               */
+      TestResult tr11 = tcd.getTestResultFailed(V2ADDLFILTERTESTS_SPEC2_20_ACTION_FILTERWRAPPER1);
+      /* TODO: implement test */
+      tr11.appendTcDetail("Not implemented.");
+      tr11.writeTo(writer);
+
+      /* TestCase: V2AddlFilterTests_SPEC2_20_Action_filterWrapper2           */
+      /* Details: "An ACTION_PHASE filter can wrap the ActionResponse         */
+      /* object with a custom wrapper"                                        */
+      TestResult tr12 = tcd.getTestResultFailed(V2ADDLFILTERTESTS_SPEC2_20_ACTION_FILTERWRAPPER2);
+      /* TODO: implement test */
+      tr12.appendTcDetail("Not implemented.");
+      tr12.writeTo(writer);
+
+      /* TestCase: V2AddlFilterTests_SPEC2_20_Action_filter2                  */
+      /* Details: "If the filter declaration specifies the <lifecycle> tag    */
+      /* value ACTION_PHASE, the ActionFilter.doFilter method is called"      */
+      TestResult tr13 = tcd.getTestResultFailed(V2ADDLFILTERTESTS_SPEC2_20_ACTION_FILTER2);
+      /* TODO: implement test */
+      tr13.appendTcDetail("Not implemented.");
+      tr13.writeTo(writer);
+
+      portletReq.getPortletSession().setAttribute(
+                   Constants.RESULT_ATTR_PREFIX + "AddlFilterTests_SPEC2_20_Action",
+                   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();
+
+   }
+
+   @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();
+
+      PortletSession ps = portletReq.getPortletSession();
+      String msg = (String) ps.getAttribute(RESULT_ATTR_PREFIX + "AddlFilterTests_SPEC2_20_Action", APPLICATION_SCOPE);
+      if (msg != null) {
+         writer.write("<p>" + msg + "</p><br/>\n");
+         ps.removeAttribute(RESULT_ATTR_PREFIX + "AddlFilterTests_SPEC2_20_Action", APPLICATION_SCOPE);
+      }
+
+      /* TestCase: V2AddlFilterTests_SPEC2_20_Action_filter1                  */
+      /* Details: "A filter declaration can be configured in the deployment   */
+      /* descriptor"                                                          */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2AddlFilterTests_SPEC2_20_Action_filter1", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2AddlFilterTests_SPEC2_20_Action_filter6                  */
+      /* Details: "A filter declaration can contain multiple <lifecycle>      */
+      /* tags for a single filter class"                                      */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2AddlFilterTests_SPEC2_20_Action_filter6", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2AddlFilterTests_SPEC2_20_Action_filter7                  */
+      /* Details: "The filter declaration can contain initialization          */
+      /* parameters which can be read by the filter through the               */
+      /* FilterConfig object"                                                 */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2AddlFilterTests_SPEC2_20_Action_filter7", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2AddlFilterTests_SPEC2_20_Action_filter8                  */
+      /* Details: "For each filter declaration, the filter instance must      */
+      /* receive all initialization parameters defined in the filter          */
+      /* declaration"                                                         */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2AddlFilterTests_SPEC2_20_Action_filter8", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2AddlFilterTests_SPEC2_20_Action_filter9                  */
+      /* Details: "For each filter declaration, the filter instance must      */
+      /* receive only initialization parameters defined in the filter         */
+      /* declaration"                                                         */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2AddlFilterTests_SPEC2_20_Action_filter9", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2AddlFilterTests_SPEC2_20_Action_filter10                 */
+      /* Details: "For multiple filter declarations for a single filter       */
+      /* class, the filter instance must receive all initialization           */
+      /* parameters defined in the filter declaration"                        */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2AddlFilterTests_SPEC2_20_Action_filter10", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2AddlFilterTests_SPEC2_20_Action_filter11                 */
+      /* Details: "For multiple filter declarations for a single filter       */
+      /* class, the filter instance must receive only initialization          */
+      /* parameters defined in the filter declaration"                        */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2AddlFilterTests_SPEC2_20_Action_filter11", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2AddlFilterTests_SPEC2_20_Action_filter12                 */
+      /* Details: "A filter class can appear in multiple filter               */
+      /* declarations"                                                        */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2AddlFilterTests_SPEC2_20_Action_filter12", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2AddlFilterTests_SPEC2_20_Action_filter13                 */
+      /* Details: "A filter declaration can be mapped to a portlet through    */
+      /* the deployment descriptor <filter-mapping> element"                  */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2AddlFilterTests_SPEC2_20_Action_filter13", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2AddlFilterTests_SPEC2_20_Action_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"                      */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2AddlFilterTests_SPEC2_20_Action_filter14", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2AddlFilterTests_SPEC2_20_Action_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"                                               */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2AddlFilterTests_SPEC2_20_Action_filter15", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2AddlFilterTests_SPEC2_20_Action_filterWrapper1           */
+      /* Details: "An ACTION_PHASE filter can wrap the ActionRequest object   */
+      /* with a custom wrapper"                                               */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2AddlFilterTests_SPEC2_20_Action_filterWrapper1", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2AddlFilterTests_SPEC2_20_Action_filterWrapper2           */
+      /* Details: "An ACTION_PHASE filter can wrap the ActionResponse         */
+      /* object with a custom wrapper"                                        */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2AddlFilterTests_SPEC2_20_Action_filterWrapper2", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2AddlFilterTests_SPEC2_20_Action_filter2                  */
+      /* Details: "If the filter declaration specifies the <lifecycle> tag    */
+      /* value ACTION_PHASE, the ActionFilter.doFilter method is called"      */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2AddlFilterTests_SPEC2_20_Action_filter2", aurl);
+         tb.writeTo(writer);
+      }
+
+   }
+
+}

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_Event.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlFilterTests/src/main/java/javax/portlet/tck/portlets/AddlFilterTests_SPEC2_20_Event.java b/portlet-tck_3.0/V2AddlFilterTests/src/main/java/javax/portlet/tck/portlets/AddlFilterTests_SPEC2_20_Event.java
new file mode 100644
index 0000000..5568c38
--- /dev/null
+++ b/portlet-tck_3.0/V2AddlFilterTests/src/main/java/javax/portlet/tck/portlets/AddlFilterTests_SPEC2_20_Event.java
@@ -0,0 +1,253 @@
+/*  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_Event_event
+ *
+ */
+public class AddlFilterTests_SPEC2_20_Event implements Portlet, ResourceServingPortlet {
+   private static final String LOG_CLASS = 
+         AddlFilterTests_SPEC2_20_Event.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();
+
+      QName eventQName = new QName(TCKNAMESPACE,
+             "AddlFilterTests_SPEC2_20_Event");
+      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: V2AddlFilterTests_SPEC2_20_Event_filter1                   */
+      /* Details: "A filter declaration can be configured in the deployment   */
+      /* descriptor"                                                          */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2AddlFilterTests_SPEC2_20_Event_filter1", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2AddlFilterTests_SPEC2_20_Event_filter6                   */
+      /* Details: "A filter declaration can contain multiple <lifecycle>      */
+      /* tags for a single filter class"                                      */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2AddlFilterTests_SPEC2_20_Event_filter6", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2AddlFilterTests_SPEC2_20_Event_filter7                   */
+      /* Details: "The filter declaration can contain initialization          */
+      /* parameters which can be read by the filter through the               */
+      /* FilterConfig object"                                                 */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2AddlFilterTests_SPEC2_20_Event_filter7", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2AddlFilterTests_SPEC2_20_Event_filter8                   */
+      /* Details: "For each filter declaration, the filter instance must      */
+      /* receive all initialization parameters defined in the filter          */
+      /* declaration"                                                         */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2AddlFilterTests_SPEC2_20_Event_filter8", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2AddlFilterTests_SPEC2_20_Event_filter9                   */
+      /* Details: "For each filter declaration, the filter instance must      */
+      /* receive only initialization parameters defined in the filter         */
+      /* declaration"                                                         */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2AddlFilterTests_SPEC2_20_Event_filter9", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2AddlFilterTests_SPEC2_20_Event_filter10                  */
+      /* Details: "For multiple filter declarations for a single filter       */
+      /* class, the filter instance must receive all initialization           */
+      /* parameters defined in the filter declaration"                        */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2AddlFilterTests_SPEC2_20_Event_filter10", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2AddlFilterTests_SPEC2_20_Event_filter11                  */
+      /* Details: "For multiple filter declarations for a single filter       */
+      /* class, the filter instance must receive only initialization          */
+      /* parameters defined in the filter declaration"                        */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2AddlFilterTests_SPEC2_20_Event_filter11", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2AddlFilterTests_SPEC2_20_Event_filter12                  */
+      /* Details: "A filter class can appear in multiple filter               */
+      /* declarations"                                                        */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2AddlFilterTests_SPEC2_20_Event_filter12", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2AddlFilterTests_SPEC2_20_Event_filter13                  */
+      /* Details: "A filter declaration can be mapped to a portlet through    */
+      /* the deployment descriptor <filter-mapping> element"                  */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2AddlFilterTests_SPEC2_20_Event_filter13", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2AddlFilterTests_SPEC2_20_Event_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"                      */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2AddlFilterTests_SPEC2_20_Event_filter14", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2AddlFilterTests_SPEC2_20_Event_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"                                               */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2AddlFilterTests_SPEC2_20_Event_filter15", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2AddlFilterTests_SPEC2_20_Event_filterWrapper3            */
+      /* Details: "An EVENT_PHASE filter can wrap the EventRequest object     */
+      /* with a custom wrapper"                                               */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2AddlFilterTests_SPEC2_20_Event_filterWrapper3", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2AddlFilterTests_SPEC2_20_Event_filterWrapper4            */
+      /* Details: "An EVENT_PHASE filter can wrap the EventResponse object    */
+      /* with a custom wrapper"                                               */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2AddlFilterTests_SPEC2_20_Event_filterWrapper4", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2AddlFilterTests_SPEC2_20_Event_filter4                   */
+      /* Details: "If the filter declaration specifies the <lifecycle> tag    */
+      /* value EVENT_PHASE, the EventFilter.doFilter method is called"        */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2AddlFilterTests_SPEC2_20_Event_filter4", aurl);
+         tb.writeTo(writer);
+      }
+
+   }
+
+}

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_Event_event.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlFilterTests/src/main/java/javax/portlet/tck/portlets/AddlFilterTests_SPEC2_20_Event_event.java b/portlet-tck_3.0/V2AddlFilterTests/src/main/java/javax/portlet/tck/portlets/AddlFilterTests_SPEC2_20_Event_event.java
new file mode 100644
index 0000000..7f5b4e3
--- /dev/null
+++ b/portlet-tck_3.0/V2AddlFilterTests/src/main/java/javax/portlet/tck/portlets/AddlFilterTests_SPEC2_20_Event_event.java
@@ -0,0 +1,230 @@
+/*  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.constants.Constants.*;
+import static javax.portlet.tck.beans.JSR286SpecTestCaseDetails.*;
+import static javax.portlet.PortletSession.*;
+
+/**
+ * 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 AddlFilterTests_SPEC2_20_Event_event implements Portlet, EventPortlet, ResourceServingPortlet {
+   private static final String LOG_CLASS = 
+         AddlFilterTests_SPEC2_20_Event_event.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, "event companion processAction - ERROR!!");
+   }
+
+   @Override
+   public void serveResource(ResourceRequest portletReq, ResourceResponse portletResp)
+         throws PortletException, IOException {
+      LOGGER.entering(LOG_CLASS, "event companion serveResource - ERROR!!");
+   }
+
+   @Override
+   public void processEvent(EventRequest portletReq, EventResponse portletResp)
+         throws PortletException, IOException {
+      LOGGER.entering(LOG_CLASS, "event companion processEvent");
+
+
+      portletResp.setRenderParameters(portletReq);
+
+      long tid = Thread.currentThread().getId();
+      portletReq.setAttribute(THREADID_ATTR, tid);
+
+      StringWriter writer = new StringWriter();
+
+      JSR286SpecTestCaseDetails tcd = new JSR286SpecTestCaseDetails();
+
+      // Create result objects for the tests
+
+      /* TestCase: V2AddlFilterTests_SPEC2_20_Event_filter1                   */
+      /* Details: "A filter declaration can be configured in the deployment   */
+      /* descriptor"                                                          */
+      TestResult tr0 = tcd.getTestResultFailed(V2ADDLFILTERTESTS_SPEC2_20_EVENT_FILTER1);
+      /* TODO: implement test */
+      tr0.appendTcDetail("Not implemented.");
+      tr0.writeTo(writer);
+
+      /* TestCase: V2AddlFilterTests_SPEC2_20_Event_filter6                   */
+      /* Details: "A filter declaration can contain multiple <lifecycle>      */
+      /* tags for a single filter class"                                      */
+      TestResult tr1 = tcd.getTestResultFailed(V2ADDLFILTERTESTS_SPEC2_20_EVENT_FILTER6);
+      /* TODO: implement test */
+      tr1.appendTcDetail("Not implemented.");
+      tr1.writeTo(writer);
+
+      /* TestCase: V2AddlFilterTests_SPEC2_20_Event_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_EVENT_FILTER7);
+      /* TODO: implement test */
+      tr2.appendTcDetail("Not implemented.");
+      tr2.writeTo(writer);
+
+      /* TestCase: V2AddlFilterTests_SPEC2_20_Event_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_EVENT_FILTER8);
+      /* TODO: implement test */
+      tr3.appendTcDetail("Not implemented.");
+      tr3.writeTo(writer);
+
+      /* TestCase: V2AddlFilterTests_SPEC2_20_Event_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_EVENT_FILTER9);
+      /* TODO: implement test */
+      tr4.appendTcDetail("Not implemented.");
+      tr4.writeTo(writer);
+
+      /* TestCase: V2AddlFilterTests_SPEC2_20_Event_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_EVENT_FILTER10);
+      /* TODO: implement test */
+      tr5.appendTcDetail("Not implemented.");
+      tr5.writeTo(writer);
+
+      /* TestCase: V2AddlFilterTests_SPEC2_20_Event_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_EVENT_FILTER11);
+      /* TODO: implement test */
+      tr6.appendTcDetail("Not implemented.");
+      tr6.writeTo(writer);
+
+      /* TestCase: V2AddlFilterTests_SPEC2_20_Event_filter12                  */
+      /* Details: "A filter class can appear in multiple filter               */
+      /* declarations"                                                        */
+      TestResult tr7 = tcd.getTestResultFailed(V2ADDLFILTERTESTS_SPEC2_20_EVENT_FILTER12);
+      /* TODO: implement test */
+      tr7.appendTcDetail("Not implemented.");
+      tr7.writeTo(writer);
+
+      /* TestCase: V2AddlFilterTests_SPEC2_20_Event_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_EVENT_FILTER13);
+      /* TODO: implement test */
+      tr8.appendTcDetail("Not implemented.");
+      tr8.writeTo(writer);
+
+      /* TestCase: V2AddlFilterTests_SPEC2_20_Event_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_EVENT_FILTER14);
+      /* TODO: implement test */
+      tr9.appendTcDetail("Not implemented.");
+      tr9.writeTo(writer);
+
+      /* TestCase: V2AddlFilterTests_SPEC2_20_Event_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_EVENT_FILTER15);
+      /* TODO: implement test */
+      tr10.appendTcDetail("Not implemented.");
+      tr10.writeTo(writer);
+
+      /* TestCase: V2AddlFilterTests_SPEC2_20_Event_filterWrapper3            */
+      /* Details: "An EVENT_PHASE filter can wrap the EventRequest object     */
+      /* with a custom wrapper"                                               */
+      TestResult tr11 = tcd.getTestResultFailed(V2ADDLFILTERTESTS_SPEC2_20_EVENT_FILTERWRAPPER3);
+      /* TODO: implement test */
+      tr11.appendTcDetail("Not implemented.");
+      tr11.writeTo(writer);
+
+      /* TestCase: V2AddlFilterTests_SPEC2_20_Event_filterWrapper4            */
+      /* Details: "An EVENT_PHASE filter can wrap the EventResponse object    */
+      /* with a custom wrapper"                                               */
+      TestResult tr12 = tcd.getTestResultFailed(V2ADDLFILTERTESTS_SPEC2_20_EVENT_FILTERWRAPPER4);
+      /* TODO: implement test */
+      tr12.appendTcDetail("Not implemented.");
+      tr12.writeTo(writer);
+
+      /* TestCase: V2AddlFilterTests_SPEC2_20_Event_filter4                   */
+      /* Details: "If the filter declaration specifies the <lifecycle> tag    */
+      /* value EVENT_PHASE, the EventFilter.doFilter method is called"        */
+      TestResult tr13 = tcd.getTestResultFailed(V2ADDLFILTERTESTS_SPEC2_20_EVENT_FILTER4);
+      /* TODO: implement test */
+      tr13.appendTcDetail("Not implemented.");
+      tr13.writeTo(writer);
+
+      portletReq.getPortletSession().setAttribute(
+                   Constants.RESULT_ATTR_PREFIX + "AddlFilterTests_SPEC2_20_Event",
+                   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>AddlFilterTests_SPEC2_20_Event_event</p>\n");
+
+      String msg = (String) portletReq.getPortletSession()
+            .getAttribute(RESULT_ATTR_PREFIX + "AddlFilterTests_SPEC2_20_Event", APPLICATION_SCOPE);
+      msg = (msg==null) ? "Not ready. click test case link." : msg;
+      writer.write("<p>" + msg + "</p>\n");
+
+   }
+
+}

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/23a1c547/portlet-tck_3.0/V2AddlFilterTests/src/main/java/javax/portlet/tck/portlets/AddlFilterTests_SPEC2_20_PortletFilter.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlFilterTests/src/main/java/javax/portlet/tck/portlets/AddlFilterTests_SPEC2_20_PortletFilter.java b/portlet-tck_3.0/V2AddlFilterTests/src/main/java/javax/portlet/tck/portlets/AddlFilterTests_SPEC2_20_PortletFilter.java
deleted file mode 100644
index b631ac4..0000000
--- a/portlet-tck_3.0/V2AddlFilterTests/src/main/java/javax/portlet/tck/portlets/AddlFilterTests_SPEC2_20_PortletFilter.java
+++ /dev/null
@@ -1,258 +0,0 @@
-/*  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.IOException;
-import java.io.PrintWriter;
-
-import java.util.Enumeration;
-import java.util.Locale;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-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 static javax.portlet.tck.beans.JSR286SpecTestCaseDetails.*;
-import javax.portlet.tck.beans.TestResult;
-
-/**
- * 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.
- */
-public class AddlFilterTests_SPEC2_20_PortletFilter implements Portlet {
-   private static final String LOG_CLASS = 
-         AddlFilterTests_SPEC2_20_PortletFilter.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 actionRequest, ActionResponse actionResponse)
-         throws PortletException, IOException {
-   }
-
-   @Override
-   public void render(RenderRequest renderRequest, RenderResponse renderResponse)
-         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
-
-      /* TestCase: SPEC2_20_PortletFilter_filter1                             */
-      /* Details: "A filter declaration can be configured in the deployment   */
-      /* descriptor"                                                          */
-      TestResult tr0 = tcd.getTestResultFailed(SPEC2_20_PORTLETFILTER_FILTER1);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_20_PortletFilter_filter2                             */
-      /* Details: "If the filter declaration specifies the <lifecycle> tag    */
-      /* value ACTION_PHASE, the ActionFilter.doFilter method is called"      */
-      TestResult tr1 = tcd.getTestResultFailed(SPEC2_20_PORTLETFILTER_FILTER2);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_20_PortletFilter_filter3                             */
-      /* Details: "If the filter declaration specifies the <lifecycle> tag    */
-      /* value RENDER_PHASE, the RenderFilter.doFilter method is called"      */
-      TestResult tr2 = tcd.getTestResultFailed(SPEC2_20_PORTLETFILTER_FILTER3);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_20_PortletFilter_filter4                             */
-      /* Details: "If the filter declaration specifies the <lifecycle> tag    */
-      /* value EVENT_PHASE, the EventFilter.doFilter method is called"        */
-      TestResult tr3 = tcd.getTestResultFailed(SPEC2_20_PORTLETFILTER_FILTER4);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_20_PortletFilter_filter5                             */
-      /* Details: "If the filter declaration specifies the <lifecycle> tag    */
-      /* value RESOURCE_PHASE, the ResourceFilter.doFilter method is          */
-      /* called"                                                              */
-      TestResult tr4 = tcd.getTestResultFailed(SPEC2_20_PORTLETFILTER_FILTER5);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_20_PortletFilter_filter6                             */
-      /* Details: "A filter declaration can contain multiple <lifecycle>      */
-      /* tags for a single filter class"                                      */
-      TestResult tr5 = tcd.getTestResultFailed(SPEC2_20_PORTLETFILTER_FILTER6);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_20_PortletFilter_filter7                             */
-      /* Details: "The filter declaration can contain initialization          */
-      /* parameters which can be read by the filter through the               */
-      /* FilterConfig object"                                                 */
-      TestResult tr6 = tcd.getTestResultFailed(SPEC2_20_PORTLETFILTER_FILTER7);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_20_PortletFilter_filter8                             */
-      /* Details: "For each filter declaration, the filter instance must      */
-      /* receive all initialization parameters defined in the filter          */
-      /* declaration"                                                         */
-      TestResult tr7 = tcd.getTestResultFailed(SPEC2_20_PORTLETFILTER_FILTER8);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_20_PortletFilter_filter9                             */
-      /* Details: "For each filter declaration, the filter instance must      */
-      /* receive only initialization parameters defined in the filter         */
-      /* declaration"                                                         */
-      TestResult tr8 = tcd.getTestResultFailed(SPEC2_20_PORTLETFILTER_FILTER9);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_20_PortletFilter_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 tr9 = tcd.getTestResultFailed(SPEC2_20_PORTLETFILTER_FILTER10);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_20_PortletFilter_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 tr10 = tcd.getTestResultFailed(SPEC2_20_PORTLETFILTER_FILTER11);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_20_PortletFilter_filter12                            */
-      /* Details: "A filter class can appear in multiple filter               */
-      /* declarations, and is instantiated once for each filter declaration   */
-      /* in which it appears"                                                 */
-      TestResult tr11 = tcd.getTestResultFailed(SPEC2_20_PORTLETFILTER_FILTER12);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_20_PortletFilter_filter13                            */
-      /* Details: "A filter declaration can be mapped to a portlet through    */
-      /* the deployment descriptor <filter-mapping> element"                  */
-      TestResult tr12 = tcd.getTestResultFailed(SPEC2_20_PORTLETFILTER_FILTER13);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_20_PortletFilter_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 tr13 = tcd.getTestResultFailed(SPEC2_20_PORTLETFILTER_FILTER14);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_20_PortletFilter_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 tr14 = tcd.getTestResultFailed(SPEC2_20_PORTLETFILTER_FILTER15);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_20_PortletFilter_filterWrapper1                      */
-      /* Details: "An ACTION_PHASE filter can wrap the ActionRequest object   */
-      /* with a custom wrapper"                                               */
-      TestResult tr15 = tcd.getTestResultFailed(SPEC2_20_PORTLETFILTER_FILTERWRAPPER1);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_20_PortletFilter_filterWrapper2                      */
-      /* Details: "An ACTION_PHASE filter can wrap the ActionResponse         */
-      /* object with a custom wrapper"                                        */
-      TestResult tr16 = tcd.getTestResultFailed(SPEC2_20_PORTLETFILTER_FILTERWRAPPER2);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_20_PortletFilter_filterWrapper3                      */
-      /* Details: "An EVENT_PHASE filter can wrap the EventRequest object     */
-      /* with a custom wrapper"                                               */
-      TestResult tr17 = tcd.getTestResultFailed(SPEC2_20_PORTLETFILTER_FILTERWRAPPER3);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_20_PortletFilter_filterWrapper4                      */
-      /* Details: "An EVENT_PHASE filter can wrap the EventResponse object    */
-      /* with a custom wrapper"                                               */
-      TestResult tr18 = tcd.getTestResultFailed(SPEC2_20_PORTLETFILTER_FILTERWRAPPER4);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_20_PortletFilter_filterWrapper5                      */
-      /* Details: "An RENDER_PHASE filter can wrap the RenderRequest object   */
-      /* with a custom wrapper"                                               */
-      TestResult tr19 = tcd.getTestResultFailed(SPEC2_20_PORTLETFILTER_FILTERWRAPPER5);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_20_PortletFilter_filterWrapper6                      */
-      /* Details: "An RENDER_PHASE filter can wrap the RenderResponse         */
-      /* object with a custom wrapper"                                        */
-      TestResult tr20 = tcd.getTestResultFailed(SPEC2_20_PORTLETFILTER_FILTERWRAPPER6);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_20_PortletFilter_filterWrapper7                      */
-      /* Details: "An RESOURCE_PHASE filter can wrap the ResourceRequest      */
-      /* object with a custom wrapper"                                        */
-      TestResult tr21 = tcd.getTestResultFailed(SPEC2_20_PORTLETFILTER_FILTERWRAPPER7);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_20_PortletFilter_filterWrapper8                      */
-      /* Details: "An RESOURCE_PHASE filter can wrap the ResourceResponse     */
-      /* object with a custom wrapper"                                        */
-      TestResult tr22 = tcd.getTestResultFailed(SPEC2_20_PORTLETFILTER_FILTERWRAPPER8);
-      /* 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);
-
-
-   }
-
-}
-

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_Render.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlFilterTests/src/main/java/javax/portlet/tck/portlets/AddlFilterTests_SPEC2_20_Render.java b/portlet-tck_3.0/V2AddlFilterTests/src/main/java/javax/portlet/tck/portlets/AddlFilterTests_SPEC2_20_Render.java
new file mode 100644
index 0000000..4c1996a
--- /dev/null
+++ b/portlet-tck_3.0/V2AddlFilterTests/src/main/java/javax/portlet/tck/portlets/AddlFilterTests_SPEC2_20_Render.java
@@ -0,0 +1,226 @@
+/*  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_Render_event
+ *
+ */
+public class AddlFilterTests_SPEC2_20_Render implements Portlet, ResourceServingPortlet {
+   private static final String LOG_CLASS = 
+         AddlFilterTests_SPEC2_20_Render.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();
+
+   }
+
+   @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();
+
+      JSR286SpecTestCaseDetails tcd = new JSR286SpecTestCaseDetails();
+
+      // Create result objects for the tests
+
+      /* TestCase: V2AddlFilterTests_SPEC2_20_Render_filter1                  */
+      /* Details: "A filter declaration can be configured in the deployment   */
+      /* descriptor"                                                          */
+      TestResult tr0 = tcd.getTestResultFailed(V2ADDLFILTERTESTS_SPEC2_20_RENDER_FILTER1);
+      /* TODO: implement test */
+      tr0.appendTcDetail("Not implemented.");
+      tr0.writeTo(writer);
+
+      /* TestCase: V2AddlFilterTests_SPEC2_20_Render_filter6                  */
+      /* Details: "A filter declaration can contain multiple <lifecycle>      */
+      /* tags for a single filter class"                                      */
+      TestResult tr1 = tcd.getTestResultFailed(V2ADDLFILTERTESTS_SPEC2_20_RENDER_FILTER6);
+      /* TODO: implement test */
+      tr1.appendTcDetail("Not implemented.");
+      tr1.writeTo(writer);
+
+      /* TestCase: V2AddlFilterTests_SPEC2_20_Render_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_RENDER_FILTER7);
+      /* TODO: implement test */
+      tr2.appendTcDetail("Not implemented.");
+      tr2.writeTo(writer);
+
+      /* TestCase: V2AddlFilterTests_SPEC2_20_Render_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_RENDER_FILTER8);
+      /* TODO: implement test */
+      tr3.appendTcDetail("Not implemented.");
+      tr3.writeTo(writer);
+
+      /* TestCase: V2AddlFilterTests_SPEC2_20_Render_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_RENDER_FILTER9);
+      /* TODO: implement test */
+      tr4.appendTcDetail("Not implemented.");
+      tr4.writeTo(writer);
+
+      /* TestCase: V2AddlFilterTests_SPEC2_20_Render_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_RENDER_FILTER10);
+      /* TODO: implement test */
+      tr5.appendTcDetail("Not implemented.");
+      tr5.writeTo(writer);
+
+      /* TestCase: V2AddlFilterTests_SPEC2_20_Render_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_RENDER_FILTER11);
+      /* TODO: implement test */
+      tr6.appendTcDetail("Not implemented.");
+      tr6.writeTo(writer);
+
+      /* TestCase: V2AddlFilterTests_SPEC2_20_Render_filter12                 */
+      /* Details: "A filter class can appear in multiple filter               */
+      /* declarations"                                                        */
+      TestResult tr7 = tcd.getTestResultFailed(V2ADDLFILTERTESTS_SPEC2_20_RENDER_FILTER12);
+      /* TODO: implement test */
+      tr7.appendTcDetail("Not implemented.");
+      tr7.writeTo(writer);
+
+      /* TestCase: V2AddlFilterTests_SPEC2_20_Render_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_RENDER_FILTER13);
+      /* TODO: implement test */
+      tr8.appendTcDetail("Not implemented.");
+      tr8.writeTo(writer);
+
+      /* TestCase: V2AddlFilterTests_SPEC2_20_Render_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_RENDER_FILTER14);
+      /* TODO: implement test */
+      tr9.appendTcDetail("Not implemented.");
+      tr9.writeTo(writer);
+
+      /* TestCase: V2AddlFilterTests_SPEC2_20_Render_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_RENDER_FILTER15);
+      /* TODO: implement test */
+      tr10.appendTcDetail("Not implemented.");
+      tr10.writeTo(writer);
+
+      /* TestCase: V2AddlFilterTests_SPEC2_20_Render_filterWrapper5           */
+      /* Details: "An RENDER_PHASE filter can wrap the RenderRequest object   */
+      /* with a custom wrapper"                                               */
+      TestResult tr11 = tcd.getTestResultFailed(V2ADDLFILTERTESTS_SPEC2_20_RENDER_FILTERWRAPPER5);
+      /* TODO: implement test */
+      tr11.appendTcDetail("Not implemented.");
+      tr11.writeTo(writer);
+
+      /* TestCase: V2AddlFilterTests_SPEC2_20_Render_filterWrapper6           */
+      /* Details: "An RENDER_PHASE filter can wrap the RenderResponse         */
+      /* object with a custom wrapper"                                        */
+      TestResult tr12 = tcd.getTestResultFailed(V2ADDLFILTERTESTS_SPEC2_20_RENDER_FILTERWRAPPER6);
+      /* TODO: implement test */
+      tr12.appendTcDetail("Not implemented.");
+      tr12.writeTo(writer);
+
+      /* TestCase: V2AddlFilterTests_SPEC2_20_Render_filter3                  */
+      /* Details: "If the filter declaration specifies the <lifecycle> tag    */
+      /* value RENDER_PHASE, the RenderFilter.doFilter method is called"      */
+      TestResult tr13 = tcd.getTestResultFailed(V2ADDLFILTERTESTS_SPEC2_20_RENDER_FILTER3);
+      /* TODO: implement test */
+      tr13.appendTcDetail("Not implemented.");
+      tr13.writeTo(writer);
+
+   }
+
+}


[10/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.

Posted by ms...@apache.org.
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/23a1c547/portlet-tck_3.0/V2AddlRequestTests/src/main/java/javax/portlet/tck/portlets/AddlRequestTests_SPEC2_11_ResourceReq.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlRequestTests/src/main/java/javax/portlet/tck/portlets/AddlRequestTests_SPEC2_11_ResourceReq.java b/portlet-tck_3.0/V2AddlRequestTests/src/main/java/javax/portlet/tck/portlets/AddlRequestTests_SPEC2_11_ResourceReq.java
new file mode 100644
index 0000000..ad002b8
--- /dev/null
+++ b/portlet-tck_3.0/V2AddlRequestTests/src/main/java/javax/portlet/tck/portlets/AddlRequestTests_SPEC2_11_ResourceReq.java
@@ -0,0 +1,189 @@
+/*  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 AddlRequestTests_SPEC2_11_ResourceReq_event
+ *
+ */
+public class AddlRequestTests_SPEC2_11_ResourceReq implements Portlet, ResourceServingPortlet {
+   private static final String LOG_CLASS = 
+         AddlRequestTests_SPEC2_11_ResourceReq.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: V2AddlRequestTests_SPEC2_11_ResourceReq_contentType1       */
+      /* Details: "The getResponseContentType method returns a String         */
+      /* representing the default content type the portlet container          */
+      /* assumes for the output"                                              */
+      TestResult tr0 = tcd.getTestResultFailed(V2ADDLREQUESTTESTS_SPEC2_11_RESOURCEREQ_CONTENTTYPE1);
+      /* TODO: implement test */
+      tr0.appendTcDetail("Not implemented.");
+      tr0.writeTo(writer);
+
+      /* TestCase: V2AddlRequestTests_SPEC2_11_ResourceReq_contentType2       */
+      /* Details: "The getResponseContentTypes method returns an              */
+      /* Enumeration of String elements representing the acceptable content   */
+      /* types for the output in order of preference"                         */
+      TestResult tr1 = tcd.getTestResultFailed(V2ADDLREQUESTTESTS_SPEC2_11_RESOURCEREQ_CONTENTTYPE2);
+      /* TODO: implement test */
+      tr1.appendTcDetail("Not implemented.");
+      tr1.writeTo(writer);
+
+      /* TestCase: V2AddlRequestTests_SPEC2_11_ResourceReq_contentType3       */
+      /* Details: "The first element of the Enumeration returned by the       */
+      /* getResponseContentTypes method must equal the value returned by      */
+      /* the getResponseContentType method"                                   */
+      TestResult tr2 = tcd.getTestResultFailed(V2ADDLREQUESTTESTS_SPEC2_11_RESOURCEREQ_CONTENTTYPE3);
+      /* TODO: implement test */
+      tr2.appendTcDetail("Not implemented.");
+      tr2.writeTo(writer);
+
+      /* TestCase: V2AddlRequestTests_SPEC2_11_ResourceReq_contentType4       */
+      /* Details: "If a portlet defines support for all content types using   */
+      /* a wildcard and the portlet container supports all content types,     */
+      /* the getResponseContentType may return the wildcard"                  */
+      TestResult tr3 = tcd.getTestResultFailed(V2ADDLREQUESTTESTS_SPEC2_11_RESOURCEREQ_CONTENTTYPE4);
+      /* TODO: implement test */
+      tr3.appendTcDetail("Not implemented.");
+      tr3.writeTo(writer);
+
+      /* TestCase: V2AddlRequestTests_SPEC2_11_ResourceReq_contentType5       */
+      /* Details: "If a portlet defines support for all content types using   */
+      /* a wildcard and the portlet container supports all content types,     */
+      /* the getResponseContentType may return the preferred content type"    */
+      TestResult tr4 = tcd.getTestResultFailed(V2ADDLREQUESTTESTS_SPEC2_11_RESOURCEREQ_CONTENTTYPE5);
+      /* TODO: implement test */
+      tr4.appendTcDetail("Not implemented.");
+      tr4.writeTo(writer);
+
+      /* TestCase: V2AddlRequestTests_SPEC2_11_ResourceReq_windowId4          */
+      /* Details: "The string returned by getWindowID method must be the      */
+      /* same ID used for scoping portlet-scope session attributes"           */
+      TestResult tr5 = tcd.getTestResultFailed(V2ADDLREQUESTTESTS_SPEC2_11_RESOURCEREQ_WINDOWID4);
+      /* TODO: implement test */
+      tr5.appendTcDetail("Not implemented.");
+      tr5.writeTo(writer);
+
+      /* TestCase: V2AddlRequestTests_SPEC2_11_ResourceReq_contentType12      */
+      /* Details: "Within the serveResource method, the content type should   */
+      /* be based on the HTTP Accept header provided by the client"           */
+      TestResult tr6 = tcd.getTestResultFailed(V2ADDLREQUESTTESTS_SPEC2_11_RESOURCEREQ_CONTENTTYPE12);
+      /* TODO: implement test */
+      tr6.appendTcDetail("Not implemented.");
+      tr6.writeTo(writer);
+
+      /* TestCase: V2AddlRequestTests_SPEC2_11_ResourceReq_contentType13      */
+      /* Details: "The character set of the response can be retrieved via     */
+      /* the RenderResponse.getCharacterEncoding method"                      */
+      TestResult tr7 = tcd.getTestResultFailed(V2ADDLREQUESTTESTS_SPEC2_11_RESOURCEREQ_CONTENTTYPE13);
+      /* TODO: implement test */
+      tr7.appendTcDetail("Not implemented.");
+      tr7.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=\"AddlRequestTests_SPEC2_11_ResourceReq\">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(\"AddlRequestTests_SPEC2_11_ResourceReq\").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/V2AddlRequestTests/src/main/resources/xml-resources/additionalTCs.xml
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlRequestTests/src/main/resources/xml-resources/additionalTCs.xml b/portlet-tck_3.0/V2AddlRequestTests/src/main/resources/xml-resources/additionalTCs.xml
index dcddbdc..ff193b9 100644
--- a/portlet-tck_3.0/V2AddlRequestTests/src/main/resources/xml-resources/additionalTCs.xml
+++ b/portlet-tck_3.0/V2AddlRequestTests/src/main/resources/xml-resources/additionalTCs.xml
@@ -17,62 +17,96 @@
     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 AddlRequestTests test case names and page mappings -->
-<entry key="SPEC2_11_RequestParamsProps_parameters1">V2AddlRequestTests</entry>
-<entry key="SPEC2_11_RequestParamsProps_parameters2">V2AddlRequestTests</entry>
-<entry key="SPEC2_11_RequestParamsProps_parameters6">V2AddlRequestTests</entry>
-<entry key="SPEC2_11_RequestParamsProps_parameters8">V2AddlRequestTests</entry>
-<entry key="SPEC2_11_RequestParamsProps_parameters9">V2AddlRequestTests</entry>
-<entry key="SPEC2_11_RequestParamsProps_parameters10">V2AddlRequestTests</entry>
-<entry key="SPEC2_11_RequestParamsProps_parameters11">V2AddlRequestTests</entry>
-<entry key="SPEC2_11_RequestParamsProps_parameters12">V2AddlRequestTests</entry>
-<entry key="SPEC2_11_RequestParamsProps_parameters13">V2AddlRequestTests</entry>
-<entry key="SPEC2_11_RequestParamsProps_parameters15">V2AddlRequestTests</entry>
-<entry key="SPEC2_11_RequestParamsProps_parameters17">V2AddlRequestTests</entry>
-<entry key="SPEC2_11_RequestPRP_publicRenderParameters1">V2AddlRequestTests</entry>
-<entry key="SPEC2_11_RequestPRP_publicRenderParameters2">V2AddlRequestTests</entry>
-<entry key="SPEC2_11_RequestPRP_publicRenderParameters4">V2AddlRequestTests</entry>
-<entry key="SPEC2_11_RequestPRP_publicRenderParameters5">V2AddlRequestTests</entry>
-<entry key="SPEC2_11_RequestPRP_publicRenderParameters6">V2AddlRequestTests</entry>
-<entry key="SPEC2_11_RequestPRP_publicRenderParameters7">V2AddlRequestTests</entry>
-<entry key="SPEC2_11_RequestPRP_publicRenderParameters8">V2AddlRequestTests</entry>
-<entry key="SPEC2_11_RequestPRP_publicRenderParameters9">V2AddlRequestTests</entry>
-<entry key="SPEC2_11_RequestPRP_publicRenderParameters10">V2AddlRequestTests</entry>
-<entry key="SPEC2_11_RequestPRP_publicRenderParameters11">V2AddlRequestTests</entry>
-<entry key="SPEC2_11_RequestPRP_publicRenderParameters12">V2AddlRequestTests</entry>
-<entry key="SPEC2_11_RequestPRP_publicRenderParameters13">V2AddlRequestTests</entry>
-<entry key="SPEC2_11_RequestPRP_publicRenderParameters15">V2AddlRequestTests</entry>
-<entry key="SPEC2_11_RequestPRP_publicRenderParameters16">V2AddlRequestTests</entry>
-<entry key="SPEC2_11_Request_attributes1">V2AddlRequestTests</entry>
-<entry key="SPEC2_11_Request_attributes2">V2AddlRequestTests</entry>
-<entry key="SPEC2_11_Request_attributes3">V2AddlRequestTests</entry>
-<entry key="SPEC2_11_Request_attributes4">V2AddlRequestTests</entry>
-<entry key="SPEC2_11_Request_attributes5">V2AddlRequestTests</entry>
-<entry key="SPEC2_11_Request_attributes6">V2AddlRequestTests</entry>
-<entry key="SPEC2_11_Request_attributes7">V2AddlRequestTests</entry>
-<entry key="SPEC2_11_Request_attributes8">V2AddlRequestTests</entry>
-<entry key="SPEC2_11_Request_attributes9">V2AddlRequestTests</entry>
-<entry key="SPEC2_11_Request_contentType1">V2AddlRequestTests</entry>
-<entry key="SPEC2_11_Request_contentType2">V2AddlRequestTests</entry>
-<entry key="SPEC2_11_Request_contentType3">V2AddlRequestTests</entry>
-<entry key="SPEC2_11_Request_contentType4">V2AddlRequestTests</entry>
-<entry key="SPEC2_11_Request_contentType5">V2AddlRequestTests</entry>
-<entry key="SPEC2_11_Request_contentType6">V2AddlRequestTests</entry>
-<entry key="SPEC2_11_Request_contentType7">V2AddlRequestTests</entry>
-<entry key="SPEC2_11_Request_contentType8">V2AddlRequestTests</entry>
-<entry key="SPEC2_11_Request_contentType9">V2AddlRequestTests</entry>
-<entry key="SPEC2_11_Request_contentType10">V2AddlRequestTests</entry>
-<entry key="SPEC2_11_Request_contentType11">V2AddlRequestTests</entry>
-<entry key="SPEC2_11_Request_contentType12">V2AddlRequestTests</entry>
-<entry key="SPEC2_11_Request_contentType13">V2AddlRequestTests</entry>
-<entry key="SPEC2_11_Request_windowId4">V2AddlRequestTests</entry>
-
+<entry key="V2AddlRequestTests_SPEC2_11_Action_parameters1">V2AddlRequestTests</entry>
+<entry key="V2AddlRequestTests_SPEC2_11_Action_parameters2">V2AddlRequestTests</entry>
+<entry key="V2AddlRequestTests_SPEC2_11_Action_parameters6">V2AddlRequestTests</entry>
+<entry key="V2AddlRequestTests_SPEC2_11_Action_parameters8">V2AddlRequestTests</entry>
+<entry key="V2AddlRequestTests_SPEC2_11_Action_parameters9">V2AddlRequestTests</entry>
+<entry key="V2AddlRequestTests_SPEC2_11_Action_publicRenderParameters15">V2AddlRequestTests</entry>
+<entry key="V2AddlRequestTests_SPEC2_11_Action_publicRenderParameters16">V2AddlRequestTests</entry>
+<entry key="V2AddlRequestTests_SPEC2_11_Action_publicRenderParameters4">V2AddlRequestTests</entry>
+<entry key="V2AddlRequestTests_SPEC2_11_Action_publicRenderParameters11">V2AddlRequestTests</entry>
+<entry key="V2AddlRequestTests_SPEC2_11_Event_parameters1">V2AddlRequestTests</entry>
+<entry key="V2AddlRequestTests_SPEC2_11_Event_parameters2">V2AddlRequestTests</entry>
+<entry key="V2AddlRequestTests_SPEC2_11_Event_parameters6">V2AddlRequestTests</entry>
+<entry key="V2AddlRequestTests_SPEC2_11_Event_parameters12">V2AddlRequestTests</entry>
+<entry key="V2AddlRequestTests_SPEC2_11_Event_publicRenderParameters15">V2AddlRequestTests</entry>
+<entry key="V2AddlRequestTests_SPEC2_11_Event_publicRenderParameters16">V2AddlRequestTests</entry>
+<entry key="V2AddlRequestTests_SPEC2_11_Event_publicRenderParameters5">V2AddlRequestTests</entry>
+<entry key="V2AddlRequestTests_SPEC2_11_Render_parameters10">V2AddlRequestTests</entry>
+<entry key="V2AddlRequestTests_SPEC2_11_Render_parameters11">V2AddlRequestTests</entry>
+<entry key="V2AddlRequestTests_SPEC2_11_Render_parameters13">V2AddlRequestTests</entry>
+<entry key="V2AddlRequestTests_SPEC2_11_Render_parameters15">V2AddlRequestTests</entry>
+<entry key="V2AddlRequestTests_SPEC2_11_Render_parameters1">V2AddlRequestTests</entry>
+<entry key="V2AddlRequestTests_SPEC2_11_Render_parameters2">V2AddlRequestTests</entry>
+<entry key="V2AddlRequestTests_SPEC2_11_Render_parameters6">V2AddlRequestTests</entry>
+<entry key="V2AddlRequestTests_SPEC2_11_Render_publicRenderParameters15">V2AddlRequestTests</entry>
+<entry key="V2AddlRequestTests_SPEC2_11_Render_publicRenderParameters16">V2AddlRequestTests</entry>
+<entry key="V2AddlRequestTests_SPEC2_11_Render_publicRenderParameters1">V2AddlRequestTests</entry>
+<entry key="V2AddlRequestTests_SPEC2_11_Render_publicRenderParameters2">V2AddlRequestTests</entry>
+<entry key="V2AddlRequestTests_SPEC2_11_Render_publicRenderParameters6">V2AddlRequestTests</entry>
+<entry key="V2AddlRequestTests_SPEC2_11_Render_publicRenderParameters13">V2AddlRequestTests</entry>
+<entry key="V2AddlRequestTests_SPEC2_11_Render_publicRenderParameters13a">V2AddlRequestTests</entry>
+<entry key="V2AddlRequestTests_SPEC2_11_Resource_parameters1">V2AddlRequestTests</entry>
+<entry key="V2AddlRequestTests_SPEC2_11_Resource_parameters2">V2AddlRequestTests</entry>
+<entry key="V2AddlRequestTests_SPEC2_11_Resource_parameters6">V2AddlRequestTests</entry>
+<entry key="V2AddlRequestTests_SPEC2_11_Resource_parameters17">V2AddlRequestTests</entry>
+<entry key="V2AddlRequestTests_SPEC2_11_Resource_publicRenderParameters15">V2AddlRequestTests</entry>
+<entry key="V2AddlRequestTests_SPEC2_11_Resource_publicRenderParameters16">V2AddlRequestTests</entry>
+<entry key="V2AddlRequestTests_SPEC2_11_Resource_publicRenderParameters7">V2AddlRequestTests</entry>
+<entry key="V2AddlRequestTests_SPEC2_11_Resource_publicRenderParameters12">V2AddlRequestTests</entry>
+<entry key="V2AddlRequestTests_SPEC2_11_RenderPRP_publicRenderParameters8">V2AddlRequestTests</entry>
+<entry key="V2AddlRequestTests_SPEC2_11_RenderPRP_publicRenderParameters9">V2AddlRequestTests</entry>
+<entry key="V2AddlRequestTests_SPEC2_11_RenderPRP_publicRenderParameters10">V2AddlRequestTests</entry>
+<entry key="V2AddlRequestTests_SPEC2_11_RenderAttr_attributes1">V2AddlRequestTests</entry>
+<entry key="V2AddlRequestTests_SPEC2_11_RenderAttr_attributes2">V2AddlRequestTests</entry>
+<entry key="V2AddlRequestTests_SPEC2_11_RenderAttr_attributes3">V2AddlRequestTests</entry>
+<entry key="V2AddlRequestTests_SPEC2_11_RenderAttr_attributes4">V2AddlRequestTests</entry>
+<entry key="V2AddlRequestTests_SPEC2_11_RenderAttr_attributes5">V2AddlRequestTests</entry>
+<entry key="V2AddlRequestTests_SPEC2_11_RenderAttr_attributes8">V2AddlRequestTests</entry>
+<entry key="V2AddlRequestTests_SPEC2_11_ActionAttr_attributes1">V2AddlRequestTests</entry>
+<entry key="V2AddlRequestTests_SPEC2_11_ActionAttr_attributes2">V2AddlRequestTests</entry>
+<entry key="V2AddlRequestTests_SPEC2_11_ActionAttr_attributes6">V2AddlRequestTests</entry>
+<entry key="V2AddlRequestTests_SPEC2_11_EventAttr_attributes1">V2AddlRequestTests</entry>
+<entry key="V2AddlRequestTests_SPEC2_11_EventAttr_attributes2">V2AddlRequestTests</entry>
+<entry key="V2AddlRequestTests_SPEC2_11_EventAttr_attributes7">V2AddlRequestTests</entry>
+<entry key="V2AddlRequestTests_SPEC2_11_ResourceAttr_attributes1">V2AddlRequestTests</entry>
+<entry key="V2AddlRequestTests_SPEC2_11_ResourceAttr_attributes2">V2AddlRequestTests</entry>
+<entry key="V2AddlRequestTests_SPEC2_11_ResourceAttr_attributes9">V2AddlRequestTests</entry>
+<entry key="V2AddlRequestTests_SPEC2_11_ActionReq_contentType1">V2AddlRequestTests</entry>
+<entry key="V2AddlRequestTests_SPEC2_11_ActionReq_contentType2">V2AddlRequestTests</entry>
+<entry key="V2AddlRequestTests_SPEC2_11_ActionReq_contentType3">V2AddlRequestTests</entry>
+<entry key="V2AddlRequestTests_SPEC2_11_ActionReq_contentType4">V2AddlRequestTests</entry>
+<entry key="V2AddlRequestTests_SPEC2_11_ActionReq_contentType5">V2AddlRequestTests</entry>
+<entry key="V2AddlRequestTests_SPEC2_11_ActionReq_windowId4">V2AddlRequestTests</entry>
+<entry key="V2AddlRequestTests_SPEC2_11_ActionReq_contentType6">V2AddlRequestTests</entry>
+<entry key="V2AddlRequestTests_SPEC2_11_ActionReq_contentType7">V2AddlRequestTests</entry>
+<entry key="V2AddlRequestTests_SPEC2_11_EventReq_contentType1">V2AddlRequestTests</entry>
+<entry key="V2AddlRequestTests_SPEC2_11_EventReq_contentType2">V2AddlRequestTests</entry>
+<entry key="V2AddlRequestTests_SPEC2_11_EventReq_contentType3">V2AddlRequestTests</entry>
+<entry key="V2AddlRequestTests_SPEC2_11_EventReq_contentType4">V2AddlRequestTests</entry>
+<entry key="V2AddlRequestTests_SPEC2_11_EventReq_contentType5">V2AddlRequestTests</entry>
+<entry key="V2AddlRequestTests_SPEC2_11_EventReq_windowId4">V2AddlRequestTests</entry>
+<entry key="V2AddlRequestTests_SPEC2_11_EventReq_contentType8">V2AddlRequestTests</entry>
+<entry key="V2AddlRequestTests_SPEC2_11_EventReq_contentType9">V2AddlRequestTests</entry>
+<entry key="V2AddlRequestTests_SPEC2_11_RenderReq_contentType1">V2AddlRequestTests</entry>
+<entry key="V2AddlRequestTests_SPEC2_11_RenderReq_contentType2">V2AddlRequestTests</entry>
+<entry key="V2AddlRequestTests_SPEC2_11_RenderReq_contentType3">V2AddlRequestTests</entry>
+<entry key="V2AddlRequestTests_SPEC2_11_RenderReq_contentType4">V2AddlRequestTests</entry>
+<entry key="V2AddlRequestTests_SPEC2_11_RenderReq_contentType5">V2AddlRequestTests</entry>
+<entry key="V2AddlRequestTests_SPEC2_11_RenderReq_windowId4">V2AddlRequestTests</entry>
+<entry key="V2AddlRequestTests_SPEC2_11_RenderReq_contentType10">V2AddlRequestTests</entry>
+<entry key="V2AddlRequestTests_SPEC2_11_RenderReq_contentType11">V2AddlRequestTests</entry>
+<entry key="V2AddlRequestTests_SPEC2_11_RenderReq_contentType13">V2AddlRequestTests</entry>
+<entry key="V2AddlRequestTests_SPEC2_11_ResourceReq_contentType1">V2AddlRequestTests</entry>
+<entry key="V2AddlRequestTests_SPEC2_11_ResourceReq_contentType2">V2AddlRequestTests</entry>
+<entry key="V2AddlRequestTests_SPEC2_11_ResourceReq_contentType3">V2AddlRequestTests</entry>
+<entry key="V2AddlRequestTests_SPEC2_11_ResourceReq_contentType4">V2AddlRequestTests</entry>
+<entry key="V2AddlRequestTests_SPEC2_11_ResourceReq_contentType5">V2AddlRequestTests</entry>
+<entry key="V2AddlRequestTests_SPEC2_11_ResourceReq_windowId4">V2AddlRequestTests</entry>
+<entry key="V2AddlRequestTests_SPEC2_11_ResourceReq_contentType12">V2AddlRequestTests</entry>
+<entry key="V2AddlRequestTests_SPEC2_11_ResourceReq_contentType13">V2AddlRequestTests</entry>
 </properties>

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/23a1c547/portlet-tck_3.0/V2AddlRequestTests/src/main/webapp/WEB-INF/portlet.xml
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlRequestTests/src/main/webapp/WEB-INF/portlet.xml b/portlet-tck_3.0/V2AddlRequestTests/src/main/webapp/WEB-INF/portlet.xml
index 0b557a9..c42c01f 100644
--- a/portlet-tck_3.0/V2AddlRequestTests/src/main/webapp/WEB-INF/portlet.xml
+++ b/portlet-tck_3.0/V2AddlRequestTests/src/main/webapp/WEB-INF/portlet.xml
@@ -20,74 +20,271 @@
 <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-AddlRequestTests">
-
+   xmlns:tck="http://www.apache.org/portals/pluto/portlet-tck_3.0"
+   version="2.0" id="V2AddlRequestTests">
    <portlet>
-      <portlet-name>AddlRequestTests_SPEC2_11_RequestParamsProps</portlet-name>
-      <portlet-class>javax.portlet.tck.portlets.AddlRequestTests_SPEC2_11_RequestParamsProps</portlet-class>
-
-      <init-param>
-         <name>TestParameter</name>
-         <value>TestValue</value>
-      </init-param>
-
+      <portlet-name>AddlRequestTests_SPEC2_11_Action</portlet-name>
+      <portlet-class>javax.portlet.tck.portlets.AddlRequestTests_SPEC2_11_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>AddlRequestTests_SPEC2_11_Action</title>
+      </portlet-info>
+   </portlet>
 
+   <portlet>
+      <portlet-name>AddlRequestTests_SPEC2_11_Event</portlet-name>
+      <portlet-class>javax.portlet.tck.portlets.AddlRequestTests_SPEC2_11_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>AddlRequestTests_SPEC2_11_Event</title>
+      </portlet-info>
+      <supported-publishing-event>
+         <qname>tck:AddlRequestTests_SPEC2_11_Event</qname>
+      </supported-publishing-event>
+   </portlet>
 
+   <portlet>
+      <portlet-name>AddlRequestTests_SPEC2_11_Event_event</portlet-name>
+      <portlet-class>javax.portlet.tck.portlets.AddlRequestTests_SPEC2_11_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>AddlRequestTests_SPEC2_11_Event_event</title>
+      </portlet-info>
+      <supported-processing-event>
+         <qname>tck:AddlRequestTests_SPEC2_11_Event</qname>
+      </supported-processing-event>
+   </portlet>
 
+   <portlet>
+      <portlet-name>AddlRequestTests_SPEC2_11_Render</portlet-name>
+      <portlet-class>javax.portlet.tck.portlets.AddlRequestTests_SPEC2_11_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>AddlRequestTests_SPEC2_11_RequestParamsProps</title>
+         <title>AddlRequestTests_SPEC2_11_Render</title>
       </portlet-info>
    </portlet>
 
    <portlet>
-      <portlet-name>AddlRequestTests_SPEC2_11_RequestPRP</portlet-name>
-      <portlet-class>javax.portlet.tck.portlets.AddlRequestTests_SPEC2_11_RequestPRP</portlet-class>
+      <portlet-name>AddlRequestTests_SPEC2_11_Resource</portlet-name>
+      <portlet-class>javax.portlet.tck.portlets.AddlRequestTests_SPEC2_11_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>AddlRequestTests_SPEC2_11_Resource</title>
+      </portlet-info>
+   </portlet>
 
-      <init-param>
-         <name>TestParameter</name>
-         <value>TestValue</value>
-      </init-param>
+   <portlet>
+      <portlet-name>AddlRequestTests_SPEC2_11_RenderPRP</portlet-name>
+      <portlet-class>javax.portlet.tck.portlets.AddlRequestTests_SPEC2_11_RenderPRP</portlet-class>
+      <expiration-cache>0</expiration-cache>
+      <supports>
+         <mime-type>text/html</mime-type>
+      </supports>
+      <supported-locale>en_US</supported-locale>
+      <portlet-info>
+         <title>AddlRequestTests_SPEC2_11_RenderPRP</title>
+      </portlet-info>
+   </portlet>
 
+   <portlet>
+      <portlet-name>AddlRequestTests_SPEC2_11_RenderAttr</portlet-name>
+      <portlet-class>javax.portlet.tck.portlets.AddlRequestTests_SPEC2_11_RenderAttr</portlet-class>
       <expiration-cache>0</expiration-cache>
+      <supports>
+         <mime-type>text/html</mime-type>
+      </supports>
+      <supported-locale>en_US</supported-locale>
+      <portlet-info>
+         <title>AddlRequestTests_SPEC2_11_RenderAttr</title>
+      </portlet-info>
+   </portlet>
 
+   <portlet>
+      <portlet-name>AddlRequestTests_SPEC2_11_ActionAttr</portlet-name>
+      <portlet-class>javax.portlet.tck.portlets.AddlRequestTests_SPEC2_11_ActionAttr</portlet-class>
+      <expiration-cache>0</expiration-cache>
       <supports>
          <mime-type>text/html</mime-type>
       </supports>
+      <supported-locale>en_US</supported-locale>
+      <portlet-info>
+         <title>AddlRequestTests_SPEC2_11_ActionAttr</title>
+      </portlet-info>
+   </portlet>
 
+   <portlet>
+      <portlet-name>AddlRequestTests_SPEC2_11_EventAttr</portlet-name>
+      <portlet-class>javax.portlet.tck.portlets.AddlRequestTests_SPEC2_11_EventAttr</portlet-class>
+      <expiration-cache>0</expiration-cache>
+      <supports>
+         <mime-type>text/html</mime-type>
+      </supports>
       <supported-locale>en_US</supported-locale>
+      <portlet-info>
+         <title>AddlRequestTests_SPEC2_11_EventAttr</title>
+      </portlet-info>
+      <supported-publishing-event>
+         <qname>tck:AddlRequestTests_SPEC2_11_EventAttr</qname>
+      </supported-publishing-event>
+   </portlet>
 
+   <portlet>
+      <portlet-name>AddlRequestTests_SPEC2_11_EventAttr_event</portlet-name>
+      <portlet-class>javax.portlet.tck.portlets.AddlRequestTests_SPEC2_11_EventAttr_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>AddlRequestTests_SPEC2_11_RequestPRP</title>
+         <title>AddlRequestTests_SPEC2_11_EventAttr_event</title>
       </portlet-info>
+      <supported-processing-event>
+         <qname>tck:AddlRequestTests_SPEC2_11_EventAttr</qname>
+      </supported-processing-event>
    </portlet>
 
    <portlet>
-      <portlet-name>AddlRequestTests_SPEC2_11_Request</portlet-name>
-      <portlet-class>javax.portlet.tck.portlets.AddlRequestTests_SPEC2_11_Request</portlet-class>
+      <portlet-name>AddlRequestTests_SPEC2_11_ResourceAttr</portlet-name>
+      <portlet-class>javax.portlet.tck.portlets.AddlRequestTests_SPEC2_11_ResourceAttr</portlet-class>
+      <expiration-cache>0</expiration-cache>
+      <supports>
+         <mime-type>text/html</mime-type>
+      </supports>
+      <supported-locale>en_US</supported-locale>
+      <portlet-info>
+         <title>AddlRequestTests_SPEC2_11_ResourceAttr</title>
+      </portlet-info>
+   </portlet>
 
-      <init-param>
-         <name>TestParameter</name>
-         <value>TestValue</value>
-      </init-param>
+   <portlet>
+      <portlet-name>AddlRequestTests_SPEC2_11_ActionReq</portlet-name>
+      <portlet-class>javax.portlet.tck.portlets.AddlRequestTests_SPEC2_11_ActionReq</portlet-class>
+      <expiration-cache>0</expiration-cache>
+      <supports>
+         <mime-type>text/html</mime-type>
+      </supports>
+      <supported-locale>en_US</supported-locale>
+      <portlet-info>
+         <title>AddlRequestTests_SPEC2_11_ActionReq</title>
+      </portlet-info>
+   </portlet>
 
+   <portlet>
+      <portlet-name>AddlRequestTests_SPEC2_11_EventReq</portlet-name>
+      <portlet-class>javax.portlet.tck.portlets.AddlRequestTests_SPEC2_11_EventReq</portlet-class>
       <expiration-cache>0</expiration-cache>
+      <supports>
+         <mime-type>text/html</mime-type>
+      </supports>
+      <supported-locale>en_US</supported-locale>
+      <portlet-info>
+         <title>AddlRequestTests_SPEC2_11_EventReq</title>
+      </portlet-info>
+      <supported-publishing-event>
+         <qname>tck:AddlRequestTests_SPEC2_11_EventReq</qname>
+      </supported-publishing-event>
+   </portlet>
 
+   <portlet>
+      <portlet-name>AddlRequestTests_SPEC2_11_EventReq_event</portlet-name>
+      <portlet-class>javax.portlet.tck.portlets.AddlRequestTests_SPEC2_11_EventReq_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>AddlRequestTests_SPEC2_11_EventReq_event</title>
+      </portlet-info>
+      <supported-processing-event>
+         <qname>tck:AddlRequestTests_SPEC2_11_EventReq</qname>
+      </supported-processing-event>
+   </portlet>
 
+   <portlet>
+      <portlet-name>AddlRequestTests_SPEC2_11_RenderReq</portlet-name>
+      <portlet-class>javax.portlet.tck.portlets.AddlRequestTests_SPEC2_11_RenderReq</portlet-class>
+      <expiration-cache>0</expiration-cache>
+      <supports>
+         <mime-type>text/html</mime-type>
+      </supports>
       <supported-locale>en_US</supported-locale>
+      <portlet-info>
+         <title>AddlRequestTests_SPEC2_11_RenderReq</title>
+      </portlet-info>
+   </portlet>
 
+   <portlet>
+      <portlet-name>AddlRequestTests_SPEC2_11_ResourceReq</portlet-name>
+      <portlet-class>javax.portlet.tck.portlets.AddlRequestTests_SPEC2_11_ResourceReq</portlet-class>
+      <expiration-cache>0</expiration-cache>
+      <supports>
+         <mime-type>text/html</mime-type>
+      </supports>
+      <supported-locale>en_US</supported-locale>
       <portlet-info>
-         <title>AddlRequestTests_SPEC2_11_Request</title>
+         <title>AddlRequestTests_SPEC2_11_ResourceReq</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>
 
+   <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/V2AddlRequestTests/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlRequestTests/src/main/webapp/WEB-INF/web.xml b/portlet-tck_3.0/V2AddlRequestTests/src/main/webapp/WEB-INF/web.xml
index 68235bb..97dfe10 100644
--- a/portlet-tck_3.0/V2AddlRequestTests/src/main/webapp/WEB-INF/web.xml
+++ b/portlet-tck_3.0/V2AddlRequestTests/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-AddlRequestTests</display-name>
-</web-app>
+   <display-name>javax.portlet-tck-AddlRequestTests</display-name>
 
+</web-app>

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/23a1c547/portlet-tck_3.0/V2AddlResponseTests/pom.xml
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlResponseTests/pom.xml b/portlet-tck_3.0/V2AddlResponseTests/pom.xml
index 03a7c5a..419a7bc 100644
--- a/portlet-tck_3.0/V2AddlResponseTests/pom.xml
+++ b/portlet-tck_3.0/V2AddlResponseTests/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-V2AddlResponseTests</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-V2AddlResponseTests</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/V2AddlResponseTests/src/main/java/javax/portlet/tck/portlets/AddlResponseTests_SPEC2_12_Action.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlResponseTests/src/main/java/javax/portlet/tck/portlets/AddlResponseTests_SPEC2_12_Action.java b/portlet-tck_3.0/V2AddlResponseTests/src/main/java/javax/portlet/tck/portlets/AddlResponseTests_SPEC2_12_Action.java
new file mode 100644
index 0000000..3beaf63
--- /dev/null
+++ b/portlet-tck_3.0/V2AddlResponseTests/src/main/java/javax/portlet/tck/portlets/AddlResponseTests_SPEC2_12_Action.java
@@ -0,0 +1,245 @@
+/*  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 AddlResponseTests_SPEC2_12_Action_event
+ *
+ */
+public class AddlResponseTests_SPEC2_12_Action implements Portlet, ResourceServingPortlet {
+   private static final String LOG_CLASS = 
+         AddlResponseTests_SPEC2_12_Action.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();
+
+      JSR286SpecTestCaseDetails tcd = new JSR286SpecTestCaseDetails();
+
+      // Create result objects for the tests
+
+      /* TestCase: V2AddlResponseTests_SPEC2_12_Action_cookie1                */
+      /* Details: "Cookies set during the Action phase should be available    */
+      /* to the portlet during the Render phase"                              */
+      TestResult tr0 = tcd.getTestResultFailed(V2ADDLRESPONSETESTS_SPEC2_12_ACTION_COOKIE1);
+      /* TODO: implement test */
+      tr0.appendTcDetail("Not implemented.");
+      tr0.writeTo(writer);
+
+      /* TestCase: V2AddlResponseTests_SPEC2_12_Action_cookie2                */
+      /* Details: "Cookies set during the Action phase should be available    */
+      /* to the portlet during the Resource phase"                            */
+      TestResult tr1 = tcd.getTestResultFailed(V2ADDLRESPONSETESTS_SPEC2_12_ACTION_COOKIE2);
+      /* TODO: implement test */
+      tr1.appendTcDetail("Not implemented.");
+      tr1.writeTo(writer);
+
+      /* TestCase: V2AddlResponseTests_SPEC2_12_Action_cookie3                */
+      /* Details: "Cookies set during the Action phase should be available    */
+      /* to the portlet during the Event phase"                               */
+      TestResult tr2 = tcd.getTestResultFailed(V2ADDLRESPONSETESTS_SPEC2_12_ACTION_COOKIE3);
+      /* TODO: implement test */
+      tr2.appendTcDetail("Not implemented.");
+      tr2.writeTo(writer);
+
+      /* TestCase: V2AddlResponseTests_SPEC2_12_Action_cookie4                */
+      /* Details: "Cookies set during the Action phase should be available    */
+      /* to the portlet during a subsequent request triggered by a URL"       */
+      TestResult tr3 = tcd.getTestResultFailed(V2ADDLRESPONSETESTS_SPEC2_12_ACTION_COOKIE4);
+      /* TODO: implement test */
+      tr3.appendTcDetail("Not implemented.");
+      tr3.writeTo(writer);
+
+      /* TestCase: V2AddlResponseTests_SPEC2_12_Action_redirect1              */
+      /* Details: "If a relative path is supplied to the sendRedirect         */
+      /* method, an IllegalArgumentException must be thrown"                  */
+      TestResult tr4 = tcd.getTestResultFailed(V2ADDLRESPONSETESTS_SPEC2_12_ACTION_REDIRECT1);
+      /* TODO: implement test */
+      tr4.appendTcDetail("Not implemented.");
+      tr4.writeTo(writer);
+
+      /* TestCase: V2AddlResponseTests_SPEC2_12_Action_redirect12             */
+      /* Details: "If a new private render parameter value is set on the      */
+      /* ActionResponse before the redirect, the new private render           */
+      /* parameter value must be set on the attached render URL"              */
+      TestResult tr5 = tcd.getTestResultFailed(V2ADDLRESPONSETESTS_SPEC2_12_ACTION_REDIRECT12);
+      /* TODO: implement test */
+      tr5.appendTcDetail("Not implemented.");
+      tr5.writeTo(writer);
+
+      /* TestCase: V2AddlResponseTests_SPEC2_12_Action_redirect14             */
+      /* Details: "If a new public render parameter value is set on the       */
+      /* ActionResponse before the redirect, the new public render            */
+      /* parameter value must be set on the attached render URL"              */
+      TestResult tr6 = tcd.getTestResultFailed(V2ADDLRESPONSETESTS_SPEC2_12_ACTION_REDIRECT14);
+      /* TODO: implement test */
+      tr6.appendTcDetail("Not implemented.");
+      tr6.writeTo(writer);
+
+      portletReq.getPortletSession().setAttribute(
+                   Constants.RESULT_ATTR_PREFIX + "AddlResponseTests_SPEC2_12_Action",
+                   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();
+
+   }
+
+   @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();
+
+      PortletSession ps = portletReq.getPortletSession();
+      String msg = (String) ps.getAttribute(RESULT_ATTR_PREFIX + "AddlResponseTests_SPEC2_12_Action", APPLICATION_SCOPE);
+      if (msg != null) {
+         writer.write("<p>" + msg + "</p><br/>\n");
+         ps.removeAttribute(RESULT_ATTR_PREFIX + "AddlResponseTests_SPEC2_12_Action", APPLICATION_SCOPE);
+      }
+
+      /* TestCase: V2AddlResponseTests_SPEC2_12_Action_cookie1                */
+      /* Details: "Cookies set during the Action phase should be available    */
+      /* to the portlet during the Render phase"                              */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2AddlResponseTests_SPEC2_12_Action_cookie1", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2AddlResponseTests_SPEC2_12_Action_cookie2                */
+      /* Details: "Cookies set during the Action phase should be available    */
+      /* to the portlet during the Resource phase"                            */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2AddlResponseTests_SPEC2_12_Action_cookie2", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2AddlResponseTests_SPEC2_12_Action_cookie3                */
+      /* Details: "Cookies set during the Action phase should be available    */
+      /* to the portlet during the Event phase"                               */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2AddlResponseTests_SPEC2_12_Action_cookie3", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2AddlResponseTests_SPEC2_12_Action_cookie4                */
+      /* Details: "Cookies set during the Action phase should be available    */
+      /* to the portlet during a subsequent request triggered by a URL"       */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2AddlResponseTests_SPEC2_12_Action_cookie4", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2AddlResponseTests_SPEC2_12_Action_redirect1              */
+      /* Details: "If a relative path is supplied to the sendRedirect         */
+      /* method, an IllegalArgumentException must be thrown"                  */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2AddlResponseTests_SPEC2_12_Action_redirect1", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2AddlResponseTests_SPEC2_12_Action_redirect12             */
+      /* Details: "If a new private render parameter value is set on the      */
+      /* ActionResponse before the redirect, the new private render           */
+      /* parameter value must be set on the attached render URL"              */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2AddlResponseTests_SPEC2_12_Action_redirect12", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2AddlResponseTests_SPEC2_12_Action_redirect14             */
+      /* Details: "If a new public render parameter value is set on the       */
+      /* ActionResponse before the redirect, the new public render            */
+      /* parameter value must be set on the attached render URL"              */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2AddlResponseTests_SPEC2_12_Action_redirect14", aurl);
+         tb.writeTo(writer);
+      }
+
+   }
+
+}

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/23a1c547/portlet-tck_3.0/V2AddlResponseTests/src/main/java/javax/portlet/tck/portlets/AddlResponseTests_SPEC2_12_Event.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlResponseTests/src/main/java/javax/portlet/tck/portlets/AddlResponseTests_SPEC2_12_Event.java b/portlet-tck_3.0/V2AddlResponseTests/src/main/java/javax/portlet/tck/portlets/AddlResponseTests_SPEC2_12_Event.java
new file mode 100644
index 0000000..7fd3204
--- /dev/null
+++ b/portlet-tck_3.0/V2AddlResponseTests/src/main/java/javax/portlet/tck/portlets/AddlResponseTests_SPEC2_12_Event.java
@@ -0,0 +1,134 @@
+/*  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 AddlResponseTests_SPEC2_12_Event_event
+ *
+ */
+public class AddlResponseTests_SPEC2_12_Event implements Portlet, ResourceServingPortlet {
+   private static final String LOG_CLASS = 
+         AddlResponseTests_SPEC2_12_Event.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();
+
+      QName eventQName = new QName(TCKNAMESPACE,
+             "AddlResponseTests_SPEC2_12_Event");
+      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: V2AddlResponseTests_SPEC2_12_Event_cookie5                 */
+      /* Details: "Cookies set during the Event phase should be available     */
+      /* to the portlet during the Render phase"                              */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2AddlResponseTests_SPEC2_12_Event_cookie5", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2AddlResponseTests_SPEC2_12_Event_cookie6                 */
+      /* Details: "Cookies set during the Event phase should be available     */
+      /* to the portlet during the Resource phase"                            */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2AddlResponseTests_SPEC2_12_Event_cookie6", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2AddlResponseTests_SPEC2_12_Event_cookie7                 */
+      /* Details: "Cookies set during the Event phase should be available     */
+      /* to the portlet during a subsequent request triggered by a URL"       */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2AddlResponseTests_SPEC2_12_Event_cookie7", aurl);
+         tb.writeTo(writer);
+      }
+
+   }
+
+}

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/23a1c547/portlet-tck_3.0/V2AddlResponseTests/src/main/java/javax/portlet/tck/portlets/AddlResponseTests_SPEC2_12_Event_event.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlResponseTests/src/main/java/javax/portlet/tck/portlets/AddlResponseTests_SPEC2_12_Event_event.java b/portlet-tck_3.0/V2AddlResponseTests/src/main/java/javax/portlet/tck/portlets/AddlResponseTests_SPEC2_12_Event_event.java
new file mode 100644
index 0000000..5c084a8
--- /dev/null
+++ b/portlet-tck_3.0/V2AddlResponseTests/src/main/java/javax/portlet/tck/portlets/AddlResponseTests_SPEC2_12_Event_event.java
@@ -0,0 +1,133 @@
+/*  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.constants.Constants.*;
+import static javax.portlet.tck.beans.JSR286SpecTestCaseDetails.*;
+import static javax.portlet.PortletSession.*;
+
+/**
+ * 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 AddlResponseTests_SPEC2_12_Event_event implements Portlet, EventPortlet, ResourceServingPortlet {
+   private static final String LOG_CLASS = 
+         AddlResponseTests_SPEC2_12_Event_event.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, "event companion processAction - ERROR!!");
+   }
+
+   @Override
+   public void serveResource(ResourceRequest portletReq, ResourceResponse portletResp)
+         throws PortletException, IOException {
+      LOGGER.entering(LOG_CLASS, "event companion serveResource - ERROR!!");
+   }
+
+   @Override
+   public void processEvent(EventRequest portletReq, EventResponse portletResp)
+         throws PortletException, IOException {
+      LOGGER.entering(LOG_CLASS, "event companion processEvent");
+
+
+      portletResp.setRenderParameters(portletReq);
+
+      long tid = Thread.currentThread().getId();
+      portletReq.setAttribute(THREADID_ATTR, tid);
+
+      StringWriter writer = new StringWriter();
+
+      JSR286SpecTestCaseDetails tcd = new JSR286SpecTestCaseDetails();
+
+      // Create result objects for the tests
+
+      /* TestCase: V2AddlResponseTests_SPEC2_12_Event_cookie5                 */
+      /* Details: "Cookies set during the Event phase should be available     */
+      /* to the portlet during the Render phase"                              */
+      TestResult tr0 = tcd.getTestResultFailed(V2ADDLRESPONSETESTS_SPEC2_12_EVENT_COOKIE5);
+      /* TODO: implement test */
+      tr0.appendTcDetail("Not implemented.");
+      tr0.writeTo(writer);
+
+      /* TestCase: V2AddlResponseTests_SPEC2_12_Event_cookie6                 */
+      /* Details: "Cookies set during the Event phase should be available     */
+      /* to the portlet during the Resource phase"                            */
+      TestResult tr1 = tcd.getTestResultFailed(V2ADDLRESPONSETESTS_SPEC2_12_EVENT_COOKIE6);
+      /* TODO: implement test */
+      tr1.appendTcDetail("Not implemented.");
+      tr1.writeTo(writer);
+
+      /* TestCase: V2AddlResponseTests_SPEC2_12_Event_cookie7                 */
+      /* Details: "Cookies set during the Event phase should be available     */
+      /* to the portlet during a subsequent request triggered by a URL"       */
+      TestResult tr2 = tcd.getTestResultFailed(V2ADDLRESPONSETESTS_SPEC2_12_EVENT_COOKIE7);
+      /* TODO: implement test */
+      tr2.appendTcDetail("Not implemented.");
+      tr2.writeTo(writer);
+
+      portletReq.getPortletSession().setAttribute(
+                   Constants.RESULT_ATTR_PREFIX + "AddlResponseTests_SPEC2_12_Event",
+                   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>AddlResponseTests_SPEC2_12_Event_event</p>\n");
+
+      String msg = (String) portletReq.getPortletSession()
+            .getAttribute(RESULT_ATTR_PREFIX + "AddlResponseTests_SPEC2_12_Event", APPLICATION_SCOPE);
+      msg = (msg==null) ? "Not ready. click test case link." : msg;
+      writer.write("<p>" + msg + "</p>\n");
+
+   }
+
+}

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/23a1c547/portlet-tck_3.0/V2AddlResponseTests/src/main/java/javax/portlet/tck/portlets/AddlResponseTests_SPEC2_12_Render.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlResponseTests/src/main/java/javax/portlet/tck/portlets/AddlResponseTests_SPEC2_12_Render.java b/portlet-tck_3.0/V2AddlResponseTests/src/main/java/javax/portlet/tck/portlets/AddlResponseTests_SPEC2_12_Render.java
new file mode 100644
index 0000000..c90ae9a
--- /dev/null
+++ b/portlet-tck_3.0/V2AddlResponseTests/src/main/java/javax/portlet/tck/portlets/AddlResponseTests_SPEC2_12_Render.java
@@ -0,0 +1,181 @@
+/*  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 AddlResponseTests_SPEC2_12_Render_event
+ *
+ */
+public class AddlResponseTests_SPEC2_12_Render implements Portlet, ResourceServingPortlet {
+   private static final String LOG_CLASS = 
+         AddlResponseTests_SPEC2_12_Render.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();
+
+   }
+
+   @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();
+
+      JSR286SpecTestCaseDetails tcd = new JSR286SpecTestCaseDetails();
+
+      // Create result objects for the tests
+
+      /* TestCase: V2AddlResponseTests_SPEC2_12_Render_cookie8                */
+      /* Details: "Cookies set during the Render phase should be available    */
+      /* to the portlet during the Resource phase"                            */
+      TestResult tr0 = tcd.getTestResultFailed(V2ADDLRESPONSETESTS_SPEC2_12_RENDER_COOKIE8);
+      /* TODO: implement test */
+      tr0.appendTcDetail("Not implemented.");
+      tr0.writeTo(writer);
+
+      /* TestCase: V2AddlResponseTests_SPEC2_12_Render_cookie9                */
+      /* Details: "Cookies set during the Render phase should be available    */
+      /* to the portlet during a subsequent Action phase"                     */
+      TestResult tr1 = tcd.getTestResultFailed(V2ADDLRESPONSETESTS_SPEC2_12_RENDER_COOKIE9);
+      /* TODO: implement test */
+      tr1.appendTcDetail("Not implemented.");
+      tr1.writeTo(writer);
+
+      /* TestCase: V2AddlResponseTests_SPEC2_12_Render_cookie10               */
+      /* Details: "Cookies set during the Render phase should be available    */
+      /* to the portlet during a subsequent Render phase"                     */
+      TestResult tr2 = tcd.getTestResultFailed(V2ADDLRESPONSETESTS_SPEC2_12_RENDER_COOKIE10);
+      /* TODO: implement test */
+      tr2.appendTcDetail("Not implemented.");
+      tr2.writeTo(writer);
+
+      /* TestCase: V2AddlResponseTests_SPEC2_12_Render_cookie11               */
+      /* Details: "Cookies set during the Render phase should be available    */
+      /* to the portlet during a subsequent request triggered by a URL"       */
+      TestResult tr3 = tcd.getTestResultFailed(V2ADDLRESPONSETESTS_SPEC2_12_RENDER_COOKIE11);
+      /* TODO: implement test */
+      tr3.appendTcDetail("Not implemented.");
+      tr3.writeTo(writer);
+
+      /* TestCase: V2AddlResponseTests_SPEC2_12_Render_cookie12               */
+      /* Details: "Cookies set during the Render phase after the response     */
+      /* has been committed are ignored"                                      */
+      TestResult tr4 = tcd.getTestResultFailed(V2ADDLRESPONSETESTS_SPEC2_12_RENDER_COOKIE12);
+      /* TODO: implement test */
+      tr4.appendTcDetail("Not implemented.");
+      tr4.writeTo(writer);
+
+      /* TestCase: V2AddlResponseTests_SPEC2_12_Render_contentType5           */
+      /* Details: "If the setContentType method is not called before the      */
+      /* getWriter or getPortletOutputStream method is used, the portlet      */
+      /* container uses the content type returned by                          */
+      /* getResponseContentType"                                              */
+      TestResult tr5 = tcd.getTestResultFailed(V2ADDLRESPONSETESTS_SPEC2_12_RENDER_CONTENTTYPE5);
+      /* TODO: implement test */
+      tr5.appendTcDetail("Not implemented.");
+      tr5.writeTo(writer);
+
+      /* TestCase: V2AddlResponseTests_SPEC2_12_Render_characterEncoding2     */
+      /* Details: "The character encoding can be set via the setLocale        */
+      /* method and a locale-encoding-mapping-list mapping in the web.xml     */
+      /* deployment descriptor"                                               */
+      TestResult tr6 = tcd.getTestResultFailed(V2ADDLRESPONSETESTS_SPEC2_12_RENDER_CHARACTERENCODING2);
+      /* TODO: implement test */
+      tr6.appendTcDetail("Not implemented.");
+      tr6.writeTo(writer);
+
+      /* TestCase: V2AddlResponseTests_SPEC2_12_Render_characterEncoding3     */
+      /* Details: "The character encoding can be set via the setContentType   */
+      /* method if the given content type string provides a value for the     */
+      /* charset attribute"                                                   */
+      TestResult tr7 = tcd.getTestResultFailed(V2ADDLRESPONSETESTS_SPEC2_12_RENDER_CHARACTERENCODING3);
+      /* TODO: implement test */
+      tr7.appendTcDetail("Not implemented.");
+      tr7.writeTo(writer);
+
+      /* TestCase: V2AddlResponseTests_SPEC2_12_Render_characterEncoding4     */
+      /* Details: "If the portlet does not set the character encoding, the    */
+      /* portlet container uses UTF-8 as the default character encoding"      */
+      TestResult tr8 = tcd.getTestResultFailed(V2ADDLRESPONSETESTS_SPEC2_12_RENDER_CHARACTERENCODING4);
+      /* TODO: implement test */
+      tr8.appendTcDetail("Not implemented.");
+      tr8.writeTo(writer);
+
+   }
+
+}

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/23a1c547/portlet-tck_3.0/V2AddlResponseTests/src/main/java/javax/portlet/tck/portlets/AddlResponseTests_SPEC2_12_Resource.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlResponseTests/src/main/java/javax/portlet/tck/portlets/AddlResponseTests_SPEC2_12_Resource.java b/portlet-tck_3.0/V2AddlResponseTests/src/main/java/javax/portlet/tck/portlets/AddlResponseTests_SPEC2_12_Resource.java
new file mode 100644
index 0000000..5ece95a
--- /dev/null
+++ b/portlet-tck_3.0/V2AddlResponseTests/src/main/java/javax/portlet/tck/portlets/AddlResponseTests_SPEC2_12_Resource.java
@@ -0,0 +1,197 @@
+/*  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 AddlResponseTests_SPEC2_12_Resource_event
+ *
+ */
+public class AddlResponseTests_SPEC2_12_Resource implements Portlet, ResourceServingPortlet {
+   private static final String LOG_CLASS = 
+         AddlResponseTests_SPEC2_12_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: V2AddlResponseTests_SPEC2_12_Resource_cookie13             */
+      /* Details: "Cookies set during the Resource phase should be            */
+      /* available to the portlet during a subsequent Action phase"           */
+      TestResult tr0 = tcd.getTestResultFailed(V2ADDLRESPONSETESTS_SPEC2_12_RESOURCE_COOKIE13);
+      /* TODO: implement test */
+      tr0.appendTcDetail("Not implemented.");
+      tr0.writeTo(writer);
+
+      /* TestCase: V2AddlResponseTests_SPEC2_12_Resource_cookie14             */
+      /* Details: "Cookies set during the Resource phase should be            */
+      /* available to the portlet during a subsequent Resource phase"         */
+      TestResult tr1 = tcd.getTestResultFailed(V2ADDLRESPONSETESTS_SPEC2_12_RESOURCE_COOKIE14);
+      /* TODO: implement test */
+      tr1.appendTcDetail("Not implemented.");
+      tr1.writeTo(writer);
+
+      /* TestCase: V2AddlResponseTests_SPEC2_12_Resource_cookie15             */
+      /* Details: "Cookies set during the Resource phase should be            */
+      /* available to the portlet during a subsequent Render phase"           */
+      TestResult tr2 = tcd.getTestResultFailed(V2ADDLRESPONSETESTS_SPEC2_12_RESOURCE_COOKIE15);
+      /* TODO: implement test */
+      tr2.appendTcDetail("Not implemented.");
+      tr2.writeTo(writer);
+
+      /* TestCase: V2AddlResponseTests_SPEC2_12_Resource_cookie16             */
+      /* Details: "Cookies set during the Resource phase should be            */
+      /* available to the portlet during a subsequent request triggered by    */
+      /* a URL"                                                               */
+      TestResult tr3 = tcd.getTestResultFailed(V2ADDLRESPONSETESTS_SPEC2_12_RESOURCE_COOKIE16);
+      /* TODO: implement test */
+      tr3.appendTcDetail("Not implemented.");
+      tr3.writeTo(writer);
+
+      /* TestCase: V2AddlResponseTests_SPEC2_12_Resource_cookie17             */
+      /* Details: "Cookies set during the Resource phase after the response   */
+      /* has been committed are ignored"                                      */
+      TestResult tr4 = tcd.getTestResultFailed(V2ADDLRESPONSETESTS_SPEC2_12_RESOURCE_COOKIE17);
+      /* TODO: implement test */
+      tr4.appendTcDetail("Not implemented.");
+      tr4.writeTo(writer);
+
+      /* TestCase: V2AddlResponseTests_SPEC2_12_Resource_contentType5         */
+      /* Details: "If the setContentType method is not called before the      */
+      /* getWriter or getPortletOutputStream method is used, the portlet      */
+      /* container uses the content type returned by                          */
+      /* getResponseContentType"                                              */
+      TestResult tr5 = tcd.getTestResultFailed(V2ADDLRESPONSETESTS_SPEC2_12_RESOURCE_CONTENTTYPE5);
+      /* TODO: implement test */
+      tr5.appendTcDetail("Not implemented.");
+      tr5.writeTo(writer);
+
+      /* TestCase: V2AddlResponseTests_SPEC2_12_Resource_characterEncoding2   */
+      /* Details: "The character encoding can be set via the setLocale        */
+      /* method and a locale-encoding-mapping-list mapping in the web.xml     */
+      /* deployment descriptor"                                               */
+      TestResult tr6 = tcd.getTestResultFailed(V2ADDLRESPONSETESTS_SPEC2_12_RESOURCE_CHARACTERENCODING2);
+      /* TODO: implement test */
+      tr6.appendTcDetail("Not implemented.");
+      tr6.writeTo(writer);
+
+      /* TestCase: V2AddlResponseTests_SPEC2_12_Resource_characterEncoding3   */
+      /* Details: "The character encoding can be set via the setContentType   */
+      /* method if the given content type string provides a value for the     */
+      /* charset attribute"                                                   */
+      TestResult tr7 = tcd.getTestResultFailed(V2ADDLRESPONSETESTS_SPEC2_12_RESOURCE_CHARACTERENCODING3);
+      /* TODO: implement test */
+      tr7.appendTcDetail("Not implemented.");
+      tr7.writeTo(writer);
+
+      /* TestCase: V2AddlResponseTests_SPEC2_12_Resource_characterEncoding4   */
+      /* Details: "If the portlet does not set the character encoding, the    */
+      /* portlet container uses UTF-8 as the default character encoding"      */
+      TestResult tr8 = tcd.getTestResultFailed(V2ADDLRESPONSETESTS_SPEC2_12_RESOURCE_CHARACTERENCODING4);
+      /* TODO: implement test */
+      tr8.appendTcDetail("Not implemented.");
+      tr8.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=\"AddlResponseTests_SPEC2_12_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(\"AddlResponseTests_SPEC2_12_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");
+   }
+
+}


[07/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.

Posted by ms...@apache.org.
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/23a1c547/portlet-tck_3.0/V2PortletTagLibraryTests/src/main/java/javax/portlet/tck/portlets/PortletTagLibraryTests_SPEC2_26_TagLibAction.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2PortletTagLibraryTests/src/main/java/javax/portlet/tck/portlets/PortletTagLibraryTests_SPEC2_26_TagLibAction.java b/portlet-tck_3.0/V2PortletTagLibraryTests/src/main/java/javax/portlet/tck/portlets/PortletTagLibraryTests_SPEC2_26_TagLibAction.java
deleted file mode 100644
index e7b6003..0000000
--- a/portlet-tck_3.0/V2PortletTagLibraryTests/src/main/java/javax/portlet/tck/portlets/PortletTagLibraryTests_SPEC2_26_TagLibAction.java
+++ /dev/null
@@ -1,516 +0,0 @@
-/*  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.IOException;
-import java.io.PrintWriter;
-
-import java.util.Enumeration;
-import java.util.Locale;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-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 static javax.portlet.tck.beans.JSR286SpecTestCaseDetails.*;
-import javax.portlet.tck.beans.TestResult;
-
-/**
- * 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.
- */
-public class PortletTagLibraryTests_SPEC2_26_TagLibAction implements Portlet {
-   private static final String LOG_CLASS = 
-         PortletTagLibraryTests_SPEC2_26_TagLibAction.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 actionRequest, ActionResponse actionResponse)
-         throws PortletException, IOException {
-   }
-
-   @Override
-   public void render(RenderRequest renderRequest, RenderResponse renderResponse)
-         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
-
-      /* TestCase: SPEC2_26_TagLibAction_defineObjectsAction1                 */
-      /* Details: "When included in the Action phase, the defineObjects tag   */
-      /* defines the variable RenderRequest renderRequest to be null or       */
-      /* undefined"                                                           */
-      TestResult tr0 = tcd.getTestResultFailed(SPEC2_26_TAGLIBACTION_DEFINEOBJECTSACTION1);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibAction_defineObjectsAction2                 */
-      /* Details: "When included in the Action phase, the defineObjects tag   */
-      /* defines the variable ResourceRequest resourceRequest to be null or   */
-      /* undefined"                                                           */
-      TestResult tr1 = tcd.getTestResultFailed(SPEC2_26_TAGLIBACTION_DEFINEOBJECTSACTION2);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibAction_defineObjectsAction3                 */
-      /* Details: "When included in the Action phase, the defineObjects tag   */
-      /* defines the variable ActionRequest actionRequest to the              */
-      /* corresponding object"                                                */
-      TestResult tr2 = tcd.getTestResultFailed(SPEC2_26_TAGLIBACTION_DEFINEOBJECTSACTION3);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibAction_defineObjectsAction4                 */
-      /* Details: "When included in the Action phase, the defineObjects tag   */
-      /* defines the variable EventRequest eventRequest to be null or         */
-      /* undefined"                                                           */
-      TestResult tr3 = tcd.getTestResultFailed(SPEC2_26_TAGLIBACTION_DEFINEOBJECTSACTION4);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibAction_defineObjectsAction5                 */
-      /* Details: "When included in the Action phase, the defineObjects tag   */
-      /* defines the variable RenderResponse renderResponse to be null or     */
-      /* undefined"                                                           */
-      TestResult tr4 = tcd.getTestResultFailed(SPEC2_26_TAGLIBACTION_DEFINEOBJECTSACTION5);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibAction_defineObjectsAction6                 */
-      /* Details: "When included in the Action phase, the defineObjects tag   */
-      /* defines the variable ResourceResponse resourceResponse to be null    */
-      /* or undefined"                                                        */
-      TestResult tr5 = tcd.getTestResultFailed(SPEC2_26_TAGLIBACTION_DEFINEOBJECTSACTION6);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibAction_defineObjectsAction7                 */
-      /* Details: "When included in the Action phase, the defineObjects tag   */
-      /* defines the variable ActionResponse actionResponse to the            */
-      /* corresponding object"                                                */
-      TestResult tr6 = tcd.getTestResultFailed(SPEC2_26_TAGLIBACTION_DEFINEOBJECTSACTION7);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibAction_defineObjectsAction8                 */
-      /* Details: "When included in the Action phase, the defineObjects tag   */
-      /* defines the variable EventResponse eventResponse to be null or       */
-      /* undefined"                                                           */
-      TestResult tr7 = tcd.getTestResultFailed(SPEC2_26_TAGLIBACTION_DEFINEOBJECTSACTION8);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibAction_defineObjectsAction9                 */
-      /* Details: "When included in the Action phase, the defineObjects tag   */
-      /* defines the variable PortletConfig portletConfig"                    */
-      TestResult tr8 = tcd.getTestResultFailed(SPEC2_26_TAGLIBACTION_DEFINEOBJECTSACTION9);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibAction_defineObjectsAction10                */
-      /* Details: "When included in the Action phase, the defineObjects tag   */
-      /* defines the variable PortletSession portletSession, providing        */
-      /* access to the portletSession, does not create a new session, only    */
-      /* returns an existing session or null if no session exists."           */
-      TestResult tr9 = tcd.getTestResultFailed(SPEC2_26_TAGLIBACTION_DEFINEOBJECTSACTION10);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibAction_defineObjectsAction11                */
-      /* Details: "When included in the Action phase, the defineObjects tag   */
-      /* defines the variable Map<String, Object> portletSessionScope,        */
-      /* providing access to the portletSession attributes as a Map           */
-      /* equivalent to the PortletSession.getAttributeMap() call, does not    */
-      /* create a new session, only returns an existing session. If no        */
-      /* session attributes exist this method returns an empty Map."          */
-      TestResult tr10 = tcd.getTestResultFailed(SPEC2_26_TAGLIBACTION_DEFINEOBJECTSACTION11);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibAction_defineObjectsAction12                */
-      /* Details: "When included in the Action phase, the defineObjects tag   */
-      /* defines the variable PortletPreferences portletPreferences,          */
-      /* providing access to the portlet preferences."                        */
-      TestResult tr11 = tcd.getTestResultFailed(SPEC2_26_TAGLIBACTION_DEFINEOBJECTSACTION12);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibAction_defineObjectsAction13                */
-      /* Details: "When included in the Action phase, the defineObjects tag   */
-      /* defines the variable Map<String, String[]>                           */
-      /* portletPreferencesValues, providing access to the portlet            */
-      /* preferences as a Map, equivalent to the                              */
-      /* PortletPreferences.getMap() call. If no portlet preferences exist,   */
-      /* the Map is empty."                                                   */
-      TestResult tr12 = tcd.getTestResultFailed(SPEC2_26_TAGLIBACTION_DEFINEOBJECTSACTION13);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibAction_defineObjectsEvent1                  */
-      /* Details: "When included in the Event phase, the defineObjects tag    */
-      /* defines the variable RenderRequest renderRequest to be null or       */
-      /* undefined"                                                           */
-      TestResult tr13 = tcd.getTestResultFailed(SPEC2_26_TAGLIBACTION_DEFINEOBJECTSEVENT1);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibAction_defineObjectsEvent2                  */
-      /* Details: "When included in the Event phase, the defineObjects tag    */
-      /* defines the variable ResourceRequest resourceRequest to be null or   */
-      /* undefined"                                                           */
-      TestResult tr14 = tcd.getTestResultFailed(SPEC2_26_TAGLIBACTION_DEFINEOBJECTSEVENT2);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibAction_defineObjectsEvent3                  */
-      /* Details: "When included in the Event phase, the defineObjects tag    */
-      /* defines the variable ActionRequest actionRequest to be null or       */
-      /* undefined"                                                           */
-      TestResult tr15 = tcd.getTestResultFailed(SPEC2_26_TAGLIBACTION_DEFINEOBJECTSEVENT3);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibAction_defineObjectsEvent4                  */
-      /* Details: "When included in the Event phase, the defineObjects tag    */
-      /* defines the variable EventRequest eventRequest to the                */
-      /* corresponding object"                                                */
-      TestResult tr16 = tcd.getTestResultFailed(SPEC2_26_TAGLIBACTION_DEFINEOBJECTSEVENT4);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibAction_defineObjectsEvent5                  */
-      /* Details: "When included in the Event phase, the defineObjects tag    */
-      /* defines the variable RenderResponse renderResponse to be null or     */
-      /* undefined"                                                           */
-      TestResult tr17 = tcd.getTestResultFailed(SPEC2_26_TAGLIBACTION_DEFINEOBJECTSEVENT5);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibAction_defineObjectsEvent6                  */
-      /* Details: "When included in the Event phase, the defineObjects tag    */
-      /* defines the variable ResourceResponse resourceResponse to be null    */
-      /* or undefined"                                                        */
-      TestResult tr18 = tcd.getTestResultFailed(SPEC2_26_TAGLIBACTION_DEFINEOBJECTSEVENT6);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibAction_defineObjectsEvent7                  */
-      /* Details: "When included in the Event phase, the defineObjects tag    */
-      /* defines the variable ActionResponse actionResponse to be null or     */
-      /* undefined"                                                           */
-      TestResult tr19 = tcd.getTestResultFailed(SPEC2_26_TAGLIBACTION_DEFINEOBJECTSEVENT7);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibAction_defineObjectsEvent8                  */
-      /* Details: "When included in the Event phase, the defineObjects tag    */
-      /* defines the variable EventResponse eventResponse to the              */
-      /* corresponding object"                                                */
-      TestResult tr20 = tcd.getTestResultFailed(SPEC2_26_TAGLIBACTION_DEFINEOBJECTSEVENT8);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibAction_defineObjectsEvent9                  */
-      /* Details: "When included in the Event phase, the defineObjects tag    */
-      /* defines the variable PortletConfig portletConfig"                    */
-      TestResult tr21 = tcd.getTestResultFailed(SPEC2_26_TAGLIBACTION_DEFINEOBJECTSEVENT9);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibAction_defineObjectsEvent10                 */
-      /* Details: "When included in the Event phase, the defineObjects tag    */
-      /* defines the variable PortletSession portletSession, providing        */
-      /* access to the portletSession, does not create a new session, only    */
-      /* returns an existing session or null if no session exists."           */
-      TestResult tr22 = tcd.getTestResultFailed(SPEC2_26_TAGLIBACTION_DEFINEOBJECTSEVENT10);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibAction_defineObjectsEvent11                 */
-      /* Details: "When included in the Event phase, the defineObjects tag    */
-      /* defines the variable Map<String, Object> portletSessionScope,        */
-      /* providing access to the portletSession attributes as a Map           */
-      /* equivalent to the PortletSession.getAttributeMap() call, does not    */
-      /* create a new session, only returns an existing session. If no        */
-      /* session attributes exist this method returns an empty Map."          */
-      TestResult tr23 = tcd.getTestResultFailed(SPEC2_26_TAGLIBACTION_DEFINEOBJECTSEVENT11);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibAction_defineObjectsEvent12                 */
-      /* Details: "When included in the Event phase, the defineObjects tag    */
-      /* defines the variable PortletPreferences portletPreferences,          */
-      /* providing access to the portlet preferences."                        */
-      TestResult tr24 = tcd.getTestResultFailed(SPEC2_26_TAGLIBACTION_DEFINEOBJECTSEVENT12);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibAction_defineObjectsEvent13                 */
-      /* Details: "When included in the Event phase, the defineObjects tag    */
-      /* defines the variable Map<String, String[]>                           */
-      /* portletPreferencesValues, providing access to the portlet            */
-      /* preferences as a Map, equivalent to the                              */
-      /* PortletPreferences.getMap() call. If no portlet preferences exist,   */
-      /* the Map is empty."                                                   */
-      TestResult tr25 = tcd.getTestResultFailed(SPEC2_26_TAGLIBACTION_DEFINEOBJECTSEVENT13);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibAction_actionURL1                           */
-      /* Details: "The portlet actionURL tag creates a URL that must point    */
-      /* to the current portlet and must trigger an action request with the   */
-      /* supplied parameters"                                                 */
-      TestResult tr26 = tcd.getTestResultFailed(SPEC2_26_TAGLIBACTION_ACTIONURL1);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibAction_actionURL2                           */
-      /* Details: "Parameters may be added to the URL by including the        */
-      /* param tag between the actionURL start and end tags"                  */
-      TestResult tr27 = tcd.getTestResultFailed(SPEC2_26_TAGLIBACTION_ACTIONURL2);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibAction_actionURL3                           */
-      /* Details: "The optional actionURL \"windowState\" attribute can       */
-      /* specify the desired window state after the URL is triggered"         */
-      TestResult tr28 = tcd.getTestResultFailed(SPEC2_26_TAGLIBACTION_ACTIONURL3);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibAction_actionURL4                           */
-      /* Details: "If the \"windowState\" attribute specifies an invalid      */
-      /* value, a JspException with the PortletException that caused this     */
-      /* error as root cause is thrown"                                       */
-      TestResult tr29 = tcd.getTestResultFailed(SPEC2_26_TAGLIBACTION_ACTIONURL4);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibAction_actionURL5                           */
-      /* Details: "The \"windowState\" attribute is not case sensitive"       */
-      TestResult tr30 = tcd.getTestResultFailed(SPEC2_26_TAGLIBACTION_ACTIONURL5);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibAction_actionURL6                           */
-      /* Details: "The \"windowState\" attribute is not specified, the        */
-      /* current window state is retained when the URL is triggered"          */
-      TestResult tr31 = tcd.getTestResultFailed(SPEC2_26_TAGLIBACTION_ACTIONURL6);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibAction_actionURL7                           */
-      /* Details: "The optional actionURL \"portletMode\" attribute can       */
-      /* specify the desired portlet mode after the URL is triggered"         */
-      TestResult tr32 = tcd.getTestResultFailed(SPEC2_26_TAGLIBACTION_ACTIONURL7);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibAction_actionURL8                           */
-      /* Details: "If the \"portletMode\" attribute specifies an invalid      */
-      /* value, a JspException with the PortletException that caused this     */
-      /* error as root cause is thrown"                                       */
-      TestResult tr33 = tcd.getTestResultFailed(SPEC2_26_TAGLIBACTION_ACTIONURL8);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibAction_actionURL9                           */
-      /* Details: "The \"portletMode\" attribute is not case sensitive"       */
-      TestResult tr34 = tcd.getTestResultFailed(SPEC2_26_TAGLIBACTION_ACTIONURL9);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibAction_actionURL10                          */
-      /* Details: "The \"portletMode\" attribute is not specified, the        */
-      /* current portlet mode is retained when the URL is triggered"          */
-      TestResult tr35 = tcd.getTestResultFailed(SPEC2_26_TAGLIBACTION_ACTIONURL10);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibAction_actionURL11                          */
-      /* Details: "The optional actionURL \"var\" attribute can specify a     */
-      /* scoped variable for exporting the action URL"                        */
-      TestResult tr36 = tcd.getTestResultFailed(SPEC2_26_TAGLIBACTION_ACTIONURL11);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibAction_actionURL12                          */
-      /* Details: "If the actionURL \"var\" attribute is specified, the URL   */
-      /* is not written to the JspWriter"                                     */
-      TestResult tr37 = tcd.getTestResultFailed(SPEC2_26_TAGLIBACTION_ACTIONURL12);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibAction_actionURL13                          */
-      /* Details: "If the actionURL \"var\" attribute is not specified, the   */
-      /* URL is written to the JspWriter"                                     */
-      TestResult tr38 = tcd.getTestResultFailed(SPEC2_26_TAGLIBACTION_ACTIONURL13);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibAction_actionURL14                          */
-      /* Details: "If the optional actionURL \"secure\" attribute is set to   */
-      /* true, the resulting URL should require a secure connection"          */
-      TestResult tr39 = tcd.getTestResultFailed(SPEC2_26_TAGLIBACTION_ACTIONURL14);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibAction_actionURL15                          */
-      /* Details: "If the optional actionURL \"secure\" attribute is set to   */
-      /* false, the resulting URL does not need to require a secure           */
-      /* connection"                                                          */
-      TestResult tr40 = tcd.getTestResultFailed(SPEC2_26_TAGLIBACTION_ACTIONURL15);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibAction_actionURL17                          */
-      /* Details: "The \"secure\" attribute is not specified, the security    */
-      /* setting is retained"                                                 */
-      TestResult tr41 = tcd.getTestResultFailed(SPEC2_26_TAGLIBACTION_ACTIONURL17);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibAction_actionURL18                          */
-      /* Details: "If the optional actionURL                                  */
-      /* \"copyCurrentRenderParameters\" attribute is set to true, the        */
-      /* current private render parameters are attached to the URL"           */
-      TestResult tr42 = tcd.getTestResultFailed(SPEC2_26_TAGLIBACTION_ACTIONURL18);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibAction_actionURL19                          */
-      /* Details: "If the optional actionURL                                  */
-      /* \"copyCurrentRenderParameters\" attribute is set to true,            */
-      /* additional parameters specified with the <portlet:param> element     */
-      /* are merged with the render parameters"                               */
-      TestResult tr43 = tcd.getTestResultFailed(SPEC2_26_TAGLIBACTION_ACTIONURL19);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibAction_actionURL20                          */
-      /* Details: "If the optional actionURL                                  */
-      /* \"copyCurrentRenderParameters\" attribute is set to true,            */
-      /* additional parameters specified with the <portlet:param> element     */
-      /* appear in the values array before the render parameter values if     */
-      /* there is a name conflict"                                            */
-      TestResult tr44 = tcd.getTestResultFailed(SPEC2_26_TAGLIBACTION_ACTIONURL20);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibAction_actionURL21                          */
-      /* Details: "If the optional actionURL                                  */
-      /* \"copyCurrentRenderParameters\" attribute is set to false, the       */
-      /* current render parameters are not attached to the URL"               */
-      TestResult tr45 = tcd.getTestResultFailed(SPEC2_26_TAGLIBACTION_ACTIONURL21);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibAction_actionURL22                          */
-      /* Details: "If the \"copyCurrentRenderParameters\" attribute           */
-      /* specifies an invalid value, a JspException is thrown"                */
-      TestResult tr46 = tcd.getTestResultFailed(SPEC2_26_TAGLIBACTION_ACTIONURL22);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibAction_actionURL23                          */
-      /* Details: "The \"copyCurrentRenderParameters\" attribute is not       */
-      /* specified, the security setting is retained"                         */
-      TestResult tr47 = tcd.getTestResultFailed(SPEC2_26_TAGLIBACTION_ACTIONURL23);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibAction_actionURL25                          */
-      /* Details: "If the optional actionURL \"escapeXML\" attribute is set   */
-      /* to false, the characters \"<>&'\\\"\" are not converted to their     */
-      /* entity codes"                                                        */
-      TestResult tr48 = tcd.getTestResultFailed(SPEC2_26_TAGLIBACTION_ACTIONURL25);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibAction_actionURL26                          */
-      /* Details: "The \"escapeXML\" attribute default value is true"         */
-      TestResult tr49 = tcd.getTestResultFailed(SPEC2_26_TAGLIBACTION_ACTIONURL26);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibAction_actionURL27                          */
-      /* Details: "If the optional actionURL \"name\" attribute is set, the   */
-      /* provided name string is used by GenericPortlet to dispatch the       */
-      /* request to the coresponding annotated method"                        */
-      TestResult tr50 = tcd.getTestResultFailed(SPEC2_26_TAGLIBACTION_ACTIONURL27);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibAction_actionURL28                          */
-      /* Details: "Setting the \"name\" attribute will add a parameter to     */
-      /* the action URL with the name of \"javax.portlet.action\""            */
-      TestResult tr51 = tcd.getTestResultFailed(SPEC2_26_TAGLIBACTION_ACTIONURL28);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibAction_actionURL29                          */
-      /* Details: "If this tag is used in markup provided by a                */
-      /* serveResource call that was directly or indirectly triggered via a   */
-      /* resource URL of type FULL, a JspException with the                   */
-      /* IllegalStateException that caused this error is thrown"              */
-      TestResult tr52 = tcd.getTestResultFailed(SPEC2_26_TAGLIBACTION_ACTIONURL29);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibAction_actionURL30                          */
-      /* Details: "If this tag is used in markup provided by a                */
-      /* serveResource call that was directly or indirectly triggered via a   */
-      /* resource URL of type PORTLET, a JspException with the                */
-      /* IllegalStateException that caused this error is thrown"              */
-      TestResult tr53 = tcd.getTestResultFailed(SPEC2_26_TAGLIBACTION_ACTIONURL30);
-      /* 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.writeTo(writer);
-      tr30.writeTo(writer);
-      tr31.writeTo(writer);
-      tr32.writeTo(writer);
-      tr33.writeTo(writer);
-      tr34.writeTo(writer);
-      tr35.writeTo(writer);
-      tr36.writeTo(writer);
-      tr37.writeTo(writer);
-      tr38.writeTo(writer);
-      tr39.writeTo(writer);
-      tr40.writeTo(writer);
-      tr41.writeTo(writer);
-      tr42.writeTo(writer);
-      tr43.writeTo(writer);
-      tr44.writeTo(writer);
-      tr45.writeTo(writer);
-      tr46.writeTo(writer);
-      tr47.writeTo(writer);
-      tr48.writeTo(writer);
-      tr49.writeTo(writer);
-      tr50.writeTo(writer);
-      tr51.writeTo(writer);
-      tr52.writeTo(writer);
-      tr53.writeTo(writer);
-
-
-   }
-
-}
-

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/23a1c547/portlet-tck_3.0/V2PortletTagLibraryTests/src/main/java/javax/portlet/tck/portlets/PortletTagLibraryTests_SPEC2_26_TagLibParam.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2PortletTagLibraryTests/src/main/java/javax/portlet/tck/portlets/PortletTagLibraryTests_SPEC2_26_TagLibParam.java b/portlet-tck_3.0/V2PortletTagLibraryTests/src/main/java/javax/portlet/tck/portlets/PortletTagLibraryTests_SPEC2_26_TagLibParam.java
deleted file mode 100644
index 628f6ab..0000000
--- a/portlet-tck_3.0/V2PortletTagLibraryTests/src/main/java/javax/portlet/tck/portlets/PortletTagLibraryTests_SPEC2_26_TagLibParam.java
+++ /dev/null
@@ -1,215 +0,0 @@
-/*  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.IOException;
-import java.io.PrintWriter;
-
-import java.util.Enumeration;
-import java.util.Locale;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-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 static javax.portlet.tck.beans.JSR286SpecTestCaseDetails.*;
-import javax.portlet.tck.beans.TestResult;
-
-/**
- * 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.
- */
-public class PortletTagLibraryTests_SPEC2_26_TagLibParam implements Portlet {
-   private static final String LOG_CLASS = 
-         PortletTagLibraryTests_SPEC2_26_TagLibParam.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 actionRequest, ActionResponse actionResponse)
-         throws PortletException, IOException {
-   }
-
-   @Override
-   public void render(RenderRequest renderRequest, RenderResponse renderResponse)
-         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
-
-      /* TestCase: SPEC2_26_TagLibParam_paramAction1                          */
-      /* Details: "The param tag can be used within the actionURL tag to      */
-      /* add a parameter"                                                     */
-      TestResult tr0 = tcd.getTestResultFailed(SPEC2_26_TAGLIBPARAM_PARAMACTION1);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibParam_paramAction2                          */
-      /* Details: "The param tag required attribute \"name\" defines the      */
-      /* parameter name"                                                      */
-      TestResult tr1 = tcd.getTestResultFailed(SPEC2_26_TAGLIBPARAM_PARAMACTION2);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibParam_paramAction3                          */
-      /* Details: "If more than one tags appear in the actionURL tag, the     */
-      /* values must be stored as a multivalued array in order of             */
-      /* appearance within the actionURL tag"                                 */
-      TestResult tr2 = tcd.getTestResultFailed(SPEC2_26_TAGLIBPARAM_PARAMACTION3);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibParam_paramAction4                          */
-      /* Details: "If the \"name\" attribute is null or empty, no action is   */
-      /* performed"                                                           */
-      TestResult tr3 = tcd.getTestResultFailed(SPEC2_26_TAGLIBPARAM_PARAMACTION4);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibParam_paramAction5                          */
-      /* Details: "The param tag required attribute \"value\" defines the     */
-      /* parameter value"                                                     */
-      TestResult tr4 = tcd.getTestResultFailed(SPEC2_26_TAGLIBPARAM_PARAMACTION5);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibParam_paramAction6                          */
-      /* Details: "If the \"value\" attribute is null or empty, the           */
-      /* parameter is removed"                                                */
-      TestResult tr5 = tcd.getTestResultFailed(SPEC2_26_TAGLIBPARAM_PARAMACTION6);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibParam_paramRender1                          */
-      /* Details: "The param tag can be used within the renderURL tag to      */
-      /* add a parameter"                                                     */
-      TestResult tr6 = tcd.getTestResultFailed(SPEC2_26_TAGLIBPARAM_PARAMRENDER1);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibParam_paramRender2                          */
-      /* Details: "The param tag required attribute \"name\" defines the      */
-      /* parameter name"                                                      */
-      TestResult tr7 = tcd.getTestResultFailed(SPEC2_26_TAGLIBPARAM_PARAMRENDER2);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibParam_paramRender3                          */
-      /* Details: "If more than one tags appear in the renderURL tag, the     */
-      /* values must be stored as a multivalued array in order of             */
-      /* appearance within the renderURL tag"                                 */
-      TestResult tr8 = tcd.getTestResultFailed(SPEC2_26_TAGLIBPARAM_PARAMRENDER3);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibParam_paramRender4                          */
-      /* Details: "If the \"name\" attribute is null or empty, no action is   */
-      /* performed"                                                           */
-      TestResult tr9 = tcd.getTestResultFailed(SPEC2_26_TAGLIBPARAM_PARAMRENDER4);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibParam_paramRender5                          */
-      /* Details: "The param tag required attribute \"value\" defines the     */
-      /* parameter value"                                                     */
-      TestResult tr10 = tcd.getTestResultFailed(SPEC2_26_TAGLIBPARAM_PARAMRENDER5);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibParam_paramRender6                          */
-      /* Details: "If the \"value\" attribute is null or empty, the           */
-      /* parameter is removed"                                                */
-      TestResult tr11 = tcd.getTestResultFailed(SPEC2_26_TAGLIBPARAM_PARAMRENDER6);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibParam_paramResource1                        */
-      /* Details: "The param tag can be used within the resourceURL tag to    */
-      /* add a parameter"                                                     */
-      TestResult tr12 = tcd.getTestResultFailed(SPEC2_26_TAGLIBPARAM_PARAMRESOURCE1);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibParam_paramResource2                        */
-      /* Details: "The param tag required attribute \"name\" defines the      */
-      /* parameter name"                                                      */
-      TestResult tr13 = tcd.getTestResultFailed(SPEC2_26_TAGLIBPARAM_PARAMRESOURCE2);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibParam_paramResource3                        */
-      /* Details: "If more than one tags appear in the resourceURL tag, the   */
-      /* values must be stored as a multivalued array in order of             */
-      /* appearance within the resourceURL tag"                               */
-      TestResult tr14 = tcd.getTestResultFailed(SPEC2_26_TAGLIBPARAM_PARAMRESOURCE3);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibParam_paramResource4                        */
-      /* Details: "If the \"name\" attribute is null or empty, no action is   */
-      /* performed"                                                           */
-      TestResult tr15 = tcd.getTestResultFailed(SPEC2_26_TAGLIBPARAM_PARAMRESOURCE4);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibParam_paramResource5                        */
-      /* Details: "The param tag required attribute \"value\" defines the     */
-      /* parameter value"                                                     */
-      TestResult tr16 = tcd.getTestResultFailed(SPEC2_26_TAGLIBPARAM_PARAMRESOURCE5);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibParam_paramResource6                        */
-      /* Details: "If the \"value\" attribute is null or empty, no action     */
-      /* is performed"                                                        */
-      TestResult tr17 = tcd.getTestResultFailed(SPEC2_26_TAGLIBPARAM_PARAMRESOURCE6);
-      /* 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);
-
-
-   }
-
-}
-

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/23a1c547/portlet-tck_3.0/V2PortletTagLibraryTests/src/main/java/javax/portlet/tck/portlets/PortletTagLibraryTests_SPEC2_26_TagLibProperty.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2PortletTagLibraryTests/src/main/java/javax/portlet/tck/portlets/PortletTagLibraryTests_SPEC2_26_TagLibProperty.java b/portlet-tck_3.0/V2PortletTagLibraryTests/src/main/java/javax/portlet/tck/portlets/PortletTagLibraryTests_SPEC2_26_TagLibProperty.java
deleted file mode 100644
index 84deaa5..0000000
--- a/portlet-tck_3.0/V2PortletTagLibraryTests/src/main/java/javax/portlet/tck/portlets/PortletTagLibraryTests_SPEC2_26_TagLibProperty.java
+++ /dev/null
@@ -1,215 +0,0 @@
-/*  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.IOException;
-import java.io.PrintWriter;
-
-import java.util.Enumeration;
-import java.util.Locale;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-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 static javax.portlet.tck.beans.JSR286SpecTestCaseDetails.*;
-import javax.portlet.tck.beans.TestResult;
-
-/**
- * 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.
- */
-public class PortletTagLibraryTests_SPEC2_26_TagLibProperty implements Portlet {
-   private static final String LOG_CLASS = 
-         PortletTagLibraryTests_SPEC2_26_TagLibProperty.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 actionRequest, ActionResponse actionResponse)
-         throws PortletException, IOException {
-   }
-
-   @Override
-   public void render(RenderRequest renderRequest, RenderResponse renderResponse)
-         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
-
-      /* TestCase: SPEC2_26_TagLibProperty_propertyAction1                    */
-      /* Details: "The property tag can be used within the actionURL tag to   */
-      /* add a property"                                                      */
-      TestResult tr0 = tcd.getTestResultFailed(SPEC2_26_TAGLIBPROPERTY_PROPERTYACTION1);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibProperty_propertyAction2                    */
-      /* Details: "The property tag required attribute \"name\" defines the   */
-      /* property name"                                                       */
-      TestResult tr1 = tcd.getTestResultFailed(SPEC2_26_TAGLIBPROPERTY_PROPERTYACTION2);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibProperty_propertyAction3                    */
-      /* Details: "If more than one tags appear in the actionURL tag, the     */
-      /* values must be stored as a multivalued array in order of             */
-      /* appearance within the actionURL tag"                                 */
-      TestResult tr2 = tcd.getTestResultFailed(SPEC2_26_TAGLIBPROPERTY_PROPERTYACTION3);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibProperty_propertyAction4                    */
-      /* Details: "If the \"name\" attribute is null or empty, no action is   */
-      /* performed"                                                           */
-      TestResult tr3 = tcd.getTestResultFailed(SPEC2_26_TAGLIBPROPERTY_PROPERTYACTION4);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibProperty_propertyAction5                    */
-      /* Details: "The property tag required attribute \"value\" defines      */
-      /* the property value"                                                  */
-      TestResult tr4 = tcd.getTestResultFailed(SPEC2_26_TAGLIBPROPERTY_PROPERTYACTION5);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibProperty_propertyAction6                    */
-      /* Details: "If the \"value\" attribute is null or empty,  the          */
-      /* property value is set to null"                                       */
-      TestResult tr5 = tcd.getTestResultFailed(SPEC2_26_TAGLIBPROPERTY_PROPERTYACTION6);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibProperty_propertyRender1                    */
-      /* Details: "The property tag can be used within the renderURL tag to   */
-      /* add a property"                                                      */
-      TestResult tr6 = tcd.getTestResultFailed(SPEC2_26_TAGLIBPROPERTY_PROPERTYRENDER1);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibProperty_propertyRender2                    */
-      /* Details: "The property tag required attribute \"name\" defines the   */
-      /* property name"                                                       */
-      TestResult tr7 = tcd.getTestResultFailed(SPEC2_26_TAGLIBPROPERTY_PROPERTYRENDER2);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibProperty_propertyRender3                    */
-      /* Details: "If more than one tags appear in the renderURL tag, the     */
-      /* values must be stored as a multivalued array in order of             */
-      /* appearance within the renderURL tag"                                 */
-      TestResult tr8 = tcd.getTestResultFailed(SPEC2_26_TAGLIBPROPERTY_PROPERTYRENDER3);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibProperty_propertyRender4                    */
-      /* Details: "If the \"name\" attribute is null or empty, no action is   */
-      /* performed"                                                           */
-      TestResult tr9 = tcd.getTestResultFailed(SPEC2_26_TAGLIBPROPERTY_PROPERTYRENDER4);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibProperty_propertyRender5                    */
-      /* Details: "The property tag required attribute \"value\" defines      */
-      /* the property value"                                                  */
-      TestResult tr10 = tcd.getTestResultFailed(SPEC2_26_TAGLIBPROPERTY_PROPERTYRENDER5);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibProperty_propertyRender6                    */
-      /* Details: "If the \"value\" attribute is null or empty,  the          */
-      /* property value is set to null"                                       */
-      TestResult tr11 = tcd.getTestResultFailed(SPEC2_26_TAGLIBPROPERTY_PROPERTYRENDER6);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibProperty_propertyResource1                  */
-      /* Details: "The property tag can be used within the resourceURL tag    */
-      /* to add a property"                                                   */
-      TestResult tr12 = tcd.getTestResultFailed(SPEC2_26_TAGLIBPROPERTY_PROPERTYRESOURCE1);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibProperty_propertyResource2                  */
-      /* Details: "The property tag required attribute \"name\" defines the   */
-      /* property name"                                                       */
-      TestResult tr13 = tcd.getTestResultFailed(SPEC2_26_TAGLIBPROPERTY_PROPERTYRESOURCE2);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibProperty_propertyResource3                  */
-      /* Details: "If more than one tags appear in the resourceURL tag, the   */
-      /* values must be stored as a multivalued array in order of             */
-      /* appearance within the resourceURL tag"                               */
-      TestResult tr14 = tcd.getTestResultFailed(SPEC2_26_TAGLIBPROPERTY_PROPERTYRESOURCE3);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibProperty_propertyResource4                  */
-      /* Details: "If the \"name\" attribute is null or empty, no action is   */
-      /* performed"                                                           */
-      TestResult tr15 = tcd.getTestResultFailed(SPEC2_26_TAGLIBPROPERTY_PROPERTYRESOURCE4);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibProperty_propertyResource5                  */
-      /* Details: "The property tag required attribute \"value\" defines      */
-      /* the property value"                                                  */
-      TestResult tr16 = tcd.getTestResultFailed(SPEC2_26_TAGLIBPROPERTY_PROPERTYRESOURCE5);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibProperty_propertyResource6                  */
-      /* Details: "If the \"value\" attribute is null or empty, the           */
-      /* property value is set to null"                                       */
-      TestResult tr17 = tcd.getTestResultFailed(SPEC2_26_TAGLIBPROPERTY_PROPERTYRESOURCE6);
-      /* 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);
-
-
-   }
-
-}
-

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/23a1c547/portlet-tck_3.0/V2PortletTagLibraryTests/src/main/java/javax/portlet/tck/portlets/PortletTagLibraryTests_SPEC2_26_TagLibRender.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2PortletTagLibraryTests/src/main/java/javax/portlet/tck/portlets/PortletTagLibraryTests_SPEC2_26_TagLibRender.java b/portlet-tck_3.0/V2PortletTagLibraryTests/src/main/java/javax/portlet/tck/portlets/PortletTagLibraryTests_SPEC2_26_TagLibRender.java
deleted file mode 100644
index 525ddd4..0000000
--- a/portlet-tck_3.0/V2PortletTagLibraryTests/src/main/java/javax/portlet/tck/portlets/PortletTagLibraryTests_SPEC2_26_TagLibRender.java
+++ /dev/null
@@ -1,373 +0,0 @@
-/*  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.IOException;
-import java.io.PrintWriter;
-
-import java.util.Enumeration;
-import java.util.Locale;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-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 static javax.portlet.tck.beans.JSR286SpecTestCaseDetails.*;
-import javax.portlet.tck.beans.TestResult;
-
-/**
- * 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.
- */
-public class PortletTagLibraryTests_SPEC2_26_TagLibRender implements Portlet {
-   private static final String LOG_CLASS = 
-         PortletTagLibraryTests_SPEC2_26_TagLibRender.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 actionRequest, ActionResponse actionResponse)
-         throws PortletException, IOException {
-   }
-
-   @Override
-   public void render(RenderRequest renderRequest, RenderResponse renderResponse)
-         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
-
-      /* TestCase: SPEC2_26_TagLibRender_defineObjectsRender1                 */
-      /* Details: "When included in the Render phase, the defineObjects tag   */
-      /* defines the variable RenderRequest renderRequest to the              */
-      /* corresponding object"                                                */
-      TestResult tr0 = tcd.getTestResultFailed(SPEC2_26_TAGLIBRENDER_DEFINEOBJECTSRENDER1);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibRender_defineObjectsRender2                 */
-      /* Details: "When included in the Render phase, the defineObjects tag   */
-      /* defines the variable ResourceRequest resourceRequest to be null or   */
-      /* undefined"                                                           */
-      TestResult tr1 = tcd.getTestResultFailed(SPEC2_26_TAGLIBRENDER_DEFINEOBJECTSRENDER2);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibRender_defineObjectsRender3                 */
-      /* Details: "When included in the Render phase, the defineObjects tag   */
-      /* defines the variable ActionRequest actionRequest to be null or       */
-      /* undefined"                                                           */
-      TestResult tr2 = tcd.getTestResultFailed(SPEC2_26_TAGLIBRENDER_DEFINEOBJECTSRENDER3);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibRender_defineObjectsRender4                 */
-      /* Details: "When included in the Render phase, the defineObjects tag   */
-      /* defines the variable EventRequest eventRequest to be null or         */
-      /* undefined"                                                           */
-      TestResult tr3 = tcd.getTestResultFailed(SPEC2_26_TAGLIBRENDER_DEFINEOBJECTSRENDER4);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibRender_defineObjectsRender5                 */
-      /* Details: "When included in the Render phase, the defineObjects tag   */
-      /* defines the variable RenderResponse renderResponse to the            */
-      /* corresponding object"                                                */
-      TestResult tr4 = tcd.getTestResultFailed(SPEC2_26_TAGLIBRENDER_DEFINEOBJECTSRENDER5);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibRender_defineObjectsRender6                 */
-      /* Details: "When included in the Render phase, the defineObjects tag   */
-      /* defines the variable ResourceResponse resourceResponse to be null    */
-      /* or undefined"                                                        */
-      TestResult tr5 = tcd.getTestResultFailed(SPEC2_26_TAGLIBRENDER_DEFINEOBJECTSRENDER6);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibRender_defineObjectsRender7                 */
-      /* Details: "When included in the Render phase, the defineObjects tag   */
-      /* defines the variable ActionResponse actionResponse to be null or     */
-      /* undefined"                                                           */
-      TestResult tr6 = tcd.getTestResultFailed(SPEC2_26_TAGLIBRENDER_DEFINEOBJECTSRENDER7);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibRender_defineObjectsRender8                 */
-      /* Details: "When included in the Render phase, the defineObjects tag   */
-      /* defines the variable EventResponse eventResponse to be null or       */
-      /* undefined"                                                           */
-      TestResult tr7 = tcd.getTestResultFailed(SPEC2_26_TAGLIBRENDER_DEFINEOBJECTSRENDER8);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibRender_defineObjectsRender9                 */
-      /* Details: "When included in the Render phase, the defineObjects tag   */
-      /* defines the variable PortletConfig portletConfig"                    */
-      TestResult tr8 = tcd.getTestResultFailed(SPEC2_26_TAGLIBRENDER_DEFINEOBJECTSRENDER9);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibRender_defineObjectsRender10                */
-      /* Details: "When included in the Render phase, the defineObjects tag   */
-      /* defines the variable PortletSession portletSession, providing        */
-      /* access to the portletSession, does not create a new session, only    */
-      /* returns an existing session or null if no session exists."           */
-      TestResult tr9 = tcd.getTestResultFailed(SPEC2_26_TAGLIBRENDER_DEFINEOBJECTSRENDER10);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibRender_defineObjectsRender11                */
-      /* Details: "When included in the Render phase, the defineObjects tag   */
-      /* defines the variable Map<String, Object> portletSessionScope,        */
-      /* providing access to the portletSession attributes as a Map           */
-      /* equivalent to the PortletSession.getAttributeMap() call, does not    */
-      /* create a new session, only returns an existing session. If no        */
-      /* session attributes exist this method returns an empty Map."          */
-      TestResult tr10 = tcd.getTestResultFailed(SPEC2_26_TAGLIBRENDER_DEFINEOBJECTSRENDER11);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibRender_defineObjectsRender12                */
-      /* Details: "When included in the Render phase, the defineObjects tag   */
-      /* defines the variable PortletPreferences portletPreferences,          */
-      /* providing access to the portlet preferences."                        */
-      TestResult tr11 = tcd.getTestResultFailed(SPEC2_26_TAGLIBRENDER_DEFINEOBJECTSRENDER12);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibRender_defineObjectsRender13                */
-      /* Details: "When included in the Render phase, the defineObjects tag   */
-      /* defines the variable Map<String, String[]>                           */
-      /* portletPreferencesValues, providing access to the portlet            */
-      /* preferences as a Map, equivalent to the                              */
-      /* PortletPreferences.getMap() call. If no portlet preferences exist,   */
-      /* the Map is empty."                                                   */
-      TestResult tr12 = tcd.getTestResultFailed(SPEC2_26_TAGLIBRENDER_DEFINEOBJECTSRENDER13);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibRender_renderURL1                           */
-      /* Details: "The portlet renderURL tag creates a URL that must point    */
-      /* to the current portlet and must trigger an render request with the   */
-      /* supplied parameters"                                                 */
-      TestResult tr13 = tcd.getTestResultFailed(SPEC2_26_TAGLIBRENDER_RENDERURL1);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibRender_renderURL2                           */
-      /* Details: "Parameters may be added to the URL by including the        */
-      /* param tag between the renderURL start and end tags"                  */
-      TestResult tr14 = tcd.getTestResultFailed(SPEC2_26_TAGLIBRENDER_RENDERURL2);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibRender_renderURL3                           */
-      /* Details: "The optional renderURL \"windowState\" attribute can       */
-      /* specify the desired window state after the URL is triggered"         */
-      TestResult tr15 = tcd.getTestResultFailed(SPEC2_26_TAGLIBRENDER_RENDERURL3);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibRender_renderURL4                           */
-      /* Details: "If the \"windowState\" attribute specifies an invalid      */
-      /* value, a JspException with the PortletException that caused this     */
-      /* error as root cause is thrown"                                       */
-      TestResult tr16 = tcd.getTestResultFailed(SPEC2_26_TAGLIBRENDER_RENDERURL4);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibRender_renderURL5                           */
-      /* Details: "The \"windowState\" attribute is not case sensitive"       */
-      TestResult tr17 = tcd.getTestResultFailed(SPEC2_26_TAGLIBRENDER_RENDERURL5);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibRender_renderURL6                           */
-      /* Details: "The \"windowState\" attribute is not specified, the        */
-      /* current window state is retained when the URL is triggered"          */
-      TestResult tr18 = tcd.getTestResultFailed(SPEC2_26_TAGLIBRENDER_RENDERURL6);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibRender_renderURL7                           */
-      /* Details: "The optional renderURL \"portletMode\" attribute can       */
-      /* specify the desired portlet mode after the URL is triggered"         */
-      TestResult tr19 = tcd.getTestResultFailed(SPEC2_26_TAGLIBRENDER_RENDERURL7);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibRender_renderURL8                           */
-      /* Details: "If the \"portletMode\" attribute specifies an invalid      */
-      /* value, a JspException with the PortletException that caused this     */
-      /* error as root cause is thrown"                                       */
-      TestResult tr20 = tcd.getTestResultFailed(SPEC2_26_TAGLIBRENDER_RENDERURL8);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibRender_renderURL9                           */
-      /* Details: "The \"portletMode\" attribute is not case sensitive"       */
-      TestResult tr21 = tcd.getTestResultFailed(SPEC2_26_TAGLIBRENDER_RENDERURL9);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibRender_renderURL10                          */
-      /* Details: "The \"portletMode\" attribute is not specified, the        */
-      /* current portlet mode is retained when the URL is triggered"          */
-      TestResult tr22 = tcd.getTestResultFailed(SPEC2_26_TAGLIBRENDER_RENDERURL10);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibRender_renderURL11                          */
-      /* Details: "The optional renderURL \"var\" attribute can specify a     */
-      /* scoped variable for exporting the action URL"                        */
-      TestResult tr23 = tcd.getTestResultFailed(SPEC2_26_TAGLIBRENDER_RENDERURL11);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibRender_renderURL12                          */
-      /* Details: "If the renderURL \"var\" attribute is specified, the URL   */
-      /* is not written to the JspWriter"                                     */
-      TestResult tr24 = tcd.getTestResultFailed(SPEC2_26_TAGLIBRENDER_RENDERURL12);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibRender_renderURL13                          */
-      /* Details: "If the renderURL \"var\" attribute is not specified, the   */
-      /* URL is written to the JspWriter"                                     */
-      TestResult tr25 = tcd.getTestResultFailed(SPEC2_26_TAGLIBRENDER_RENDERURL13);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibRender_renderURL14                          */
-      /* Details: "If the optional renderURL \"secure\" attribute is set to   */
-      /* true, the resulting URL should require a secure connection"          */
-      TestResult tr26 = tcd.getTestResultFailed(SPEC2_26_TAGLIBRENDER_RENDERURL14);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibRender_renderURL15                          */
-      /* Details: "If the optional renderURL \"secure\" attribute is set to   */
-      /* false, the resulting URL does not need to require a secure           */
-      /* connection"                                                          */
-      TestResult tr27 = tcd.getTestResultFailed(SPEC2_26_TAGLIBRENDER_RENDERURL15);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibRender_renderURL17                          */
-      /* Details: "The \"secure\" attribute is not specified, the security    */
-      /* setting is retained"                                                 */
-      TestResult tr28 = tcd.getTestResultFailed(SPEC2_26_TAGLIBRENDER_RENDERURL17);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibRender_renderURL18                          */
-      /* Details: "If the optional renderURL                                  */
-      /* \"copyCurrentRenderParameters\" attribute is set to true, the        */
-      /* current private render parameters are attached to the URL"           */
-      TestResult tr29 = tcd.getTestResultFailed(SPEC2_26_TAGLIBRENDER_RENDERURL18);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibRender_renderURL19                          */
-      /* Details: "If the optional renderURL                                  */
-      /* \"copyCurrentRenderParameters\" attribute is set to true,            */
-      /* additional parameters specified with the <portlet:param> element     */
-      /* are merged with the render parameters"                               */
-      TestResult tr30 = tcd.getTestResultFailed(SPEC2_26_TAGLIBRENDER_RENDERURL19);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibRender_renderURL20                          */
-      /* Details: "If the optional renderURL                                  */
-      /* \"copyCurrentRenderParameters\" attribute is set to true,            */
-      /* additional parameters specified with the <portlet:param> element     */
-      /* appear in the values array before the render parameter values if     */
-      /* there is a name conflict"                                            */
-      TestResult tr31 = tcd.getTestResultFailed(SPEC2_26_TAGLIBRENDER_RENDERURL20);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibRender_renderURL21                          */
-      /* Details: "If the optional renderURL                                  */
-      /* \"copyCurrentRenderParameters\" attribute is set to false, the       */
-      /* current render parameters are not attached to the URL"               */
-      TestResult tr32 = tcd.getTestResultFailed(SPEC2_26_TAGLIBRENDER_RENDERURL21);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibRender_renderURL22                          */
-      /* Details: "If the \"copyCurrentRenderParameters\" attribute           */
-      /* specifies an invalid value, a JspException is thrown"                */
-      TestResult tr33 = tcd.getTestResultFailed(SPEC2_26_TAGLIBRENDER_RENDERURL22);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibRender_renderURL23                          */
-      /* Details: "The \"copyCurrentRenderParameters\" attribute is not       */
-      /* specified, the security setting is retained"                         */
-      TestResult tr34 = tcd.getTestResultFailed(SPEC2_26_TAGLIBRENDER_RENDERURL23);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibRender_renderURL25                          */
-      /* Details: "If the optional renderURL \"escapeXML\" attribute is set   */
-      /* to false, the characters \"<>&'\\\"\" are not converted to their     */
-      /* entity codes"                                                        */
-      TestResult tr35 = tcd.getTestResultFailed(SPEC2_26_TAGLIBRENDER_RENDERURL25);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibRender_renderURL26                          */
-      /* Details: "The \"escapeXML\" attribute default value is true"         */
-      TestResult tr36 = tcd.getTestResultFailed(SPEC2_26_TAGLIBRENDER_RENDERURL26);
-      /* 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.writeTo(writer);
-      tr30.writeTo(writer);
-      tr31.writeTo(writer);
-      tr32.writeTo(writer);
-      tr33.writeTo(writer);
-      tr34.writeTo(writer);
-      tr35.writeTo(writer);
-      tr36.writeTo(writer);
-
-
-   }
-
-}
-


[19/22] git commit: 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.

Posted by ms...@apache.org.
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.


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

Branch: refs/heads/master
Commit: 23a1c54763d6d4ac6a174bd1ccaeb48a021e2ff0
Parents: e531b0b
Author: Scott Nicklous <ms...@apache.org>
Authored: Fri Aug 22 22:47:49 2014 +0200
Committer: Scott Nicklous <ms...@apache.org>
Committed: Fri Aug 22 22:47:49 2014 +0200

----------------------------------------------------------------------
 portlet-tck_3.0/V2AddlEnvironmentTests/pom.xml  |  250 +-
 .../AddlEnvironmentTests_SPEC2_10_Context.java  |  231 +-
 ...nvironmentTests_SPEC2_10_ContextOptions.java |  169 +-
 ...ronmentTests_SPEC2_17_ActionPreferences.java |  269 ++
 ...ironmentTests_SPEC2_17_EventPreferences.java |  189 ++
 ...ntTests_SPEC2_17_EventPreferences_event.java |  178 ++
 ...dlEnvironmentTests_SPEC2_17_Preferences.java |  285 --
 ...ronmentTests_SPEC2_17_RenderPreferences.java |  121 +
 ...nmentTests_SPEC2_17_ResourcePreferences.java |  189 ++
 .../AddlEnvironmentTests_SPEC2_18_Sessions.java |  362 +--
 .../resources/xml-resources/additionalTCs.xml   |  191 +-
 .../src/main/webapp/WEB-INF/portlet.xml         |  122 +-
 .../src/main/webapp/WEB-INF/web.xml             |    4 +-
 portlet-tck_3.0/V2AddlFilterTests/pom.xml       |  250 +-
 .../AddlFilterTests_SPEC2_20_Action.java        |  385 +++
 .../AddlFilterTests_SPEC2_20_Event.java         |  253 ++
 .../AddlFilterTests_SPEC2_20_Event_event.java   |  230 ++
 .../AddlFilterTests_SPEC2_20_PortletFilter.java |  258 --
 .../AddlFilterTests_SPEC2_20_Render.java        |  226 ++
 .../AddlFilterTests_SPEC2_20_Resource.java      |  242 ++
 .../resources/xml-resources/additionalTCs.xml   |   86 +-
 .../src/main/webapp/WEB-INF/portlet.xml         |  116 +-
 .../src/main/webapp/WEB-INF/web.xml             |    4 +-
 portlet-tck_3.0/V2AddlPortletTests/pom.xml      |  250 +-
 ...dlPortletTests_SPEC2_13_ResourceServing.java |  170 +-
 ...tletTests_SPEC2_13_ResourceServingCache.java |  294 ++-
 ...rtletTests_SPEC2_15_ActionEventHandling.java |  289 ++
 .../AddlPortletTests_SPEC2_15_Event.java        |  332 +--
 ...ortletTests_SPEC2_15_EventEventHandling.java |  294 +++
 ...Tests_SPEC2_15_EventEventHandling_event.java |  263 ++
 .../AddlPortletTests_SPEC2_15_Event_event.java  |  116 +
 ...rtletTests_SPEC2_15_RenderEventHandling.java |  129 +
 .../AddlPortletTests_SPEC2_2_Compatibility.java |   85 +-
 ...AddlPortletTests_SPEC2_5_ActionHandling.java |  213 ++
 .../AddlPortletTests_SPEC2_5_EventHandling.java |  126 +
 ...ortletTests_SPEC2_5_EventHandling_event.java |  127 +
 ...AddlPortletTests_SPEC2_5_GenericPortlet.java |  127 -
 ...AddlPortletTests_SPEC2_5_Initialization.java |   78 +-
 ...rtletTests_SPEC2_5_RenderGenericPortlet.java |  151 ++
 ...AddlPortletTests_SPEC2_5_RenderHandling.java |  114 +
 ...ddlPortletTests_SPEC2_5_RequestHandling.java |  181 --
 ...dlPortletTests_SPEC2_5_ResourceHandling.java |  129 +
 .../AddlPortletTests_SPEC2_6_Config.java        |  239 --
 .../AddlPortletTests_SPEC2_6_RenderConfig.java  |  219 ++
 .../AddlPortletTests_SPEC2_6_RenderConfig2.java |  132 +
 .../AddlPortletTests_SPEC2_6_RenderConfig3.java |  135 +
 .../AddlPortletTests_SPEC2_8_PortletModes.java  |  134 +-
 .../AddlPortletTests_SPEC2_9_WindowStates.java  |  120 +-
 .../resources/xml-resources/additionalTCs.xml   |  256 +-
 .../src/main/webapp/WEB-INF/portlet.xml         |  274 +-
 .../src/main/webapp/WEB-INF/web.xml             |    4 +-
 portlet-tck_3.0/V2AddlRequestTests/pom.xml      |  250 +-
 .../AddlRequestTests_SPEC2_11_Action.java       |  295 +++
 .../AddlRequestTests_SPEC2_11_ActionAttr.java   |  171 ++
 .../AddlRequestTests_SPEC2_11_ActionReq.java    |  271 ++
 .../AddlRequestTests_SPEC2_11_Event.java        |  179 ++
 .../AddlRequestTests_SPEC2_11_EventAttr.java    |  135 +
 ...dlRequestTests_SPEC2_11_EventAttr_event.java |  134 +
 .../AddlRequestTests_SPEC2_11_EventReq.java     |  190 ++
 ...ddlRequestTests_SPEC2_11_EventReq_event.java |  179 ++
 .../AddlRequestTests_SPEC2_11_Event_event.java  |  170 ++
 .../AddlRequestTests_SPEC2_11_Render.java       |  226 ++
 .../AddlRequestTests_SPEC2_11_RenderAttr.java   |  159 ++
 .../AddlRequestTests_SPEC2_11_RenderPRP.java    |  134 +
 .../AddlRequestTests_SPEC2_11_RenderReq.java    |  183 ++
 .../AddlRequestTests_SPEC2_11_Request.java      |  264 --
 .../AddlRequestTests_SPEC2_11_RequestPRP.java   |  195 --
 ...equestTests_SPEC2_11_RequestParamsProps.java |  178 --
 .../AddlRequestTests_SPEC2_11_Resource.java     |  190 ++
 .../AddlRequestTests_SPEC2_11_ResourceAttr.java |  145 +
 .../AddlRequestTests_SPEC2_11_ResourceReq.java  |  189 ++
 .../resources/xml-resources/additionalTCs.xml   |  144 +-
 .../src/main/webapp/WEB-INF/portlet.xml         |  247 +-
 .../src/main/webapp/WEB-INF/web.xml             |    4 +-
 portlet-tck_3.0/V2AddlResponseTests/pom.xml     |  250 +-
 .../AddlResponseTests_SPEC2_12_Action.java      |  245 ++
 .../AddlResponseTests_SPEC2_12_Event.java       |  134 +
 .../AddlResponseTests_SPEC2_12_Event_event.java |  133 +
 .../AddlResponseTests_SPEC2_12_Render.java      |  181 ++
 .../AddlResponseTests_SPEC2_12_Resource.java    |  197 ++
 ...lResponseTests_SPEC2_12_ResponseContent.java |  146 --
 ...sponseTests_SPEC2_12_ResponseProperties.java |  220 --
 ...ResponseTests_SPEC2_12_ResponseRedirect.java |  109 -
 .../resources/xml-resources/additionalTCs.xml   |   65 +-
 .../src/main/webapp/WEB-INF/portlet.xml         |  123 +-
 .../src/main/webapp/WEB-INF/web.xml             |    4 +-
 portlet-tck_3.0/V2AddlUrlTests/pom.xml          |  250 +-
 .../tck/portlets/AddlUrlTests_SPEC2_7_Url.java  |  145 -
 .../AddlUrlTests_SPEC2_7_UrlAction.java         |  219 +-
 .../AddlUrlTests_SPEC2_7_UrlListener.java       |   78 +-
 .../AddlUrlTests_SPEC2_7_UrlRender.java         |  214 +-
 .../AddlUrlTests_SPEC2_7_UrlResource.java       |  147 +-
 .../resources/xml-resources/additionalTCs.xml   |   82 +-
 .../src/main/webapp/WEB-INF/portlet.xml         |   83 +-
 .../src/main/webapp/WEB-INF/web.xml             |    4 +-
 .../V2PortletTagLibraryTests/pom.xml            |  250 +-
 ...gLibraryTests_SPEC2_26_IncludeJSPAction.java |  262 ++
 ...agLibraryTests_SPEC2_26_IncludeJSPEvent.java |  253 ++
 ...aryTests_SPEC2_26_IncludeJSPEvent_event.java |  107 +
 ...LibraryTests_SPEC2_26_IncludeJSPGeneral.java |  106 +
 .../PortletTagLibraryTests_SPEC2_26_TagLib.java |  130 -
 ...etTagLibraryTests_SPEC2_26_TagLibAction.java |  516 ----
 ...letTagLibraryTests_SPEC2_26_TagLibParam.java |  215 --
 ...TagLibraryTests_SPEC2_26_TagLibProperty.java |  215 --
 ...etTagLibraryTests_SPEC2_26_TagLibRender.java |  373 ---
 ...TagLibraryTests_SPEC2_26_TagLibResource.java |  385 ---
 ...ortletTagLibraryTests_SPEC2_26_TagLibV1.java |   93 -
 .../resources/xml-resources/additionalTCs.xml   |  212 +-
 ...agLibraryTests_SPEC2_26_IncludeJSPAction.jsp |  152 ++
 ...TagLibraryTests_SPEC2_26_IncludeJSPEvent.jsp |  152 ++
 ...gLibraryTests_SPEC2_26_IncludeJSPGeneral.jsp |   84 +
 .../src/main/webapp/WEB-INF/portlet.xml         |  192 +-
 .../src/main/webapp/WEB-INF/web.xml             |    4 +-
 .../V2PortletTagLibraryTests2/pom.xml           |  127 +
 ...LibraryTests2_SPEC2_26_IncludeJSPRender.java |  106 +
 .../resources/xml-resources/additionalTCs.xml   |  149 ++
 ...gLibraryTests2_SPEC2_26_IncludeJSPRender.jsp | 1096 ++++++++
 .../src/main/webapp/WEB-INF/portlet.xml         |   92 +
 .../src/main/webapp/WEB-INF/web.xml             |   23 +
 .../V2PortletTagLibraryTests3/pom.xml           |  127 +
 ...braryTests3_SPEC2_26_IncludeJSPResource.java |  121 +
 .../resources/xml-resources/additionalTCs.xml   |  149 ++
 ...ibraryTests3_SPEC2_26_IncludeJSPResource.jsp | 1096 ++++++++
 .../src/main/webapp/WEB-INF/portlet.xml         |   92 +
 .../src/main/webapp/WEB-INF/web.xml             |   23 +
 .../tck/beans/JSR286SpecTestCaseDetails.java    | 2479 ++++++++++--------
 portlet-tck_3.0/deploy/pom.xml                  |   12 +
 portlet-tck_3.0/driver/pom.xml                  |   14 +
 .../main/resources/xml-resources/pageFiles.xml  |    2 +
 .../main/resources/xml-resources/testFiles.xml  |    2 +
 portlet-tck_3.0/pom.xml                         |    2 +
 131 files changed, 17932 insertions(+), 8333 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/23a1c547/portlet-tck_3.0/V2AddlEnvironmentTests/pom.xml
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlEnvironmentTests/pom.xml b/portlet-tck_3.0/V2AddlEnvironmentTests/pom.xml
index efca2c5..3a23385 100644
--- a/portlet-tck_3.0/V2AddlEnvironmentTests/pom.xml
+++ b/portlet-tck_3.0/V2AddlEnvironmentTests/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-V2AddlEnvironmentTests</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-V2AddlEnvironmentTests</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/V2AddlEnvironmentTests/src/main/java/javax/portlet/tck/portlets/AddlEnvironmentTests_SPEC2_10_Context.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlEnvironmentTests/src/main/java/javax/portlet/tck/portlets/AddlEnvironmentTests_SPEC2_10_Context.java b/portlet-tck_3.0/V2AddlEnvironmentTests/src/main/java/javax/portlet/tck/portlets/AddlEnvironmentTests_SPEC2_10_Context.java
index db1f276..bce0a23 100644
--- a/portlet-tck_3.0/V2AddlEnvironmentTests/src/main/java/javax/portlet/tck/portlets/AddlEnvironmentTests_SPEC2_10_Context.java
+++ b/portlet-tck_3.0/V2AddlEnvironmentTests/src/main/java/javax/portlet/tck/portlets/AddlEnvironmentTests_SPEC2_10_Context.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 AddlEnvironmentTests_SPEC2_10_Context_event
+ *
  */
-public class AddlEnvironmentTests_SPEC2_10_Context implements Portlet {
+public class AddlEnvironmentTests_SPEC2_10_Context implements Portlet, ResourceServingPortlet {
    private static final String LOG_CLASS = 
          AddlEnvironmentTests_SPEC2_10_Context.class.getName();
    private final Logger LOGGER = Logger.getLogger(LOG_CLASS);
@@ -57,146 +62,176 @@ public class AddlEnvironmentTests_SPEC2_10_Context 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 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 renderRequest, RenderResponse renderResponse)
+   public void render(RenderRequest portletReq, RenderResponse portletResp)
          throws PortletException, IOException {
-      
-      if (LOGGER.isLoggable(Level.FINE)) {
-         LOGGER.logp(Level.FINE, LOG_CLASS, "render", "Entry");
-      }
+      LOGGER.entering(LOG_CLASS, "main portlet render 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_10_Context_portletContextServletContext1             */
+      /* TestCase: V2AddlEnvironmentTests_SPEC2_10_Context_portletContextServletContext1 */
       /* Details: "The initialization parameters accessible through the       */
       /* PortletContext must be the same that are accessible through the      */
       /* ServletContext of the portlet application"                           */
-      TestResult tr0 = tcd.getTestResultFailed(SPEC2_10_CONTEXT_PORTLETCONTEXTSERVLETCONTEXT1);
+      TestResult tr0 = tcd.getTestResultFailed(V2ADDLENVIRONMENTTESTS_SPEC2_10_CONTEXT_PORTLETCONTEXTSERVLETCONTEXT1);
       /* TODO: implement test */
+      tr0.appendTcDetail("Not implemented.");
+      tr0.writeTo(writer);
 
-      /* TestCase: SPEC2_10_Context_portletContextServletContext2             */
+      /* TestCase: V2AddlEnvironmentTests_SPEC2_10_Context_portletContextServletContext2 */
       /* Details: "The context initialization parameters are set in the       */
       /* web.xml file"                                                        */
-      TestResult tr1 = tcd.getTestResultFailed(SPEC2_10_CONTEXT_PORTLETCONTEXTSERVLETCONTEXT2);
+      TestResult tr1 = tcd.getTestResultFailed(V2ADDLENVIRONMENTTESTS_SPEC2_10_CONTEXT_PORTLETCONTEXTSERVLETCONTEXT2);
       /* TODO: implement test */
+      tr1.appendTcDetail("Not implemented.");
+      tr1.writeTo(writer);
 
-      /* TestCase: SPEC2_10_Context_portletContextServletContext3             */
+      /* TestCase: V2AddlEnvironmentTests_SPEC2_10_Context_portletContextServletContext3 */
       /* Details: "The PortletContext must offer access to the same set of    */
       /* resources the ServletContext exposes"                                */
-      TestResult tr2 = tcd.getTestResultFailed(SPEC2_10_CONTEXT_PORTLETCONTEXTSERVLETCONTEXT3);
+      TestResult tr2 = tcd.getTestResultFailed(V2ADDLENVIRONMENTTESTS_SPEC2_10_CONTEXT_PORTLETCONTEXTSERVLETCONTEXT3);
       /* TODO: implement test */
+      tr2.appendTcDetail("Not implemented.");
+      tr2.writeTo(writer);
 
-      /* TestCase: SPEC2_10_Context_portletContextServletContext4             */
+      /* TestCase: V2AddlEnvironmentTests_SPEC2_10_Context_portletContextServletContext4 */
       /* Details: "The temporary working directory must be accessible as a    */
       /* context attribute through the PortletContext using the attribute     */
       /* name \"javax.servlet.context.tempdir\""                              */
-      TestResult tr3 = tcd.getTestResultFailed(SPEC2_10_CONTEXT_PORTLETCONTEXTSERVLETCONTEXT4);
+      TestResult tr3 = tcd.getTestResultFailed(V2ADDLENVIRONMENTTESTS_SPEC2_10_CONTEXT_PORTLETCONTEXTSERVLETCONTEXT4);
       /* TODO: implement test */
+      tr3.appendTcDetail("Not implemented.");
+      tr3.writeTo(writer);
 
-      /* TestCase: SPEC2_10_Context_portletContextServletContext7             */
-      /* Details: "The PortletContext getAttribute method provides the same   */
-      /* functionality as the ServletContext getAttribute method"             */
-      TestResult tr4 = tcd.getTestResultFailed(SPEC2_10_CONTEXT_PORTLETCONTEXTSERVLETCONTEXT7);
+      /* TestCase: V2AddlEnvironmentTests_SPEC2_10_Context_getAttribute       */
+      /* Details: "The PortletContext.getAttribute method provides the same   */
+      /* functionality as the ServletContext.getAttribute method"             */
+      TestResult tr4 = tcd.getTestResultFailed(V2ADDLENVIRONMENTTESTS_SPEC2_10_CONTEXT_GETATTRIBUTE);
       /* TODO: implement test */
+      tr4.appendTcDetail("Not implemented.");
+      tr4.writeTo(writer);
 
-      /* TestCase: SPEC2_10_Context_portletContextServletContext8             */
-      /* Details: "The PortletContext getAttributeNames method provides the   */
-      /* same functionality as the ServletContext getAttributeNames method"   */
-      TestResult tr5 = tcd.getTestResultFailed(SPEC2_10_CONTEXT_PORTLETCONTEXTSERVLETCONTEXT8);
+      /* TestCase: V2AddlEnvironmentTests_SPEC2_10_Context_getAttributeNames  */
+      /* Details: "The PortletContext.getAttributeNames method provides the   */
+      /* same functionality as the ServletContext.getAttributeNames method"   */
+      TestResult tr5 = tcd.getTestResultFailed(V2ADDLENVIRONMENTTESTS_SPEC2_10_CONTEXT_GETATTRIBUTENAMES);
       /* TODO: implement test */
+      tr5.appendTcDetail("Not implemented.");
+      tr5.writeTo(writer);
 
-      /* TestCase: SPEC2_10_Context_portletContextServletContext9             */
-      /* Details: "The PortletContext getInitParameter method provides the    */
-      /* same functionality as the ServletContext getInitParameter method"    */
-      TestResult tr6 = tcd.getTestResultFailed(SPEC2_10_CONTEXT_PORTLETCONTEXTSERVLETCONTEXT9);
+      /* TestCase: V2AddlEnvironmentTests_SPEC2_10_Context_getInitParameter   */
+      /* Details: "The PortletContext.getInitParameter method provides the    */
+      /* same functionality as the ServletContext.getInitParameter method"    */
+      TestResult tr6 = tcd.getTestResultFailed(V2ADDLENVIRONMENTTESTS_SPEC2_10_CONTEXT_GETINITPARAMETER);
       /* TODO: implement test */
+      tr6.appendTcDetail("Not implemented.");
+      tr6.writeTo(writer);
 
-      /* TestCase: SPEC2_10_Context_portletContextServletContext10            */
-      /* Details: "The PortletContext getInitParameterNames method provides   */
-      /* the same functionality as the ServletContext getInitParameterNames   */
+      /* TestCase: V2AddlEnvironmentTests_SPEC2_10_Context_getInitParameterNames */
+      /* Details: "The PortletContext.getInitParameterNames method provides   */
+      /* the same functionality as the ServletContext.getInitParameterNames   */
       /* method"                                                              */
-      TestResult tr7 = tcd.getTestResultFailed(SPEC2_10_CONTEXT_PORTLETCONTEXTSERVLETCONTEXT10);
+      TestResult tr7 = tcd.getTestResultFailed(V2ADDLENVIRONMENTTESTS_SPEC2_10_CONTEXT_GETINITPARAMETERNAMES);
       /* TODO: implement test */
+      tr7.appendTcDetail("Not implemented.");
+      tr7.writeTo(writer);
 
-      /* TestCase: SPEC2_10_Context_portletContextServletContext11            */
-      /* Details: "The PortletContext getMimeType method provides the same    */
-      /* functionality as the ServletContext getMimeType method"              */
-      TestResult tr8 = tcd.getTestResultFailed(SPEC2_10_CONTEXT_PORTLETCONTEXTSERVLETCONTEXT11);
+      /* TestCase: V2AddlEnvironmentTests_SPEC2_10_Context_getMimeType        */
+      /* Details: "The PortletContext.getMimeType method provides the same    */
+      /* functionality as the ServletContext.getMimeType method"              */
+      TestResult tr8 = tcd.getTestResultFailed(V2ADDLENVIRONMENTTESTS_SPEC2_10_CONTEXT_GETMIMETYPE);
       /* TODO: implement test */
+      tr8.appendTcDetail("Not implemented.");
+      tr8.writeTo(writer);
 
-      /* TestCase: SPEC2_10_Context_portletContextServletContext12            */
-      /* Details: "The PortletContext getRealPath method provides the same    */
-      /* functionality as the ServletContext getRealPath method"              */
-      TestResult tr9 = tcd.getTestResultFailed(SPEC2_10_CONTEXT_PORTLETCONTEXTSERVLETCONTEXT12);
+      /* TestCase: V2AddlEnvironmentTests_SPEC2_10_Context_getRealPath        */
+      /* Details: "The PortletContext.getRealPath method provides the same    */
+      /* functionality as the ServletContext.getRealPath method"              */
+      TestResult tr9 = tcd.getTestResultFailed(V2ADDLENVIRONMENTTESTS_SPEC2_10_CONTEXT_GETREALPATH);
       /* TODO: implement test */
+      tr9.appendTcDetail("Not implemented.");
+      tr9.writeTo(writer);
 
-      /* TestCase: SPEC2_10_Context_portletContextServletContext13            */
-      /* Details: "The PortletContext getResource method provides the same    */
-      /* functionality as the ServletContext getResource method"              */
-      TestResult tr10 = tcd.getTestResultFailed(SPEC2_10_CONTEXT_PORTLETCONTEXTSERVLETCONTEXT13);
+      /* TestCase: V2AddlEnvironmentTests_SPEC2_10_Context_getResource        */
+      /* Details: "The PortletContext.getResource method provides the same    */
+      /* functionality as the ServletContext.getResource method"              */
+      TestResult tr10 = tcd.getTestResultFailed(V2ADDLENVIRONMENTTESTS_SPEC2_10_CONTEXT_GETRESOURCE);
       /* TODO: implement test */
+      tr10.appendTcDetail("Not implemented.");
+      tr10.writeTo(writer);
 
-      /* TestCase: SPEC2_10_Context_portletContextServletContext14            */
-      /* Details: "The PortletContext getResourcePaths method provides the    */
-      /* same functionality as the ServletContext getResourcePaths method"    */
-      TestResult tr11 = tcd.getTestResultFailed(SPEC2_10_CONTEXT_PORTLETCONTEXTSERVLETCONTEXT14);
+      /* TestCase: V2AddlEnvironmentTests_SPEC2_10_Context_getResourcePaths   */
+      /* Details: "The PortletContext.getResourcePaths method provides the    */
+      /* same functionality as the ServletContext.getResourcePaths method"    */
+      TestResult tr11 = tcd.getTestResultFailed(V2ADDLENVIRONMENTTESTS_SPEC2_10_CONTEXT_GETRESOURCEPATHS);
       /* TODO: implement test */
+      tr11.appendTcDetail("Not implemented.");
+      tr11.writeTo(writer);
 
-      /* TestCase: SPEC2_10_Context_portletContextServletContext15            */
-      /* Details: "The PortletContext getResourceAsStream method provides     */
-      /* the same functionality as the ServletContext getResourceAsStream     */
+      /* TestCase: V2AddlEnvironmentTests_SPEC2_10_Context_getResourceAsStream */
+      /* Details: "The PortletContext.getResourceAsStream method provides     */
+      /* the same functionality as the ServletContext.getResourceAsStream     */
       /* method"                                                              */
-      TestResult tr12 = tcd.getTestResultFailed(SPEC2_10_CONTEXT_PORTLETCONTEXTSERVLETCONTEXT15);
+      TestResult tr12 = tcd.getTestResultFailed(V2ADDLENVIRONMENTTESTS_SPEC2_10_CONTEXT_GETRESOURCEASSTREAM);
       /* TODO: implement test */
+      tr12.appendTcDetail("Not implemented.");
+      tr12.writeTo(writer);
 
-      /* TestCase: SPEC2_10_Context_portletContextServletContext16            */
-      /* Details: "The PortletContext log method provides the same            */
-      /* functionality as the ServletContext log method"                      */
-      TestResult tr13 = tcd.getTestResultFailed(SPEC2_10_CONTEXT_PORTLETCONTEXTSERVLETCONTEXT16);
+      /* TestCase: V2AddlEnvironmentTests_SPEC2_10_Context_log                */
+      /* Details: "The PortletContext.log method provides the same            */
+      /* functionality as the ServletContext.log method"                      */
+      TestResult tr13 = tcd.getTestResultFailed(V2ADDLENVIRONMENTTESTS_SPEC2_10_CONTEXT_LOG);
       /* TODO: implement test */
+      tr13.appendTcDetail("Not implemented.");
+      tr13.writeTo(writer);
 
-      /* TestCase: SPEC2_10_Context_portletContextServletContext17            */
-      /* Details: "The PortletContext removeAttribute method provides the     */
-      /* same functionality as the ServletContext removeAttribute method"     */
-      TestResult tr14 = tcd.getTestResultFailed(SPEC2_10_CONTEXT_PORTLETCONTEXTSERVLETCONTEXT17);
+      /* TestCase: V2AddlEnvironmentTests_SPEC2_10_Context_removeAttribute    */
+      /* Details: "The PortletContext.removeAttribute method provides the     */
+      /* same functionality as the ServletContext.removeAttribute method"     */
+      TestResult tr14 = tcd.getTestResultFailed(V2ADDLENVIRONMENTTESTS_SPEC2_10_CONTEXT_REMOVEATTRIBUTE);
       /* TODO: implement test */
+      tr14.appendTcDetail("Not implemented.");
+      tr14.writeTo(writer);
 
-      /* TestCase: SPEC2_10_Context_portletContextServletContext18            */
-      /* Details: "The PortletContext setAttribute method provides the same   */
-      /* functionality as the ServletContext setAttribute method"             */
-      TestResult tr15 = tcd.getTestResultFailed(SPEC2_10_CONTEXT_PORTLETCONTEXTSERVLETCONTEXT18);
+      /* TestCase: V2AddlEnvironmentTests_SPEC2_10_Context_setAttribute       */
+      /* Details: "The PortletContext.setAttribute method provides the same   */
+      /* functionality as the ServletContext.setAttribute method"             */
+      TestResult tr15 = tcd.getTestResultFailed(V2ADDLENVIRONMENTTESTS_SPEC2_10_CONTEXT_SETATTRIBUTE);
       /* 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.appendTcDetail("Not implemented.");
       tr15.writeTo(writer);
 
-
    }
 
 }
-

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/23a1c547/portlet-tck_3.0/V2AddlEnvironmentTests/src/main/java/javax/portlet/tck/portlets/AddlEnvironmentTests_SPEC2_10_ContextOptions.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlEnvironmentTests/src/main/java/javax/portlet/tck/portlets/AddlEnvironmentTests_SPEC2_10_ContextOptions.java b/portlet-tck_3.0/V2AddlEnvironmentTests/src/main/java/javax/portlet/tck/portlets/AddlEnvironmentTests_SPEC2_10_ContextOptions.java
index 432a271..8c2b7df 100644
--- a/portlet-tck_3.0/V2AddlEnvironmentTests/src/main/java/javax/portlet/tck/portlets/AddlEnvironmentTests_SPEC2_10_ContextOptions.java
+++ b/portlet-tck_3.0/V2AddlEnvironmentTests/src/main/java/javax/portlet/tck/portlets/AddlEnvironmentTests_SPEC2_10_ContextOptions.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 AddlEnvironmentTests_SPEC2_10_ContextOptions_event
+ *
  */
-public class AddlEnvironmentTests_SPEC2_10_ContextOptions implements Portlet {
+public class AddlEnvironmentTests_SPEC2_10_ContextOptions implements Portlet, ResourceServingPortlet {
    private static final String LOG_CLASS = 
          AddlEnvironmentTests_SPEC2_10_ContextOptions.class.getName();
    private final Logger LOGGER = Logger.getLogger(LOG_CLASS);
@@ -57,147 +62,175 @@ public class AddlEnvironmentTests_SPEC2_10_ContextOptions 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 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 renderRequest, RenderResponse renderResponse)
+   public void render(RenderRequest portletReq, RenderResponse portletResp)
          throws PortletException, IOException {
-      
-      if (LOGGER.isLoggable(Level.FINE)) {
-         LOGGER.logp(Level.FINE, LOG_CLASS, "render", "Entry");
-      }
+      LOGGER.entering(LOG_CLASS, "main portlet render 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_10_ContextOptions_containerRuntimeOptions1           */
+      /* TestCase: V2AddlEnvironmentTests_SPEC2_10_ContextOptions_containerRuntimeOptions1 */
       /* Details: "The getContainerRuntimeOptions method returns an           */
       /* enumeration of type String containing the keys of all container      */
       /* runtime options that the current portlet container supports."        */
-      TestResult tr0 = tcd.getTestResultFailed(SPEC2_10_CONTEXTOPTIONS_CONTAINERRUNTIMEOPTIONS1);
+      TestResult tr0 = tcd.getTestResultFailed(V2ADDLENVIRONMENTTESTS_SPEC2_10_CONTEXTOPTIONS_CONTAINERRUNTIMEOPTIONS1);
       /* TODO: implement test */
+      tr0.appendTcDetail("Not implemented.");
+      tr0.writeTo(writer);
 
-      /* TestCase: SPEC2_10_ContextOptions_actionScopedRequestAttributes1     */
+      /* TestCase: V2AddlEnvironmentTests_SPEC2_10_ContextOptions_actionScopedRequestAttributes1 */
       /* Details: "The container runtime option                               */
       /* \"javax.portlet.actionScopedRequestAttributes\" must be supported    */
       /* by the portlet container"                                            */
-      TestResult tr1 = tcd.getTestResultFailed(SPEC2_10_CONTEXTOPTIONS_ACTIONSCOPEDREQUESTATTRIBUTES1);
+      TestResult tr1 = tcd.getTestResultFailed(V2ADDLENVIRONMENTTESTS_SPEC2_10_CONTEXTOPTIONS_ACTIONSCOPEDREQUESTATTRIBUTES1);
       /* TODO: implement test */
+      tr1.appendTcDetail("Not implemented.");
+      tr1.writeTo(writer);
 
-      /* TestCase: SPEC2_10_ContextOptions_actionScopedRequestAttributes2     */
+      /* TestCase: V2AddlEnvironmentTests_SPEC2_10_ContextOptions_actionScopedRequestAttributes2 */
       /* Details: "If the actionScopedRequestAttributes option is set to      */
       /* TRUE, request attributes that are set in an action persist until a   */
       /* new action occurs"                                                   */
-      TestResult tr2 = tcd.getTestResultFailed(SPEC2_10_CONTEXTOPTIONS_ACTIONSCOPEDREQUESTATTRIBUTES2);
+      TestResult tr2 = tcd.getTestResultFailed(V2ADDLENVIRONMENTTESTS_SPEC2_10_CONTEXTOPTIONS_ACTIONSCOPEDREQUESTATTRIBUTES2);
       /* TODO: implement test */
+      tr2.appendTcDetail("Not implemented.");
+      tr2.writeTo(writer);
 
-      /* TestCase: SPEC2_10_ContextOptions_actionScopedRequestAttributes3     */
+      /* TestCase: V2AddlEnvironmentTests_SPEC2_10_ContextOptions_actionScopedRequestAttributes3 */
       /* Details: "If the option is set to TRUE and an attribute is set       */
       /* during an action request, the portlet container sets a render        */
       /* parameter with the name PortletRequest.ACTION_SCOPE_ID               */
       /* (\"javax.portlet.as\")"                                              */
-      TestResult tr3 = tcd.getTestResultFailed(SPEC2_10_CONTEXTOPTIONS_ACTIONSCOPEDREQUESTATTRIBUTES3);
+      TestResult tr3 = tcd.getTestResultFailed(V2ADDLENVIRONMENTTESTS_SPEC2_10_CONTEXTOPTIONS_ACTIONSCOPEDREQUESTATTRIBUTES3);
       /* TODO: implement test */
+      tr3.appendTcDetail("Not implemented.");
+      tr3.writeTo(writer);
 
-      /* TestCase: SPEC2_10_ContextOptions_actionScopedRequestAttributes4     */
+      /* TestCase: V2AddlEnvironmentTests_SPEC2_10_ContextOptions_actionScopedRequestAttributes4 */
       /* Details: "If the option is set to TRUE and an attribute is set       */
       /* during an action request, the attribute can be accessed in an        */
       /* event request that was initiated by the same action request"         */
-      TestResult tr4 = tcd.getTestResultFailed(SPEC2_10_CONTEXTOPTIONS_ACTIONSCOPEDREQUESTATTRIBUTES4);
+      TestResult tr4 = tcd.getTestResultFailed(V2ADDLENVIRONMENTTESTS_SPEC2_10_CONTEXTOPTIONS_ACTIONSCOPEDREQUESTATTRIBUTES4);
       /* TODO: implement test */
+      tr4.appendTcDetail("Not implemented.");
+      tr4.writeTo(writer);
 
-      /* TestCase: SPEC2_10_ContextOptions_actionScopedRequestAttributes5     */
+      /* TestCase: V2AddlEnvironmentTests_SPEC2_10_ContextOptions_actionScopedRequestAttributes5 */
       /* Details: "If the option is set to TRUE and an attribute is set       */
       /* during an action request, the attribute can be accessed in a         */
       /* subsequent render request"                                           */
-      TestResult tr5 = tcd.getTestResultFailed(SPEC2_10_CONTEXTOPTIONS_ACTIONSCOPEDREQUESTATTRIBUTES5);
+      TestResult tr5 = tcd.getTestResultFailed(V2ADDLENVIRONMENTTESTS_SPEC2_10_CONTEXTOPTIONS_ACTIONSCOPEDREQUESTATTRIBUTES5);
       /* TODO: implement test */
+      tr5.appendTcDetail("Not implemented.");
+      tr5.writeTo(writer);
 
-      /* TestCase: SPEC2_10_ContextOptions_actionScopedRequestAttributes6     */
+      /* TestCase: V2AddlEnvironmentTests_SPEC2_10_ContextOptions_actionScopedRequestAttributes6 */
       /* Details: "If the option is set to TRUE, a request attribute set      */
       /* during an event request is persisted in the same manner as an        */
       /* attribute set during action processing"                              */
-      TestResult tr6 = tcd.getTestResultFailed(SPEC2_10_CONTEXTOPTIONS_ACTIONSCOPEDREQUESTATTRIBUTES6);
+      TestResult tr6 = tcd.getTestResultFailed(V2ADDLENVIRONMENTTESTS_SPEC2_10_CONTEXTOPTIONS_ACTIONSCOPEDREQUESTATTRIBUTES6);
       /* TODO: implement test */
+      tr6.appendTcDetail("Not implemented.");
+      tr6.writeTo(writer);
 
-      /* TestCase: SPEC2_10_ContextOptions_actionScopedRequestAttributes7     */
+      /* TestCase: V2AddlEnvironmentTests_SPEC2_10_ContextOptions_actionScopedRequestAttributes7 */
       /* Details: "If the option is set to TRUE, receiving an action starts   */
       /* a new action scope with a new scope ID, all previous attributes      */
       /* are no longer accessible, new attributes can be stored"              */
-      TestResult tr7 = tcd.getTestResultFailed(SPEC2_10_CONTEXTOPTIONS_ACTIONSCOPEDREQUESTATTRIBUTES7);
+      TestResult tr7 = tcd.getTestResultFailed(V2ADDLENVIRONMENTTESTS_SPEC2_10_CONTEXTOPTIONS_ACTIONSCOPEDREQUESTATTRIBUTES7);
       /* TODO: implement test */
+      tr7.appendTcDetail("Not implemented.");
+      tr7.writeTo(writer);
 
-      /* TestCase: SPEC2_10_ContextOptions_actionScopedRequestAttributes8     */
+      /* TestCase: V2AddlEnvironmentTests_SPEC2_10_ContextOptions_actionScopedRequestAttributes8 */
       /* Details: "If the option is set to TRUE, receiving a render without   */
       /* an existing scope ID starts a new action scope with a new scope      */
       /* ID, all previous attributes are no longer accessible, new            */
       /* attributes can be stored"                                            */
-      TestResult tr8 = tcd.getTestResultFailed(SPEC2_10_CONTEXTOPTIONS_ACTIONSCOPEDREQUESTATTRIBUTES8);
+      TestResult tr8 = tcd.getTestResultFailed(V2ADDLENVIRONMENTTESTS_SPEC2_10_CONTEXTOPTIONS_ACTIONSCOPEDREQUESTATTRIBUTES8);
       /* TODO: implement test */
+      tr8.appendTcDetail("Not implemented.");
+      tr8.writeTo(writer);
 
-      /* TestCase: SPEC2_10_ContextOptions_actionScopedRequestAttributes9     */
+      /* TestCase: V2AddlEnvironmentTests_SPEC2_10_ContextOptions_actionScopedRequestAttributes9 */
       /* Details: "If the option is set to TRUE, receiving an event without   */
       /* an existing scope ID starts a new action scope with a new scope      */
       /* ID, all previous attributes are no longer accessible, new            */
       /* attributes can be stored"                                            */
-      TestResult tr9 = tcd.getTestResultFailed(SPEC2_10_CONTEXTOPTIONS_ACTIONSCOPEDREQUESTATTRIBUTES9);
+      TestResult tr9 = tcd.getTestResultFailed(V2ADDLENVIRONMENTTESTS_SPEC2_10_CONTEXTOPTIONS_ACTIONSCOPEDREQUESTATTRIBUTES9);
       /* TODO: implement test */
+      tr9.appendTcDetail("Not implemented.");
+      tr9.writeTo(writer);
 
-      /* TestCase: SPEC2_10_ContextOptions_actionScopedRequestAttributes0     */
+      /* TestCase: V2AddlEnvironmentTests_SPEC2_10_ContextOptions_actionScopedRequestAttributes0 */
       /* Details: "If the option is set to TRUE, receiving an event with an   */
       /* existing scope ID after the first render for this scope had          */
       /* occurred starts a new action scope with a new scope ID, all          */
       /* previous attributes are no longer accessible, new attributes can     */
       /* be stored"                                                           */
-      TestResult tr10 = tcd.getTestResultFailed(SPEC2_10_CONTEXTOPTIONS_ACTIONSCOPEDREQUESTATTRIBUTES0);
+      TestResult tr10 = tcd.getTestResultFailed(V2ADDLENVIRONMENTTESTS_SPEC2_10_CONTEXTOPTIONS_ACTIONSCOPEDREQUESTATTRIBUTES0);
       /* TODO: implement test */
+      tr10.appendTcDetail("Not implemented.");
+      tr10.writeTo(writer);
 
-      /* TestCase: SPEC2_10_ContextOptions_actionScopedRequestAttributes11    */
+      /* TestCase: V2AddlEnvironmentTests_SPEC2_10_ContextOptions_actionScopedRequestAttributes11 */
       /* Details: "The render parameter PortletRequest.ACTION_SCOPE_ID        */
       /* (\"javax.portlet.as\") can be removed from a URL in a                */
       /* PortletURLGenerationListener"                                        */
-      TestResult tr11 = tcd.getTestResultFailed(SPEC2_10_CONTEXTOPTIONS_ACTIONSCOPEDREQUESTATTRIBUTES11);
+      TestResult tr11 = tcd.getTestResultFailed(V2ADDLENVIRONMENTTESTS_SPEC2_10_CONTEXTOPTIONS_ACTIONSCOPEDREQUESTATTRIBUTES11);
       /* TODO: implement test */
+      tr11.appendTcDetail("Not implemented.");
+      tr11.writeTo(writer);
 
-      /* TestCase: SPEC2_10_ContextOptions_actionScopedRequestAttributes12    */
+      /* TestCase: V2AddlEnvironmentTests_SPEC2_10_ContextOptions_actionScopedRequestAttributes12 */
       /* Details: "The render parameter PortletRequest.ACTION_SCOPE_ID        */
       /* (\"javax.portlet.as\") can be removed from a ResourceURL in a        */
       /* PortletURLGenerationListener"                                        */
-      TestResult tr12 = tcd.getTestResultFailed(SPEC2_10_CONTEXTOPTIONS_ACTIONSCOPEDREQUESTATTRIBUTES12);
+      TestResult tr12 = tcd.getTestResultFailed(V2ADDLENVIRONMENTTESTS_SPEC2_10_CONTEXTOPTIONS_ACTIONSCOPEDREQUESTATTRIBUTES12);
       /* TODO: implement test */
+      tr12.appendTcDetail("Not implemented.");
+      tr12.writeTo(writer);
 
-      /* TestCase: SPEC2_10_ContextOptions_actionScopedRequestAttributes13    */
+      /* TestCase: V2AddlEnvironmentTests_SPEC2_10_ContextOptions_actionScopedRequestAttributes13 */
       /* Details: "If the actionScopedRequestAttributes option is set to      */
       /* FALSE, request attributes that are set in an action are released     */
       /* at the end of the request"                                           */
-      TestResult tr13 = tcd.getTestResultFailed(SPEC2_10_CONTEXTOPTIONS_ACTIONSCOPEDREQUESTATTRIBUTES13);
+      TestResult tr13 = tcd.getTestResultFailed(V2ADDLENVIRONMENTTESTS_SPEC2_10_CONTEXTOPTIONS_ACTIONSCOPEDREQUESTATTRIBUTES13);
       /* 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.appendTcDetail("Not implemented.");
       tr13.writeTo(writer);
 
-
    }
 
 }
-

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/23a1c547/portlet-tck_3.0/V2AddlEnvironmentTests/src/main/java/javax/portlet/tck/portlets/AddlEnvironmentTests_SPEC2_17_ActionPreferences.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlEnvironmentTests/src/main/java/javax/portlet/tck/portlets/AddlEnvironmentTests_SPEC2_17_ActionPreferences.java b/portlet-tck_3.0/V2AddlEnvironmentTests/src/main/java/javax/portlet/tck/portlets/AddlEnvironmentTests_SPEC2_17_ActionPreferences.java
new file mode 100644
index 0000000..2336209
--- /dev/null
+++ b/portlet-tck_3.0/V2AddlEnvironmentTests/src/main/java/javax/portlet/tck/portlets/AddlEnvironmentTests_SPEC2_17_ActionPreferences.java
@@ -0,0 +1,269 @@
+/*  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 AddlEnvironmentTests_SPEC2_17_ActionPreferences_event
+ *
+ */
+public class AddlEnvironmentTests_SPEC2_17_ActionPreferences implements Portlet, ResourceServingPortlet {
+   private static final String LOG_CLASS = 
+         AddlEnvironmentTests_SPEC2_17_ActionPreferences.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();
+
+      JSR286SpecTestCaseDetails tcd = new JSR286SpecTestCaseDetails();
+
+      // Create result objects for the tests
+
+      /* TestCase: V2AddlEnvironmentTests_SPEC2_17_ActionPreferences_setValues4 */
+      /* Details: "The setValues method allows the value array to be set to   */
+      /* null"                                                                */
+      TestResult tr0 = tcd.getTestResultFailed(V2ADDLENVIRONMENTTESTS_SPEC2_17_ACTIONPREFERENCES_SETVALUES4);
+      /* TODO: implement test */
+      tr0.appendTcDetail("Not implemented.");
+      tr0.writeTo(writer);
+
+      /* TestCase: V2AddlEnvironmentTests_SPEC2_17_ActionPreferences_reset1   */
+      /* Details: "The reset method sets the value of the specified           */
+      /* preference to its default value. The actual default value itself     */
+      /* is implementation-specific and cannot be tested."                    */
+      TestResult tr1 = tcd.getTestResultFailed(V2ADDLENVIRONMENTTESTS_SPEC2_17_ACTIONPREFERENCES_RESET1);
+      /* TODO: implement test */
+      tr1.appendTcDetail("Not implemented.");
+      tr1.writeTo(writer);
+
+      /* TestCase: V2AddlEnvironmentTests_SPEC2_17_ActionPreferences_store1   */
+      /* Details: "The store method persists preference changes previously    */
+      /* made during the processAction method"                                */
+      TestResult tr2 = tcd.getTestResultFailed(V2ADDLENVIRONMENTTESTS_SPEC2_17_ACTIONPREFERENCES_STORE1);
+      /* TODO: implement test */
+      tr2.appendTcDetail("Not implemented.");
+      tr2.writeTo(writer);
+
+      /* TestCase: V2AddlEnvironmentTests_SPEC2_17_ActionPreferences_store4   */
+      /* Details: "If preference changes are made during the processAction    */
+      /* method, but the method completes without store being called, the     */
+      /* preference changes are discarded"                                    */
+      TestResult tr3 = tcd.getTestResultFailed(V2ADDLENVIRONMENTTESTS_SPEC2_17_ACTIONPREFERENCES_STORE4);
+      /* TODO: implement test */
+      tr3.appendTcDetail("Not implemented.");
+      tr3.writeTo(writer);
+
+      /* TestCase: V2AddlEnvironmentTests_SPEC2_17_ActionPreferences_deployment3 */
+      /* Details: "A preference attribute definition may indicate if the      */
+      /* attribute is read only"                                              */
+      TestResult tr4 = tcd.getTestResultFailed(V2ADDLENVIRONMENTTESTS_SPEC2_17_ACTIONPREFERENCES_DEPLOYMENT3);
+      /* TODO: implement test */
+      tr4.appendTcDetail("Not implemented.");
+      tr4.writeTo(writer);
+
+      /* TestCase: V2AddlEnvironmentTests_SPEC2_17_ActionPreferences_deployment4 */
+      /* Details: "If a preference attribute definition does not contain      */
+      /* the read-only setting, it will be modifiable in the processAction    */
+      /* method"                                                              */
+      TestResult tr5 = tcd.getTestResultFailed(V2ADDLENVIRONMENTTESTS_SPEC2_17_ACTIONPREFERENCES_DEPLOYMENT4);
+      /* TODO: implement test */
+      tr5.appendTcDetail("Not implemented.");
+      tr5.writeTo(writer);
+
+      /* TestCase: V2AddlEnvironmentTests_SPEC2_17_ActionPreferences_deployment7 */
+      /* Details: "If a preference attribute definition contains the          */
+      /* read-only setting, it will not be modifiable in the processAction    */
+      /* method"                                                              */
+      TestResult tr6 = tcd.getTestResultFailed(V2ADDLENVIRONMENTTESTS_SPEC2_17_ACTIONPREFERENCES_DEPLOYMENT7);
+      /* TODO: implement test */
+      tr6.appendTcDetail("Not implemented.");
+      tr6.writeTo(writer);
+
+      /* TestCase: V2AddlEnvironmentTests_SPEC2_17_ActionPreferences_deployment10 */
+      /* Details: "A preference attribute not defined in the deployment       */
+      /* descriptor may be added programmatically in the processAction        */
+      /* method"                                                              */
+      TestResult tr7 = tcd.getTestResultFailed(V2ADDLENVIRONMENTTESTS_SPEC2_17_ACTIONPREFERENCES_DEPLOYMENT10);
+      /* TODO: implement test */
+      tr7.appendTcDetail("Not implemented.");
+      tr7.writeTo(writer);
+
+      portletReq.getPortletSession().setAttribute(
+                   Constants.RESULT_ATTR_PREFIX + "AddlEnvironmentTests_SPEC2_17_ActionPreferences",
+                   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();
+
+   }
+
+   @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();
+
+      PortletSession ps = portletReq.getPortletSession();
+      String msg = (String) ps.getAttribute(RESULT_ATTR_PREFIX + "AddlEnvironmentTests_SPEC2_17_ActionPreferences", APPLICATION_SCOPE);
+      if (msg != null) {
+         writer.write("<p>" + msg + "</p><br/>\n");
+         ps.removeAttribute(RESULT_ATTR_PREFIX + "AddlEnvironmentTests_SPEC2_17_ActionPreferences", APPLICATION_SCOPE);
+      }
+
+      /* TestCase: V2AddlEnvironmentTests_SPEC2_17_ActionPreferences_setValues4 */
+      /* Details: "The setValues method allows the value array to be set to   */
+      /* null"                                                                */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2AddlEnvironmentTests_SPEC2_17_ActionPreferences_setValues4", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2AddlEnvironmentTests_SPEC2_17_ActionPreferences_reset1   */
+      /* Details: "The reset method sets the value of the specified           */
+      /* preference to its default value. The actual default value itself     */
+      /* is implementation-specific and cannot be tested."                    */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2AddlEnvironmentTests_SPEC2_17_ActionPreferences_reset1", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2AddlEnvironmentTests_SPEC2_17_ActionPreferences_store1   */
+      /* Details: "The store method persists preference changes previously    */
+      /* made during the processAction method"                                */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2AddlEnvironmentTests_SPEC2_17_ActionPreferences_store1", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2AddlEnvironmentTests_SPEC2_17_ActionPreferences_store4   */
+      /* Details: "If preference changes are made during the processAction    */
+      /* method, but the method completes without store being called, the     */
+      /* preference changes are discarded"                                    */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2AddlEnvironmentTests_SPEC2_17_ActionPreferences_store4", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2AddlEnvironmentTests_SPEC2_17_ActionPreferences_deployment3 */
+      /* Details: "A preference attribute definition may indicate if the      */
+      /* attribute is read only"                                              */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2AddlEnvironmentTests_SPEC2_17_ActionPreferences_deployment3", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2AddlEnvironmentTests_SPEC2_17_ActionPreferences_deployment4 */
+      /* Details: "If a preference attribute definition does not contain      */
+      /* the read-only setting, it will be modifiable in the processAction    */
+      /* method"                                                              */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2AddlEnvironmentTests_SPEC2_17_ActionPreferences_deployment4", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2AddlEnvironmentTests_SPEC2_17_ActionPreferences_deployment7 */
+      /* Details: "If a preference attribute definition contains the          */
+      /* read-only setting, it will not be modifiable in the processAction    */
+      /* method"                                                              */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2AddlEnvironmentTests_SPEC2_17_ActionPreferences_deployment7", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2AddlEnvironmentTests_SPEC2_17_ActionPreferences_deployment10 */
+      /* Details: "A preference attribute not defined in the deployment       */
+      /* descriptor may be added programmatically in the processAction        */
+      /* method"                                                              */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2AddlEnvironmentTests_SPEC2_17_ActionPreferences_deployment10", aurl);
+         tb.writeTo(writer);
+      }
+
+   }
+
+}

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/23a1c547/portlet-tck_3.0/V2AddlEnvironmentTests/src/main/java/javax/portlet/tck/portlets/AddlEnvironmentTests_SPEC2_17_EventPreferences.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlEnvironmentTests/src/main/java/javax/portlet/tck/portlets/AddlEnvironmentTests_SPEC2_17_EventPreferences.java b/portlet-tck_3.0/V2AddlEnvironmentTests/src/main/java/javax/portlet/tck/portlets/AddlEnvironmentTests_SPEC2_17_EventPreferences.java
new file mode 100644
index 0000000..08cb518
--- /dev/null
+++ b/portlet-tck_3.0/V2AddlEnvironmentTests/src/main/java/javax/portlet/tck/portlets/AddlEnvironmentTests_SPEC2_17_EventPreferences.java
@@ -0,0 +1,189 @@
+/*  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 AddlEnvironmentTests_SPEC2_17_EventPreferences_event
+ *
+ */
+public class AddlEnvironmentTests_SPEC2_17_EventPreferences implements Portlet, ResourceServingPortlet {
+   private static final String LOG_CLASS = 
+         AddlEnvironmentTests_SPEC2_17_EventPreferences.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();
+
+      QName eventQName = new QName(TCKNAMESPACE,
+             "AddlEnvironmentTests_SPEC2_17_EventPreferences");
+      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: V2AddlEnvironmentTests_SPEC2_17_EventPreferences_setValues4 */
+      /* Details: "The setValues method allows the value array to be set to   */
+      /* null"                                                                */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2AddlEnvironmentTests_SPEC2_17_EventPreferences_setValues4", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2AddlEnvironmentTests_SPEC2_17_EventPreferences_reset1    */
+      /* Details: "The reset method sets the value of the specified           */
+      /* preference to its default value. The actual default value itself     */
+      /* is implementation-specific and cannot be tested."                    */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2AddlEnvironmentTests_SPEC2_17_EventPreferences_reset1", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2AddlEnvironmentTests_SPEC2_17_EventPreferences_store1    */
+      /* Details: "The store method persists preference changes previously    */
+      /* made during the processAction method"                                */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2AddlEnvironmentTests_SPEC2_17_EventPreferences_store1", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2AddlEnvironmentTests_SPEC2_17_EventPreferences_store4    */
+      /* Details: "If preference changes are made during the processAction    */
+      /* method, but the method completes without store being called, the     */
+      /* preference changes are discarded"                                    */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2AddlEnvironmentTests_SPEC2_17_EventPreferences_store4", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2AddlEnvironmentTests_SPEC2_17_EventPreferences_deployment3 */
+      /* Details: "A preference attribute definition may indicate if the      */
+      /* attribute is read only"                                              */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2AddlEnvironmentTests_SPEC2_17_EventPreferences_deployment3", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2AddlEnvironmentTests_SPEC2_17_EventPreferences_deployment4 */
+      /* Details: "If a preference attribute definition does not contain      */
+      /* the read-only setting, it will be modifiable in the processAction    */
+      /* method"                                                              */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2AddlEnvironmentTests_SPEC2_17_EventPreferences_deployment4", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2AddlEnvironmentTests_SPEC2_17_EventPreferences_deployment7 */
+      /* Details: "If a preference attribute definition contains the          */
+      /* read-only setting, it will not be modifiable in the processAction    */
+      /* method"                                                              */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2AddlEnvironmentTests_SPEC2_17_EventPreferences_deployment7", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2AddlEnvironmentTests_SPEC2_17_EventPreferences_deployment10 */
+      /* Details: "A preference attribute not defined in the deployment       */
+      /* descriptor may be added programmatically in the processAction        */
+      /* method"                                                              */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2AddlEnvironmentTests_SPEC2_17_EventPreferences_deployment10", aurl);
+         tb.writeTo(writer);
+      }
+
+   }
+
+}

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/23a1c547/portlet-tck_3.0/V2AddlEnvironmentTests/src/main/java/javax/portlet/tck/portlets/AddlEnvironmentTests_SPEC2_17_EventPreferences_event.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlEnvironmentTests/src/main/java/javax/portlet/tck/portlets/AddlEnvironmentTests_SPEC2_17_EventPreferences_event.java b/portlet-tck_3.0/V2AddlEnvironmentTests/src/main/java/javax/portlet/tck/portlets/AddlEnvironmentTests_SPEC2_17_EventPreferences_event.java
new file mode 100644
index 0000000..960299a
--- /dev/null
+++ b/portlet-tck_3.0/V2AddlEnvironmentTests/src/main/java/javax/portlet/tck/portlets/AddlEnvironmentTests_SPEC2_17_EventPreferences_event.java
@@ -0,0 +1,178 @@
+/*  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.constants.Constants.*;
+import static javax.portlet.tck.beans.JSR286SpecTestCaseDetails.*;
+import static javax.portlet.PortletSession.*;
+
+/**
+ * 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 AddlEnvironmentTests_SPEC2_17_EventPreferences_event implements Portlet, EventPortlet, ResourceServingPortlet {
+   private static final String LOG_CLASS = 
+         AddlEnvironmentTests_SPEC2_17_EventPreferences_event.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, "event companion processAction - ERROR!!");
+   }
+
+   @Override
+   public void serveResource(ResourceRequest portletReq, ResourceResponse portletResp)
+         throws PortletException, IOException {
+      LOGGER.entering(LOG_CLASS, "event companion serveResource - ERROR!!");
+   }
+
+   @Override
+   public void processEvent(EventRequest portletReq, EventResponse portletResp)
+         throws PortletException, IOException {
+      LOGGER.entering(LOG_CLASS, "event companion processEvent");
+
+
+      portletResp.setRenderParameters(portletReq);
+
+      long tid = Thread.currentThread().getId();
+      portletReq.setAttribute(THREADID_ATTR, tid);
+
+      StringWriter writer = new StringWriter();
+
+      JSR286SpecTestCaseDetails tcd = new JSR286SpecTestCaseDetails();
+
+      // Create result objects for the tests
+
+      /* TestCase: V2AddlEnvironmentTests_SPEC2_17_EventPreferences_setValues4 */
+      /* Details: "The setValues method allows the value array to be set to   */
+      /* null"                                                                */
+      TestResult tr0 = tcd.getTestResultFailed(V2ADDLENVIRONMENTTESTS_SPEC2_17_EVENTPREFERENCES_SETVALUES4);
+      /* TODO: implement test */
+      tr0.appendTcDetail("Not implemented.");
+      tr0.writeTo(writer);
+
+      /* TestCase: V2AddlEnvironmentTests_SPEC2_17_EventPreferences_reset1    */
+      /* Details: "The reset method sets the value of the specified           */
+      /* preference to its default value. The actual default value itself     */
+      /* is implementation-specific and cannot be tested."                    */
+      TestResult tr1 = tcd.getTestResultFailed(V2ADDLENVIRONMENTTESTS_SPEC2_17_EVENTPREFERENCES_RESET1);
+      /* TODO: implement test */
+      tr1.appendTcDetail("Not implemented.");
+      tr1.writeTo(writer);
+
+      /* TestCase: V2AddlEnvironmentTests_SPEC2_17_EventPreferences_store1    */
+      /* Details: "The store method persists preference changes previously    */
+      /* made during the processAction method"                                */
+      TestResult tr2 = tcd.getTestResultFailed(V2ADDLENVIRONMENTTESTS_SPEC2_17_EVENTPREFERENCES_STORE1);
+      /* TODO: implement test */
+      tr2.appendTcDetail("Not implemented.");
+      tr2.writeTo(writer);
+
+      /* TestCase: V2AddlEnvironmentTests_SPEC2_17_EventPreferences_store4    */
+      /* Details: "If preference changes are made during the processAction    */
+      /* method, but the method completes without store being called, the     */
+      /* preference changes are discarded"                                    */
+      TestResult tr3 = tcd.getTestResultFailed(V2ADDLENVIRONMENTTESTS_SPEC2_17_EVENTPREFERENCES_STORE4);
+      /* TODO: implement test */
+      tr3.appendTcDetail("Not implemented.");
+      tr3.writeTo(writer);
+
+      /* TestCase: V2AddlEnvironmentTests_SPEC2_17_EventPreferences_deployment3 */
+      /* Details: "A preference attribute definition may indicate if the      */
+      /* attribute is read only"                                              */
+      TestResult tr4 = tcd.getTestResultFailed(V2ADDLENVIRONMENTTESTS_SPEC2_17_EVENTPREFERENCES_DEPLOYMENT3);
+      /* TODO: implement test */
+      tr4.appendTcDetail("Not implemented.");
+      tr4.writeTo(writer);
+
+      /* TestCase: V2AddlEnvironmentTests_SPEC2_17_EventPreferences_deployment4 */
+      /* Details: "If a preference attribute definition does not contain      */
+      /* the read-only setting, it will be modifiable in the processAction    */
+      /* method"                                                              */
+      TestResult tr5 = tcd.getTestResultFailed(V2ADDLENVIRONMENTTESTS_SPEC2_17_EVENTPREFERENCES_DEPLOYMENT4);
+      /* TODO: implement test */
+      tr5.appendTcDetail("Not implemented.");
+      tr5.writeTo(writer);
+
+      /* TestCase: V2AddlEnvironmentTests_SPEC2_17_EventPreferences_deployment7 */
+      /* Details: "If a preference attribute definition contains the          */
+      /* read-only setting, it will not be modifiable in the processAction    */
+      /* method"                                                              */
+      TestResult tr6 = tcd.getTestResultFailed(V2ADDLENVIRONMENTTESTS_SPEC2_17_EVENTPREFERENCES_DEPLOYMENT7);
+      /* TODO: implement test */
+      tr6.appendTcDetail("Not implemented.");
+      tr6.writeTo(writer);
+
+      /* TestCase: V2AddlEnvironmentTests_SPEC2_17_EventPreferences_deployment10 */
+      /* Details: "A preference attribute not defined in the deployment       */
+      /* descriptor may be added programmatically in the processAction        */
+      /* method"                                                              */
+      TestResult tr7 = tcd.getTestResultFailed(V2ADDLENVIRONMENTTESTS_SPEC2_17_EVENTPREFERENCES_DEPLOYMENT10);
+      /* TODO: implement test */
+      tr7.appendTcDetail("Not implemented.");
+      tr7.writeTo(writer);
+
+      portletReq.getPortletSession().setAttribute(
+                   Constants.RESULT_ATTR_PREFIX + "AddlEnvironmentTests_SPEC2_17_EventPreferences",
+                   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>AddlEnvironmentTests_SPEC2_17_EventPreferences_event</p>\n");
+
+      String msg = (String) portletReq.getPortletSession()
+            .getAttribute(RESULT_ATTR_PREFIX + "AddlEnvironmentTests_SPEC2_17_EventPreferences", APPLICATION_SCOPE);
+      msg = (msg==null) ? "Not ready. click test case link." : msg;
+      writer.write("<p>" + msg + "</p>\n");
+
+   }
+
+}


[18/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.

Posted by ms...@apache.org.
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/23a1c547/portlet-tck_3.0/V2AddlEnvironmentTests/src/main/java/javax/portlet/tck/portlets/AddlEnvironmentTests_SPEC2_17_Preferences.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlEnvironmentTests/src/main/java/javax/portlet/tck/portlets/AddlEnvironmentTests_SPEC2_17_Preferences.java b/portlet-tck_3.0/V2AddlEnvironmentTests/src/main/java/javax/portlet/tck/portlets/AddlEnvironmentTests_SPEC2_17_Preferences.java
deleted file mode 100644
index b8c1700..0000000
--- a/portlet-tck_3.0/V2AddlEnvironmentTests/src/main/java/javax/portlet/tck/portlets/AddlEnvironmentTests_SPEC2_17_Preferences.java
+++ /dev/null
@@ -1,285 +0,0 @@
-/*  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.IOException;
-import java.io.PrintWriter;
-
-import java.util.Enumeration;
-import java.util.Locale;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-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 static javax.portlet.tck.beans.JSR286SpecTestCaseDetails.*;
-import javax.portlet.tck.beans.TestResult;
-
-/**
- * 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.
- */
-public class AddlEnvironmentTests_SPEC2_17_Preferences implements Portlet {
-   private static final String LOG_CLASS = 
-         AddlEnvironmentTests_SPEC2_17_Preferences.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 actionRequest, ActionResponse actionResponse)
-         throws PortletException, IOException {
-   }
-
-   @Override
-   public void render(RenderRequest renderRequest, RenderResponse renderResponse)
-         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
-
-      /* TestCase: SPEC2_17_Preferences_values6                               */
-      /* Details: "Changing the Map returned by getMap does not change the    */
-      /* underlying preferences"                                              */
-      TestResult tr0 = tcd.getTestResultFailed(SPEC2_17_PREFERENCES_VALUES6);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_17_Preferences_values7                               */
-      /* Details: "When the lifecycle method render is invoked, the           */
-      /* PortletPreferences object must reflect the current state of the      */
-      /* persistent store"                                                    */
-      TestResult tr1 = tcd.getTestResultFailed(SPEC2_17_PREFERENCES_VALUES7);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_17_Preferences_values8                               */
-      /* Details: "When the lifecycle method processAction is invoked, the    */
-      /* PortletPreferences object must reflect the current state of the      */
-      /* persistent store"                                                    */
-      TestResult tr2 = tcd.getTestResultFailed(SPEC2_17_PREFERENCES_VALUES8);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_17_Preferences_values9                               */
-      /* Details: "When the lifecycle method processEvent is invoked, the     */
-      /* PortletPreferences object must reflect the current state of the      */
-      /* persistent store"                                                    */
-      TestResult tr3 = tcd.getTestResultFailed(SPEC2_17_PREFERENCES_VALUES9);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_17_Preferences_values10                              */
-      /* Details: "When the lifecycle method serveResource is invoked, the    */
-      /* PortletPreferences object must reflect the current state of the      */
-      /* persistent store"                                                    */
-      TestResult tr4 = tcd.getTestResultFailed(SPEC2_17_PREFERENCES_VALUES10);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_17_Preferences_setValues4                            */
-      /* Details: "The setValues method allows the value array to be set to   */
-      /* null"                                                                */
-      TestResult tr5 = tcd.getTestResultFailed(SPEC2_17_PREFERENCES_SETVALUES4);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_17_Preferences_reset1                                */
-      /* Details: "The reset method sets the value of the specified           */
-      /* preference to its default value. The actual default value itself     */
-      /* is implementation-specific and cannot be tested."                    */
-      TestResult tr6 = tcd.getTestResultFailed(SPEC2_17_PREFERENCES_RESET1);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_17_Preferences_reset2                                */
-      /* Details: "The reset method deletes the preference if there is no     */
-      /* default value"                                                       */
-      TestResult tr7 = tcd.getTestResultFailed(SPEC2_17_PREFERENCES_RESET2);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_17_Preferences_store1                                */
-      /* Details: "The store method persists preference changes previously    */
-      /* made during the processAction method"                                */
-      TestResult tr8 = tcd.getTestResultFailed(SPEC2_17_PREFERENCES_STORE1);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_17_Preferences_store2                                */
-      /* Details: "The store method persists preference changes previously    */
-      /* made during the processEvent method"                                 */
-      TestResult tr9 = tcd.getTestResultFailed(SPEC2_17_PREFERENCES_STORE2);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_17_Preferences_store3                                */
-      /* Details: "The store method persists preference changes previously    */
-      /* made during the serveResource method"                                */
-      TestResult tr10 = tcd.getTestResultFailed(SPEC2_17_PREFERENCES_STORE3);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_17_Preferences_store4                                */
-      /* Details: "If preference changes are made during the processAction    */
-      /* method, but the method completes without store being called, the     */
-      /* preference changes are discarded"                                    */
-      TestResult tr11 = tcd.getTestResultFailed(SPEC2_17_PREFERENCES_STORE4);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_17_Preferences_store5                                */
-      /* Details: "If preference changes are made during the processEvent     */
-      /* method, but the method completes without store being called, the     */
-      /* preference changes are discarded"                                    */
-      TestResult tr12 = tcd.getTestResultFailed(SPEC2_17_PREFERENCES_STORE5);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_17_Preferences_store6                                */
-      /* Details: "If preference changes are made during the serveResource    */
-      /* method, but the method completes without store being called, the     */
-      /* preference changes are discarded"                                    */
-      TestResult tr13 = tcd.getTestResultFailed(SPEC2_17_PREFERENCES_STORE6);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_17_Preferences_deployment1                           */
-      /* Details: "The portlet definition may define the preference           */
-      /* attributes a portlet uses"                                           */
-      TestResult tr14 = tcd.getTestResultFailed(SPEC2_17_PREFERENCES_DEPLOYMENT1);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_17_Preferences_deployment2                           */
-      /* Details: "A preference attribute definition may include initial      */
-      /* default values"                                                      */
-      TestResult tr15 = tcd.getTestResultFailed(SPEC2_17_PREFERENCES_DEPLOYMENT2);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_17_Preferences_deployment3                           */
-      /* Details: "A preference attribute definition may indicate if the      */
-      /* attribute is read only"                                              */
-      TestResult tr16 = tcd.getTestResultFailed(SPEC2_17_PREFERENCES_DEPLOYMENT3);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_17_Preferences_deployment4                           */
-      /* Details: "If a preference attribute definition does not contain      */
-      /* the read-only setting, it will be modifiable in the processAction    */
-      /* method"                                                              */
-      TestResult tr17 = tcd.getTestResultFailed(SPEC2_17_PREFERENCES_DEPLOYMENT4);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_17_Preferences_deployment5                           */
-      /* Details: "If a preference attribute definition does not contain      */
-      /* the read-only setting, it will be modifiable in the processEvent     */
-      /* method"                                                              */
-      TestResult tr18 = tcd.getTestResultFailed(SPEC2_17_PREFERENCES_DEPLOYMENT5);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_17_Preferences_deployment6                           */
-      /* Details: "If a preference attribute definition does not contain      */
-      /* the read-only setting, it will be modifiable in the serveResource    */
-      /* method"                                                              */
-      TestResult tr19 = tcd.getTestResultFailed(SPEC2_17_PREFERENCES_DEPLOYMENT6);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_17_Preferences_deployment7                           */
-      /* Details: "If a preference attribute definition contains the          */
-      /* read-only setting, it will not be modifiable in the processAction    */
-      /* method"                                                              */
-      TestResult tr20 = tcd.getTestResultFailed(SPEC2_17_PREFERENCES_DEPLOYMENT7);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_17_Preferences_deployment8                           */
-      /* Details: "If a preference attribute definition contains the          */
-      /* read-only setting, it will not be modifiable in the processEvent     */
-      /* method"                                                              */
-      TestResult tr21 = tcd.getTestResultFailed(SPEC2_17_PREFERENCES_DEPLOYMENT8);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_17_Preferences_deployment9                           */
-      /* Details: "If a preference attribute definition contains the          */
-      /* read-only setting, it will not be modifiable in the serveResource    */
-      /* method"                                                              */
-      TestResult tr22 = tcd.getTestResultFailed(SPEC2_17_PREFERENCES_DEPLOYMENT9);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_17_Preferences_deployment10                          */
-      /* Details: "A preference attribute not defined in the deployment       */
-      /* descriptor may be added programmatically in the processAction        */
-      /* method"                                                              */
-      TestResult tr23 = tcd.getTestResultFailed(SPEC2_17_PREFERENCES_DEPLOYMENT10);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_17_Preferences_deployment11                          */
-      /* Details: "A preference attribute not defined in the deployment       */
-      /* descriptor may be added programmatically in the processEvent         */
-      /* method"                                                              */
-      TestResult tr24 = tcd.getTestResultFailed(SPEC2_17_PREFERENCES_DEPLOYMENT11);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_17_Preferences_deployment12                          */
-      /* Details: "A preference attribute not defined in the deployment       */
-      /* descriptor may be added programmatically in the serveResource        */
-      /* method"                                                              */
-      TestResult tr25 = tcd.getTestResultFailed(SPEC2_17_PREFERENCES_DEPLOYMENT12);
-      /* 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);
-
-
-   }
-
-}
-

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/23a1c547/portlet-tck_3.0/V2AddlEnvironmentTests/src/main/java/javax/portlet/tck/portlets/AddlEnvironmentTests_SPEC2_17_RenderPreferences.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlEnvironmentTests/src/main/java/javax/portlet/tck/portlets/AddlEnvironmentTests_SPEC2_17_RenderPreferences.java b/portlet-tck_3.0/V2AddlEnvironmentTests/src/main/java/javax/portlet/tck/portlets/AddlEnvironmentTests_SPEC2_17_RenderPreferences.java
new file mode 100644
index 0000000..a539e0e
--- /dev/null
+++ b/portlet-tck_3.0/V2AddlEnvironmentTests/src/main/java/javax/portlet/tck/portlets/AddlEnvironmentTests_SPEC2_17_RenderPreferences.java
@@ -0,0 +1,121 @@
+/*  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 AddlEnvironmentTests_SPEC2_17_RenderPreferences_event
+ *
+ */
+public class AddlEnvironmentTests_SPEC2_17_RenderPreferences implements Portlet, ResourceServingPortlet {
+   private static final String LOG_CLASS = 
+         AddlEnvironmentTests_SPEC2_17_RenderPreferences.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();
+
+   }
+
+   @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();
+
+      JSR286SpecTestCaseDetails tcd = new JSR286SpecTestCaseDetails();
+
+      // Create result objects for the tests
+
+      /* TestCase: V2AddlEnvironmentTests_SPEC2_17_RenderPreferences_deployment1 */
+      /* Details: "The portlet definition may define the preference           */
+      /* attributes a portlet uses"                                           */
+      TestResult tr0 = tcd.getTestResultFailed(V2ADDLENVIRONMENTTESTS_SPEC2_17_RENDERPREFERENCES_DEPLOYMENT1);
+      /* TODO: implement test */
+      tr0.appendTcDetail("Not implemented.");
+      tr0.writeTo(writer);
+
+      /* TestCase: V2AddlEnvironmentTests_SPEC2_17_RenderPreferences_deployment2 */
+      /* Details: "A preference attribute definition may include initial      */
+      /* default values"                                                      */
+      TestResult tr1 = tcd.getTestResultFailed(V2ADDLENVIRONMENTTESTS_SPEC2_17_RENDERPREFERENCES_DEPLOYMENT2);
+      /* TODO: implement test */
+      tr1.appendTcDetail("Not implemented.");
+      tr1.writeTo(writer);
+
+   }
+
+}

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/23a1c547/portlet-tck_3.0/V2AddlEnvironmentTests/src/main/java/javax/portlet/tck/portlets/AddlEnvironmentTests_SPEC2_17_ResourcePreferences.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlEnvironmentTests/src/main/java/javax/portlet/tck/portlets/AddlEnvironmentTests_SPEC2_17_ResourcePreferences.java b/portlet-tck_3.0/V2AddlEnvironmentTests/src/main/java/javax/portlet/tck/portlets/AddlEnvironmentTests_SPEC2_17_ResourcePreferences.java
new file mode 100644
index 0000000..371f6af
--- /dev/null
+++ b/portlet-tck_3.0/V2AddlEnvironmentTests/src/main/java/javax/portlet/tck/portlets/AddlEnvironmentTests_SPEC2_17_ResourcePreferences.java
@@ -0,0 +1,189 @@
+/*  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 AddlEnvironmentTests_SPEC2_17_ResourcePreferences_event
+ *
+ */
+public class AddlEnvironmentTests_SPEC2_17_ResourcePreferences implements Portlet, ResourceServingPortlet {
+   private static final String LOG_CLASS = 
+         AddlEnvironmentTests_SPEC2_17_ResourcePreferences.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: V2AddlEnvironmentTests_SPEC2_17_ResourcePreferences_setValues4 */
+      /* Details: "The setValues method allows the value array to be set to   */
+      /* null"                                                                */
+      TestResult tr0 = tcd.getTestResultFailed(V2ADDLENVIRONMENTTESTS_SPEC2_17_RESOURCEPREFERENCES_SETVALUES4);
+      /* TODO: implement test */
+      tr0.appendTcDetail("Not implemented.");
+      tr0.writeTo(writer);
+
+      /* TestCase: V2AddlEnvironmentTests_SPEC2_17_ResourcePreferences_reset1 */
+      /* Details: "The reset method sets the value of the specified           */
+      /* preference to its default value. The actual default value itself     */
+      /* is implementation-specific and cannot be tested."                    */
+      TestResult tr1 = tcd.getTestResultFailed(V2ADDLENVIRONMENTTESTS_SPEC2_17_RESOURCEPREFERENCES_RESET1);
+      /* TODO: implement test */
+      tr1.appendTcDetail("Not implemented.");
+      tr1.writeTo(writer);
+
+      /* TestCase: V2AddlEnvironmentTests_SPEC2_17_ResourcePreferences_store1 */
+      /* Details: "The store method persists preference changes previously    */
+      /* made during the processAction method"                                */
+      TestResult tr2 = tcd.getTestResultFailed(V2ADDLENVIRONMENTTESTS_SPEC2_17_RESOURCEPREFERENCES_STORE1);
+      /* TODO: implement test */
+      tr2.appendTcDetail("Not implemented.");
+      tr2.writeTo(writer);
+
+      /* TestCase: V2AddlEnvironmentTests_SPEC2_17_ResourcePreferences_store4 */
+      /* Details: "If preference changes are made during the processAction    */
+      /* method, but the method completes without store being called, the     */
+      /* preference changes are discarded"                                    */
+      TestResult tr3 = tcd.getTestResultFailed(V2ADDLENVIRONMENTTESTS_SPEC2_17_RESOURCEPREFERENCES_STORE4);
+      /* TODO: implement test */
+      tr3.appendTcDetail("Not implemented.");
+      tr3.writeTo(writer);
+
+      /* TestCase: V2AddlEnvironmentTests_SPEC2_17_ResourcePreferences_deployment3 */
+      /* Details: "A preference attribute definition may indicate if the      */
+      /* attribute is read only"                                              */
+      TestResult tr4 = tcd.getTestResultFailed(V2ADDLENVIRONMENTTESTS_SPEC2_17_RESOURCEPREFERENCES_DEPLOYMENT3);
+      /* TODO: implement test */
+      tr4.appendTcDetail("Not implemented.");
+      tr4.writeTo(writer);
+
+      /* TestCase: V2AddlEnvironmentTests_SPEC2_17_ResourcePreferences_deployment4 */
+      /* Details: "If a preference attribute definition does not contain      */
+      /* the read-only setting, it will be modifiable in the processAction    */
+      /* method"                                                              */
+      TestResult tr5 = tcd.getTestResultFailed(V2ADDLENVIRONMENTTESTS_SPEC2_17_RESOURCEPREFERENCES_DEPLOYMENT4);
+      /* TODO: implement test */
+      tr5.appendTcDetail("Not implemented.");
+      tr5.writeTo(writer);
+
+      /* TestCase: V2AddlEnvironmentTests_SPEC2_17_ResourcePreferences_deployment7 */
+      /* Details: "If a preference attribute definition contains the          */
+      /* read-only setting, it will not be modifiable in the processAction    */
+      /* method"                                                              */
+      TestResult tr6 = tcd.getTestResultFailed(V2ADDLENVIRONMENTTESTS_SPEC2_17_RESOURCEPREFERENCES_DEPLOYMENT7);
+      /* TODO: implement test */
+      tr6.appendTcDetail("Not implemented.");
+      tr6.writeTo(writer);
+
+      /* TestCase: V2AddlEnvironmentTests_SPEC2_17_ResourcePreferences_deployment10 */
+      /* Details: "A preference attribute not defined in the deployment       */
+      /* descriptor may be added programmatically in the processAction        */
+      /* method"                                                              */
+      TestResult tr7 = tcd.getTestResultFailed(V2ADDLENVIRONMENTTESTS_SPEC2_17_RESOURCEPREFERENCES_DEPLOYMENT10);
+      /* TODO: implement test */
+      tr7.appendTcDetail("Not implemented.");
+      tr7.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=\"AddlEnvironmentTests_SPEC2_17_ResourcePreferences\">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(\"AddlEnvironmentTests_SPEC2_17_ResourcePreferences\").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/V2AddlEnvironmentTests/src/main/java/javax/portlet/tck/portlets/AddlEnvironmentTests_SPEC2_18_Sessions.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlEnvironmentTests/src/main/java/javax/portlet/tck/portlets/AddlEnvironmentTests_SPEC2_18_Sessions.java b/portlet-tck_3.0/V2AddlEnvironmentTests/src/main/java/javax/portlet/tck/portlets/AddlEnvironmentTests_SPEC2_18_Sessions.java
index 80cc92c..f53739a 100644
--- a/portlet-tck_3.0/V2AddlEnvironmentTests/src/main/java/javax/portlet/tck/portlets/AddlEnvironmentTests_SPEC2_18_Sessions.java
+++ b/portlet-tck_3.0/V2AddlEnvironmentTests/src/main/java/javax/portlet/tck/portlets/AddlEnvironmentTests_SPEC2_18_Sessions.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 AddlEnvironmentTests_SPEC2_18_Sessions_event
+ *
  */
-public class AddlEnvironmentTests_SPEC2_18_Sessions implements Portlet {
+public class AddlEnvironmentTests_SPEC2_18_Sessions implements Portlet, ResourceServingPortlet {
    private static final String LOG_CLASS = 
          AddlEnvironmentTests_SPEC2_18_Sessions.class.getName();
    private final Logger LOGGER = Logger.getLogger(LOG_CLASS);
@@ -57,301 +62,354 @@ public class AddlEnvironmentTests_SPEC2_18_Sessions 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();
+
+   }
+
+   @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();
 
-      PrintWriter writer = renderResponse.getWriter();
       JSR286SpecTestCaseDetails tcd = new JSR286SpecTestCaseDetails();
 
       // Create result objects for the tests
 
-      /* TestCase: SPEC2_18_Sessions_scope1                                   */
+      /* TestCase: V2AddlEnvironmentTests_SPEC2_18_Sessions_scope1            */
       /* Details: "PortletSession objects must be scoped at the portlet       */
       /* application context level"                                           */
-      TestResult tr0 = tcd.getTestResultFailed(SPEC2_18_SESSIONS_SCOPE1);
+      TestResult tr0 = tcd.getTestResultFailed(V2ADDLENVIRONMENTTESTS_SPEC2_18_SESSIONS_SCOPE1);
       /* TODO: implement test */
+      tr0.appendTcDetail("Not implemented.");
+      tr0.writeTo(writer);
 
-      /* TestCase: SPEC2_18_Sessions_scope2                                   */
+      /* TestCase: V2AddlEnvironmentTests_SPEC2_18_Sessions_scope2            */
       /* Details: "The portlet container must not share the PortletSession    */
       /* object or the attributes stored in it among different portlet        */
       /* applications or among different user sessions"                       */
-      TestResult tr1 = tcd.getTestResultFailed(SPEC2_18_SESSIONS_SCOPE2);
+      TestResult tr1 = tcd.getTestResultFailed(V2ADDLENVIRONMENTTESTS_SPEC2_18_SESSIONS_SCOPE2);
       /* TODO: implement test */
+      tr1.appendTcDetail("Not implemented.");
+      tr1.writeTo(writer);
 
-      /* TestCase: SPEC2_18_Sessions_scope3                                   */
+      /* TestCase: V2AddlEnvironmentTests_SPEC2_18_Sessions_scope3            */
       /* Details: "Any object stored in the session using the                 */
       /* APPLICATION_SCOPE is available to any portlet that belongs to the    */
       /* same portlet application and that handles a request in the same      */
       /* session"                                                             */
-      TestResult tr2 = tcd.getTestResultFailed(SPEC2_18_SESSIONS_SCOPE3);
+      TestResult tr2 = tcd.getTestResultFailed(V2ADDLENVIRONMENTTESTS_SPEC2_18_SESSIONS_SCOPE3);
       /* TODO: implement test */
+      tr2.appendTcDetail("Not implemented.");
+      tr2.writeTo(writer);
 
-      /* TestCase: SPEC2_18_Sessions_scope4                                   */
+      /* TestCase: V2AddlEnvironmentTests_SPEC2_18_Sessions_scope4            */
       /* Details: "Any Object stored in the session using the PORTLET_SCOPE   */
       /* must be available to the portlet during requests for the same        */
       /* portlet window that stored the object"                               */
-      TestResult tr3 = tcd.getTestResultFailed(SPEC2_18_SESSIONS_SCOPE4);
+      TestResult tr3 = tcd.getTestResultFailed(V2ADDLENVIRONMENTTESTS_SPEC2_18_SESSIONS_SCOPE4);
       /* TODO: implement test */
+      tr3.appendTcDetail("Not implemented.");
+      tr3.writeTo(writer);
 
-      /* TestCase: SPEC2_18_Sessions_scope5                                   */
+      /* TestCase: V2AddlEnvironmentTests_SPEC2_18_Sessions_scope5            */
       /* Details: "The PORTLET_SCOPE object must be stored in the             */
       /* APPLICATION_SCOPE with the attribute name                            */
       /* 'javax.portlet.p.<ID>?<ATTRIBUTE_NAME>', where <ID> must be equal    */
       /* to the ID returned by the PortletRequest.getWindowID()"              */
-      TestResult tr4 = tcd.getTestResultFailed(SPEC2_18_SESSIONS_SCOPE5);
+      TestResult tr4 = tcd.getTestResultFailed(V2ADDLENVIRONMENTTESTS_SPEC2_18_SESSIONS_SCOPE5);
       /* TODO: implement test */
+      tr4.appendTcDetail("Not implemented.");
+      tr4.writeTo(writer);
 
-      /* TestCase: SPEC2_18_Sessions_setAttribute1                            */
+      /* TestCase: V2AddlEnvironmentTests_SPEC2_18_Sessions_setAttribute1     */
       /* Details: "The setAttribute method can bind an object to the          */
       /* session in PORTLET_SCOPE"                                            */
-      TestResult tr5 = tcd.getTestResultFailed(SPEC2_18_SESSIONS_SETATTRIBUTE1);
+      TestResult tr5 = tcd.getTestResultFailed(V2ADDLENVIRONMENTTESTS_SPEC2_18_SESSIONS_SETATTRIBUTE1);
       /* TODO: implement test */
+      tr5.appendTcDetail("Not implemented.");
+      tr5.writeTo(writer);
 
-      /* TestCase: SPEC2_18_Sessions_setAttribute2                            */
+      /* TestCase: V2AddlEnvironmentTests_SPEC2_18_Sessions_setAttribute2     */
       /* Details: "The setAttribute method that does not take a scope         */
       /* parameter binds an object to the session in PORTLET_SCOPE"           */
-      TestResult tr6 = tcd.getTestResultFailed(SPEC2_18_SESSIONS_SETATTRIBUTE2);
+      TestResult tr6 = tcd.getTestResultFailed(V2ADDLENVIRONMENTTESTS_SPEC2_18_SESSIONS_SETATTRIBUTE2);
       /* TODO: implement test */
+      tr6.appendTcDetail("Not implemented.");
+      tr6.writeTo(writer);
 
-      /* TestCase: SPEC2_18_Sessions_setAttribute3                            */
+      /* TestCase: V2AddlEnvironmentTests_SPEC2_18_Sessions_setAttribute3     */
       /* Details: "The setAttribute method can bind an object to the          */
       /* session in APPLICATION_SCOPE"                                        */
-      TestResult tr7 = tcd.getTestResultFailed(SPEC2_18_SESSIONS_SETATTRIBUTE3);
+      TestResult tr7 = tcd.getTestResultFailed(V2ADDLENVIRONMENTTESTS_SPEC2_18_SESSIONS_SETATTRIBUTE3);
       /* TODO: implement test */
+      tr7.appendTcDetail("Not implemented.");
+      tr7.writeTo(writer);
 
-      /* TestCase: SPEC2_18_Sessions_getAttribute1                            */
+      /* TestCase: V2AddlEnvironmentTests_SPEC2_18_Sessions_getAttribute1     */
       /* Details: "The getAttribute method is used to retrieve attributes     */
       /* stored in the session in PORTLET_SCOPE"                              */
-      TestResult tr8 = tcd.getTestResultFailed(SPEC2_18_SESSIONS_GETATTRIBUTE1);
+      TestResult tr8 = tcd.getTestResultFailed(V2ADDLENVIRONMENTTESTS_SPEC2_18_SESSIONS_GETATTRIBUTE1);
       /* TODO: implement test */
+      tr8.appendTcDetail("Not implemented.");
+      tr8.writeTo(writer);
 
-      /* TestCase: SPEC2_18_Sessions_getAttribute2                            */
+      /* TestCase: V2AddlEnvironmentTests_SPEC2_18_Sessions_getAttribute2     */
       /* Details: "The getAttribute method that does not take a scope         */
       /* parameter retrieves attributes stored in the session in              */
       /* PORTLET_SCOPE"                                                       */
-      TestResult tr9 = tcd.getTestResultFailed(SPEC2_18_SESSIONS_GETATTRIBUTE2);
+      TestResult tr9 = tcd.getTestResultFailed(V2ADDLENVIRONMENTTESTS_SPEC2_18_SESSIONS_GETATTRIBUTE2);
       /* TODO: implement test */
+      tr9.appendTcDetail("Not implemented.");
+      tr9.writeTo(writer);
 
-      /* TestCase: SPEC2_18_Sessions_getAttribute3                            */
+      /* TestCase: V2AddlEnvironmentTests_SPEC2_18_Sessions_getAttribute3     */
       /* Details: "The getAttribute method is used to retrieve attributes     */
       /* stored in the session in APPLICATION_SCOPE"                          */
-      TestResult tr10 = tcd.getTestResultFailed(SPEC2_18_SESSIONS_GETATTRIBUTE3);
+      TestResult tr10 = tcd.getTestResultFailed(V2ADDLENVIRONMENTTESTS_SPEC2_18_SESSIONS_GETATTRIBUTE3);
       /* TODO: implement test */
+      tr10.appendTcDetail("Not implemented.");
+      tr10.writeTo(writer);
 
-      /* TestCase: SPEC2_18_Sessions_removeAttribute1                         */
+      /* TestCase: V2AddlEnvironmentTests_SPEC2_18_Sessions_removeAttribute1  */
       /* Details: "The removeAttribute method is used to remove attributes    */
       /* stored in the session in PORTLET_SCOPE"                              */
-      TestResult tr11 = tcd.getTestResultFailed(SPEC2_18_SESSIONS_REMOVEATTRIBUTE1);
+      TestResult tr11 = tcd.getTestResultFailed(V2ADDLENVIRONMENTTESTS_SPEC2_18_SESSIONS_REMOVEATTRIBUTE1);
       /* TODO: implement test */
+      tr11.appendTcDetail("Not implemented.");
+      tr11.writeTo(writer);
 
-      /* TestCase: SPEC2_18_Sessions_removeAttribute2                         */
+      /* TestCase: V2AddlEnvironmentTests_SPEC2_18_Sessions_removeAttribute2  */
       /* Details: "The removeAttribute method that does not take a scope      */
       /* parameter remove attributes stored in the session in                 */
       /* PORTLET_SCOPE"                                                       */
-      TestResult tr12 = tcd.getTestResultFailed(SPEC2_18_SESSIONS_REMOVEATTRIBUTE2);
+      TestResult tr12 = tcd.getTestResultFailed(V2ADDLENVIRONMENTTESTS_SPEC2_18_SESSIONS_REMOVEATTRIBUTE2);
       /* TODO: implement test */
+      tr12.appendTcDetail("Not implemented.");
+      tr12.writeTo(writer);
 
-      /* TestCase: SPEC2_18_Sessions_removeAttribute3                         */
+      /* TestCase: V2AddlEnvironmentTests_SPEC2_18_Sessions_removeAttribute3  */
       /* Details: "The removeAttribute method is used to remove attributes    */
       /* stored in the session in APPLICATION_SCOPE"                          */
-      TestResult tr13 = tcd.getTestResultFailed(SPEC2_18_SESSIONS_REMOVEATTRIBUTE3);
+      TestResult tr13 = tcd.getTestResultFailed(V2ADDLENVIRONMENTTESTS_SPEC2_18_SESSIONS_REMOVEATTRIBUTE3);
       /* TODO: implement test */
+      tr13.appendTcDetail("Not implemented.");
+      tr13.writeTo(writer);
 
-      /* TestCase: SPEC2_18_Sessions_getAttributeNames1                       */
+      /* TestCase: V2AddlEnvironmentTests_SPEC2_18_Sessions_getAttributeNames1 */
       /* Details: "The getAttributeNames method can retrieve an               */
       /* Enumeration<String> of all attribute names stored in the session     */
       /* in PORTLET_SCOPE"                                                    */
-      TestResult tr14 = tcd.getTestResultFailed(SPEC2_18_SESSIONS_GETATTRIBUTENAMES1);
+      TestResult tr14 = tcd.getTestResultFailed(V2ADDLENVIRONMENTTESTS_SPEC2_18_SESSIONS_GETATTRIBUTENAMES1);
       /* TODO: implement test */
+      tr14.appendTcDetail("Not implemented.");
+      tr14.writeTo(writer);
 
-      /* TestCase: SPEC2_18_Sessions_getAttributeNames2                       */
+      /* TestCase: V2AddlEnvironmentTests_SPEC2_18_Sessions_getAttributeNames2 */
       /* Details: "The getAttributeNames method that does not take a scope    */
       /* parameter retrieves an Enumeration<String> of all attribute names    */
       /* stored in the session in PORTLET_SCOPE"                              */
-      TestResult tr15 = tcd.getTestResultFailed(SPEC2_18_SESSIONS_GETATTRIBUTENAMES2);
+      TestResult tr15 = tcd.getTestResultFailed(V2ADDLENVIRONMENTTESTS_SPEC2_18_SESSIONS_GETATTRIBUTENAMES2);
       /* TODO: implement test */
+      tr15.appendTcDetail("Not implemented.");
+      tr15.writeTo(writer);
 
-      /* TestCase: SPEC2_18_Sessions_getAttributeNames3                       */
+      /* TestCase: V2AddlEnvironmentTests_SPEC2_18_Sessions_getAttributeNames3 */
       /* Details: "The getAttributeNames method can retrieve an               */
       /* Enumeration<String> of all attribute names stored in the session     */
       /* in APPLICATION_SCOPE"                                                */
-      TestResult tr16 = tcd.getTestResultFailed(SPEC2_18_SESSIONS_GETATTRIBUTENAMES3);
+      TestResult tr16 = tcd.getTestResultFailed(V2ADDLENVIRONMENTTESTS_SPEC2_18_SESSIONS_GETATTRIBUTENAMES3);
       /* TODO: implement test */
+      tr16.appendTcDetail("Not implemented.");
+      tr16.writeTo(writer);
 
-      /* TestCase: SPEC2_18_Sessions_decodeAttributeName1                     */
+      /* TestCase: V2AddlEnvironmentTests_SPEC2_18_Sessions_decodeAttributeName1 */
       /* Details: "The PortletSessionUtil.decodeAttributeName method          */
       /* returns the attribute name without the prefix for an attribute       */
-      /* name retrieved from the HTTPSession"                                 */
-      TestResult tr17 = tcd.getTestResultFailed(SPEC2_18_SESSIONS_DECODEATTRIBUTENAME1);
+      /* name retrieved from the HttpSession"                                 */
+      TestResult tr17 = tcd.getTestResultFailed(V2ADDLENVIRONMENTTESTS_SPEC2_18_SESSIONS_DECODEATTRIBUTENAME1);
       /* TODO: implement test */
+      tr17.appendTcDetail("Not implemented.");
+      tr17.writeTo(writer);
 
-      /* TestCase: SPEC2_18_Sessions_decodeAttributeName2                     */
+      /* TestCase: V2AddlEnvironmentTests_SPEC2_18_Sessions_decodeAttributeName2 */
       /* Details: "The PortletSessionUtil.decodeAttributeName method          */
       /* returns the attribute name without the prefix for an attribute       */
       /* name retrieved from the PortletSession in APPLICATION_SCOPE"         */
-      TestResult tr18 = tcd.getTestResultFailed(SPEC2_18_SESSIONS_DECODEATTRIBUTENAME2);
+      TestResult tr18 = tcd.getTestResultFailed(V2ADDLENVIRONMENTTESTS_SPEC2_18_SESSIONS_DECODEATTRIBUTENAME2);
       /* TODO: implement test */
+      tr18.appendTcDetail("Not implemented.");
+      tr18.writeTo(writer);
 
-      /* TestCase: SPEC2_18_Sessions_httpSession1                             */
+      /* TestCase: V2AddlEnvironmentTests_SPEC2_18_Sessions_httpSession1      */
       /* Details: "Data stored in the HttpSession by a servlet in the same    */
       /* web application is accessible to portlets through the                */
       /* PortletSession in APPLICATION_SCOPE"                                 */
-      TestResult tr19 = tcd.getTestResultFailed(SPEC2_18_SESSIONS_HTTPSESSION1);
+      TestResult tr19 = tcd.getTestResultFailed(V2ADDLENVIRONMENTTESTS_SPEC2_18_SESSIONS_HTTPSESSION1);
       /* TODO: implement test */
+      tr19.appendTcDetail("Not implemented.");
+      tr19.writeTo(writer);
 
-      /* TestCase: SPEC2_18_Sessions_httpSession2                             */
+      /* TestCase: V2AddlEnvironmentTests_SPEC2_18_Sessions_httpSession2      */
       /* Details: "Data stored in the HttpSession by a JSP in the same web    */
       /* application is accessible to portlets through the PortletSession     */
       /* in APPLICATION_SCOPE"                                                */
-      TestResult tr20 = tcd.getTestResultFailed(SPEC2_18_SESSIONS_HTTPSESSION2);
+      TestResult tr20 = tcd.getTestResultFailed(V2ADDLENVIRONMENTTESTS_SPEC2_18_SESSIONS_HTTPSESSION2);
       /* TODO: implement test */
+      tr20.appendTcDetail("Not implemented.");
+      tr20.writeTo(writer);
 
-      /* TestCase: SPEC2_18_Sessions_httpSession3                             */
+      /* TestCase: V2AddlEnvironmentTests_SPEC2_18_Sessions_httpSession3      */
       /* Details: "Data stored by portlets in the PortletSession is           */
       /* accessible to servlets and JSPs through the HttpSession"             */
-      TestResult tr21 = tcd.getTestResultFailed(SPEC2_18_SESSIONS_HTTPSESSION3);
+      TestResult tr21 = tcd.getTestResultFailed(V2ADDLENVIRONMENTTESTS_SPEC2_18_SESSIONS_HTTPSESSION3);
       /* TODO: implement test */
+      tr21.appendTcDetail("Not implemented.");
+      tr21.writeTo(writer);
 
-      /* TestCase: SPEC2_18_Sessions_httpSession4                             */
+      /* TestCase: V2AddlEnvironmentTests_SPEC2_18_Sessions_httpSession4      */
       /* Details: "If the HttpSession object is invalidated, the              */
       /* PortletSession object must also be invalidated by the portlet        */
       /* container"                                                           */
-      TestResult tr22 = tcd.getTestResultFailed(SPEC2_18_SESSIONS_HTTPSESSION4);
+      TestResult tr22 = tcd.getTestResultFailed(V2ADDLENVIRONMENTTESTS_SPEC2_18_SESSIONS_HTTPSESSION4);
       /* TODO: implement test */
+      tr22.appendTcDetail("Not implemented.");
+      tr22.writeTo(writer);
 
-      /* TestCase: SPEC2_18_Sessions_httpSession5                             */
+      /* TestCase: V2AddlEnvironmentTests_SPEC2_18_Sessions_httpSession5      */
       /* Details: "If the PortletSession object is invalidated by a           */
       /* portlet, the portlet container must invalidate the associated        */
       /* HttpSession object"                                                  */
-      TestResult tr23 = tcd.getTestResultFailed(SPEC2_18_SESSIONS_HTTPSESSION5);
+      TestResult tr23 = tcd.getTestResultFailed(V2ADDLENVIRONMENTTESTS_SPEC2_18_SESSIONS_HTTPSESSION5);
       /* TODO: implement test */
+      tr23.appendTcDetail("Not implemented.");
+      tr23.writeTo(writer);
 
-      /* TestCase: SPEC2_18_Sessions_httpSession6                             */
-      /* Details: "The attribute names retrieved from the HTTPSession must    */
+      /* TestCase: V2AddlEnvironmentTests_SPEC2_18_Sessions_httpSession6      */
+      /* Details: "The attribute names retrieved from the HttpSession must    */
       /* be the same as those retrieve from the PortletSession if             */
       /* APPLICATION_SCOPE scope is used"                                     */
-      TestResult tr24 = tcd.getTestResultFailed(SPEC2_18_SESSIONS_HTTPSESSION6);
+      TestResult tr24 = tcd.getTestResultFailed(V2ADDLENVIRONMENTTESTS_SPEC2_18_SESSIONS_HTTPSESSION6);
       /* TODO: implement test */
+      tr24.appendTcDetail("Not implemented.");
+      tr24.writeTo(writer);
 
-      /* TestCase: SPEC2_18_Sessions_httpSession7                             */
-      /* Details: "The attribute names retrieved from the HTTPSession must    */
+      /* TestCase: V2AddlEnvironmentTests_SPEC2_18_Sessions_httpSession7      */
+      /* Details: "The attribute names retrieved from the HttpSession must    */
       /* have the speficied prefixing if PORTLET_SCOPE scope is used"         */
-      TestResult tr25 = tcd.getTestResultFailed(SPEC2_18_SESSIONS_HTTPSESSION7);
+      TestResult tr25 = tcd.getTestResultFailed(V2ADDLENVIRONMENTTESTS_SPEC2_18_SESSIONS_HTTPSESSION7);
       /* TODO: implement test */
+      tr25.appendTcDetail("Not implemented.");
+      tr25.writeTo(writer);
 
-      /* TestCase: SPEC2_18_Sessions_httpSession8                             */
+      /* TestCase: V2AddlEnvironmentTests_SPEC2_18_Sessions_httpSession8      */
       /* Details: "The portlet session follows the timeout behavior of the    */
       /* servlet session"                                                     */
-      TestResult tr26 = tcd.getTestResultFailed(SPEC2_18_SESSIONS_HTTPSESSION8);
+      TestResult tr26 = tcd.getTestResultFailed(V2ADDLENVIRONMENTTESTS_SPEC2_18_SESSIONS_HTTPSESSION8);
       /* TODO: implement test */
+      tr26.appendTcDetail("Not implemented.");
+      tr26.writeTo(writer);
 
-      /* TestCase: SPEC2_18_Sessions_httpSession9                             */
+      /* TestCase: V2AddlEnvironmentTests_SPEC2_18_Sessions_httpSession9      */
       /* Details: "The portlet session follows the last accessed times        */
       /* behavior of the servlet session"                                     */
-      TestResult tr27 = tcd.getTestResultFailed(SPEC2_18_SESSIONS_HTTPSESSION9);
+      TestResult tr27 = tcd.getTestResultFailed(V2ADDLENVIRONMENTTESTS_SPEC2_18_SESSIONS_HTTPSESSION9);
       /* TODO: implement test */
+      tr27.appendTcDetail("Not implemented.");
+      tr27.writeTo(writer);
 
-      /* TestCase: SPEC2_18_Sessions_httpSession11                            */
+      /* TestCase: V2AddlEnvironmentTests_SPEC2_18_Sessions_httpSession11     */
       /* Details: "The portlet session follows the same semantic              */
       /* considerations as the servlet session"                               */
-      TestResult tr28 = tcd.getTestResultFailed(SPEC2_18_SESSIONS_HTTPSESSION11);
+      TestResult tr28 = tcd.getTestResultFailed(V2ADDLENVIRONMENTTESTS_SPEC2_18_SESSIONS_HTTPSESSION11);
       /* TODO: implement test */
+      tr28.appendTcDetail("Not implemented.");
+      tr28.writeTo(writer);
 
-      /* TestCase: SPEC2_18_Sessions_httpSession12                            */
-      /* Details: "The PortletSession getCreationTime method provides the     */
-      /* same functionality as the corresponding HTTPSession method"          */
-      TestResult tr29 = tcd.getTestResultFailed(SPEC2_18_SESSIONS_HTTPSESSION12);
+      /* TestCase: V2AddlEnvironmentTests_SPEC2_18_Sessions_getCreationTime   */
+      /* Details: "The PortletSession.getCreationTime method provides the     */
+      /* same functionality as the corresponding                              */
+      /* HttpSession.getCreationTime method"                                  */
+      TestResult tr29 = tcd.getTestResultFailed(V2ADDLENVIRONMENTTESTS_SPEC2_18_SESSIONS_GETCREATIONTIME);
       /* TODO: implement test */
+      tr29.appendTcDetail("Not implemented.");
+      tr29.writeTo(writer);
 
-      /* TestCase: SPEC2_18_Sessions_httpSession13                            */
-      /* Details: "The PortletSession getId method provides the same          */
-      /* functionality as the corresponding HTTPSession method"               */
-      TestResult tr30 = tcd.getTestResultFailed(SPEC2_18_SESSIONS_HTTPSESSION13);
+      /* TestCase: V2AddlEnvironmentTests_SPEC2_18_Sessions_getId             */
+      /* Details: "The PortletSession.getId method provides the same          */
+      /* functionality as the corresponding HttpSession.getId method"         */
+      TestResult tr30 = tcd.getTestResultFailed(V2ADDLENVIRONMENTTESTS_SPEC2_18_SESSIONS_GETID);
       /* TODO: implement test */
+      tr30.appendTcDetail("Not implemented.");
+      tr30.writeTo(writer);
 
-      /* TestCase: SPEC2_18_Sessions_httpSession14                            */
-      /* Details: "The PortletSession getLastAccessTime method provides the   */
-      /* same functionality as the corresponding HTTPSession method"          */
-      TestResult tr31 = tcd.getTestResultFailed(SPEC2_18_SESSIONS_HTTPSESSION14);
+      /* TestCase: V2AddlEnvironmentTests_SPEC2_18_Sessions_getLastAccessTime */
+      /* Details: "The PortletSession.getLastAccessTime method provides the   */
+      /* same functionality as the corresponding                              */
+      /* HttpSession.getLastAccessTime method"                                */
+      TestResult tr31 = tcd.getTestResultFailed(V2ADDLENVIRONMENTTESTS_SPEC2_18_SESSIONS_GETLASTACCESSTIME);
       /* TODO: implement test */
+      tr31.appendTcDetail("Not implemented.");
+      tr31.writeTo(writer);
 
-      /* TestCase: SPEC2_18_Sessions_httpSession15                            */
-      /* Details: "The PortletSession getMaxInctiveInterval method provides   */
-      /* the same functionality as the corresponding HTTPSession method"      */
-      TestResult tr32 = tcd.getTestResultFailed(SPEC2_18_SESSIONS_HTTPSESSION15);
+      /* TestCase: V2AddlEnvironmentTests_SPEC2_18_Sessions_getMaxInctiveInterval */
+      /* Details: "The PortletSession.getMaxInctiveInterval method provides   */
+      /* the same functionality as the corresponding                          */
+      /* HttpSession.getMaxInctiveInterval method"                            */
+      TestResult tr32 = tcd.getTestResultFailed(V2ADDLENVIRONMENTTESTS_SPEC2_18_SESSIONS_GETMAXINCTIVEINTERVAL);
       /* TODO: implement test */
+      tr32.appendTcDetail("Not implemented.");
+      tr32.writeTo(writer);
 
-      /* TestCase: SPEC2_18_Sessions_httpSession16                            */
-      /* Details: "The PortletSession invalidate method provides the same     */
-      /* functionality as the corresponding HTTPSession method"               */
-      TestResult tr33 = tcd.getTestResultFailed(SPEC2_18_SESSIONS_HTTPSESSION16);
+      /* TestCase: V2AddlEnvironmentTests_SPEC2_18_Sessions_invalidate        */
+      /* Details: "The PortletSession.invalidate method provides the same     */
+      /* functionality as the corresponding HttpSession.invalidate method"    */
+      TestResult tr33 = tcd.getTestResultFailed(V2ADDLENVIRONMENTTESTS_SPEC2_18_SESSIONS_INVALIDATE);
       /* TODO: implement test */
+      tr33.appendTcDetail("Not implemented.");
+      tr33.writeTo(writer);
 
-      /* TestCase: SPEC2_18_Sessions_httpSession17                            */
-      /* Details: "The PortletSession isNew method provides the same          */
-      /* functionality as the corresponding HTTPSession method"               */
-      TestResult tr34 = tcd.getTestResultFailed(SPEC2_18_SESSIONS_HTTPSESSION17);
+      /* TestCase: V2AddlEnvironmentTests_SPEC2_18_Sessions_isNew             */
+      /* Details: "The PortletSession.isNew method provides the same          */
+      /* functionality as the corresponding HttpSession.isNew method"         */
+      TestResult tr34 = tcd.getTestResultFailed(V2ADDLENVIRONMENTTESTS_SPEC2_18_SESSIONS_ISNEW);
       /* TODO: implement test */
+      tr34.appendTcDetail("Not implemented.");
+      tr34.writeTo(writer);
 
-      /* TestCase: SPEC2_18_Sessions_httpSession18                            */
-      /* Details: "The PortletSession setMaxInactiveInterval method           */
-      /* provides the same functionality as the corresponding HTTPSession     */
-      /* method"                                                              */
-      TestResult tr35 = tcd.getTestResultFailed(SPEC2_18_SESSIONS_HTTPSESSION18);
+      /* TestCase: V2AddlEnvironmentTests_SPEC2_18_Sessions_setMaxInactiveInterval */
+      /* Details: "The PortletSession.setMaxInactiveInterval method           */
+      /* provides the same functionality as the corresponding                 */
+      /* HttpSession.setMaxInactiveInterval method"                           */
+      TestResult tr35 = tcd.getTestResultFailed(V2ADDLENVIRONMENTTESTS_SPEC2_18_SESSIONS_SETMAXINACTIVEINTERVAL);
       /* 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.writeTo(writer);
-      tr30.writeTo(writer);
-      tr31.writeTo(writer);
-      tr32.writeTo(writer);
-      tr33.writeTo(writer);
-      tr34.writeTo(writer);
+      tr35.appendTcDetail("Not implemented.");
       tr35.writeTo(writer);
 
-
    }
 
 }
-

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/23a1c547/portlet-tck_3.0/V2AddlEnvironmentTests/src/main/resources/xml-resources/additionalTCs.xml
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlEnvironmentTests/src/main/resources/xml-resources/additionalTCs.xml b/portlet-tck_3.0/V2AddlEnvironmentTests/src/main/resources/xml-resources/additionalTCs.xml
index 8752f5e..8b6197f 100644
--- a/portlet-tck_3.0/V2AddlEnvironmentTests/src/main/resources/xml-resources/additionalTCs.xml
+++ b/portlet-tck_3.0/V2AddlEnvironmentTests/src/main/resources/xml-resources/additionalTCs.xml
@@ -17,106 +17,99 @@
     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 AddlEnvironmentTests test case names and page mappings -->
-<entry key="SPEC2_10_Context_portletContextServletContext1">V2AddlEnvironmentTests</entry>
-<entry key="SPEC2_10_Context_portletContextServletContext2">V2AddlEnvironmentTests</entry>
-<entry key="SPEC2_10_Context_portletContextServletContext3">V2AddlEnvironmentTests</entry>
-<entry key="SPEC2_10_Context_portletContextServletContext4">V2AddlEnvironmentTests</entry>
-<entry key="SPEC2_10_Context_portletContextServletContext7">V2AddlEnvironmentTests</entry>
-<entry key="SPEC2_10_Context_portletContextServletContext8">V2AddlEnvironmentTests</entry>
-<entry key="SPEC2_10_Context_portletContextServletContext9">V2AddlEnvironmentTests</entry>
-<entry key="SPEC2_10_Context_portletContextServletContext10">V2AddlEnvironmentTests</entry>
-<entry key="SPEC2_10_Context_portletContextServletContext11">V2AddlEnvironmentTests</entry>
-<entry key="SPEC2_10_Context_portletContextServletContext12">V2AddlEnvironmentTests</entry>
-<entry key="SPEC2_10_Context_portletContextServletContext13">V2AddlEnvironmentTests</entry>
-<entry key="SPEC2_10_Context_portletContextServletContext14">V2AddlEnvironmentTests</entry>
-<entry key="SPEC2_10_Context_portletContextServletContext15">V2AddlEnvironmentTests</entry>
-<entry key="SPEC2_10_Context_portletContextServletContext16">V2AddlEnvironmentTests</entry>
-<entry key="SPEC2_10_Context_portletContextServletContext17">V2AddlEnvironmentTests</entry>
-<entry key="SPEC2_10_Context_portletContextServletContext18">V2AddlEnvironmentTests</entry>
-<entry key="SPEC2_10_ContextOptions_containerRuntimeOptions1">V2AddlEnvironmentTests</entry>
-<entry key="SPEC2_10_ContextOptions_actionScopedRequestAttributes1">V2AddlEnvironmentTests</entry>
-<entry key="SPEC2_10_ContextOptions_actionScopedRequestAttributes2">V2AddlEnvironmentTests</entry>
-<entry key="SPEC2_10_ContextOptions_actionScopedRequestAttributes3">V2AddlEnvironmentTests</entry>
-<entry key="SPEC2_10_ContextOptions_actionScopedRequestAttributes4">V2AddlEnvironmentTests</entry>
-<entry key="SPEC2_10_ContextOptions_actionScopedRequestAttributes5">V2AddlEnvironmentTests</entry>
-<entry key="SPEC2_10_ContextOptions_actionScopedRequestAttributes6">V2AddlEnvironmentTests</entry>
-<entry key="SPEC2_10_ContextOptions_actionScopedRequestAttributes7">V2AddlEnvironmentTests</entry>
-<entry key="SPEC2_10_ContextOptions_actionScopedRequestAttributes8">V2AddlEnvironmentTests</entry>
-<entry key="SPEC2_10_ContextOptions_actionScopedRequestAttributes9">V2AddlEnvironmentTests</entry>
-<entry key="SPEC2_10_ContextOptions_actionScopedRequestAttributes0">V2AddlEnvironmentTests</entry>
-<entry key="SPEC2_10_ContextOptions_actionScopedRequestAttributes11">V2AddlEnvironmentTests</entry>
-<entry key="SPEC2_10_ContextOptions_actionScopedRequestAttributes12">V2AddlEnvironmentTests</entry>
-<entry key="SPEC2_10_ContextOptions_actionScopedRequestAttributes13">V2AddlEnvironmentTests</entry>
-<entry key="SPEC2_17_Preferences_values6">V2AddlEnvironmentTests</entry>
-<entry key="SPEC2_17_Preferences_values7">V2AddlEnvironmentTests</entry>
-<entry key="SPEC2_17_Preferences_values8">V2AddlEnvironmentTests</entry>
-<entry key="SPEC2_17_Preferences_values9">V2AddlEnvironmentTests</entry>
-<entry key="SPEC2_17_Preferences_values10">V2AddlEnvironmentTests</entry>
-<entry key="SPEC2_17_Preferences_setValues4">V2AddlEnvironmentTests</entry>
-<entry key="SPEC2_17_Preferences_reset1">V2AddlEnvironmentTests</entry>
-<entry key="SPEC2_17_Preferences_reset2">V2AddlEnvironmentTests</entry>
-<entry key="SPEC2_17_Preferences_store1">V2AddlEnvironmentTests</entry>
-<entry key="SPEC2_17_Preferences_store2">V2AddlEnvironmentTests</entry>
-<entry key="SPEC2_17_Preferences_store3">V2AddlEnvironmentTests</entry>
-<entry key="SPEC2_17_Preferences_store4">V2AddlEnvironmentTests</entry>
-<entry key="SPEC2_17_Preferences_store5">V2AddlEnvironmentTests</entry>
-<entry key="SPEC2_17_Preferences_store6">V2AddlEnvironmentTests</entry>
-<entry key="SPEC2_17_Preferences_deployment1">V2AddlEnvironmentTests</entry>
-<entry key="SPEC2_17_Preferences_deployment2">V2AddlEnvironmentTests</entry>
-<entry key="SPEC2_17_Preferences_deployment3">V2AddlEnvironmentTests</entry>
-<entry key="SPEC2_17_Preferences_deployment4">V2AddlEnvironmentTests</entry>
-<entry key="SPEC2_17_Preferences_deployment5">V2AddlEnvironmentTests</entry>
-<entry key="SPEC2_17_Preferences_deployment6">V2AddlEnvironmentTests</entry>
-<entry key="SPEC2_17_Preferences_deployment7">V2AddlEnvironmentTests</entry>
-<entry key="SPEC2_17_Preferences_deployment8">V2AddlEnvironmentTests</entry>
-<entry key="SPEC2_17_Preferences_deployment9">V2AddlEnvironmentTests</entry>
-<entry key="SPEC2_17_Preferences_deployment10">V2AddlEnvironmentTests</entry>
-<entry key="SPEC2_17_Preferences_deployment11">V2AddlEnvironmentTests</entry>
-<entry key="SPEC2_17_Preferences_deployment12">V2AddlEnvironmentTests</entry>
-<entry key="SPEC2_18_Sessions_scope1">V2AddlEnvironmentTests</entry>
-<entry key="SPEC2_18_Sessions_scope2">V2AddlEnvironmentTests</entry>
-<entry key="SPEC2_18_Sessions_scope3">V2AddlEnvironmentTests</entry>
-<entry key="SPEC2_18_Sessions_scope4">V2AddlEnvironmentTests</entry>
-<entry key="SPEC2_18_Sessions_scope5">V2AddlEnvironmentTests</entry>
-<entry key="SPEC2_18_Sessions_setAttribute1">V2AddlEnvironmentTests</entry>
-<entry key="SPEC2_18_Sessions_setAttribute2">V2AddlEnvironmentTests</entry>
-<entry key="SPEC2_18_Sessions_setAttribute3">V2AddlEnvironmentTests</entry>
-<entry key="SPEC2_18_Sessions_getAttribute1">V2AddlEnvironmentTests</entry>
-<entry key="SPEC2_18_Sessions_getAttribute2">V2AddlEnvironmentTests</entry>
-<entry key="SPEC2_18_Sessions_getAttribute3">V2AddlEnvironmentTests</entry>
-<entry key="SPEC2_18_Sessions_removeAttribute1">V2AddlEnvironmentTests</entry>
-<entry key="SPEC2_18_Sessions_removeAttribute2">V2AddlEnvironmentTests</entry>
-<entry key="SPEC2_18_Sessions_removeAttribute3">V2AddlEnvironmentTests</entry>
-<entry key="SPEC2_18_Sessions_getAttributeNames1">V2AddlEnvironmentTests</entry>
-<entry key="SPEC2_18_Sessions_getAttributeNames2">V2AddlEnvironmentTests</entry>
-<entry key="SPEC2_18_Sessions_getAttributeNames3">V2AddlEnvironmentTests</entry>
-<entry key="SPEC2_18_Sessions_decodeAttributeName1">V2AddlEnvironmentTests</entry>
-<entry key="SPEC2_18_Sessions_decodeAttributeName2">V2AddlEnvironmentTests</entry>
-<entry key="SPEC2_18_Sessions_httpSession1">V2AddlEnvironmentTests</entry>
-<entry key="SPEC2_18_Sessions_httpSession2">V2AddlEnvironmentTests</entry>
-<entry key="SPEC2_18_Sessions_httpSession3">V2AddlEnvironmentTests</entry>
-<entry key="SPEC2_18_Sessions_httpSession4">V2AddlEnvironmentTests</entry>
-<entry key="SPEC2_18_Sessions_httpSession5">V2AddlEnvironmentTests</entry>
-<entry key="SPEC2_18_Sessions_httpSession6">V2AddlEnvironmentTests</entry>
-<entry key="SPEC2_18_Sessions_httpSession7">V2AddlEnvironmentTests</entry>
-<entry key="SPEC2_18_Sessions_httpSession8">V2AddlEnvironmentTests</entry>
-<entry key="SPEC2_18_Sessions_httpSession9">V2AddlEnvironmentTests</entry>
-<entry key="SPEC2_18_Sessions_httpSession11">V2AddlEnvironmentTests</entry>
-<entry key="SPEC2_18_Sessions_httpSession12">V2AddlEnvironmentTests</entry>
-<entry key="SPEC2_18_Sessions_httpSession13">V2AddlEnvironmentTests</entry>
-<entry key="SPEC2_18_Sessions_httpSession14">V2AddlEnvironmentTests</entry>
-<entry key="SPEC2_18_Sessions_httpSession15">V2AddlEnvironmentTests</entry>
-<entry key="SPEC2_18_Sessions_httpSession16">V2AddlEnvironmentTests</entry>
-<entry key="SPEC2_18_Sessions_httpSession17">V2AddlEnvironmentTests</entry>
-<entry key="SPEC2_18_Sessions_httpSession18">V2AddlEnvironmentTests</entry>
-
+<entry key="V2AddlEnvironmentTests_SPEC2_10_Context_portletContextServletContext1">V2AddlEnvironmentTests</entry>
+<entry key="V2AddlEnvironmentTests_SPEC2_10_Context_portletContextServletContext2">V2AddlEnvironmentTests</entry>
+<entry key="V2AddlEnvironmentTests_SPEC2_10_Context_portletContextServletContext3">V2AddlEnvironmentTests</entry>
+<entry key="V2AddlEnvironmentTests_SPEC2_10_Context_portletContextServletContext4">V2AddlEnvironmentTests</entry>
+<entry key="V2AddlEnvironmentTests_SPEC2_10_Context_getAttribute">V2AddlEnvironmentTests</entry>
+<entry key="V2AddlEnvironmentTests_SPEC2_10_Context_getAttributeNames">V2AddlEnvironmentTests</entry>
+<entry key="V2AddlEnvironmentTests_SPEC2_10_Context_getInitParameter">V2AddlEnvironmentTests</entry>
+<entry key="V2AddlEnvironmentTests_SPEC2_10_Context_getInitParameterNames">V2AddlEnvironmentTests</entry>
+<entry key="V2AddlEnvironmentTests_SPEC2_10_Context_getMimeType">V2AddlEnvironmentTests</entry>
+<entry key="V2AddlEnvironmentTests_SPEC2_10_Context_getRealPath">V2AddlEnvironmentTests</entry>
+<entry key="V2AddlEnvironmentTests_SPEC2_10_Context_getResource">V2AddlEnvironmentTests</entry>
+<entry key="V2AddlEnvironmentTests_SPEC2_10_Context_getResourcePaths">V2AddlEnvironmentTests</entry>
+<entry key="V2AddlEnvironmentTests_SPEC2_10_Context_getResourceAsStream">V2AddlEnvironmentTests</entry>
+<entry key="V2AddlEnvironmentTests_SPEC2_10_Context_log">V2AddlEnvironmentTests</entry>
+<entry key="V2AddlEnvironmentTests_SPEC2_10_Context_removeAttribute">V2AddlEnvironmentTests</entry>
+<entry key="V2AddlEnvironmentTests_SPEC2_10_Context_setAttribute">V2AddlEnvironmentTests</entry>
+<entry key="V2AddlEnvironmentTests_SPEC2_10_ContextOptions_containerRuntimeOptions1">V2AddlEnvironmentTests</entry>
+<entry key="V2AddlEnvironmentTests_SPEC2_10_ContextOptions_actionScopedRequestAttributes1">V2AddlEnvironmentTests</entry>
+<entry key="V2AddlEnvironmentTests_SPEC2_10_ContextOptions_actionScopedRequestAttributes2">V2AddlEnvironmentTests</entry>
+<entry key="V2AddlEnvironmentTests_SPEC2_10_ContextOptions_actionScopedRequestAttributes3">V2AddlEnvironmentTests</entry>
+<entry key="V2AddlEnvironmentTests_SPEC2_10_ContextOptions_actionScopedRequestAttributes4">V2AddlEnvironmentTests</entry>
+<entry key="V2AddlEnvironmentTests_SPEC2_10_ContextOptions_actionScopedRequestAttributes5">V2AddlEnvironmentTests</entry>
+<entry key="V2AddlEnvironmentTests_SPEC2_10_ContextOptions_actionScopedRequestAttributes6">V2AddlEnvironmentTests</entry>
+<entry key="V2AddlEnvironmentTests_SPEC2_10_ContextOptions_actionScopedRequestAttributes7">V2AddlEnvironmentTests</entry>
+<entry key="V2AddlEnvironmentTests_SPEC2_10_ContextOptions_actionScopedRequestAttributes8">V2AddlEnvironmentTests</entry>
+<entry key="V2AddlEnvironmentTests_SPEC2_10_ContextOptions_actionScopedRequestAttributes9">V2AddlEnvironmentTests</entry>
+<entry key="V2AddlEnvironmentTests_SPEC2_10_ContextOptions_actionScopedRequestAttributes0">V2AddlEnvironmentTests</entry>
+<entry key="V2AddlEnvironmentTests_SPEC2_10_ContextOptions_actionScopedRequestAttributes11">V2AddlEnvironmentTests</entry>
+<entry key="V2AddlEnvironmentTests_SPEC2_10_ContextOptions_actionScopedRequestAttributes12">V2AddlEnvironmentTests</entry>
+<entry key="V2AddlEnvironmentTests_SPEC2_10_ContextOptions_actionScopedRequestAttributes13">V2AddlEnvironmentTests</entry>
+<entry key="V2AddlEnvironmentTests_SPEC2_17_ActionPreferences_setValues4">V2AddlEnvironmentTests</entry>
+<entry key="V2AddlEnvironmentTests_SPEC2_17_ActionPreferences_reset1">V2AddlEnvironmentTests</entry>
+<entry key="V2AddlEnvironmentTests_SPEC2_17_ActionPreferences_store1">V2AddlEnvironmentTests</entry>
+<entry key="V2AddlEnvironmentTests_SPEC2_17_ActionPreferences_store4">V2AddlEnvironmentTests</entry>
+<entry key="V2AddlEnvironmentTests_SPEC2_17_ActionPreferences_deployment3">V2AddlEnvironmentTests</entry>
+<entry key="V2AddlEnvironmentTests_SPEC2_17_ActionPreferences_deployment4">V2AddlEnvironmentTests</entry>
+<entry key="V2AddlEnvironmentTests_SPEC2_17_ActionPreferences_deployment7">V2AddlEnvironmentTests</entry>
+<entry key="V2AddlEnvironmentTests_SPEC2_17_ActionPreferences_deployment10">V2AddlEnvironmentTests</entry>
+<entry key="V2AddlEnvironmentTests_SPEC2_17_EventPreferences_setValues4">V2AddlEnvironmentTests</entry>
+<entry key="V2AddlEnvironmentTests_SPEC2_17_EventPreferences_reset1">V2AddlEnvironmentTests</entry>
+<entry key="V2AddlEnvironmentTests_SPEC2_17_EventPreferences_store1">V2AddlEnvironmentTests</entry>
+<entry key="V2AddlEnvironmentTests_SPEC2_17_EventPreferences_store4">V2AddlEnvironmentTests</entry>
+<entry key="V2AddlEnvironmentTests_SPEC2_17_EventPreferences_deployment3">V2AddlEnvironmentTests</entry>
+<entry key="V2AddlEnvironmentTests_SPEC2_17_EventPreferences_deployment4">V2AddlEnvironmentTests</entry>
+<entry key="V2AddlEnvironmentTests_SPEC2_17_EventPreferences_deployment7">V2AddlEnvironmentTests</entry>
+<entry key="V2AddlEnvironmentTests_SPEC2_17_EventPreferences_deployment10">V2AddlEnvironmentTests</entry>
+<entry key="V2AddlEnvironmentTests_SPEC2_17_ResourcePreferences_setValues4">V2AddlEnvironmentTests</entry>
+<entry key="V2AddlEnvironmentTests_SPEC2_17_ResourcePreferences_reset1">V2AddlEnvironmentTests</entry>
+<entry key="V2AddlEnvironmentTests_SPEC2_17_ResourcePreferences_store1">V2AddlEnvironmentTests</entry>
+<entry key="V2AddlEnvironmentTests_SPEC2_17_ResourcePreferences_store4">V2AddlEnvironmentTests</entry>
+<entry key="V2AddlEnvironmentTests_SPEC2_17_ResourcePreferences_deployment3">V2AddlEnvironmentTests</entry>
+<entry key="V2AddlEnvironmentTests_SPEC2_17_ResourcePreferences_deployment4">V2AddlEnvironmentTests</entry>
+<entry key="V2AddlEnvironmentTests_SPEC2_17_ResourcePreferences_deployment7">V2AddlEnvironmentTests</entry>
+<entry key="V2AddlEnvironmentTests_SPEC2_17_ResourcePreferences_deployment10">V2AddlEnvironmentTests</entry>
+<entry key="V2AddlEnvironmentTests_SPEC2_17_RenderPreferences_deployment1">V2AddlEnvironmentTests</entry>
+<entry key="V2AddlEnvironmentTests_SPEC2_17_RenderPreferences_deployment2">V2AddlEnvironmentTests</entry>
+<entry key="V2AddlEnvironmentTests_SPEC2_18_Sessions_scope1">V2AddlEnvironmentTests</entry>
+<entry key="V2AddlEnvironmentTests_SPEC2_18_Sessions_scope2">V2AddlEnvironmentTests</entry>
+<entry key="V2AddlEnvironmentTests_SPEC2_18_Sessions_scope3">V2AddlEnvironmentTests</entry>
+<entry key="V2AddlEnvironmentTests_SPEC2_18_Sessions_scope4">V2AddlEnvironmentTests</entry>
+<entry key="V2AddlEnvironmentTests_SPEC2_18_Sessions_scope5">V2AddlEnvironmentTests</entry>
+<entry key="V2AddlEnvironmentTests_SPEC2_18_Sessions_setAttribute1">V2AddlEnvironmentTests</entry>
+<entry key="V2AddlEnvironmentTests_SPEC2_18_Sessions_setAttribute2">V2AddlEnvironmentTests</entry>
+<entry key="V2AddlEnvironmentTests_SPEC2_18_Sessions_setAttribute3">V2AddlEnvironmentTests</entry>
+<entry key="V2AddlEnvironmentTests_SPEC2_18_Sessions_getAttribute1">V2AddlEnvironmentTests</entry>
+<entry key="V2AddlEnvironmentTests_SPEC2_18_Sessions_getAttribute2">V2AddlEnvironmentTests</entry>
+<entry key="V2AddlEnvironmentTests_SPEC2_18_Sessions_getAttribute3">V2AddlEnvironmentTests</entry>
+<entry key="V2AddlEnvironmentTests_SPEC2_18_Sessions_removeAttribute1">V2AddlEnvironmentTests</entry>
+<entry key="V2AddlEnvironmentTests_SPEC2_18_Sessions_removeAttribute2">V2AddlEnvironmentTests</entry>
+<entry key="V2AddlEnvironmentTests_SPEC2_18_Sessions_removeAttribute3">V2AddlEnvironmentTests</entry>
+<entry key="V2AddlEnvironmentTests_SPEC2_18_Sessions_getAttributeNames1">V2AddlEnvironmentTests</entry>
+<entry key="V2AddlEnvironmentTests_SPEC2_18_Sessions_getAttributeNames2">V2AddlEnvironmentTests</entry>
+<entry key="V2AddlEnvironmentTests_SPEC2_18_Sessions_getAttributeNames3">V2AddlEnvironmentTests</entry>
+<entry key="V2AddlEnvironmentTests_SPEC2_18_Sessions_decodeAttributeName1">V2AddlEnvironmentTests</entry>
+<entry key="V2AddlEnvironmentTests_SPEC2_18_Sessions_decodeAttributeName2">V2AddlEnvironmentTests</entry>
+<entry key="V2AddlEnvironmentTests_SPEC2_18_Sessions_httpSession1">V2AddlEnvironmentTests</entry>
+<entry key="V2AddlEnvironmentTests_SPEC2_18_Sessions_httpSession2">V2AddlEnvironmentTests</entry>
+<entry key="V2AddlEnvironmentTests_SPEC2_18_Sessions_httpSession3">V2AddlEnvironmentTests</entry>
+<entry key="V2AddlEnvironmentTests_SPEC2_18_Sessions_httpSession4">V2AddlEnvironmentTests</entry>
+<entry key="V2AddlEnvironmentTests_SPEC2_18_Sessions_httpSession5">V2AddlEnvironmentTests</entry>
+<entry key="V2AddlEnvironmentTests_SPEC2_18_Sessions_httpSession6">V2AddlEnvironmentTests</entry>
+<entry key="V2AddlEnvironmentTests_SPEC2_18_Sessions_httpSession7">V2AddlEnvironmentTests</entry>
+<entry key="V2AddlEnvironmentTests_SPEC2_18_Sessions_httpSession8">V2AddlEnvironmentTests</entry>
+<entry key="V2AddlEnvironmentTests_SPEC2_18_Sessions_httpSession9">V2AddlEnvironmentTests</entry>
+<entry key="V2AddlEnvironmentTests_SPEC2_18_Sessions_httpSession11">V2AddlEnvironmentTests</entry>
+<entry key="V2AddlEnvironmentTests_SPEC2_18_Sessions_getCreationTime">V2AddlEnvironmentTests</entry>
+<entry key="V2AddlEnvironmentTests_SPEC2_18_Sessions_getId">V2AddlEnvironmentTests</entry>
+<entry key="V2AddlEnvironmentTests_SPEC2_18_Sessions_getLastAccessTime">V2AddlEnvironmentTests</entry>
+<entry key="V2AddlEnvironmentTests_SPEC2_18_Sessions_getMaxInctiveInterval">V2AddlEnvironmentTests</entry>
+<entry key="V2AddlEnvironmentTests_SPEC2_18_Sessions_invalidate">V2AddlEnvironmentTests</entry>
+<entry key="V2AddlEnvironmentTests_SPEC2_18_Sessions_isNew">V2AddlEnvironmentTests</entry>
+<entry key="V2AddlEnvironmentTests_SPEC2_18_Sessions_setMaxInactiveInterval">V2AddlEnvironmentTests</entry>
 </properties>

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/23a1c547/portlet-tck_3.0/V2AddlEnvironmentTests/src/main/webapp/WEB-INF/portlet.xml
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlEnvironmentTests/src/main/webapp/WEB-INF/portlet.xml b/portlet-tck_3.0/V2AddlEnvironmentTests/src/main/webapp/WEB-INF/portlet.xml
index 0573396..f0b87de 100644
--- a/portlet-tck_3.0/V2AddlEnvironmentTests/src/main/webapp/WEB-INF/portlet.xml
+++ b/portlet-tck_3.0/V2AddlEnvironmentTests/src/main/webapp/WEB-INF/portlet.xml
@@ -20,25 +20,16 @@
 <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-AddlEnvironmentTests">
-
+   xmlns:tck="http://www.apache.org/portals/pluto/portlet-tck_3.0"
+   version="2.0" id="V2AddlEnvironmentTests">
    <portlet>
       <portlet-name>AddlEnvironmentTests_SPEC2_10_Context</portlet-name>
       <portlet-class>javax.portlet.tck.portlets.AddlEnvironmentTests_SPEC2_10_Context</portlet-class>
-
-      <init-param>
-         <name>TestParameter</name>
-         <value>TestValue</value>
-      </init-param>
-
       <expiration-cache>0</expiration-cache>
-
       <supports>
          <mime-type>text/html</mime-type>
       </supports>
-
       <supported-locale>en_US</supported-locale>
-
       <portlet-info>
          <title>AddlEnvironmentTests_SPEC2_10_Context</title>
       </portlet-info>
@@ -47,69 +38,122 @@
    <portlet>
       <portlet-name>AddlEnvironmentTests_SPEC2_10_ContextOptions</portlet-name>
       <portlet-class>javax.portlet.tck.portlets.AddlEnvironmentTests_SPEC2_10_ContextOptions</portlet-class>
-
-      <init-param>
-         <name>TestParameter</name>
-         <value>TestValue</value>
-      </init-param>
-
       <expiration-cache>0</expiration-cache>
-
       <supports>
          <mime-type>text/html</mime-type>
       </supports>
-
       <supported-locale>en_US</supported-locale>
-
       <portlet-info>
          <title>AddlEnvironmentTests_SPEC2_10_ContextOptions</title>
       </portlet-info>
    </portlet>
 
    <portlet>
-      <portlet-name>AddlEnvironmentTests_SPEC2_17_Preferences</portlet-name>
-      <portlet-class>javax.portlet.tck.portlets.AddlEnvironmentTests_SPEC2_17_Preferences</portlet-class>
-
-      <init-param>
-         <name>TestParameter</name>
-         <value>TestValue</value>
-      </init-param>
+      <portlet-name>AddlEnvironmentTests_SPEC2_17_ActionPreferences</portlet-name>
+      <portlet-class>javax.portlet.tck.portlets.AddlEnvironmentTests_SPEC2_17_ActionPreferences</portlet-class>
+      <expiration-cache>0</expiration-cache>
+      <supports>
+         <mime-type>text/html</mime-type>
+      </supports>
+      <supported-locale>en_US</supported-locale>
+      <portlet-info>
+         <title>AddlEnvironmentTests_SPEC2_17_ActionPreferences</title>
+      </portlet-info>
+   </portlet>
 
+   <portlet>
+      <portlet-name>AddlEnvironmentTests_SPEC2_17_EventPreferences</portlet-name>
+      <portlet-class>javax.portlet.tck.portlets.AddlEnvironmentTests_SPEC2_17_EventPreferences</portlet-class>
       <expiration-cache>0</expiration-cache>
+      <supports>
+         <mime-type>text/html</mime-type>
+      </supports>
+      <supported-locale>en_US</supported-locale>
+      <portlet-info>
+         <title>AddlEnvironmentTests_SPEC2_17_EventPreferences</title>
+      </portlet-info>
+      <supported-publishing-event>
+         <qname>tck:AddlEnvironmentTests_SPEC2_17_EventPreferences</qname>
+      </supported-publishing-event>
+   </portlet>
 
+   <portlet>
+      <portlet-name>AddlEnvironmentTests_SPEC2_17_EventPreferences_event</portlet-name>
+      <portlet-class>javax.portlet.tck.portlets.AddlEnvironmentTests_SPEC2_17_EventPreferences_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>AddlEnvironmentTests_SPEC2_17_EventPreferences_event</title>
+      </portlet-info>
+      <supported-processing-event>
+         <qname>tck:AddlEnvironmentTests_SPEC2_17_EventPreferences</qname>
+      </supported-processing-event>
+   </portlet>
 
+   <portlet>
+      <portlet-name>AddlEnvironmentTests_SPEC2_17_ResourcePreferences</portlet-name>
+      <portlet-class>javax.portlet.tck.portlets.AddlEnvironmentTests_SPEC2_17_ResourcePreferences</portlet-class>
+      <expiration-cache>0</expiration-cache>
+      <supports>
+         <mime-type>text/html</mime-type>
+      </supports>
       <supported-locale>en_US</supported-locale>
+      <portlet-info>
+         <title>AddlEnvironmentTests_SPEC2_17_ResourcePreferences</title>
+      </portlet-info>
+   </portlet>
 
+   <portlet>
+      <portlet-name>AddlEnvironmentTests_SPEC2_17_RenderPreferences</portlet-name>
+      <portlet-class>javax.portlet.tck.portlets.AddlEnvironmentTests_SPEC2_17_RenderPreferences</portlet-class>
+      <expiration-cache>0</expiration-cache>
+      <supports>
+         <mime-type>text/html</mime-type>
+      </supports>
+      <supported-locale>en_US</supported-locale>
       <portlet-info>
-         <title>AddlEnvironmentTests_SPEC2_17_Preferences</title>
+         <title>AddlEnvironmentTests_SPEC2_17_RenderPreferences</title>
       </portlet-info>
    </portlet>
 
    <portlet>
       <portlet-name>AddlEnvironmentTests_SPEC2_18_Sessions</portlet-name>
       <portlet-class>javax.portlet.tck.portlets.AddlEnvironmentTests_SPEC2_18_Sessions</portlet-class>
-
-      <init-param>
-         <name>TestParameter</name>
-         <value>TestValue</value>
-      </init-param>
-
       <expiration-cache>0</expiration-cache>
-
       <supports>
          <mime-type>text/html</mime-type>
       </supports>
-
       <supported-locale>en_US</supported-locale>
-
       <portlet-info>
          <title>AddlEnvironmentTests_SPEC2_18_Sessions</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>
+
+   <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/V2AddlEnvironmentTests/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlEnvironmentTests/src/main/webapp/WEB-INF/web.xml b/portlet-tck_3.0/V2AddlEnvironmentTests/src/main/webapp/WEB-INF/web.xml
index ff05605..a45527b 100644
--- a/portlet-tck_3.0/V2AddlEnvironmentTests/src/main/webapp/WEB-INF/web.xml
+++ b/portlet-tck_3.0/V2AddlEnvironmentTests/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-AddlEnvironmentTests</display-name>
-</web-app>
+   <display-name>javax.portlet-tck-AddlEnvironmentTests</display-name>
 
+</web-app>


[08/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.

Posted by ms...@apache.org.
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/23a1c547/portlet-tck_3.0/V2AddlUrlTests/src/main/java/javax/portlet/tck/portlets/AddlUrlTests_SPEC2_7_UrlResource.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlUrlTests/src/main/java/javax/portlet/tck/portlets/AddlUrlTests_SPEC2_7_UrlResource.java b/portlet-tck_3.0/V2AddlUrlTests/src/main/java/javax/portlet/tck/portlets/AddlUrlTests_SPEC2_7_UrlResource.java
index 6559396..923b7af 100644
--- a/portlet-tck_3.0/V2AddlUrlTests/src/main/java/javax/portlet/tck/portlets/AddlUrlTests_SPEC2_7_UrlResource.java
+++ b/portlet-tck_3.0/V2AddlUrlTests/src/main/java/javax/portlet/tck/portlets/AddlUrlTests_SPEC2_7_UrlResource.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 AddlUrlTests_SPEC2_7_UrlResource_event
+ *
  */
-public class AddlUrlTests_SPEC2_7_UrlResource implements Portlet {
+public class AddlUrlTests_SPEC2_7_UrlResource implements Portlet, ResourceServingPortlet {
    private static final String LOG_CLASS = 
          AddlUrlTests_SPEC2_7_UrlResource.class.getName();
    private final Logger LOGGER = Logger.getLogger(LOG_CLASS);
@@ -57,98 +62,136 @@ public class AddlUrlTests_SPEC2_7_UrlResource 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_7_UrlResource_resourceURL1                           */
+      /* TestCase: V2AddlUrlTests_SPEC2_7_UrlResource_resourceURL1            */
       /* Details: "When a resource URL is triggered, the serveResource        */
       /* method must be invoked"                                              */
-      TestResult tr0 = tcd.getTestResultFailed(SPEC2_7_URLRESOURCE_RESOURCEURL1);
+      TestResult tr0 = tcd.getTestResultFailed(V2ADDLURLTESTS_SPEC2_7_URLRESOURCE_RESOURCEURL1);
       /* TODO: implement test */
+      tr0.appendTcDetail("Not implemented.");
+      tr0.writeTo(writer);
 
-      /* TestCase: SPEC2_7_UrlResource_resourceURL2                           */
+      /* TestCase: V2AddlUrlTests_SPEC2_7_UrlResource_resourceURL2            */
       /* Details: "When resource parameters are set on a resource URL,        */
       /* those parameters must become resource parameters of the request      */
       /* resulting from triggering the resourceURL"                           */
-      TestResult tr1 = tcd.getTestResultFailed(SPEC2_7_URLRESOURCE_RESOURCEURL2);
+      TestResult tr1 = tcd.getTestResultFailed(V2ADDLURLTESTS_SPEC2_7_URLRESOURCE_RESOURCEURL2);
       /* TODO: implement test */
+      tr1.appendTcDetail("Not implemented.");
+      tr1.writeTo(writer);
 
-      /* TestCase: SPEC2_7_UrlResource_resourceURL3                           */
+      /* TestCase: V2AddlUrlTests_SPEC2_7_UrlResource_resourceURL3            */
       /* Details: "When resource parameters are set on a resource URL,        */
       /* those parameters must become resource parameters of the request      */
       /* resulting from triggering the resourceURL"                           */
-      TestResult tr2 = tcd.getTestResultFailed(SPEC2_7_URLRESOURCE_RESOURCEURL3);
+      TestResult tr2 = tcd.getTestResultFailed(V2ADDLURLTESTS_SPEC2_7_URLRESOURCE_RESOURCEURL3);
       /* TODO: implement test */
+      tr2.appendTcDetail("Not implemented.");
+      tr2.writeTo(writer);
 
-      /* TestCase: SPEC2_7_UrlResource_resourceURL4                           */
+      /* TestCase: V2AddlUrlTests_SPEC2_7_UrlResource_resourceURL4            */
       /* Details: "Resource parameters can be set on the resource URL         */
       /* through the setParameter(String, String) method"                     */
-      TestResult tr3 = tcd.getTestResultFailed(SPEC2_7_URLRESOURCE_RESOURCEURL4);
+      TestResult tr3 = tcd.getTestResultFailed(V2ADDLURLTESTS_SPEC2_7_URLRESOURCE_RESOURCEURL4);
       /* TODO: implement test */
+      tr3.appendTcDetail("Not implemented.");
+      tr3.writeTo(writer);
 
-      /* TestCase: SPEC2_7_UrlResource_resourceURL5                           */
+      /* TestCase: V2AddlUrlTests_SPEC2_7_UrlResource_resourceURL5            */
       /* Details: "Resource parameters can be set on the resource URL         */
       /* through the setParameter(String, String[]) method"                   */
-      TestResult tr4 = tcd.getTestResultFailed(SPEC2_7_URLRESOURCE_RESOURCEURL5);
+      TestResult tr4 = tcd.getTestResultFailed(V2ADDLURLTESTS_SPEC2_7_URLRESOURCE_RESOURCEURL5);
       /* TODO: implement test */
+      tr4.appendTcDetail("Not implemented.");
+      tr4.writeTo(writer);
 
-      /* TestCase: SPEC2_7_UrlResource_resourceURL6                           */
+      /* TestCase: V2AddlUrlTests_SPEC2_7_UrlResource_resourceURL6            */
       /* Details: "Resource parameters can be set on the resource URL         */
       /* through the setParameterMap(Map<String, String[]>) method"           */
-      TestResult tr5 = tcd.getTestResultFailed(SPEC2_7_URLRESOURCE_RESOURCEURL6);
+      TestResult tr5 = tcd.getTestResultFailed(V2ADDLURLTESTS_SPEC2_7_URLRESOURCE_RESOURCEURL6);
       /* TODO: implement test */
+      tr5.appendTcDetail("Not implemented.");
+      tr5.writeTo(writer);
 
-      /* TestCase: SPEC2_7_UrlResource_resourceURL7                           */
+      /* TestCase: V2AddlUrlTests_SPEC2_7_UrlResource_resourceURL7            */
       /* Details: "If a parameter with an existing name is set through one    */
       /* of the setParameter methods, the existing value is replaced with     */
       /* the new value"                                                       */
-      TestResult tr6 = tcd.getTestResultFailed(SPEC2_7_URLRESOURCE_RESOURCEURL7);
+      TestResult tr6 = tcd.getTestResultFailed(V2ADDLURLTESTS_SPEC2_7_URLRESOURCE_RESOURCEURL7);
       /* TODO: implement test */
+      tr6.appendTcDetail("Not implemented.");
+      tr6.writeTo(writer);
 
-      /* TestCase: SPEC2_7_UrlResource_resourceURL8                           */
+      /* TestCase: V2AddlUrlTests_SPEC2_7_UrlResource_resourceURL8            */
       /* Details: "When a resource URL is created, render parameters from     */
       /* the current request are automatically copied to the new resource     */
       /* URL"                                                                 */
-      TestResult tr7 = tcd.getTestResultFailed(SPEC2_7_URLRESOURCE_RESOURCEURL8);
+      TestResult tr7 = tcd.getTestResultFailed(V2ADDLURLTESTS_SPEC2_7_URLRESOURCE_RESOURCEURL8);
       /* TODO: implement test */
+      tr7.appendTcDetail("Not implemented.");
+      tr7.writeTo(writer);
 
-      /* TestCase: SPEC2_7_UrlResource_resourceURL9                           */
+      /* TestCase: V2AddlUrlTests_SPEC2_7_UrlResource_resourceURL9            */
       /* Details: "When a resource URL is created, the automatically copied   */
       /* render parameters are hidden to the ResourceURL getParameter         */
       /* method"                                                              */
-      TestResult tr8 = tcd.getTestResultFailed(SPEC2_7_URLRESOURCE_RESOURCEURL9);
+      TestResult tr8 = tcd.getTestResultFailed(V2ADDLURLTESTS_SPEC2_7_URLRESOURCE_RESOURCEURL9);
       /* 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.appendTcDetail("Not implemented.");
       tr8.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=\"AddlUrlTests_SPEC2_7_UrlResource\">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(\"AddlUrlTests_SPEC2_7_UrlResource\").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/V2AddlUrlTests/src/main/resources/xml-resources/additionalTCs.xml
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlUrlTests/src/main/resources/xml-resources/additionalTCs.xml b/portlet-tck_3.0/V2AddlUrlTests/src/main/resources/xml-resources/additionalTCs.xml
index eb5dc39..c3ef790 100644
--- a/portlet-tck_3.0/V2AddlUrlTests/src/main/resources/xml-resources/additionalTCs.xml
+++ b/portlet-tck_3.0/V2AddlUrlTests/src/main/resources/xml-resources/additionalTCs.xml
@@ -17,52 +17,44 @@
     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 AddlUrlTests test case names and page mappings -->
-<entry key="SPEC2_7_UrlRender_renderURL0">V2AddlUrlTests</entry>
-<entry key="SPEC2_7_UrlRender_renderURL1">V2AddlUrlTests</entry>
-<entry key="SPEC2_7_UrlRender_renderURL2">V2AddlUrlTests</entry>
-<entry key="SPEC2_7_UrlRender_renderURL3">V2AddlUrlTests</entry>
-<entry key="SPEC2_7_UrlRender_renderURL4">V2AddlUrlTests</entry>
-<entry key="SPEC2_7_UrlRender_renderURL5">V2AddlUrlTests</entry>
-<entry key="SPEC2_7_UrlRender_renderURL6">V2AddlUrlTests</entry>
-<entry key="SPEC2_7_UrlRender_renderURL7">V2AddlUrlTests</entry>
-<entry key="SPEC2_7_UrlRender_renderURL8">V2AddlUrlTests</entry>
-<entry key="SPEC2_7_UrlRender_renderURL9">V2AddlUrlTests</entry>
-<entry key="SPEC2_7_UrlRender_renderURL10">V2AddlUrlTests</entry>
-<entry key="SPEC2_7_UrlRender_renderURL11">V2AddlUrlTests</entry>
-<entry key="SPEC2_7_UrlAction_actionURL1">V2AddlUrlTests</entry>
-<entry key="SPEC2_7_UrlAction_actionURL2">V2AddlUrlTests</entry>
-<entry key="SPEC2_7_UrlAction_actionURL3">V2AddlUrlTests</entry>
-<entry key="SPEC2_7_UrlAction_actionURL4">V2AddlUrlTests</entry>
-<entry key="SPEC2_7_UrlAction_actionURL5">V2AddlUrlTests</entry>
-<entry key="SPEC2_7_UrlAction_actionURL6">V2AddlUrlTests</entry>
-<entry key="SPEC2_7_UrlAction_actionURL7">V2AddlUrlTests</entry>
-<entry key="SPEC2_7_UrlAction_actionURL8">V2AddlUrlTests</entry>
-<entry key="SPEC2_7_UrlResource_resourceURL1">V2AddlUrlTests</entry>
-<entry key="SPEC2_7_UrlResource_resourceURL2">V2AddlUrlTests</entry>
-<entry key="SPEC2_7_UrlResource_resourceURL3">V2AddlUrlTests</entry>
-<entry key="SPEC2_7_UrlResource_resourceURL4">V2AddlUrlTests</entry>
-<entry key="SPEC2_7_UrlResource_resourceURL5">V2AddlUrlTests</entry>
-<entry key="SPEC2_7_UrlResource_resourceURL6">V2AddlUrlTests</entry>
-<entry key="SPEC2_7_UrlResource_resourceURL7">V2AddlUrlTests</entry>
-<entry key="SPEC2_7_UrlResource_resourceURL8">V2AddlUrlTests</entry>
-<entry key="SPEC2_7_UrlResource_resourceURL9">V2AddlUrlTests</entry>
-<entry key="SPEC2_7_Url_portletMode1">V2AddlUrlTests</entry>
-<entry key="SPEC2_7_Url_portletMode2">V2AddlUrlTests</entry>
-<entry key="SPEC2_7_Url_portletMode4">V2AddlUrlTests</entry>
-<entry key="SPEC2_7_Url_windowState1">V2AddlUrlTests</entry>
-<entry key="SPEC2_7_Url_windowState2">V2AddlUrlTests</entry>
-<entry key="SPEC2_7_Url_windowState4">V2AddlUrlTests</entry>
-<entry key="SPEC2_7_Url_setSecure1">V2AddlUrlTests</entry>
-<entry key="SPEC2_7_Url_setSecure3">V2AddlUrlTests</entry>
-<entry key="SPEC2_7_UrlListener_portletURLGenerationListener6">V2AddlUrlTests</entry>
-
+<entry key="V2AddlUrlTests_SPEC2_7_UrlRender_renderURL1">V2AddlUrlTests</entry>
+<entry key="V2AddlUrlTests_SPEC2_7_UrlRender_renderURL2">V2AddlUrlTests</entry>
+<entry key="V2AddlUrlTests_SPEC2_7_UrlRender_renderURL3">V2AddlUrlTests</entry>
+<entry key="V2AddlUrlTests_SPEC2_7_UrlRender_renderURL4">V2AddlUrlTests</entry>
+<entry key="V2AddlUrlTests_SPEC2_7_UrlRender_renderURL5">V2AddlUrlTests</entry>
+<entry key="V2AddlUrlTests_SPEC2_7_UrlRender_renderURL6">V2AddlUrlTests</entry>
+<entry key="V2AddlUrlTests_SPEC2_7_UrlRender_renderURL7">V2AddlUrlTests</entry>
+<entry key="V2AddlUrlTests_SPEC2_7_UrlRender_renderURL8">V2AddlUrlTests</entry>
+<entry key="V2AddlUrlTests_SPEC2_7_UrlRender_renderURL9">V2AddlUrlTests</entry>
+<entry key="V2AddlUrlTests_SPEC2_7_UrlRender_renderURL10">V2AddlUrlTests</entry>
+<entry key="V2AddlUrlTests_SPEC2_7_UrlRender_renderURL11">V2AddlUrlTests</entry>
+<entry key="V2AddlUrlTests_SPEC2_7_UrlRender_portletMode1">V2AddlUrlTests</entry>
+<entry key="V2AddlUrlTests_SPEC2_7_UrlRender_portletMode2">V2AddlUrlTests</entry>
+<entry key="V2AddlUrlTests_SPEC2_7_UrlRender_portletMode4">V2AddlUrlTests</entry>
+<entry key="V2AddlUrlTests_SPEC2_7_UrlRender_windowState1">V2AddlUrlTests</entry>
+<entry key="V2AddlUrlTests_SPEC2_7_UrlRender_windowState2">V2AddlUrlTests</entry>
+<entry key="V2AddlUrlTests_SPEC2_7_UrlRender_windowState4">V2AddlUrlTests</entry>
+<entry key="V2AddlUrlTests_SPEC2_7_UrlRender_setSecure1">V2AddlUrlTests</entry>
+<entry key="V2AddlUrlTests_SPEC2_7_UrlRender_setSecure3">V2AddlUrlTests</entry>
+<entry key="V2AddlUrlTests_SPEC2_7_UrlAction_actionURL1">V2AddlUrlTests</entry>
+<entry key="V2AddlUrlTests_SPEC2_7_UrlAction_actionURL2">V2AddlUrlTests</entry>
+<entry key="V2AddlUrlTests_SPEC2_7_UrlAction_actionURL3">V2AddlUrlTests</entry>
+<entry key="V2AddlUrlTests_SPEC2_7_UrlAction_actionURL4">V2AddlUrlTests</entry>
+<entry key="V2AddlUrlTests_SPEC2_7_UrlAction_actionURL5">V2AddlUrlTests</entry>
+<entry key="V2AddlUrlTests_SPEC2_7_UrlAction_actionURL6">V2AddlUrlTests</entry>
+<entry key="V2AddlUrlTests_SPEC2_7_UrlAction_actionURL7">V2AddlUrlTests</entry>
+<entry key="V2AddlUrlTests_SPEC2_7_UrlAction_actionURL8">V2AddlUrlTests</entry>
+<entry key="V2AddlUrlTests_SPEC2_7_UrlResource_resourceURL1">V2AddlUrlTests</entry>
+<entry key="V2AddlUrlTests_SPEC2_7_UrlResource_resourceURL2">V2AddlUrlTests</entry>
+<entry key="V2AddlUrlTests_SPEC2_7_UrlResource_resourceURL3">V2AddlUrlTests</entry>
+<entry key="V2AddlUrlTests_SPEC2_7_UrlResource_resourceURL4">V2AddlUrlTests</entry>
+<entry key="V2AddlUrlTests_SPEC2_7_UrlResource_resourceURL5">V2AddlUrlTests</entry>
+<entry key="V2AddlUrlTests_SPEC2_7_UrlResource_resourceURL6">V2AddlUrlTests</entry>
+<entry key="V2AddlUrlTests_SPEC2_7_UrlResource_resourceURL7">V2AddlUrlTests</entry>
+<entry key="V2AddlUrlTests_SPEC2_7_UrlResource_resourceURL8">V2AddlUrlTests</entry>
+<entry key="V2AddlUrlTests_SPEC2_7_UrlResource_resourceURL9">V2AddlUrlTests</entry>
+<entry key="V2AddlUrlTests_SPEC2_7_UrlListener_portletURLGenerationListener6">V2AddlUrlTests</entry>
 </properties>

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/23a1c547/portlet-tck_3.0/V2AddlUrlTests/src/main/webapp/WEB-INF/portlet.xml
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlUrlTests/src/main/webapp/WEB-INF/portlet.xml b/portlet-tck_3.0/V2AddlUrlTests/src/main/webapp/WEB-INF/portlet.xml
index 8549002..72953be 100644
--- a/portlet-tck_3.0/V2AddlUrlTests/src/main/webapp/WEB-INF/portlet.xml
+++ b/portlet-tck_3.0/V2AddlUrlTests/src/main/webapp/WEB-INF/portlet.xml
@@ -20,25 +20,16 @@
 <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-AddlUrlTests">
-
+   xmlns:tck="http://www.apache.org/portals/pluto/portlet-tck_3.0"
+   version="2.0" id="V2AddlUrlTests">
    <portlet>
       <portlet-name>AddlUrlTests_SPEC2_7_UrlRender</portlet-name>
       <portlet-class>javax.portlet.tck.portlets.AddlUrlTests_SPEC2_7_UrlRender</portlet-class>
-
-      <init-param>
-         <name>TestParameter</name>
-         <value>TestValue</value>
-      </init-param>
-
       <expiration-cache>0</expiration-cache>
-
       <supports>
          <mime-type>text/html</mime-type>
       </supports>
-
       <supported-locale>en_US</supported-locale>
-
       <portlet-info>
          <title>AddlUrlTests_SPEC2_7_UrlRender</title>
       </portlet-info>
@@ -47,20 +38,11 @@
    <portlet>
       <portlet-name>AddlUrlTests_SPEC2_7_UrlAction</portlet-name>
       <portlet-class>javax.portlet.tck.portlets.AddlUrlTests_SPEC2_7_UrlAction</portlet-class>
-
-      <init-param>
-         <name>TestParameter</name>
-         <value>TestValue</value>
-      </init-param>
-
       <expiration-cache>0</expiration-cache>
-
       <supports>
          <mime-type>text/html</mime-type>
       </supports>
-
       <supported-locale>en_US</supported-locale>
-
       <portlet-info>
          <title>AddlUrlTests_SPEC2_7_UrlAction</title>
       </portlet-info>
@@ -69,69 +51,46 @@
    <portlet>
       <portlet-name>AddlUrlTests_SPEC2_7_UrlResource</portlet-name>
       <portlet-class>javax.portlet.tck.portlets.AddlUrlTests_SPEC2_7_UrlResource</portlet-class>
-
-      <init-param>
-         <name>TestParameter</name>
-         <value>TestValue</value>
-      </init-param>
-
       <expiration-cache>0</expiration-cache>
-
       <supports>
          <mime-type>text/html</mime-type>
       </supports>
-
       <supported-locale>en_US</supported-locale>
-
       <portlet-info>
          <title>AddlUrlTests_SPEC2_7_UrlResource</title>
       </portlet-info>
    </portlet>
 
    <portlet>
-      <portlet-name>AddlUrlTests_SPEC2_7_Url</portlet-name>
-      <portlet-class>javax.portlet.tck.portlets.AddlUrlTests_SPEC2_7_Url</portlet-class>
-
-      <init-param>
-         <name>TestParameter</name>
-         <value>TestValue</value>
-      </init-param>
-
-      <expiration-cache>0</expiration-cache>
-
-      <supports>
-         <mime-type>text/html</mime-type>
-      </supports>
-
-      <supported-locale>en_US</supported-locale>
-
-      <portlet-info>
-         <title>AddlUrlTests_SPEC2_7_Url</title>
-      </portlet-info>
-   </portlet>
-
-   <portlet>
       <portlet-name>AddlUrlTests_SPEC2_7_UrlListener</portlet-name>
       <portlet-class>javax.portlet.tck.portlets.AddlUrlTests_SPEC2_7_UrlListener</portlet-class>
-
-      <init-param>
-         <name>TestParameter</name>
-         <value>TestValue</value>
-      </init-param>
-
       <expiration-cache>0</expiration-cache>
-
       <supports>
          <mime-type>text/html</mime-type>
       </supports>
-
       <supported-locale>en_US</supported-locale>
-
       <portlet-info>
          <title>AddlUrlTests_SPEC2_7_UrlListener</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>
+
+   <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/V2AddlUrlTests/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlUrlTests/src/main/webapp/WEB-INF/web.xml b/portlet-tck_3.0/V2AddlUrlTests/src/main/webapp/WEB-INF/web.xml
index 2419db0..6469500 100644
--- a/portlet-tck_3.0/V2AddlUrlTests/src/main/webapp/WEB-INF/web.xml
+++ b/portlet-tck_3.0/V2AddlUrlTests/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-AddlUrlTests</display-name>
-</web-app>
+   <display-name>javax.portlet-tck-AddlUrlTests</display-name>
 
+</web-app>

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/23a1c547/portlet-tck_3.0/V2PortletTagLibraryTests/pom.xml
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2PortletTagLibraryTests/pom.xml b/portlet-tck_3.0/V2PortletTagLibraryTests/pom.xml
index 5edd507..fc2792b 100644
--- a/portlet-tck_3.0/V2PortletTagLibraryTests/pom.xml
+++ b/portlet-tck_3.0/V2PortletTagLibraryTests/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-V2PortletTagLibraryTests</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-V2PortletTagLibraryTests</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/V2PortletTagLibraryTests/src/main/java/javax/portlet/tck/portlets/PortletTagLibraryTests_SPEC2_26_IncludeJSPAction.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2PortletTagLibraryTests/src/main/java/javax/portlet/tck/portlets/PortletTagLibraryTests_SPEC2_26_IncludeJSPAction.java b/portlet-tck_3.0/V2PortletTagLibraryTests/src/main/java/javax/portlet/tck/portlets/PortletTagLibraryTests_SPEC2_26_IncludeJSPAction.java
new file mode 100644
index 0000000..6b7da44
--- /dev/null
+++ b/portlet-tck_3.0/V2PortletTagLibraryTests/src/main/java/javax/portlet/tck/portlets/PortletTagLibraryTests_SPEC2_26_IncludeJSPAction.java
@@ -0,0 +1,262 @@
+/*  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 PortletTagLibraryTests_SPEC2_26_IncludeJSPAction_event
+ *
+ */
+public class PortletTagLibraryTests_SPEC2_26_IncludeJSPAction implements Portlet, ResourceServingPortlet {
+   private static final String LOG_CLASS = 
+         PortletTagLibraryTests_SPEC2_26_IncludeJSPAction.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();
+
+      // Now do the actual dispatch
+      String target = JSP_PREFIX + "PortletTagLibraryTests_SPEC2_26_IncludeJSPAction" + JSP_SUFFIX + "?" + QUERY_STRING;
+      PortletRequestDispatcher rd = portletConfig.getPortletContext()
+            .getRequestDispatcher(target);
+      rd.include(portletReq, portletResp);
+   }
+
+   @Override
+   public void serveResource(ResourceRequest portletReq, ResourceResponse portletResp)
+         throws PortletException, IOException {
+      LOGGER.entering(LOG_CLASS, "main portlet serveResource entry");
+
+      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();
+
+      PortletSession ps = portletReq.getPortletSession();
+      String msg = (String) ps.getAttribute(RESULT_ATTR_PREFIX + "PortletTagLibraryTests_SPEC2_26_IncludeJSPAction", APPLICATION_SCOPE);
+      if (msg != null) {
+         writer.write("<p>" + msg + "</p><br/>\n");
+         ps.removeAttribute(RESULT_ATTR_PREFIX + "PortletTagLibraryTests_SPEC2_26_IncludeJSPAction", APPLICATION_SCOPE);
+      }
+
+      /* TestCase: V2PortletTagLibraryTests_SPEC2_26_IncludeJSPAction_defineObjects1 */
+      /* Details: "When included in the Action phase, the defineObjects tag   */
+      /* defines the variable RenderRequest renderRequest to be null or       */
+      /* undefined"                                                           */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2PortletTagLibraryTests_SPEC2_26_IncludeJSPAction_defineObjects1", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2PortletTagLibraryTests_SPEC2_26_IncludeJSPAction_defineObjects2 */
+      /* Details: "When included in the Action phase, the defineObjects tag   */
+      /* defines the variable ResourceRequest resourceRequest to be null or   */
+      /* undefined"                                                           */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2PortletTagLibraryTests_SPEC2_26_IncludeJSPAction_defineObjects2", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2PortletTagLibraryTests_SPEC2_26_IncludeJSPAction_defineObjects3 */
+      /* Details: "When included in the Action phase, the defineObjects tag   */
+      /* defines the variable ActionRequest actionRequest to the              */
+      /* corresponding object"                                                */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2PortletTagLibraryTests_SPEC2_26_IncludeJSPAction_defineObjects3", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2PortletTagLibraryTests_SPEC2_26_IncludeJSPAction_defineObjects4 */
+      /* Details: "When included in the Action phase, the defineObjects tag   */
+      /* defines the variable EventRequest eventRequest to be null or         */
+      /* undefined"                                                           */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2PortletTagLibraryTests_SPEC2_26_IncludeJSPAction_defineObjects4", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2PortletTagLibraryTests_SPEC2_26_IncludeJSPAction_defineObjects5 */
+      /* Details: "When included in the Action phase, the defineObjects tag   */
+      /* defines the variable RenderResponse renderResponse to be null or     */
+      /* undefined"                                                           */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2PortletTagLibraryTests_SPEC2_26_IncludeJSPAction_defineObjects5", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2PortletTagLibraryTests_SPEC2_26_IncludeJSPAction_defineObjects6 */
+      /* Details: "When included in the Action phase, the defineObjects tag   */
+      /* defines the variable ResourceResponse resourceResponse to be null    */
+      /* or undefined"                                                        */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2PortletTagLibraryTests_SPEC2_26_IncludeJSPAction_defineObjects6", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2PortletTagLibraryTests_SPEC2_26_IncludeJSPAction_defineObjects7 */
+      /* Details: "When included in the Action phase, the defineObjects tag   */
+      /* defines the variable ActionResponse actionResponse to the            */
+      /* corresponding object"                                                */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2PortletTagLibraryTests_SPEC2_26_IncludeJSPAction_defineObjects7", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2PortletTagLibraryTests_SPEC2_26_IncludeJSPAction_defineObjects8 */
+      /* Details: "When included in the Action phase, the defineObjects tag   */
+      /* defines the variable EventResponse eventResponse to be null or       */
+      /* undefined"                                                           */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2PortletTagLibraryTests_SPEC2_26_IncludeJSPAction_defineObjects8", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2PortletTagLibraryTests_SPEC2_26_IncludeJSPAction_defineObjects9 */
+      /* Details: "When included in the Action phase, the defineObjects tag   */
+      /* defines the variable PortletConfig portletConfig"                    */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2PortletTagLibraryTests_SPEC2_26_IncludeJSPAction_defineObjects9", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2PortletTagLibraryTests_SPEC2_26_IncludeJSPAction_defineObjects10 */
+      /* Details: "When included in the Action phase, the defineObjects tag   */
+      /* defines the variable PortletSession portletSession, providing        */
+      /* access to the portletSession, does not create a new session, only    */
+      /* returns an existing session or null if no session exists."           */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2PortletTagLibraryTests_SPEC2_26_IncludeJSPAction_defineObjects10", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2PortletTagLibraryTests_SPEC2_26_IncludeJSPAction_defineObjects11 */
+      /* Details: "When included in the Action phase, the defineObjects tag   */
+      /* defines the variable Map<String, Object> portletSessionScope,        */
+      /* providing access to the portletSession attributes as a Map           */
+      /* equivalent to the PortletSession.getAttributeMap() call, does not    */
+      /* create a new session, only returns an existing session. If no        */
+      /* session attributes exist this method returns an empty Map."          */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2PortletTagLibraryTests_SPEC2_26_IncludeJSPAction_defineObjects11", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2PortletTagLibraryTests_SPEC2_26_IncludeJSPAction_defineObjects12 */
+      /* Details: "When included in the Action phase, the defineObjects tag   */
+      /* defines the variable PortletPreferences portletPreferences,          */
+      /* providing access to the portlet preferences."                        */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2PortletTagLibraryTests_SPEC2_26_IncludeJSPAction_defineObjects12", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2PortletTagLibraryTests_SPEC2_26_IncludeJSPAction_defineObjects13 */
+      /* Details: "When included in the Action phase, the defineObjects tag   */
+      /* defines the variable Map<String, String[]>                           */
+      /* portletPreferencesValues, providing access to the portlet            */
+      /* preferences as a Map, equivalent to the                              */
+      /* PortletPreferences.getMap() call. If no portlet preferences exist,   */
+      /* the Map is empty."                                                   */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2PortletTagLibraryTests_SPEC2_26_IncludeJSPAction_defineObjects13", aurl);
+         tb.writeTo(writer);
+      }
+
+   }
+
+}

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/23a1c547/portlet-tck_3.0/V2PortletTagLibraryTests/src/main/java/javax/portlet/tck/portlets/PortletTagLibraryTests_SPEC2_26_IncludeJSPEvent.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2PortletTagLibraryTests/src/main/java/javax/portlet/tck/portlets/PortletTagLibraryTests_SPEC2_26_IncludeJSPEvent.java b/portlet-tck_3.0/V2PortletTagLibraryTests/src/main/java/javax/portlet/tck/portlets/PortletTagLibraryTests_SPEC2_26_IncludeJSPEvent.java
new file mode 100644
index 0000000..4a6c1f9
--- /dev/null
+++ b/portlet-tck_3.0/V2PortletTagLibraryTests/src/main/java/javax/portlet/tck/portlets/PortletTagLibraryTests_SPEC2_26_IncludeJSPEvent.java
@@ -0,0 +1,253 @@
+/*  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 PortletTagLibraryTests_SPEC2_26_IncludeJSPEvent_event
+ *
+ */
+public class PortletTagLibraryTests_SPEC2_26_IncludeJSPEvent implements Portlet, ResourceServingPortlet {
+   private static final String LOG_CLASS = 
+         PortletTagLibraryTests_SPEC2_26_IncludeJSPEvent.class.getName();
+   private final Logger LOGGER = Logger.getLogger(LOG_CLASS);
+   
+   private PortletConfig portletConfig = null;
+
+   @Override
+   public void init(PortletConfig config) throws PortletException {
+      this.portletConfig = config;
+   }
+
+   @Override
+   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();
+
+      QName eventQName = new QName(TCKNAMESPACE,
+             "PortletTagLibraryTests_SPEC2_26_IncludeJSPEvent");
+      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: V2PortletTagLibraryTests_SPEC2_26_IncludeJSPEvent_defineObjects1 */
+      /* Details: "When included in the Event phase, the defineObjects tag    */
+      /* defines the variable RenderRequest renderRequest to be null or       */
+      /* undefined"                                                           */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2PortletTagLibraryTests_SPEC2_26_IncludeJSPEvent_defineObjects1", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2PortletTagLibraryTests_SPEC2_26_IncludeJSPEvent_defineObjects2 */
+      /* Details: "When included in the Event phase, the defineObjects tag    */
+      /* defines the variable ResourceRequest resourceRequest to be null or   */
+      /* undefined"                                                           */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2PortletTagLibraryTests_SPEC2_26_IncludeJSPEvent_defineObjects2", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2PortletTagLibraryTests_SPEC2_26_IncludeJSPEvent_defineObjects3 */
+      /* Details: "When included in the Event phase, the defineObjects tag    */
+      /* defines the variable ActionRequest actionRequest to be null or       */
+      /* undefined"                                                           */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2PortletTagLibraryTests_SPEC2_26_IncludeJSPEvent_defineObjects3", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2PortletTagLibraryTests_SPEC2_26_IncludeJSPEvent_defineObjects4 */
+      /* Details: "When included in the Event phase, the defineObjects tag    */
+      /* defines the variable EventRequest eventRequest to the                */
+      /* corresponding object"                                                */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2PortletTagLibraryTests_SPEC2_26_IncludeJSPEvent_defineObjects4", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2PortletTagLibraryTests_SPEC2_26_IncludeJSPEvent_defineObjects5 */
+      /* Details: "When included in the Event phase, the defineObjects tag    */
+      /* defines the variable RenderResponse renderResponse to be null or     */
+      /* undefined"                                                           */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2PortletTagLibraryTests_SPEC2_26_IncludeJSPEvent_defineObjects5", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2PortletTagLibraryTests_SPEC2_26_IncludeJSPEvent_defineObjects6 */
+      /* Details: "When included in the Event phase, the defineObjects tag    */
+      /* defines the variable ResourceResponse resourceResponse to be null    */
+      /* or undefined"                                                        */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2PortletTagLibraryTests_SPEC2_26_IncludeJSPEvent_defineObjects6", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2PortletTagLibraryTests_SPEC2_26_IncludeJSPEvent_defineObjects7 */
+      /* Details: "When included in the Event phase, the defineObjects tag    */
+      /* defines the variable ActionResponse actionResponse to be null or     */
+      /* undefined"                                                           */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2PortletTagLibraryTests_SPEC2_26_IncludeJSPEvent_defineObjects7", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2PortletTagLibraryTests_SPEC2_26_IncludeJSPEvent_defineObjects8 */
+      /* Details: "When included in the Event phase, the defineObjects tag    */
+      /* defines the variable EventResponse eventResponse to the              */
+      /* corresponding object"                                                */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2PortletTagLibraryTests_SPEC2_26_IncludeJSPEvent_defineObjects8", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2PortletTagLibraryTests_SPEC2_26_IncludeJSPEvent_defineObjects9 */
+      /* Details: "When included in the Event phase, the defineObjects tag    */
+      /* defines the variable PortletConfig portletConfig"                    */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2PortletTagLibraryTests_SPEC2_26_IncludeJSPEvent_defineObjects9", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2PortletTagLibraryTests_SPEC2_26_IncludeJSPEvent_defineObjects10 */
+      /* Details: "When included in the Event phase, the defineObjects tag    */
+      /* defines the variable PortletSession portletSession, providing        */
+      /* access to the portletSession, does not create a new session, only    */
+      /* returns an existing session or null if no session exists."           */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2PortletTagLibraryTests_SPEC2_26_IncludeJSPEvent_defineObjects10", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2PortletTagLibraryTests_SPEC2_26_IncludeJSPEvent_defineObjects11 */
+      /* Details: "When included in the Event phase, the defineObjects tag    */
+      /* defines the variable Map<String, Object> portletSessionScope,        */
+      /* providing access to the portletSession attributes as a Map           */
+      /* equivalent to the PortletSession.getAttributeMap() call, does not    */
+      /* create a new session, only returns an existing session. If no        */
+      /* session attributes exist this method returns an empty Map."          */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2PortletTagLibraryTests_SPEC2_26_IncludeJSPEvent_defineObjects11", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2PortletTagLibraryTests_SPEC2_26_IncludeJSPEvent_defineObjects12 */
+      /* Details: "When included in the Event phase, the defineObjects tag    */
+      /* defines the variable PortletPreferences portletPreferences,          */
+      /* providing access to the portlet preferences."                        */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2PortletTagLibraryTests_SPEC2_26_IncludeJSPEvent_defineObjects12", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2PortletTagLibraryTests_SPEC2_26_IncludeJSPEvent_defineObjects13 */
+      /* Details: "When included in the Event phase, the defineObjects tag    */
+      /* defines the variable Map<String, String[]>                           */
+      /* portletPreferencesValues, providing access to the portlet            */
+      /* preferences as a Map, equivalent to the                              */
+      /* PortletPreferences.getMap() call. If no portlet preferences exist,   */
+      /* the Map is empty."                                                   */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2PortletTagLibraryTests_SPEC2_26_IncludeJSPEvent_defineObjects13", aurl);
+         tb.writeTo(writer);
+      }
+
+   }
+
+}

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/23a1c547/portlet-tck_3.0/V2PortletTagLibraryTests/src/main/java/javax/portlet/tck/portlets/PortletTagLibraryTests_SPEC2_26_IncludeJSPEvent_event.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2PortletTagLibraryTests/src/main/java/javax/portlet/tck/portlets/PortletTagLibraryTests_SPEC2_26_IncludeJSPEvent_event.java b/portlet-tck_3.0/V2PortletTagLibraryTests/src/main/java/javax/portlet/tck/portlets/PortletTagLibraryTests_SPEC2_26_IncludeJSPEvent_event.java
new file mode 100644
index 0000000..ea33798
--- /dev/null
+++ b/portlet-tck_3.0/V2PortletTagLibraryTests/src/main/java/javax/portlet/tck/portlets/PortletTagLibraryTests_SPEC2_26_IncludeJSPEvent_event.java
@@ -0,0 +1,107 @@
+/*  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.constants.Constants.*;
+import static javax.portlet.tck.beans.JSR286SpecTestCaseDetails.*;
+import static javax.portlet.PortletSession.*;
+
+/**
+ * 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 PortletTagLibraryTests_SPEC2_26_IncludeJSPEvent_event implements Portlet, EventPortlet, ResourceServingPortlet {
+   private static final String LOG_CLASS = 
+         PortletTagLibraryTests_SPEC2_26_IncludeJSPEvent_event.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, "event companion processAction - ERROR!!");
+   }
+
+   @Override
+   public void serveResource(ResourceRequest portletReq, ResourceResponse portletResp)
+         throws PortletException, IOException {
+      LOGGER.entering(LOG_CLASS, "event companion serveResource - ERROR!!");
+   }
+
+   @Override
+   public void processEvent(EventRequest portletReq, EventResponse portletResp)
+         throws PortletException, IOException {
+      LOGGER.entering(LOG_CLASS, "event companion processEvent");
+
+
+      portletResp.setRenderParameters(portletReq);
+
+      long tid = Thread.currentThread().getId();
+      portletReq.setAttribute(THREADID_ATTR, tid);
+
+      StringWriter writer = new StringWriter();
+
+      // Now do the actual dispatch
+      String target = JSP_PREFIX + "PortletTagLibraryTests_SPEC2_26_IncludeJSPEvent" + JSP_SUFFIX + "?" + QUERY_STRING;
+      PortletRequestDispatcher rd = portletConfig.getPortletContext()
+            .getRequestDispatcher(target);
+      rd.include(portletReq, portletResp);
+
+   }
+
+   @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>PortletTagLibraryTests_SPEC2_26_IncludeJSPEvent_event</p>\n");
+
+      String msg = (String) portletReq.getPortletSession()
+            .getAttribute(RESULT_ATTR_PREFIX + "PortletTagLibraryTests_SPEC2_26_IncludeJSPEvent", APPLICATION_SCOPE);
+      msg = (msg==null) ? "Not ready. click test case link." : msg;
+      writer.write("<p>" + msg + "</p>\n");
+
+   }
+
+}

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/23a1c547/portlet-tck_3.0/V2PortletTagLibraryTests/src/main/java/javax/portlet/tck/portlets/PortletTagLibraryTests_SPEC2_26_IncludeJSPGeneral.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2PortletTagLibraryTests/src/main/java/javax/portlet/tck/portlets/PortletTagLibraryTests_SPEC2_26_IncludeJSPGeneral.java b/portlet-tck_3.0/V2PortletTagLibraryTests/src/main/java/javax/portlet/tck/portlets/PortletTagLibraryTests_SPEC2_26_IncludeJSPGeneral.java
new file mode 100644
index 0000000..593e5ea
--- /dev/null
+++ b/portlet-tck_3.0/V2PortletTagLibraryTests/src/main/java/javax/portlet/tck/portlets/PortletTagLibraryTests_SPEC2_26_IncludeJSPGeneral.java
@@ -0,0 +1,106 @@
+/*  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 PortletTagLibraryTests_SPEC2_26_IncludeJSPGeneral_event
+ *
+ */
+public class PortletTagLibraryTests_SPEC2_26_IncludeJSPGeneral implements Portlet, ResourceServingPortlet {
+   private static final String LOG_CLASS = 
+         PortletTagLibraryTests_SPEC2_26_IncludeJSPGeneral.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();
+
+   }
+
+   @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();
+
+      // Now do the actual dispatch
+      String target = JSP_PREFIX + "PortletTagLibraryTests_SPEC2_26_IncludeJSPGeneral" + JSP_SUFFIX + "?" + QUERY_STRING;
+      PortletRequestDispatcher rd = portletConfig.getPortletContext()
+            .getRequestDispatcher(target);
+      rd.include(portletReq, portletResp);
+   }
+
+}

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/23a1c547/portlet-tck_3.0/V2PortletTagLibraryTests/src/main/java/javax/portlet/tck/portlets/PortletTagLibraryTests_SPEC2_26_TagLib.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2PortletTagLibraryTests/src/main/java/javax/portlet/tck/portlets/PortletTagLibraryTests_SPEC2_26_TagLib.java b/portlet-tck_3.0/V2PortletTagLibraryTests/src/main/java/javax/portlet/tck/portlets/PortletTagLibraryTests_SPEC2_26_TagLib.java
deleted file mode 100644
index d0e398d..0000000
--- a/portlet-tck_3.0/V2PortletTagLibraryTests/src/main/java/javax/portlet/tck/portlets/PortletTagLibraryTests_SPEC2_26_TagLib.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*  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.IOException;
-import java.io.PrintWriter;
-
-import java.util.Enumeration;
-import java.util.Locale;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-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 static javax.portlet.tck.beans.JSR286SpecTestCaseDetails.*;
-import javax.portlet.tck.beans.TestResult;
-
-/**
- * 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.
- */
-public class PortletTagLibraryTests_SPEC2_26_TagLib implements Portlet {
-   private static final String LOG_CLASS = 
-         PortletTagLibraryTests_SPEC2_26_TagLib.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 actionRequest, ActionResponse actionResponse)
-         throws PortletException, IOException {
-   }
-
-   @Override
-   public void render(RenderRequest renderRequest, RenderResponse renderResponse)
-         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
-
-      /* TestCase: SPEC2_26_TagLib_defineObjects1                             */
-      /* Details: "The portlet-container must provide an implementation of    */
-      /* the Tag Lib"                                                         */
-      TestResult tr0 = tcd.getTestResultFailed(SPEC2_26_TAGLIB_DEFINEOBJECTS1);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLib_defineObjects2                             */
-      /* Details: "In order to obtain version 2 support, the tag library      */
-      /* must be specified as <%@ taglib                                      */
-      /* uri=\"http://java.sun.com/portlet_2_0\" prefix=\"portlet\" %>"       */
-      TestResult tr1 = tcd.getTestResultFailed(SPEC2_26_TAGLIB_DEFINEOBJECTS2);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLib_defineObjects4                             */
-      /* Details: "The defineObjects tag must not define any attribute and    */
-      /* it must not contain any body content"                                */
-      TestResult tr2 = tcd.getTestResultFailed(SPEC2_26_TAGLIB_DEFINEOBJECTS4);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLib_namespace                                  */
-      /* Details: "The namespace tag produces a unique string value for the   */
-      /* current portlet equal to the value returned by the                   */
-      /* PortletResponse.getNamespace method"                                 */
-      TestResult tr3 = tcd.getTestResultFailed(SPEC2_26_TAGLIB_NAMESPACE);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLib_escapeXML1                                 */
-      /* Details: "The container runtime option \"javax.portlet.escapeXml\"   */
-      /* can be used to set the default escapeXML setting to true"            */
-      TestResult tr4 = tcd.getTestResultFailed(SPEC2_26_TAGLIB_ESCAPEXML1);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLib_escapeXML2                                 */
-      /* Details: "The container runtime option \"javax.portlet.escapeXml\"   */
-      /* can be used to set the default escapeXML setting to false"           */
-      TestResult tr5 = tcd.getTestResultFailed(SPEC2_26_TAGLIB_ESCAPEXML2);
-      /* 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);
-
-
-   }
-
-}
-


[04/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.

Posted by ms...@apache.org.
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/23a1c547/portlet-tck_3.0/V2PortletTagLibraryTests2/src/main/webapp/WEB-INF/portlet.xml
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2PortletTagLibraryTests2/src/main/webapp/WEB-INF/portlet.xml b/portlet-tck_3.0/V2PortletTagLibraryTests2/src/main/webapp/WEB-INF/portlet.xml
new file mode 100644
index 0000000..971c185
--- /dev/null
+++ b/portlet-tck_3.0/V2PortletTagLibraryTests2/src/main/webapp/WEB-INF/portlet.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    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.     
+-->
+<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"
+   xmlns:tck="http://www.apache.org/portals/pluto/portlet-tck_3.0"
+   version="2.0" id="V2PortletTagLibraryTests2">
+   <portlet>
+      <portlet-name>PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender</portlet-name>
+      <portlet-class>javax.portlet.tck.portlets.PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender</portlet-class>
+      <expiration-cache>0</expiration-cache>
+      <supports>
+         <mime-type>text/html</mime-type>
+      </supports>
+      <supported-locale>en_US</supported-locale>
+      <portlet-info>
+         <title>PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender</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>
+
+   <event-definition>
+      <qname>tck:PortletTagLibraryTests_SPEC2_26_IncludeJSPEvent</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/V2PortletTagLibraryTests2/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2PortletTagLibraryTests2/src/main/webapp/WEB-INF/web.xml b/portlet-tck_3.0/V2PortletTagLibraryTests2/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 0000000..409c8e7
--- /dev/null
+++ b/portlet-tck_3.0/V2PortletTagLibraryTests2/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    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.     
+-->
+<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-PortletTagLibraryTests2</display-name>
+
+</web-app>

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/23a1c547/portlet-tck_3.0/V2PortletTagLibraryTests3/pom.xml
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2PortletTagLibraryTests3/pom.xml b/portlet-tck_3.0/V2PortletTagLibraryTests3/pom.xml
new file mode 100644
index 0000000..888e639
--- /dev/null
+++ b/portlet-tck_3.0/V2PortletTagLibraryTests3/pom.xml
@@ -0,0 +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-V2PortletTagLibraryTests3</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/V2PortletTagLibraryTests3/src/main/java/javax/portlet/tck/portlets/PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2PortletTagLibraryTests3/src/main/java/javax/portlet/tck/portlets/PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource.java b/portlet-tck_3.0/V2PortletTagLibraryTests3/src/main/java/javax/portlet/tck/portlets/PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource.java
new file mode 100644
index 0000000..dc4fef7
--- /dev/null
+++ b/portlet-tck_3.0/V2PortletTagLibraryTests3/src/main/java/javax/portlet/tck/portlets/PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource.java
@@ -0,0 +1,121 @@
+/*  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 PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_event
+ *
+ */
+public class PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource implements Portlet, ResourceServingPortlet {
+   private static final String LOG_CLASS = 
+         PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource.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();
+
+      // Now do the actual dispatch
+      String target = JSP_PREFIX + "PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource" + JSP_SUFFIX + "?" + QUERY_STRING;
+      PortletRequestDispatcher rd = portletConfig.getPortletContext()
+            .getRequestDispatcher(target);
+      rd.include(portletReq, portletResp);
+   }
+
+   @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=\"PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource\">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(\"PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource\").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/V2PortletTagLibraryTests3/src/main/resources/xml-resources/additionalTCs.xml
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2PortletTagLibraryTests3/src/main/resources/xml-resources/additionalTCs.xml b/portlet-tck_3.0/V2PortletTagLibraryTests3/src/main/resources/xml-resources/additionalTCs.xml
new file mode 100644
index 0000000..b4bf7e2
--- /dev/null
+++ b/portlet-tck_3.0/V2PortletTagLibraryTests3/src/main/resources/xml-resources/additionalTCs.xml
@@ -0,0 +1,149 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    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.     
+-->
+<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
+<properties>
+<!-- JSR 286 API PortletTagLibraryTests3 test case names and page mappings -->
+<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_defineObjectsResource1">V2PortletTagLibraryTests3</entry>
+<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_defineObjectsResource2">V2PortletTagLibraryTests3</entry>
+<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_defineObjectsResource3">V2PortletTagLibraryTests3</entry>
+<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_defineObjectsResource4">V2PortletTagLibraryTests3</entry>
+<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_defineObjectsResource5">V2PortletTagLibraryTests3</entry>
+<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_defineObjectsResource6">V2PortletTagLibraryTests3</entry>
+<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_defineObjectsResource7">V2PortletTagLibraryTests3</entry>
+<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_defineObjectsResource8">V2PortletTagLibraryTests3</entry>
+<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_defineObjectsResource9">V2PortletTagLibraryTests3</entry>
+<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_defineObjectsResource10">V2PortletTagLibraryTests3</entry>
+<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_defineObjectsResource11">V2PortletTagLibraryTests3</entry>
+<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_defineObjectsResource12">V2PortletTagLibraryTests3</entry>
+<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_defineObjectsResource13">V2PortletTagLibraryTests3</entry>
+<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_actionURL1">V2PortletTagLibraryTests3</entry>
+<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_actionURL2">V2PortletTagLibraryTests3</entry>
+<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_actionURL3">V2PortletTagLibraryTests3</entry>
+<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_actionURL4">V2PortletTagLibraryTests3</entry>
+<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_actionURL5">V2PortletTagLibraryTests3</entry>
+<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_actionURL6">V2PortletTagLibraryTests3</entry>
+<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_actionURL7">V2PortletTagLibraryTests3</entry>
+<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_actionURL8">V2PortletTagLibraryTests3</entry>
+<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_actionURL9">V2PortletTagLibraryTests3</entry>
+<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_actionURL10">V2PortletTagLibraryTests3</entry>
+<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_actionURL11">V2PortletTagLibraryTests3</entry>
+<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_actionURL12">V2PortletTagLibraryTests3</entry>
+<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_actionURL13">V2PortletTagLibraryTests3</entry>
+<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_actionURL14">V2PortletTagLibraryTests3</entry>
+<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_actionURL15">V2PortletTagLibraryTests3</entry>
+<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_actionURL17">V2PortletTagLibraryTests3</entry>
+<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_actionURL18">V2PortletTagLibraryTests3</entry>
+<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_actionURL19">V2PortletTagLibraryTests3</entry>
+<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_actionURL20">V2PortletTagLibraryTests3</entry>
+<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_actionURL21">V2PortletTagLibraryTests3</entry>
+<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_actionURL22">V2PortletTagLibraryTests3</entry>
+<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_actionURL23">V2PortletTagLibraryTests3</entry>
+<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_actionURL25">V2PortletTagLibraryTests3</entry>
+<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_actionURL26">V2PortletTagLibraryTests3</entry>
+<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_actionURL27">V2PortletTagLibraryTests3</entry>
+<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_actionURL28">V2PortletTagLibraryTests3</entry>
+<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_actionURL29">V2PortletTagLibraryTests3</entry>
+<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_actionURL30">V2PortletTagLibraryTests3</entry>
+<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_renderURL1">V2PortletTagLibraryTests3</entry>
+<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_renderURL2">V2PortletTagLibraryTests3</entry>
+<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_renderURL3">V2PortletTagLibraryTests3</entry>
+<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_renderURL4">V2PortletTagLibraryTests3</entry>
+<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_renderURL5">V2PortletTagLibraryTests3</entry>
+<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_renderURL6">V2PortletTagLibraryTests3</entry>
+<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_renderURL7">V2PortletTagLibraryTests3</entry>
+<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_renderURL8">V2PortletTagLibraryTests3</entry>
+<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_renderURL9">V2PortletTagLibraryTests3</entry>
+<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_renderURL10">V2PortletTagLibraryTests3</entry>
+<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_renderURL11">V2PortletTagLibraryTests3</entry>
+<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_renderURL12">V2PortletTagLibraryTests3</entry>
+<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_renderURL13">V2PortletTagLibraryTests3</entry>
+<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_renderURL14">V2PortletTagLibraryTests3</entry>
+<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_renderURL15">V2PortletTagLibraryTests3</entry>
+<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_renderURL17">V2PortletTagLibraryTests3</entry>
+<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_renderURL18">V2PortletTagLibraryTests3</entry>
+<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_renderURL19">V2PortletTagLibraryTests3</entry>
+<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_renderURL20">V2PortletTagLibraryTests3</entry>
+<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_renderURL21">V2PortletTagLibraryTests3</entry>
+<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_renderURL22">V2PortletTagLibraryTests3</entry>
+<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_renderURL23">V2PortletTagLibraryTests3</entry>
+<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_renderURL25">V2PortletTagLibraryTests3</entry>
+<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_renderURL26">V2PortletTagLibraryTests3</entry>
+<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_resourceURL1">V2PortletTagLibraryTests3</entry>
+<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_resourceURL2">V2PortletTagLibraryTests3</entry>
+<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_resourceURL3">V2PortletTagLibraryTests3</entry>
+<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_resourceURL4">V2PortletTagLibraryTests3</entry>
+<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_resourceURL5">V2PortletTagLibraryTests3</entry>
+<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_resourceURL6">V2PortletTagLibraryTests3</entry>
+<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_resourceURL7">V2PortletTagLibraryTests3</entry>
+<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_resourceURL8">V2PortletTagLibraryTests3</entry>
+<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_resourceURL9">V2PortletTagLibraryTests3</entry>
+<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_resourceURL11">V2PortletTagLibraryTests3</entry>
+<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_resourceURL12">V2PortletTagLibraryTests3</entry>
+<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_resourceURL13">V2PortletTagLibraryTests3</entry>
+<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_resourceURL14">V2PortletTagLibraryTests3</entry>
+<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_resourceURL15">V2PortletTagLibraryTests3</entry>
+<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_resourceURL16">V2PortletTagLibraryTests3</entry>
+<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_resourceURL17">V2PortletTagLibraryTests3</entry>
+<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_resourceURL19">V2PortletTagLibraryTests3</entry>
+<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_resourceURL20">V2PortletTagLibraryTests3</entry>
+<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_resourceURL21">V2PortletTagLibraryTests3</entry>
+<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_resourceURL22">V2PortletTagLibraryTests3</entry>
+<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_resourceURL23">V2PortletTagLibraryTests3</entry>
+<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_resourceURL24">V2PortletTagLibraryTests3</entry>
+<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_resourceURL25">V2PortletTagLibraryTests3</entry>
+<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_resourceURL26">V2PortletTagLibraryTests3</entry>
+<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_resourceURL27">V2PortletTagLibraryTests3</entry>
+<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_paramAction1">V2PortletTagLibraryTests3</entry>
+<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_paramAction2">V2PortletTagLibraryTests3</entry>
+<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_paramAction3">V2PortletTagLibraryTests3</entry>
+<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_paramAction4">V2PortletTagLibraryTests3</entry>
+<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_paramAction5">V2PortletTagLibraryTests3</entry>
+<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_paramAction6">V2PortletTagLibraryTests3</entry>
+<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_paramRender1">V2PortletTagLibraryTests3</entry>
+<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_paramRender2">V2PortletTagLibraryTests3</entry>
+<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_paramRender3">V2PortletTagLibraryTests3</entry>
+<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_paramRender4">V2PortletTagLibraryTests3</entry>
+<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_paramRender5">V2PortletTagLibraryTests3</entry>
+<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_paramRender6">V2PortletTagLibraryTests3</entry>
+<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_paramResource1">V2PortletTagLibraryTests3</entry>
+<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_paramResource2">V2PortletTagLibraryTests3</entry>
+<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_paramResource3">V2PortletTagLibraryTests3</entry>
+<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_paramResource4">V2PortletTagLibraryTests3</entry>
+<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_paramResource5">V2PortletTagLibraryTests3</entry>
+<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_paramResource6">V2PortletTagLibraryTests3</entry>
+<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_propertyAction1">V2PortletTagLibraryTests3</entry>
+<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_propertyAction2">V2PortletTagLibraryTests3</entry>
+<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_propertyAction3">V2PortletTagLibraryTests3</entry>
+<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_propertyAction4">V2PortletTagLibraryTests3</entry>
+<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_propertyAction5">V2PortletTagLibraryTests3</entry>
+<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_propertyAction6">V2PortletTagLibraryTests3</entry>
+<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_propertyRender1">V2PortletTagLibraryTests3</entry>
+<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_propertyRender2">V2PortletTagLibraryTests3</entry>
+<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_propertyRender3">V2PortletTagLibraryTests3</entry>
+<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_propertyRender4">V2PortletTagLibraryTests3</entry>
+<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_propertyRender5">V2PortletTagLibraryTests3</entry>
+<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_propertyRender6">V2PortletTagLibraryTests3</entry>
+<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_propertyResource1">V2PortletTagLibraryTests3</entry>
+<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_propertyResource2">V2PortletTagLibraryTests3</entry>
+<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_propertyResource3">V2PortletTagLibraryTests3</entry>
+<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_propertyResource4">V2PortletTagLibraryTests3</entry>
+<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_propertyResource5">V2PortletTagLibraryTests3</entry>
+<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_propertyResource6">V2PortletTagLibraryTests3</entry>
+</properties>


[11/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.

Posted by ms...@apache.org.
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/23a1c547/portlet-tck_3.0/V2AddlRequestTests/src/main/java/javax/portlet/tck/portlets/AddlRequestTests_SPEC2_11_Render.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlRequestTests/src/main/java/javax/portlet/tck/portlets/AddlRequestTests_SPEC2_11_Render.java b/portlet-tck_3.0/V2AddlRequestTests/src/main/java/javax/portlet/tck/portlets/AddlRequestTests_SPEC2_11_Render.java
new file mode 100644
index 0000000..1edfef7
--- /dev/null
+++ b/portlet-tck_3.0/V2AddlRequestTests/src/main/java/javax/portlet/tck/portlets/AddlRequestTests_SPEC2_11_Render.java
@@ -0,0 +1,226 @@
+/*  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 AddlRequestTests_SPEC2_11_Render_event
+ *
+ */
+public class AddlRequestTests_SPEC2_11_Render implements Portlet, ResourceServingPortlet {
+   private static final String LOG_CLASS = 
+         AddlRequestTests_SPEC2_11_Render.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();
+
+   }
+
+   @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();
+
+      JSR286SpecTestCaseDetails tcd = new JSR286SpecTestCaseDetails();
+
+      // Create result objects for the tests
+
+      /* TestCase: V2AddlRequestTests_SPEC2_11_Render_parameters10            */
+      /* Details: "The portlet-container must not propagate parameters        */
+      /* received in an action or event request to subsequent render          */
+      /* requests of the portlet"                                             */
+      TestResult tr0 = tcd.getTestResultFailed(V2ADDLREQUESTTESTS_SPEC2_11_RENDER_PARAMETERS10);
+      /* TODO: implement test */
+      tr0.appendTcDetail("Not implemented.");
+      tr0.writeTo(writer);
+
+      /* TestCase: V2AddlRequestTests_SPEC2_11_Render_parameters11            */
+      /* Details: "If a portlet receives a render request that is the         */
+      /* result of a client request targeted to another portlet in the        */
+      /* portal page, the parameters should be the same parameters as of      */
+      /* the previous render request from this client"                        */
+      TestResult tr1 = tcd.getTestResultFailed(V2ADDLREQUESTTESTS_SPEC2_11_RENDER_PARAMETERS11);
+      /* TODO: implement test */
+      tr1.appendTcDetail("Not implemented.");
+      tr1.writeTo(writer);
+
+      /* TestCase: V2AddlRequestTests_SPEC2_11_Render_parameters13            */
+      /* Details: "If a portlet receives a render request that is the         */
+      /* result of invoking a render URL targeting this portlet the render    */
+      /* parameters received with the render request must be the parameters   */
+      /* set on the render URL"                                               */
+      TestResult tr2 = tcd.getTestResultFailed(V2ADDLREQUESTTESTS_SPEC2_11_RENDER_PARAMETERS13);
+      /* TODO: implement test */
+      tr2.appendTcDetail("Not implemented.");
+      tr2.writeTo(writer);
+
+      /* TestCase: V2AddlRequestTests_SPEC2_11_Render_parameters15            */
+      /* Details: "Render parameters get automatically cleared if the         */
+      /* portlet receives a processAction or processEvent call"               */
+      TestResult tr3 = tcd.getTestResultFailed(V2ADDLREQUESTTESTS_SPEC2_11_RENDER_PARAMETERS15);
+      /* TODO: implement test */
+      tr3.appendTcDetail("Not implemented.");
+      tr3.writeTo(writer);
+
+      /* TestCase: V2AddlRequestTests_SPEC2_11_Render_parameters1             */
+      /* Details: "If a portlet receives a request from a client request      */
+      /* targeted to the portlet itself, the parameters must be the string    */
+      /* parameters encoded in the URL (added when creating the PortletURL)   */
+      /* and the string parameters sent by the client to the portlet as       */
+      /* part of the client request"                                          */
+      TestResult tr4 = tcd.getTestResultFailed(V2ADDLREQUESTTESTS_SPEC2_11_RENDER_PARAMETERS1);
+      /* TODO: implement test */
+      tr4.appendTcDetail("Not implemented.");
+      tr4.writeTo(writer);
+
+      /* TestCase: V2AddlRequestTests_SPEC2_11_Render_parameters2             */
+      /* Details: "The parameters the request object returns must be          */
+      /* \"x-www-form-urlencoded\" decoded"                                   */
+      TestResult tr5 = tcd.getTestResultFailed(V2ADDLREQUESTTESTS_SPEC2_11_RENDER_PARAMETERS2);
+      /* TODO: implement test */
+      tr5.appendTcDetail("Not implemented.");
+      tr5.writeTo(writer);
+
+      /* TestCase: V2AddlRequestTests_SPEC2_11_Render_parameters6             */
+      /* Details: "The getParameterMap method must return an unmodifiable     */
+      /* Map object"                                                          */
+      TestResult tr6 = tcd.getTestResultFailed(V2ADDLREQUESTTESTS_SPEC2_11_RENDER_PARAMETERS6);
+      /* TODO: implement test */
+      tr6.appendTcDetail("Not implemented.");
+      tr6.writeTo(writer);
+
+      /* TestCase: V2AddlRequestTests_SPEC2_11_Render_publicRenderParameters15 */
+      /* Details: "A map of private parameters can be obtained through the    */
+      /* getPrivateParameterMap method"                                       */
+      TestResult tr7 = tcd.getTestResultFailed(V2ADDLREQUESTTESTS_SPEC2_11_RENDER_PUBLICRENDERPARAMETERS15);
+      /* TODO: implement test */
+      tr7.appendTcDetail("Not implemented.");
+      tr7.writeTo(writer);
+
+      /* TestCase: V2AddlRequestTests_SPEC2_11_Render_publicRenderParameters16 */
+      /* Details: "A map of public parameters can be obtained through the     */
+      /* getPublicParameterMap method"                                        */
+      TestResult tr8 = tcd.getTestResultFailed(V2ADDLREQUESTTESTS_SPEC2_11_RENDER_PUBLICRENDERPARAMETERS16);
+      /* TODO: implement test */
+      tr8.appendTcDetail("Not implemented.");
+      tr8.writeTo(writer);
+
+      /* TestCase: V2AddlRequestTests_SPEC2_11_Render_publicRenderParameters1 */
+      /* Details: "Public render parameters can be declared in the            */
+      /* deployment descriptor using the public-render-parameter element"     */
+      TestResult tr9 = tcd.getTestResultFailed(V2ADDLREQUESTTESTS_SPEC2_11_RENDER_PUBLICRENDERPARAMETERS1);
+      /* TODO: implement test */
+      tr9.appendTcDetail("Not implemented.");
+      tr9.writeTo(writer);
+
+      /* TestCase: V2AddlRequestTests_SPEC2_11_Render_publicRenderParameters2 */
+      /* Details: "The portlet can specify the public render parameters it    */
+      /* would like to share via the supported-public-render-parameter        */
+      /* element in the deployment descriptor"                                */
+      TestResult tr10 = tcd.getTestResultFailed(V2ADDLREQUESTTESTS_SPEC2_11_RENDER_PUBLICRENDERPARAMETERS2);
+      /* TODO: implement test */
+      tr10.appendTcDetail("Not implemented.");
+      tr10.writeTo(writer);
+
+      /* TestCase: V2AddlRequestTests_SPEC2_11_Render_publicRenderParameters6 */
+      /* Details: "Public render parameters are available in the render       */
+      /* method"                                                              */
+      TestResult tr11 = tcd.getTestResultFailed(V2ADDLREQUESTTESTS_SPEC2_11_RENDER_PUBLICRENDERPARAMETERS6);
+      /* TODO: implement test */
+      tr11.appendTcDetail("Not implemented.");
+      tr11.writeTo(writer);
+
+      /* TestCase: V2AddlRequestTests_SPEC2_11_Render_publicRenderParameters13 */
+      /* Details: "A public render parameter can be deleted using the         */
+      /* removePublicRenderParameter method on the StateAwareResponse "       */
+      TestResult tr12 = tcd.getTestResultFailed(V2ADDLREQUESTTESTS_SPEC2_11_RENDER_PUBLICRENDERPARAMETERS13);
+      /* TODO: implement test */
+      tr12.appendTcDetail("Not implemented.");
+      tr12.writeTo(writer);
+
+      /* TestCase: V2AddlRequestTests_SPEC2_11_Render_publicRenderParameters13a */
+      /* Details: "A public render parameter can be deleted using the         */
+      /* removePublicRenderParameter method on the PortletURL"                */
+      TestResult tr13 = tcd.getTestResultFailed(V2ADDLREQUESTTESTS_SPEC2_11_RENDER_PUBLICRENDERPARAMETERS13A);
+      /* TODO: implement test */
+      tr13.appendTcDetail("Not implemented.");
+      tr13.writeTo(writer);
+
+   }
+
+}

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/23a1c547/portlet-tck_3.0/V2AddlRequestTests/src/main/java/javax/portlet/tck/portlets/AddlRequestTests_SPEC2_11_RenderAttr.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlRequestTests/src/main/java/javax/portlet/tck/portlets/AddlRequestTests_SPEC2_11_RenderAttr.java b/portlet-tck_3.0/V2AddlRequestTests/src/main/java/javax/portlet/tck/portlets/AddlRequestTests_SPEC2_11_RenderAttr.java
new file mode 100644
index 0000000..b1ed394
--- /dev/null
+++ b/portlet-tck_3.0/V2AddlRequestTests/src/main/java/javax/portlet/tck/portlets/AddlRequestTests_SPEC2_11_RenderAttr.java
@@ -0,0 +1,159 @@
+/*  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 AddlRequestTests_SPEC2_11_RenderAttr_event
+ *
+ */
+public class AddlRequestTests_SPEC2_11_RenderAttr implements Portlet, ResourceServingPortlet {
+   private static final String LOG_CLASS = 
+         AddlRequestTests_SPEC2_11_RenderAttr.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();
+
+   }
+
+   @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();
+
+      JSR286SpecTestCaseDetails tcd = new JSR286SpecTestCaseDetails();
+
+      // Create result objects for the tests
+
+      /* TestCase: V2AddlRequestTests_SPEC2_11_RenderAttr_attributes1         */
+      /* Details: "The portlet can access a map with user information         */
+      /* attributes via the request attribute PortletRequest.USER_INFO"       */
+      TestResult tr0 = tcd.getTestResultFailed(V2ADDLREQUESTTESTS_SPEC2_11_RENDERATTR_ATTRIBUTES1);
+      /* TODO: implement test */
+      tr0.appendTcDetail("Not implemented.");
+      tr0.writeTo(writer);
+
+      /* TestCase: V2AddlRequestTests_SPEC2_11_RenderAttr_attributes2         */
+      /* Details: "The PortletRequest.CCPP_PROFILE request attribute must     */
+      /* return a javax.ccpp.Profile based on the current portlet request"    */
+      TestResult tr1 = tcd.getTestResultFailed(V2ADDLREQUESTTESTS_SPEC2_11_RENDERATTR_ATTRIBUTES2);
+      /* TODO: implement test */
+      tr1.appendTcDetail("Not implemented.");
+      tr1.writeTo(writer);
+
+      /* TestCase: V2AddlRequestTests_SPEC2_11_RenderAttr_attributes3         */
+      /* Details: "If the portlet container runtime option                    */
+      /* javax.portlet.renderHeaders is set to TRUE, the RENDER_PART          */
+      /* attribute will be set when the render method is called"              */
+      TestResult tr2 = tcd.getTestResultFailed(V2ADDLREQUESTTESTS_SPEC2_11_RENDERATTR_ATTRIBUTES3);
+      /* TODO: implement test */
+      tr2.appendTcDetail("Not implemented.");
+      tr2.writeTo(writer);
+
+      /* TestCase: V2AddlRequestTests_SPEC2_11_RenderAttr_attributes4         */
+      /* Details: "If the portlet container runtime option                    */
+      /* javax.portlet.renderHeaders is set to TRUE, render method will be    */
+      /* called first with the RENDER_PART attribute set to                   */
+      /* \"RENDER_HEADERS\""                                                  */
+      TestResult tr3 = tcd.getTestResultFailed(V2ADDLREQUESTTESTS_SPEC2_11_RENDERATTR_ATTRIBUTES4);
+      /* TODO: implement test */
+      tr3.appendTcDetail("Not implemented.");
+      tr3.writeTo(writer);
+
+      /* TestCase: V2AddlRequestTests_SPEC2_11_RenderAttr_attributes5         */
+      /* Details: "If the portlet container runtime option                    */
+      /* javax.portlet.renderHeaders is set to TRUE, render method will be    */
+      /* called a second time with the RENDER_PART attribute set to           */
+      /* \"RENDER_MARKUP\""                                                   */
+      TestResult tr4 = tcd.getTestResultFailed(V2ADDLREQUESTTESTS_SPEC2_11_RENDERATTR_ATTRIBUTES5);
+      /* TODO: implement test */
+      tr4.appendTcDetail("Not implemented.");
+      tr4.writeTo(writer);
+
+      /* TestCase: V2AddlRequestTests_SPEC2_11_RenderAttr_attributes8         */
+      /* Details: "During render processing, the LIFECYCLE_PHASE              */
+      /* (\"javax.portlet.lifecycle_phase\") attribute will contain the       */
+      /* string \"RENDER_PHASE\""                                             */
+      TestResult tr5 = tcd.getTestResultFailed(V2ADDLREQUESTTESTS_SPEC2_11_RENDERATTR_ATTRIBUTES8);
+      /* TODO: implement test */
+      tr5.appendTcDetail("Not implemented.");
+      tr5.writeTo(writer);
+
+   }
+
+}

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/23a1c547/portlet-tck_3.0/V2AddlRequestTests/src/main/java/javax/portlet/tck/portlets/AddlRequestTests_SPEC2_11_RenderPRP.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlRequestTests/src/main/java/javax/portlet/tck/portlets/AddlRequestTests_SPEC2_11_RenderPRP.java b/portlet-tck_3.0/V2AddlRequestTests/src/main/java/javax/portlet/tck/portlets/AddlRequestTests_SPEC2_11_RenderPRP.java
new file mode 100644
index 0000000..946aef6
--- /dev/null
+++ b/portlet-tck_3.0/V2AddlRequestTests/src/main/java/javax/portlet/tck/portlets/AddlRequestTests_SPEC2_11_RenderPRP.java
@@ -0,0 +1,134 @@
+/*  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 AddlRequestTests_SPEC2_11_RenderPRP_event
+ *
+ */
+public class AddlRequestTests_SPEC2_11_RenderPRP implements Portlet, ResourceServingPortlet {
+   private static final String LOG_CLASS = 
+         AddlRequestTests_SPEC2_11_RenderPRP.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();
+
+   }
+
+   @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();
+
+      JSR286SpecTestCaseDetails tcd = new JSR286SpecTestCaseDetails();
+
+      // Create result objects for the tests
+
+      /* TestCase: V2AddlRequestTests_SPEC2_11_RenderPRP_publicRenderParameters8 */
+      /* Details: "The portlet container must only send those public render   */
+      /* parameters to a portlet which the portlet has defined support for    */
+      /* using supported-public-render-parameter element in the               */
+      /* portlet.xml"                                                         */
+      TestResult tr0 = tcd.getTestResultFailed(V2ADDLREQUESTTESTS_SPEC2_11_RENDERPRP_PUBLICRENDERPARAMETERS8);
+      /* TODO: implement test */
+      tr0.appendTcDetail("Not implemented.");
+      tr0.writeTo(writer);
+
+      /* TestCase: V2AddlRequestTests_SPEC2_11_RenderPRP_publicRenderParameters9 */
+      /* Details: "The portlet container must only share those render         */
+      /* parameters of a portlet which the portlet has declared as            */
+      /* supported public render parameters using                             */
+      /* supported-public-render-parameter element in the portlet.xml"        */
+      TestResult tr1 = tcd.getTestResultFailed(V2ADDLREQUESTTESTS_SPEC2_11_RENDERPRP_PUBLICRENDERPARAMETERS9);
+      /* TODO: implement test */
+      tr1.appendTcDetail("Not implemented.");
+      tr1.writeTo(writer);
+
+      /* TestCase: V2AddlRequestTests_SPEC2_11_RenderPRP_publicRenderParameters10 */
+      /* Details: "If the portlet was the target of a render URL on which a   */
+      /* specific public render parameter is set, the portlet must receive    */
+      /* at least this render parameter"                                      */
+      TestResult tr2 = tcd.getTestResultFailed(V2ADDLREQUESTTESTS_SPEC2_11_RENDERPRP_PUBLICRENDERPARAMETERS10);
+      /* TODO: implement test */
+      tr2.appendTcDetail("Not implemented.");
+      tr2.writeTo(writer);
+
+   }
+
+}

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/23a1c547/portlet-tck_3.0/V2AddlRequestTests/src/main/java/javax/portlet/tck/portlets/AddlRequestTests_SPEC2_11_RenderReq.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlRequestTests/src/main/java/javax/portlet/tck/portlets/AddlRequestTests_SPEC2_11_RenderReq.java b/portlet-tck_3.0/V2AddlRequestTests/src/main/java/javax/portlet/tck/portlets/AddlRequestTests_SPEC2_11_RenderReq.java
new file mode 100644
index 0000000..d2bdf0a
--- /dev/null
+++ b/portlet-tck_3.0/V2AddlRequestTests/src/main/java/javax/portlet/tck/portlets/AddlRequestTests_SPEC2_11_RenderReq.java
@@ -0,0 +1,183 @@
+/*  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 AddlRequestTests_SPEC2_11_RenderReq_event
+ *
+ */
+public class AddlRequestTests_SPEC2_11_RenderReq implements Portlet, ResourceServingPortlet {
+   private static final String LOG_CLASS = 
+         AddlRequestTests_SPEC2_11_RenderReq.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();
+
+   }
+
+   @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();
+
+      JSR286SpecTestCaseDetails tcd = new JSR286SpecTestCaseDetails();
+
+      // Create result objects for the tests
+
+      /* TestCase: V2AddlRequestTests_SPEC2_11_RenderReq_contentType1         */
+      /* Details: "The getResponseContentType method returns a String         */
+      /* representing the default content type the portlet container          */
+      /* assumes for the output"                                              */
+      TestResult tr0 = tcd.getTestResultFailed(V2ADDLREQUESTTESTS_SPEC2_11_RENDERREQ_CONTENTTYPE1);
+      /* TODO: implement test */
+      tr0.appendTcDetail("Not implemented.");
+      tr0.writeTo(writer);
+
+      /* TestCase: V2AddlRequestTests_SPEC2_11_RenderReq_contentType2         */
+      /* Details: "The getResponseContentTypes method returns an              */
+      /* Enumeration of String elements representing the acceptable content   */
+      /* types for the output in order of preference"                         */
+      TestResult tr1 = tcd.getTestResultFailed(V2ADDLREQUESTTESTS_SPEC2_11_RENDERREQ_CONTENTTYPE2);
+      /* TODO: implement test */
+      tr1.appendTcDetail("Not implemented.");
+      tr1.writeTo(writer);
+
+      /* TestCase: V2AddlRequestTests_SPEC2_11_RenderReq_contentType3         */
+      /* Details: "The first element of the Enumeration returned by the       */
+      /* getResponseContentTypes method must equal the value returned by      */
+      /* the getResponseContentType method"                                   */
+      TestResult tr2 = tcd.getTestResultFailed(V2ADDLREQUESTTESTS_SPEC2_11_RENDERREQ_CONTENTTYPE3);
+      /* TODO: implement test */
+      tr2.appendTcDetail("Not implemented.");
+      tr2.writeTo(writer);
+
+      /* TestCase: V2AddlRequestTests_SPEC2_11_RenderReq_contentType4         */
+      /* Details: "If a portlet defines support for all content types using   */
+      /* a wildcard and the portlet container supports all content types,     */
+      /* the getResponseContentType may return the wildcard"                  */
+      TestResult tr3 = tcd.getTestResultFailed(V2ADDLREQUESTTESTS_SPEC2_11_RENDERREQ_CONTENTTYPE4);
+      /* TODO: implement test */
+      tr3.appendTcDetail("Not implemented.");
+      tr3.writeTo(writer);
+
+      /* TestCase: V2AddlRequestTests_SPEC2_11_RenderReq_contentType5         */
+      /* Details: "If a portlet defines support for all content types using   */
+      /* a wildcard and the portlet container supports all content types,     */
+      /* the getResponseContentType may return the preferred content type"    */
+      TestResult tr4 = tcd.getTestResultFailed(V2ADDLREQUESTTESTS_SPEC2_11_RENDERREQ_CONTENTTYPE5);
+      /* TODO: implement test */
+      tr4.appendTcDetail("Not implemented.");
+      tr4.writeTo(writer);
+
+      /* TestCase: V2AddlRequestTests_SPEC2_11_RenderReq_windowId4            */
+      /* Details: "The string returned by getWindowID method must be the      */
+      /* same ID used for scoping portlet-scope session attributes"           */
+      TestResult tr5 = tcd.getTestResultFailed(V2ADDLREQUESTTESTS_SPEC2_11_RENDERREQ_WINDOWID4);
+      /* TODO: implement test */
+      tr5.appendTcDetail("Not implemented.");
+      tr5.writeTo(writer);
+
+      /* TestCase: V2AddlRequestTests_SPEC2_11_RenderReq_contentType10        */
+      /* Details: "Within the render method, the content type must include    */
+      /* only the MIME type, not the character set"                           */
+      TestResult tr6 = tcd.getTestResultFailed(V2ADDLREQUESTTESTS_SPEC2_11_RENDERREQ_CONTENTTYPE10);
+      /* TODO: implement test */
+      tr6.appendTcDetail("Not implemented.");
+      tr6.writeTo(writer);
+
+      /* TestCase: V2AddlRequestTests_SPEC2_11_RenderReq_contentType11        */
+      /* Details: "Within the render method, the getResponseContentTypes      */
+      /* method must return only the content types supported by the current   */
+      /* portlet mode"                                                        */
+      TestResult tr7 = tcd.getTestResultFailed(V2ADDLREQUESTTESTS_SPEC2_11_RENDERREQ_CONTENTTYPE11);
+      /* TODO: implement test */
+      tr7.appendTcDetail("Not implemented.");
+      tr7.writeTo(writer);
+
+      /* TestCase: V2AddlRequestTests_SPEC2_11_RenderReq_contentType13        */
+      /* Details: "The character set of the response can be retrieved via     */
+      /* the RenderResponse.getCharacterEncoding method"                      */
+      TestResult tr8 = tcd.getTestResultFailed(V2ADDLREQUESTTESTS_SPEC2_11_RENDERREQ_CONTENTTYPE13);
+      /* TODO: implement test */
+      tr8.appendTcDetail("Not implemented.");
+      tr8.writeTo(writer);
+
+   }
+
+}

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/23a1c547/portlet-tck_3.0/V2AddlRequestTests/src/main/java/javax/portlet/tck/portlets/AddlRequestTests_SPEC2_11_Request.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlRequestTests/src/main/java/javax/portlet/tck/portlets/AddlRequestTests_SPEC2_11_Request.java b/portlet-tck_3.0/V2AddlRequestTests/src/main/java/javax/portlet/tck/portlets/AddlRequestTests_SPEC2_11_Request.java
deleted file mode 100644
index 5d9fb22..0000000
--- a/portlet-tck_3.0/V2AddlRequestTests/src/main/java/javax/portlet/tck/portlets/AddlRequestTests_SPEC2_11_Request.java
+++ /dev/null
@@ -1,264 +0,0 @@
-/*  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.IOException;
-import java.io.PrintWriter;
-
-import java.util.Enumeration;
-import java.util.Locale;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-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 static javax.portlet.tck.beans.JSR286SpecTestCaseDetails.*;
-import javax.portlet.tck.beans.TestResult;
-
-/**
- * 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.
- */
-public class AddlRequestTests_SPEC2_11_Request implements Portlet {
-   private static final String LOG_CLASS = 
-         AddlRequestTests_SPEC2_11_Request.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 actionRequest, ActionResponse actionResponse)
-         throws PortletException, IOException {
-   }
-
-   @Override
-   public void render(RenderRequest renderRequest, RenderResponse renderResponse)
-         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
-
-      /* TestCase: SPEC2_11_Request_attributes1                               */
-      /* Details: "The portlet can access a map with user information         */
-      /* attributes via the request attribute PortletRequest.USER_INFO"       */
-      TestResult tr0 = tcd.getTestResultFailed(SPEC2_11_REQUEST_ATTRIBUTES1);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_11_Request_attributes2                               */
-      /* Details: "The PortletRequest.CCPP_PROFILE request attribute must     */
-      /* return a javax.ccpp.Profile based on the current portlet request"    */
-      TestResult tr1 = tcd.getTestResultFailed(SPEC2_11_REQUEST_ATTRIBUTES2);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_11_Request_attributes3                               */
-      /* Details: "If the portlet container runtime option                    */
-      /* javax.portlet.renderHeaders is set to TRUE, the RENDER_PART          */
-      /* attribute will be set when the render method is called"              */
-      TestResult tr2 = tcd.getTestResultFailed(SPEC2_11_REQUEST_ATTRIBUTES3);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_11_Request_attributes4                               */
-      /* Details: "If the portlet container runtime option                    */
-      /* javax.portlet.renderHeaders is set to TRUE, render method will be    */
-      /* called first with the RENDER_PART attribute set to                   */
-      /* \"RENDER_HEADERS\""                                                  */
-      TestResult tr3 = tcd.getTestResultFailed(SPEC2_11_REQUEST_ATTRIBUTES4);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_11_Request_attributes5                               */
-      /* Details: "If the portlet container runtime option                    */
-      /* javax.portlet.renderHeaders is set to TRUE, render method will be    */
-      /* called a second time with the RENDER_PART attribute set to           */
-      /* \"RENDER_MARKUP\""                                                   */
-      TestResult tr4 = tcd.getTestResultFailed(SPEC2_11_REQUEST_ATTRIBUTES5);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_11_Request_attributes6                               */
-      /* Details: "During action processing, the LIFECYCLE_PHASE              */
-      /* (\"javax.portlet.lifecycle_phase\") attribute will contain the       */
-      /* string \"ACTION_PHASE\""                                             */
-      TestResult tr5 = tcd.getTestResultFailed(SPEC2_11_REQUEST_ATTRIBUTES6);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_11_Request_attributes7                               */
-      /* Details: "During event processing, the LIFECYCLE_PHASE               */
-      /* (\"javax.portlet.lifecycle_phase\") attribute will contain the       */
-      /* string \"EVENT_PHASE\""                                              */
-      TestResult tr6 = tcd.getTestResultFailed(SPEC2_11_REQUEST_ATTRIBUTES7);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_11_Request_attributes8                               */
-      /* Details: "During render processing, the LIFECYCLE_PHASE              */
-      /* (\"javax.portlet.lifecycle_phase\") attribute will contain the       */
-      /* string \"RENDER_PHASE\""                                             */
-      TestResult tr7 = tcd.getTestResultFailed(SPEC2_11_REQUEST_ATTRIBUTES8);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_11_Request_attributes9                               */
-      /* Details: "During resource processing, the LIFECYCLE_PHASE            */
-      /* (\"javax.portlet.lifecycle_phase\") attribute will contain the       */
-      /* string \"RESOURCE_PHASE\""                                           */
-      TestResult tr8 = tcd.getTestResultFailed(SPEC2_11_REQUEST_ATTRIBUTES9);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_11_Request_contentType1                              */
-      /* Details: "The getResponseContentType method returns a String         */
-      /* representing the default content type the portlet container          */
-      /* assumes for the output"                                              */
-      TestResult tr9 = tcd.getTestResultFailed(SPEC2_11_REQUEST_CONTENTTYPE1);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_11_Request_contentType2                              */
-      /* Details: "The getResponseContentTypes method returns an              */
-      /* Enumeration of String elements representing the acceptable content   */
-      /* types for the output in order of preference"                         */
-      TestResult tr10 = tcd.getTestResultFailed(SPEC2_11_REQUEST_CONTENTTYPE2);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_11_Request_contentType3                              */
-      /* Details: "The first element of the Enumeration returned by the       */
-      /* getResponseContentTypes method must equal the value returned by      */
-      /* the getResponseContentType method"                                   */
-      TestResult tr11 = tcd.getTestResultFailed(SPEC2_11_REQUEST_CONTENTTYPE3);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_11_Request_contentType4                              */
-      /* Details: "If a portlet defines support for all content types using   */
-      /* a wildcard and the portlet container supports all content types,     */
-      /* the getResponseContentType may return the wildcard"                  */
-      TestResult tr12 = tcd.getTestResultFailed(SPEC2_11_REQUEST_CONTENTTYPE4);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_11_Request_contentType5                              */
-      /* Details: "If a portlet defines support for all content types using   */
-      /* a wildcard and the portlet container supports all content types,     */
-      /* the getResponseContentType may return the preferred content type"    */
-      TestResult tr13 = tcd.getTestResultFailed(SPEC2_11_REQUEST_CONTENTTYPE5);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_11_Request_contentType6                              */
-      /* Details: "Within the processAction method, the content type must     */
-      /* include only the MIME type, not the character set"                   */
-      TestResult tr14 = tcd.getTestResultFailed(SPEC2_11_REQUEST_CONTENTTYPE6);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_11_Request_contentType7                              */
-      /* Details: "Within the processAction method, the                       */
-      /* getResponseContentTypes method must return only the content types    */
-      /* supported by the current portlet mode"                               */
-      TestResult tr15 = tcd.getTestResultFailed(SPEC2_11_REQUEST_CONTENTTYPE7);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_11_Request_contentType8                              */
-      /* Details: "Within the processEvent method, the content type must      */
-      /* include only the MIME type, not the character set"                   */
-      TestResult tr16 = tcd.getTestResultFailed(SPEC2_11_REQUEST_CONTENTTYPE8);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_11_Request_contentType9                              */
-      /* Details: "Within the processEvent method, the                        */
-      /* getResponseContentTypes method must return only the content types    */
-      /* supported by the current portlet mode"                               */
-      TestResult tr17 = tcd.getTestResultFailed(SPEC2_11_REQUEST_CONTENTTYPE9);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_11_Request_contentType10                             */
-      /* Details: "Within the render method, the content type must include    */
-      /* only the MIME type, not the character set"                           */
-      TestResult tr18 = tcd.getTestResultFailed(SPEC2_11_REQUEST_CONTENTTYPE10);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_11_Request_contentType11                             */
-      /* Details: "Within the render method, the getResponseContentTypes      */
-      /* method must return only the content types supported by the current   */
-      /* portlet mode"                                                        */
-      TestResult tr19 = tcd.getTestResultFailed(SPEC2_11_REQUEST_CONTENTTYPE11);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_11_Request_contentType12                             */
-      /* Details: "Within the serveResource method, the content type should   */
-      /* be based on the HTTP Accept header provided by the client"           */
-      TestResult tr20 = tcd.getTestResultFailed(SPEC2_11_REQUEST_CONTENTTYPE12);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_11_Request_contentType13                             */
-      /* Details: "The character set of the response can be retrieved via     */
-      /* the RenderResponse.getCharacterEncoding method"                      */
-      TestResult tr21 = tcd.getTestResultFailed(SPEC2_11_REQUEST_CONTENTTYPE13);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_11_Request_windowId4                                 */
-      /* Details: "The string returned by getWindowID method must be the      */
-      /* same ID used for scoping portlet-scope session attributes"           */
-      TestResult tr22 = tcd.getTestResultFailed(SPEC2_11_REQUEST_WINDOWID4);
-      /* 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);
-
-
-   }
-
-}
-

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/23a1c547/portlet-tck_3.0/V2AddlRequestTests/src/main/java/javax/portlet/tck/portlets/AddlRequestTests_SPEC2_11_RequestPRP.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlRequestTests/src/main/java/javax/portlet/tck/portlets/AddlRequestTests_SPEC2_11_RequestPRP.java b/portlet-tck_3.0/V2AddlRequestTests/src/main/java/javax/portlet/tck/portlets/AddlRequestTests_SPEC2_11_RequestPRP.java
deleted file mode 100644
index f6e20e3..0000000
--- a/portlet-tck_3.0/V2AddlRequestTests/src/main/java/javax/portlet/tck/portlets/AddlRequestTests_SPEC2_11_RequestPRP.java
+++ /dev/null
@@ -1,195 +0,0 @@
-/*  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.IOException;
-import java.io.PrintWriter;
-
-import java.util.Enumeration;
-import java.util.Locale;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-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 static javax.portlet.tck.beans.JSR286SpecTestCaseDetails.*;
-import javax.portlet.tck.beans.TestResult;
-
-/**
- * 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.
- */
-public class AddlRequestTests_SPEC2_11_RequestPRP implements Portlet {
-   private static final String LOG_CLASS = 
-         AddlRequestTests_SPEC2_11_RequestPRP.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 actionRequest, ActionResponse actionResponse)
-         throws PortletException, IOException {
-   }
-
-   @Override
-   public void render(RenderRequest renderRequest, RenderResponse renderResponse)
-         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
-
-      /* TestCase: SPEC2_11_RequestPRP_publicRenderParameters1                */
-      /* Details: "Public render parameters can be declared in the            */
-      /* deployment descriptor using the public-render-parameter element"     */
-      TestResult tr0 = tcd.getTestResultFailed(SPEC2_11_REQUESTPRP_PUBLICRENDERPARAMETERS1);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_11_RequestPRP_publicRenderParameters2                */
-      /* Details: "The portlet can specify the public render parameters it    */
-      /* would like to share via the supported-public-render-parameter        */
-      /* element in the deployment descriptor"                                */
-      TestResult tr1 = tcd.getTestResultFailed(SPEC2_11_REQUESTPRP_PUBLICRENDERPARAMETERS2);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_11_RequestPRP_publicRenderParameters4                */
-      /* Details: "Public render parameters are available in the              */
-      /* processAction method"                                                */
-      TestResult tr2 = tcd.getTestResultFailed(SPEC2_11_REQUESTPRP_PUBLICRENDERPARAMETERS4);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_11_RequestPRP_publicRenderParameters5                */
-      /* Details: "Public render parameters are available in the              */
-      /* processEvent method"                                                 */
-      TestResult tr3 = tcd.getTestResultFailed(SPEC2_11_REQUESTPRP_PUBLICRENDERPARAMETERS5);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_11_RequestPRP_publicRenderParameters6                */
-      /* Details: "Public render parameters are available in the render       */
-      /* method"                                                              */
-      TestResult tr4 = tcd.getTestResultFailed(SPEC2_11_REQUESTPRP_PUBLICRENDERPARAMETERS6);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_11_RequestPRP_publicRenderParameters7                */
-      /* Details: "Public render parameters are available in the              */
-      /* serveResource method"                                                */
-      TestResult tr5 = tcd.getTestResultFailed(SPEC2_11_REQUESTPRP_PUBLICRENDERPARAMETERS7);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_11_RequestPRP_publicRenderParameters8                */
-      /* Details: "The portlet container must only send those public render   */
-      /* parameters to a portlet which the portlet has defined support for    */
-      /* using supported-public-render-parameter element in the               */
-      /* portlet.xml"                                                         */
-      TestResult tr6 = tcd.getTestResultFailed(SPEC2_11_REQUESTPRP_PUBLICRENDERPARAMETERS8);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_11_RequestPRP_publicRenderParameters9                */
-      /* Details: "The portlet container must only share those render         */
-      /* parameters of a portlet which the portlet has declared as            */
-      /* supported public render parameters using                             */
-      /* supported-public-render-parameter element in the portlet.xml"        */
-      TestResult tr7 = tcd.getTestResultFailed(SPEC2_11_REQUESTPRP_PUBLICRENDERPARAMETERS9);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_11_RequestPRP_publicRenderParameters10               */
-      /* Details: "If the portlet was the target of a render URL on which a   */
-      /* specific public render parameter is set, the portlet must receive    */
-      /* at least this render parameter"                                      */
-      TestResult tr8 = tcd.getTestResultFailed(SPEC2_11_REQUESTPRP_PUBLICRENDERPARAMETERS10);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_11_RequestPRP_publicRenderParameters11               */
-      /* Details: "If the portlet sets an action parameter with the same      */
-      /* name as a public render parameter, this results in a multi-valued    */
-      /* parameter. The public render parameter values must be the last       */
-      /* entries in the parameter value array"                                */
-      TestResult tr9 = tcd.getTestResultFailed(SPEC2_11_REQUESTPRP_PUBLICRENDERPARAMETERS11);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_11_RequestPRP_publicRenderParameters12               */
-      /* Details: "If the portlet sets a resource parameter with the same     */
-      /* name as a public render parameter, this results in a multi-valued    */
-      /* parameter. The public render parameter values must be the last       */
-      /* entries in the parameter value array"                                */
-      TestResult tr10 = tcd.getTestResultFailed(SPEC2_11_REQUESTPRP_PUBLICRENDERPARAMETERS12);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_11_RequestPRP_publicRenderParameters13               */
-      /* Details: "A public render parameter can be deleted using the         */
-      /* removePublicRenderParameter method on the StateAwareResponse or      */
-      /* the PortletURL"                                                      */
-      TestResult tr11 = tcd.getTestResultFailed(SPEC2_11_REQUESTPRP_PUBLICRENDERPARAMETERS13);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_11_RequestPRP_publicRenderParameters15               */
-      /* Details: "A map of private parameters can be obtained through the    */
-      /* getPrivateParameterMap method"                                       */
-      TestResult tr12 = tcd.getTestResultFailed(SPEC2_11_REQUESTPRP_PUBLICRENDERPARAMETERS15);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_11_RequestPRP_publicRenderParameters16               */
-      /* Details: "A map of public parameters can be obtained through the     */
-      /* getPublicParameterMap method"                                        */
-      TestResult tr13 = tcd.getTestResultFailed(SPEC2_11_REQUESTPRP_PUBLICRENDERPARAMETERS16);
-      /* 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);
-
-
-   }
-
-}
-

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/23a1c547/portlet-tck_3.0/V2AddlRequestTests/src/main/java/javax/portlet/tck/portlets/AddlRequestTests_SPEC2_11_RequestParamsProps.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlRequestTests/src/main/java/javax/portlet/tck/portlets/AddlRequestTests_SPEC2_11_RequestParamsProps.java b/portlet-tck_3.0/V2AddlRequestTests/src/main/java/javax/portlet/tck/portlets/AddlRequestTests_SPEC2_11_RequestParamsProps.java
deleted file mode 100644
index 463a658..0000000
--- a/portlet-tck_3.0/V2AddlRequestTests/src/main/java/javax/portlet/tck/portlets/AddlRequestTests_SPEC2_11_RequestParamsProps.java
+++ /dev/null
@@ -1,178 +0,0 @@
-/*  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.IOException;
-import java.io.PrintWriter;
-
-import java.util.Enumeration;
-import java.util.Locale;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-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 static javax.portlet.tck.beans.JSR286SpecTestCaseDetails.*;
-import javax.portlet.tck.beans.TestResult;
-
-/**
- * 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.
- */
-public class AddlRequestTests_SPEC2_11_RequestParamsProps implements Portlet {
-   private static final String LOG_CLASS = 
-         AddlRequestTests_SPEC2_11_RequestParamsProps.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 actionRequest, ActionResponse actionResponse)
-         throws PortletException, IOException {
-   }
-
-   @Override
-   public void render(RenderRequest renderRequest, RenderResponse renderResponse)
-         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
-
-      /* TestCase: SPEC2_11_RequestParamsProps_parameters1                    */
-      /* Details: "If a portlet receives a request from a client request      */
-      /* targeted to the portlet itself, the parameters must be the string    */
-      /* parameters encoded in the URL (added when creating the PortletURL)   */
-      /* and the string parameters sent by the client to the portlet as       */
-      /* part of the client request"                                          */
-      TestResult tr0 = tcd.getTestResultFailed(SPEC2_11_REQUESTPARAMSPROPS_PARAMETERS1);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_11_RequestParamsProps_parameters2                    */
-      /* Details: "The parameters the request object returns must be          */
-      /* \"x-www-form-urlencoded\" decoded"                                   */
-      TestResult tr1 = tcd.getTestResultFailed(SPEC2_11_REQUESTPARAMSPROPS_PARAMETERS2);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_11_RequestParamsProps_parameters6                    */
-      /* Details: "The getParameterMap method must return an unmodifiable     */
-      /* Map object"                                                          */
-      TestResult tr2 = tcd.getTestResultFailed(SPEC2_11_REQUESTPARAMSPROPS_PARAMETERS6);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_11_RequestParamsProps_parameters8                    */
-      /* Details: "If the portlet is performing an HTML Form submission via   */
-      /* HTTP method POST the post form data will be populated to the         */
-      /* portlet request parameter set if the content type is                 */
-      /* application/x-www-form-urlencoded"                                   */
-      TestResult tr3 = tcd.getTestResultFailed(SPEC2_11_REQUESTPARAMSPROPS_PARAMETERS8);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_11_RequestParamsProps_parameters9                    */
-      /* Details: "If the portlet is performing an HTML Form submission via   */
-      /* the HTTP method GET the form data set is appended to the portlet     */
-      /* URL used for the form submission and are therefore accessible as     */
-      /* request parameters for the portlet"                                  */
-      TestResult tr4 = tcd.getTestResultFailed(SPEC2_11_REQUESTPARAMSPROPS_PARAMETERS9);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_11_RequestParamsProps_parameters10                   */
-      /* Details: "The portlet-container must not propagate parameters        */
-      /* received in an action or event request to subsequent render          */
-      /* requests of the portlet"                                             */
-      TestResult tr5 = tcd.getTestResultFailed(SPEC2_11_REQUESTPARAMSPROPS_PARAMETERS10);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_11_RequestParamsProps_parameters11                   */
-      /* Details: "If a portlet receives a render request that is the         */
-      /* result of a client request targeted to another portlet in the        */
-      /* portal page, the parameters should be the same parameters as of      */
-      /* the previous render request from this client"                        */
-      TestResult tr6 = tcd.getTestResultFailed(SPEC2_11_REQUESTPARAMSPROPS_PARAMETERS11);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_11_RequestParamsProps_parameters12                   */
-      /* Details: "If a portlet receives an event that is the result of a     */
-      /* client request targeted to another portlet in the portal page, the   */
-      /* parameters should be the same parameters as of the previous render   */
-      /* request from this client"                                            */
-      TestResult tr7 = tcd.getTestResultFailed(SPEC2_11_REQUESTPARAMSPROPS_PARAMETERS12);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_11_RequestParamsProps_parameters13                   */
-      /* Details: "If a portlet receives a render request that is the         */
-      /* result of invoking a render URL targeting this portlet the render    */
-      /* parameters received with the render request must be the parameters   */
-      /* set on the render URL"                                               */
-      TestResult tr8 = tcd.getTestResultFailed(SPEC2_11_REQUESTPARAMSPROPS_PARAMETERS13);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_11_RequestParamsProps_parameters15                   */
-      /* Details: "Render parameters get automatically cleared if the         */
-      /* portlet receives a processAction or processEvent call"               */
-      TestResult tr9 = tcd.getTestResultFailed(SPEC2_11_REQUESTPARAMSPROPS_PARAMETERS15);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_11_RequestParamsProps_parameters17                   */
-      /* Details: "If the cacheability level of the resource URL is PORTLET   */
-      /* or PAGE, the portlet must also receive the render parameters         */
-      /* present in the request in which the URL was created"                 */
-      TestResult tr10 = tcd.getTestResultFailed(SPEC2_11_REQUESTPARAMSPROPS_PARAMETERS17);
-      /* 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);
-
-
-   }
-
-}
-

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/23a1c547/portlet-tck_3.0/V2AddlRequestTests/src/main/java/javax/portlet/tck/portlets/AddlRequestTests_SPEC2_11_Resource.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlRequestTests/src/main/java/javax/portlet/tck/portlets/AddlRequestTests_SPEC2_11_Resource.java b/portlet-tck_3.0/V2AddlRequestTests/src/main/java/javax/portlet/tck/portlets/AddlRequestTests_SPEC2_11_Resource.java
new file mode 100644
index 0000000..c0feeea
--- /dev/null
+++ b/portlet-tck_3.0/V2AddlRequestTests/src/main/java/javax/portlet/tck/portlets/AddlRequestTests_SPEC2_11_Resource.java
@@ -0,0 +1,190 @@
+/*  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 AddlRequestTests_SPEC2_11_Resource_event
+ *
+ */
+public class AddlRequestTests_SPEC2_11_Resource implements Portlet, ResourceServingPortlet {
+   private static final String LOG_CLASS = 
+         AddlRequestTests_SPEC2_11_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: V2AddlRequestTests_SPEC2_11_Resource_parameters1           */
+      /* Details: "If a portlet receives a request from a client request      */
+      /* targeted to the portlet itself, the parameters must be the string    */
+      /* parameters encoded in the URL (added when creating the PortletURL)   */
+      /* and the string parameters sent by the client to the portlet as       */
+      /* part of the client request"                                          */
+      TestResult tr0 = tcd.getTestResultFailed(V2ADDLREQUESTTESTS_SPEC2_11_RESOURCE_PARAMETERS1);
+      /* TODO: implement test */
+      tr0.appendTcDetail("Not implemented.");
+      tr0.writeTo(writer);
+
+      /* TestCase: V2AddlRequestTests_SPEC2_11_Resource_parameters2           */
+      /* Details: "The parameters the request object returns must be          */
+      /* \"x-www-form-urlencoded\" decoded"                                   */
+      TestResult tr1 = tcd.getTestResultFailed(V2ADDLREQUESTTESTS_SPEC2_11_RESOURCE_PARAMETERS2);
+      /* TODO: implement test */
+      tr1.appendTcDetail("Not implemented.");
+      tr1.writeTo(writer);
+
+      /* TestCase: V2AddlRequestTests_SPEC2_11_Resource_parameters6           */
+      /* Details: "The getParameterMap method must return an unmodifiable     */
+      /* Map object"                                                          */
+      TestResult tr2 = tcd.getTestResultFailed(V2ADDLREQUESTTESTS_SPEC2_11_RESOURCE_PARAMETERS6);
+      /* TODO: implement test */
+      tr2.appendTcDetail("Not implemented.");
+      tr2.writeTo(writer);
+
+      /* TestCase: V2AddlRequestTests_SPEC2_11_Resource_parameters17          */
+      /* Details: "If the cacheability level of the resource URL is PORTLET   */
+      /* or PAGE, the portlet must also receive the render parameters         */
+      /* present in the request in which the URL was created"                 */
+      TestResult tr3 = tcd.getTestResultFailed(V2ADDLREQUESTTESTS_SPEC2_11_RESOURCE_PARAMETERS17);
+      /* TODO: implement test */
+      tr3.appendTcDetail("Not implemented.");
+      tr3.writeTo(writer);
+
+      /* TestCase: V2AddlRequestTests_SPEC2_11_Resource_publicRenderParameters15 */
+      /* Details: "A map of private parameters can be obtained through the    */
+      /* getPrivateParameterMap method"                                       */
+      TestResult tr4 = tcd.getTestResultFailed(V2ADDLREQUESTTESTS_SPEC2_11_RESOURCE_PUBLICRENDERPARAMETERS15);
+      /* TODO: implement test */
+      tr4.appendTcDetail("Not implemented.");
+      tr4.writeTo(writer);
+
+      /* TestCase: V2AddlRequestTests_SPEC2_11_Resource_publicRenderParameters16 */
+      /* Details: "A map of public parameters can be obtained through the     */
+      /* getPublicParameterMap method"                                        */
+      TestResult tr5 = tcd.getTestResultFailed(V2ADDLREQUESTTESTS_SPEC2_11_RESOURCE_PUBLICRENDERPARAMETERS16);
+      /* TODO: implement test */
+      tr5.appendTcDetail("Not implemented.");
+      tr5.writeTo(writer);
+
+      /* TestCase: V2AddlRequestTests_SPEC2_11_Resource_publicRenderParameters7 */
+      /* Details: "Public render parameters are available in the              */
+      /* serveResource method"                                                */
+      TestResult tr6 = tcd.getTestResultFailed(V2ADDLREQUESTTESTS_SPEC2_11_RESOURCE_PUBLICRENDERPARAMETERS7);
+      /* TODO: implement test */
+      tr6.appendTcDetail("Not implemented.");
+      tr6.writeTo(writer);
+
+      /* TestCase: V2AddlRequestTests_SPEC2_11_Resource_publicRenderParameters12 */
+      /* Details: "If the portlet sets a resource parameter with the same     */
+      /* name as a public render parameter, this results in a multi-valued    */
+      /* parameter. The public render parameter values must be the last       */
+      /* entries in the parameter value array"                                */
+      TestResult tr7 = tcd.getTestResultFailed(V2ADDLREQUESTTESTS_SPEC2_11_RESOURCE_PUBLICRENDERPARAMETERS12);
+      /* TODO: implement test */
+      tr7.appendTcDetail("Not implemented.");
+      tr7.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=\"AddlRequestTests_SPEC2_11_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(\"AddlRequestTests_SPEC2_11_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/V2AddlRequestTests/src/main/java/javax/portlet/tck/portlets/AddlRequestTests_SPEC2_11_ResourceAttr.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlRequestTests/src/main/java/javax/portlet/tck/portlets/AddlRequestTests_SPEC2_11_ResourceAttr.java b/portlet-tck_3.0/V2AddlRequestTests/src/main/java/javax/portlet/tck/portlets/AddlRequestTests_SPEC2_11_ResourceAttr.java
new file mode 100644
index 0000000..cb4a436
--- /dev/null
+++ b/portlet-tck_3.0/V2AddlRequestTests/src/main/java/javax/portlet/tck/portlets/AddlRequestTests_SPEC2_11_ResourceAttr.java
@@ -0,0 +1,145 @@
+/*  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 AddlRequestTests_SPEC2_11_ResourceAttr_event
+ *
+ */
+public class AddlRequestTests_SPEC2_11_ResourceAttr implements Portlet, ResourceServingPortlet {
+   private static final String LOG_CLASS = 
+         AddlRequestTests_SPEC2_11_ResourceAttr.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: V2AddlRequestTests_SPEC2_11_ResourceAttr_attributes1       */
+      /* Details: "The portlet can access a map with user information         */
+      /* attributes via the request attribute PortletRequest.USER_INFO"       */
+      TestResult tr0 = tcd.getTestResultFailed(V2ADDLREQUESTTESTS_SPEC2_11_RESOURCEATTR_ATTRIBUTES1);
+      /* TODO: implement test */
+      tr0.appendTcDetail("Not implemented.");
+      tr0.writeTo(writer);
+
+      /* TestCase: V2AddlRequestTests_SPEC2_11_ResourceAttr_attributes2       */
+      /* Details: "The PortletRequest.CCPP_PROFILE request attribute must     */
+      /* return a javax.ccpp.Profile based on the current portlet request"    */
+      TestResult tr1 = tcd.getTestResultFailed(V2ADDLREQUESTTESTS_SPEC2_11_RESOURCEATTR_ATTRIBUTES2);
+      /* TODO: implement test */
+      tr1.appendTcDetail("Not implemented.");
+      tr1.writeTo(writer);
+
+      /* TestCase: V2AddlRequestTests_SPEC2_11_ResourceAttr_attributes9       */
+      /* Details: "During resource processing, the LIFECYCLE_PHASE            */
+      /* (\"javax.portlet.lifecycle_phase\") attribute will contain the       */
+      /* string \"RESOURCE_PHASE\""                                           */
+      TestResult tr2 = tcd.getTestResultFailed(V2ADDLREQUESTTESTS_SPEC2_11_RESOURCEATTR_ATTRIBUTES9);
+      /* TODO: implement test */
+      tr2.appendTcDetail("Not implemented.");
+      tr2.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=\"AddlRequestTests_SPEC2_11_ResourceAttr\">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(\"AddlRequestTests_SPEC2_11_ResourceAttr\").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");
+   }
+
+}


[12/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.

Posted by ms...@apache.org.
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/23a1c547/portlet-tck_3.0/V2AddlRequestTests/src/main/java/javax/portlet/tck/portlets/AddlRequestTests_SPEC2_11_Action.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlRequestTests/src/main/java/javax/portlet/tck/portlets/AddlRequestTests_SPEC2_11_Action.java b/portlet-tck_3.0/V2AddlRequestTests/src/main/java/javax/portlet/tck/portlets/AddlRequestTests_SPEC2_11_Action.java
new file mode 100644
index 0000000..c000ffb
--- /dev/null
+++ b/portlet-tck_3.0/V2AddlRequestTests/src/main/java/javax/portlet/tck/portlets/AddlRequestTests_SPEC2_11_Action.java
@@ -0,0 +1,295 @@
+/*  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 AddlRequestTests_SPEC2_11_Action_event
+ *
+ */
+public class AddlRequestTests_SPEC2_11_Action implements Portlet, ResourceServingPortlet {
+   private static final String LOG_CLASS = 
+         AddlRequestTests_SPEC2_11_Action.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();
+
+      JSR286SpecTestCaseDetails tcd = new JSR286SpecTestCaseDetails();
+
+      // Create result objects for the tests
+
+      /* TestCase: V2AddlRequestTests_SPEC2_11_Action_parameters1             */
+      /* Details: "If a portlet receives a request from a client request      */
+      /* targeted to the portlet itself, the parameters must be the string    */
+      /* parameters encoded in the URL (added when creating the PortletURL)   */
+      /* and the string parameters sent by the client to the portlet as       */
+      /* part of the client request"                                          */
+      TestResult tr0 = tcd.getTestResultFailed(V2ADDLREQUESTTESTS_SPEC2_11_ACTION_PARAMETERS1);
+      /* TODO: implement test */
+      tr0.appendTcDetail("Not implemented.");
+      tr0.writeTo(writer);
+
+      /* TestCase: V2AddlRequestTests_SPEC2_11_Action_parameters2             */
+      /* Details: "The parameters the request object returns must be          */
+      /* \"x-www-form-urlencoded\" decoded"                                   */
+      TestResult tr1 = tcd.getTestResultFailed(V2ADDLREQUESTTESTS_SPEC2_11_ACTION_PARAMETERS2);
+      /* TODO: implement test */
+      tr1.appendTcDetail("Not implemented.");
+      tr1.writeTo(writer);
+
+      /* TestCase: V2AddlRequestTests_SPEC2_11_Action_parameters6             */
+      /* Details: "The getParameterMap method must return an unmodifiable     */
+      /* Map object"                                                          */
+      TestResult tr2 = tcd.getTestResultFailed(V2ADDLREQUESTTESTS_SPEC2_11_ACTION_PARAMETERS6);
+      /* TODO: implement test */
+      tr2.appendTcDetail("Not implemented.");
+      tr2.writeTo(writer);
+
+      /* TestCase: V2AddlRequestTests_SPEC2_11_Action_parameters8             */
+      /* Details: "If the portlet is performing an HTML Form submission via   */
+      /* HTTP method POST the post form data will be populated to the         */
+      /* portlet request parameter set if the content type is                 */
+      /* application/x-www-form-urlencoded"                                   */
+      TestResult tr3 = tcd.getTestResultFailed(V2ADDLREQUESTTESTS_SPEC2_11_ACTION_PARAMETERS8);
+      /* TODO: implement test */
+      tr3.appendTcDetail("Not implemented.");
+      tr3.writeTo(writer);
+
+      /* TestCase: V2AddlRequestTests_SPEC2_11_Action_parameters9             */
+      /* Details: "If the portlet is performing an HTML Form submission via   */
+      /* the HTTP method GET the form data set is appended to the portlet     */
+      /* URL used for the form submission and are therefore accessible as     */
+      /* request parameters for the portlet"                                  */
+      TestResult tr4 = tcd.getTestResultFailed(V2ADDLREQUESTTESTS_SPEC2_11_ACTION_PARAMETERS9);
+      /* TODO: implement test */
+      tr4.appendTcDetail("Not implemented.");
+      tr4.writeTo(writer);
+
+      /* TestCase: V2AddlRequestTests_SPEC2_11_Action_publicRenderParameters15 */
+      /* Details: "A map of private parameters can be obtained through the    */
+      /* getPrivateParameterMap method"                                       */
+      TestResult tr5 = tcd.getTestResultFailed(V2ADDLREQUESTTESTS_SPEC2_11_ACTION_PUBLICRENDERPARAMETERS15);
+      /* TODO: implement test */
+      tr5.appendTcDetail("Not implemented.");
+      tr5.writeTo(writer);
+
+      /* TestCase: V2AddlRequestTests_SPEC2_11_Action_publicRenderParameters16 */
+      /* Details: "A map of public parameters can be obtained through the     */
+      /* getPublicParameterMap method"                                        */
+      TestResult tr6 = tcd.getTestResultFailed(V2ADDLREQUESTTESTS_SPEC2_11_ACTION_PUBLICRENDERPARAMETERS16);
+      /* TODO: implement test */
+      tr6.appendTcDetail("Not implemented.");
+      tr6.writeTo(writer);
+
+      /* TestCase: V2AddlRequestTests_SPEC2_11_Action_publicRenderParameters4 */
+      /* Details: "Public render parameters are available in the              */
+      /* processAction method"                                                */
+      TestResult tr7 = tcd.getTestResultFailed(V2ADDLREQUESTTESTS_SPEC2_11_ACTION_PUBLICRENDERPARAMETERS4);
+      /* TODO: implement test */
+      tr7.appendTcDetail("Not implemented.");
+      tr7.writeTo(writer);
+
+      /* TestCase: V2AddlRequestTests_SPEC2_11_Action_publicRenderParameters11 */
+      /* Details: "If the portlet sets an action parameter with the same      */
+      /* name as a public render parameter, this results in a multi-valued    */
+      /* parameter. The public render parameter values must be the last       */
+      /* entries in the parameter value array"                                */
+      TestResult tr8 = tcd.getTestResultFailed(V2ADDLREQUESTTESTS_SPEC2_11_ACTION_PUBLICRENDERPARAMETERS11);
+      /* TODO: implement test */
+      tr8.appendTcDetail("Not implemented.");
+      tr8.writeTo(writer);
+
+      portletReq.getPortletSession().setAttribute(
+                   Constants.RESULT_ATTR_PREFIX + "AddlRequestTests_SPEC2_11_Action",
+                   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();
+
+   }
+
+   @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();
+
+      PortletSession ps = portletReq.getPortletSession();
+      String msg = (String) ps.getAttribute(RESULT_ATTR_PREFIX + "AddlRequestTests_SPEC2_11_Action", APPLICATION_SCOPE);
+      if (msg != null) {
+         writer.write("<p>" + msg + "</p><br/>\n");
+         ps.removeAttribute(RESULT_ATTR_PREFIX + "AddlRequestTests_SPEC2_11_Action", APPLICATION_SCOPE);
+      }
+
+      /* TestCase: V2AddlRequestTests_SPEC2_11_Action_parameters1             */
+      /* Details: "If a portlet receives a request from a client request      */
+      /* targeted to the portlet itself, the parameters must be the string    */
+      /* parameters encoded in the URL (added when creating the PortletURL)   */
+      /* and the string parameters sent by the client to the portlet as       */
+      /* part of the client request"                                          */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2AddlRequestTests_SPEC2_11_Action_parameters1", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2AddlRequestTests_SPEC2_11_Action_parameters2             */
+      /* Details: "The parameters the request object returns must be          */
+      /* \"x-www-form-urlencoded\" decoded"                                   */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2AddlRequestTests_SPEC2_11_Action_parameters2", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2AddlRequestTests_SPEC2_11_Action_parameters6             */
+      /* Details: "The getParameterMap method must return an unmodifiable     */
+      /* Map object"                                                          */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2AddlRequestTests_SPEC2_11_Action_parameters6", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2AddlRequestTests_SPEC2_11_Action_parameters8             */
+      /* Details: "If the portlet is performing an HTML Form submission via   */
+      /* HTTP method POST the post form data will be populated to the         */
+      /* portlet request parameter set if the content type is                 */
+      /* application/x-www-form-urlencoded"                                   */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2AddlRequestTests_SPEC2_11_Action_parameters8", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2AddlRequestTests_SPEC2_11_Action_parameters9             */
+      /* Details: "If the portlet is performing an HTML Form submission via   */
+      /* the HTTP method GET the form data set is appended to the portlet     */
+      /* URL used for the form submission and are therefore accessible as     */
+      /* request parameters for the portlet"                                  */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2AddlRequestTests_SPEC2_11_Action_parameters9", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2AddlRequestTests_SPEC2_11_Action_publicRenderParameters15 */
+      /* Details: "A map of private parameters can be obtained through the    */
+      /* getPrivateParameterMap method"                                       */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2AddlRequestTests_SPEC2_11_Action_publicRenderParameters15", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2AddlRequestTests_SPEC2_11_Action_publicRenderParameters16 */
+      /* Details: "A map of public parameters can be obtained through the     */
+      /* getPublicParameterMap method"                                        */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2AddlRequestTests_SPEC2_11_Action_publicRenderParameters16", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2AddlRequestTests_SPEC2_11_Action_publicRenderParameters4 */
+      /* Details: "Public render parameters are available in the              */
+      /* processAction method"                                                */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2AddlRequestTests_SPEC2_11_Action_publicRenderParameters4", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2AddlRequestTests_SPEC2_11_Action_publicRenderParameters11 */
+      /* Details: "If the portlet sets an action parameter with the same      */
+      /* name as a public render parameter, this results in a multi-valued    */
+      /* parameter. The public render parameter values must be the last       */
+      /* entries in the parameter value array"                                */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2AddlRequestTests_SPEC2_11_Action_publicRenderParameters11", aurl);
+         tb.writeTo(writer);
+      }
+
+   }
+
+}

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/23a1c547/portlet-tck_3.0/V2AddlRequestTests/src/main/java/javax/portlet/tck/portlets/AddlRequestTests_SPEC2_11_ActionAttr.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlRequestTests/src/main/java/javax/portlet/tck/portlets/AddlRequestTests_SPEC2_11_ActionAttr.java b/portlet-tck_3.0/V2AddlRequestTests/src/main/java/javax/portlet/tck/portlets/AddlRequestTests_SPEC2_11_ActionAttr.java
new file mode 100644
index 0000000..4759e88
--- /dev/null
+++ b/portlet-tck_3.0/V2AddlRequestTests/src/main/java/javax/portlet/tck/portlets/AddlRequestTests_SPEC2_11_ActionAttr.java
@@ -0,0 +1,171 @@
+/*  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 AddlRequestTests_SPEC2_11_ActionAttr_event
+ *
+ */
+public class AddlRequestTests_SPEC2_11_ActionAttr implements Portlet, ResourceServingPortlet {
+   private static final String LOG_CLASS = 
+         AddlRequestTests_SPEC2_11_ActionAttr.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();
+
+      JSR286SpecTestCaseDetails tcd = new JSR286SpecTestCaseDetails();
+
+      // Create result objects for the tests
+
+      /* TestCase: V2AddlRequestTests_SPEC2_11_ActionAttr_attributes1         */
+      /* Details: "The portlet can access a map with user information         */
+      /* attributes via the request attribute PortletRequest.USER_INFO"       */
+      TestResult tr0 = tcd.getTestResultFailed(V2ADDLREQUESTTESTS_SPEC2_11_ACTIONATTR_ATTRIBUTES1);
+      /* TODO: implement test */
+      tr0.appendTcDetail("Not implemented.");
+      tr0.writeTo(writer);
+
+      /* TestCase: V2AddlRequestTests_SPEC2_11_ActionAttr_attributes2         */
+      /* Details: "The PortletRequest.CCPP_PROFILE request attribute must     */
+      /* return a javax.ccpp.Profile based on the current portlet request"    */
+      TestResult tr1 = tcd.getTestResultFailed(V2ADDLREQUESTTESTS_SPEC2_11_ACTIONATTR_ATTRIBUTES2);
+      /* TODO: implement test */
+      tr1.appendTcDetail("Not implemented.");
+      tr1.writeTo(writer);
+
+      /* TestCase: V2AddlRequestTests_SPEC2_11_ActionAttr_attributes6         */
+      /* Details: "During action processing, the LIFECYCLE_PHASE              */
+      /* (\"javax.portlet.lifecycle_phase\") attribute will contain the       */
+      /* string \"ACTION_PHASE\""                                             */
+      TestResult tr2 = tcd.getTestResultFailed(V2ADDLREQUESTTESTS_SPEC2_11_ACTIONATTR_ATTRIBUTES6);
+      /* TODO: implement test */
+      tr2.appendTcDetail("Not implemented.");
+      tr2.writeTo(writer);
+
+      portletReq.getPortletSession().setAttribute(
+                   Constants.RESULT_ATTR_PREFIX + "AddlRequestTests_SPEC2_11_ActionAttr",
+                   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();
+
+   }
+
+   @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();
+
+      PortletSession ps = portletReq.getPortletSession();
+      String msg = (String) ps.getAttribute(RESULT_ATTR_PREFIX + "AddlRequestTests_SPEC2_11_ActionAttr", APPLICATION_SCOPE);
+      if (msg != null) {
+         writer.write("<p>" + msg + "</p><br/>\n");
+         ps.removeAttribute(RESULT_ATTR_PREFIX + "AddlRequestTests_SPEC2_11_ActionAttr", APPLICATION_SCOPE);
+      }
+
+      /* TestCase: V2AddlRequestTests_SPEC2_11_ActionAttr_attributes1         */
+      /* Details: "The portlet can access a map with user information         */
+      /* attributes via the request attribute PortletRequest.USER_INFO"       */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2AddlRequestTests_SPEC2_11_ActionAttr_attributes1", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2AddlRequestTests_SPEC2_11_ActionAttr_attributes2         */
+      /* Details: "The PortletRequest.CCPP_PROFILE request attribute must     */
+      /* return a javax.ccpp.Profile based on the current portlet request"    */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2AddlRequestTests_SPEC2_11_ActionAttr_attributes2", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2AddlRequestTests_SPEC2_11_ActionAttr_attributes6         */
+      /* Details: "During action processing, the LIFECYCLE_PHASE              */
+      /* (\"javax.portlet.lifecycle_phase\") attribute will contain the       */
+      /* string \"ACTION_PHASE\""                                             */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2AddlRequestTests_SPEC2_11_ActionAttr_attributes6", aurl);
+         tb.writeTo(writer);
+      }
+
+   }
+
+}

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/23a1c547/portlet-tck_3.0/V2AddlRequestTests/src/main/java/javax/portlet/tck/portlets/AddlRequestTests_SPEC2_11_ActionReq.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlRequestTests/src/main/java/javax/portlet/tck/portlets/AddlRequestTests_SPEC2_11_ActionReq.java b/portlet-tck_3.0/V2AddlRequestTests/src/main/java/javax/portlet/tck/portlets/AddlRequestTests_SPEC2_11_ActionReq.java
new file mode 100644
index 0000000..55f55f1
--- /dev/null
+++ b/portlet-tck_3.0/V2AddlRequestTests/src/main/java/javax/portlet/tck/portlets/AddlRequestTests_SPEC2_11_ActionReq.java
@@ -0,0 +1,271 @@
+/*  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 AddlRequestTests_SPEC2_11_ActionReq_event
+ *
+ */
+public class AddlRequestTests_SPEC2_11_ActionReq implements Portlet, ResourceServingPortlet {
+   private static final String LOG_CLASS = 
+         AddlRequestTests_SPEC2_11_ActionReq.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();
+
+      JSR286SpecTestCaseDetails tcd = new JSR286SpecTestCaseDetails();
+
+      // Create result objects for the tests
+
+      /* TestCase: V2AddlRequestTests_SPEC2_11_ActionReq_contentType1         */
+      /* Details: "The getResponseContentType method returns a String         */
+      /* representing the default content type the portlet container          */
+      /* assumes for the output"                                              */
+      TestResult tr0 = tcd.getTestResultFailed(V2ADDLREQUESTTESTS_SPEC2_11_ACTIONREQ_CONTENTTYPE1);
+      /* TODO: implement test */
+      tr0.appendTcDetail("Not implemented.");
+      tr0.writeTo(writer);
+
+      /* TestCase: V2AddlRequestTests_SPEC2_11_ActionReq_contentType2         */
+      /* Details: "The getResponseContentTypes method returns an              */
+      /* Enumeration of String elements representing the acceptable content   */
+      /* types for the output in order of preference"                         */
+      TestResult tr1 = tcd.getTestResultFailed(V2ADDLREQUESTTESTS_SPEC2_11_ACTIONREQ_CONTENTTYPE2);
+      /* TODO: implement test */
+      tr1.appendTcDetail("Not implemented.");
+      tr1.writeTo(writer);
+
+      /* TestCase: V2AddlRequestTests_SPEC2_11_ActionReq_contentType3         */
+      /* Details: "The first element of the Enumeration returned by the       */
+      /* getResponseContentTypes method must equal the value returned by      */
+      /* the getResponseContentType method"                                   */
+      TestResult tr2 = tcd.getTestResultFailed(V2ADDLREQUESTTESTS_SPEC2_11_ACTIONREQ_CONTENTTYPE3);
+      /* TODO: implement test */
+      tr2.appendTcDetail("Not implemented.");
+      tr2.writeTo(writer);
+
+      /* TestCase: V2AddlRequestTests_SPEC2_11_ActionReq_contentType4         */
+      /* Details: "If a portlet defines support for all content types using   */
+      /* a wildcard and the portlet container supports all content types,     */
+      /* the getResponseContentType may return the wildcard"                  */
+      TestResult tr3 = tcd.getTestResultFailed(V2ADDLREQUESTTESTS_SPEC2_11_ACTIONREQ_CONTENTTYPE4);
+      /* TODO: implement test */
+      tr3.appendTcDetail("Not implemented.");
+      tr3.writeTo(writer);
+
+      /* TestCase: V2AddlRequestTests_SPEC2_11_ActionReq_contentType5         */
+      /* Details: "If a portlet defines support for all content types using   */
+      /* a wildcard and the portlet container supports all content types,     */
+      /* the getResponseContentType may return the preferred content type"    */
+      TestResult tr4 = tcd.getTestResultFailed(V2ADDLREQUESTTESTS_SPEC2_11_ACTIONREQ_CONTENTTYPE5);
+      /* TODO: implement test */
+      tr4.appendTcDetail("Not implemented.");
+      tr4.writeTo(writer);
+
+      /* TestCase: V2AddlRequestTests_SPEC2_11_ActionReq_windowId4            */
+      /* Details: "The string returned by getWindowID method must be the      */
+      /* same ID used for scoping portlet-scope session attributes"           */
+      TestResult tr5 = tcd.getTestResultFailed(V2ADDLREQUESTTESTS_SPEC2_11_ACTIONREQ_WINDOWID4);
+      /* TODO: implement test */
+      tr5.appendTcDetail("Not implemented.");
+      tr5.writeTo(writer);
+
+      /* TestCase: V2AddlRequestTests_SPEC2_11_ActionReq_contentType6         */
+      /* Details: "Within the processAction method, the content type must     */
+      /* include only the MIME type, not the character set"                   */
+      TestResult tr6 = tcd.getTestResultFailed(V2ADDLREQUESTTESTS_SPEC2_11_ACTIONREQ_CONTENTTYPE6);
+      /* TODO: implement test */
+      tr6.appendTcDetail("Not implemented.");
+      tr6.writeTo(writer);
+
+      /* TestCase: V2AddlRequestTests_SPEC2_11_ActionReq_contentType7         */
+      /* Details: "Within the processAction method, the                       */
+      /* getResponseContentTypes method must return only the content types    */
+      /* supported by the current portlet mode"                               */
+      TestResult tr7 = tcd.getTestResultFailed(V2ADDLREQUESTTESTS_SPEC2_11_ACTIONREQ_CONTENTTYPE7);
+      /* TODO: implement test */
+      tr7.appendTcDetail("Not implemented.");
+      tr7.writeTo(writer);
+
+      portletReq.getPortletSession().setAttribute(
+                   Constants.RESULT_ATTR_PREFIX + "AddlRequestTests_SPEC2_11_ActionReq",
+                   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();
+
+   }
+
+   @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();
+
+      PortletSession ps = portletReq.getPortletSession();
+      String msg = (String) ps.getAttribute(RESULT_ATTR_PREFIX + "AddlRequestTests_SPEC2_11_ActionReq", APPLICATION_SCOPE);
+      if (msg != null) {
+         writer.write("<p>" + msg + "</p><br/>\n");
+         ps.removeAttribute(RESULT_ATTR_PREFIX + "AddlRequestTests_SPEC2_11_ActionReq", APPLICATION_SCOPE);
+      }
+
+      /* TestCase: V2AddlRequestTests_SPEC2_11_ActionReq_contentType1         */
+      /* Details: "The getResponseContentType method returns a String         */
+      /* representing the default content type the portlet container          */
+      /* assumes for the output"                                              */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2AddlRequestTests_SPEC2_11_ActionReq_contentType1", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2AddlRequestTests_SPEC2_11_ActionReq_contentType2         */
+      /* Details: "The getResponseContentTypes method returns an              */
+      /* Enumeration of String elements representing the acceptable content   */
+      /* types for the output in order of preference"                         */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2AddlRequestTests_SPEC2_11_ActionReq_contentType2", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2AddlRequestTests_SPEC2_11_ActionReq_contentType3         */
+      /* Details: "The first element of the Enumeration returned by the       */
+      /* getResponseContentTypes method must equal the value returned by      */
+      /* the getResponseContentType method"                                   */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2AddlRequestTests_SPEC2_11_ActionReq_contentType3", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2AddlRequestTests_SPEC2_11_ActionReq_contentType4         */
+      /* Details: "If a portlet defines support for all content types using   */
+      /* a wildcard and the portlet container supports all content types,     */
+      /* the getResponseContentType may return the wildcard"                  */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2AddlRequestTests_SPEC2_11_ActionReq_contentType4", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2AddlRequestTests_SPEC2_11_ActionReq_contentType5         */
+      /* Details: "If a portlet defines support for all content types using   */
+      /* a wildcard and the portlet container supports all content types,     */
+      /* the getResponseContentType may return the preferred content type"    */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2AddlRequestTests_SPEC2_11_ActionReq_contentType5", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2AddlRequestTests_SPEC2_11_ActionReq_windowId4            */
+      /* Details: "The string returned by getWindowID method must be the      */
+      /* same ID used for scoping portlet-scope session attributes"           */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2AddlRequestTests_SPEC2_11_ActionReq_windowId4", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2AddlRequestTests_SPEC2_11_ActionReq_contentType6         */
+      /* Details: "Within the processAction method, the content type must     */
+      /* include only the MIME type, not the character set"                   */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2AddlRequestTests_SPEC2_11_ActionReq_contentType6", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2AddlRequestTests_SPEC2_11_ActionReq_contentType7         */
+      /* Details: "Within the processAction method, the                       */
+      /* getResponseContentTypes method must return only the content types    */
+      /* supported by the current portlet mode"                               */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2AddlRequestTests_SPEC2_11_ActionReq_contentType7", aurl);
+         tb.writeTo(writer);
+      }
+
+   }
+
+}

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/23a1c547/portlet-tck_3.0/V2AddlRequestTests/src/main/java/javax/portlet/tck/portlets/AddlRequestTests_SPEC2_11_Event.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlRequestTests/src/main/java/javax/portlet/tck/portlets/AddlRequestTests_SPEC2_11_Event.java b/portlet-tck_3.0/V2AddlRequestTests/src/main/java/javax/portlet/tck/portlets/AddlRequestTests_SPEC2_11_Event.java
new file mode 100644
index 0000000..6b684eb
--- /dev/null
+++ b/portlet-tck_3.0/V2AddlRequestTests/src/main/java/javax/portlet/tck/portlets/AddlRequestTests_SPEC2_11_Event.java
@@ -0,0 +1,179 @@
+/*  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 AddlRequestTests_SPEC2_11_Event_event
+ *
+ */
+public class AddlRequestTests_SPEC2_11_Event implements Portlet, ResourceServingPortlet {
+   private static final String LOG_CLASS = 
+         AddlRequestTests_SPEC2_11_Event.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();
+
+      QName eventQName = new QName(TCKNAMESPACE,
+             "AddlRequestTests_SPEC2_11_Event");
+      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: V2AddlRequestTests_SPEC2_11_Event_parameters1              */
+      /* Details: "If a portlet receives a request from a client request      */
+      /* targeted to the portlet itself, the parameters must be the string    */
+      /* parameters encoded in the URL (added when creating the PortletURL)   */
+      /* and the string parameters sent by the client to the portlet as       */
+      /* part of the client request"                                          */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2AddlRequestTests_SPEC2_11_Event_parameters1", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2AddlRequestTests_SPEC2_11_Event_parameters2              */
+      /* Details: "The parameters the request object returns must be          */
+      /* \"x-www-form-urlencoded\" decoded"                                   */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2AddlRequestTests_SPEC2_11_Event_parameters2", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2AddlRequestTests_SPEC2_11_Event_parameters6              */
+      /* Details: "The getParameterMap method must return an unmodifiable     */
+      /* Map object"                                                          */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2AddlRequestTests_SPEC2_11_Event_parameters6", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2AddlRequestTests_SPEC2_11_Event_parameters12             */
+      /* Details: "If a portlet receives an event that is the result of a     */
+      /* client request targeted to another portlet in the portal page, the   */
+      /* parameters should be the same parameters as of the previous render   */
+      /* request from this client"                                            */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2AddlRequestTests_SPEC2_11_Event_parameters12", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2AddlRequestTests_SPEC2_11_Event_publicRenderParameters15 */
+      /* Details: "A map of private parameters can be obtained through the    */
+      /* getPrivateParameterMap method"                                       */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2AddlRequestTests_SPEC2_11_Event_publicRenderParameters15", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2AddlRequestTests_SPEC2_11_Event_publicRenderParameters16 */
+      /* Details: "A map of public parameters can be obtained through the     */
+      /* getPublicParameterMap method"                                        */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2AddlRequestTests_SPEC2_11_Event_publicRenderParameters16", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2AddlRequestTests_SPEC2_11_Event_publicRenderParameters5  */
+      /* Details: "Public render parameters are available in the              */
+      /* processEvent method"                                                 */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2AddlRequestTests_SPEC2_11_Event_publicRenderParameters5", aurl);
+         tb.writeTo(writer);
+      }
+
+   }
+
+}

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/23a1c547/portlet-tck_3.0/V2AddlRequestTests/src/main/java/javax/portlet/tck/portlets/AddlRequestTests_SPEC2_11_EventAttr.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlRequestTests/src/main/java/javax/portlet/tck/portlets/AddlRequestTests_SPEC2_11_EventAttr.java b/portlet-tck_3.0/V2AddlRequestTests/src/main/java/javax/portlet/tck/portlets/AddlRequestTests_SPEC2_11_EventAttr.java
new file mode 100644
index 0000000..9f62c6d
--- /dev/null
+++ b/portlet-tck_3.0/V2AddlRequestTests/src/main/java/javax/portlet/tck/portlets/AddlRequestTests_SPEC2_11_EventAttr.java
@@ -0,0 +1,135 @@
+/*  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 AddlRequestTests_SPEC2_11_EventAttr_event
+ *
+ */
+public class AddlRequestTests_SPEC2_11_EventAttr implements Portlet, ResourceServingPortlet {
+   private static final String LOG_CLASS = 
+         AddlRequestTests_SPEC2_11_EventAttr.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();
+
+      QName eventQName = new QName(TCKNAMESPACE,
+             "AddlRequestTests_SPEC2_11_EventAttr");
+      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: V2AddlRequestTests_SPEC2_11_EventAttr_attributes1          */
+      /* Details: "The portlet can access a map with user information         */
+      /* attributes via the request attribute PortletRequest.USER_INFO"       */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2AddlRequestTests_SPEC2_11_EventAttr_attributes1", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2AddlRequestTests_SPEC2_11_EventAttr_attributes2          */
+      /* Details: "The PortletRequest.CCPP_PROFILE request attribute must     */
+      /* return a javax.ccpp.Profile based on the current portlet request"    */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2AddlRequestTests_SPEC2_11_EventAttr_attributes2", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2AddlRequestTests_SPEC2_11_EventAttr_attributes7          */
+      /* Details: "During event processing, the LIFECYCLE_PHASE               */
+      /* (\"javax.portlet.lifecycle_phase\") attribute will contain the       */
+      /* string \"EVENT_PHASE\""                                              */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2AddlRequestTests_SPEC2_11_EventAttr_attributes7", aurl);
+         tb.writeTo(writer);
+      }
+
+   }
+
+}

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/23a1c547/portlet-tck_3.0/V2AddlRequestTests/src/main/java/javax/portlet/tck/portlets/AddlRequestTests_SPEC2_11_EventAttr_event.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlRequestTests/src/main/java/javax/portlet/tck/portlets/AddlRequestTests_SPEC2_11_EventAttr_event.java b/portlet-tck_3.0/V2AddlRequestTests/src/main/java/javax/portlet/tck/portlets/AddlRequestTests_SPEC2_11_EventAttr_event.java
new file mode 100644
index 0000000..8e2b57b
--- /dev/null
+++ b/portlet-tck_3.0/V2AddlRequestTests/src/main/java/javax/portlet/tck/portlets/AddlRequestTests_SPEC2_11_EventAttr_event.java
@@ -0,0 +1,134 @@
+/*  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.constants.Constants.*;
+import static javax.portlet.tck.beans.JSR286SpecTestCaseDetails.*;
+import static javax.portlet.PortletSession.*;
+
+/**
+ * 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 AddlRequestTests_SPEC2_11_EventAttr_event implements Portlet, EventPortlet, ResourceServingPortlet {
+   private static final String LOG_CLASS = 
+         AddlRequestTests_SPEC2_11_EventAttr_event.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, "event companion processAction - ERROR!!");
+   }
+
+   @Override
+   public void serveResource(ResourceRequest portletReq, ResourceResponse portletResp)
+         throws PortletException, IOException {
+      LOGGER.entering(LOG_CLASS, "event companion serveResource - ERROR!!");
+   }
+
+   @Override
+   public void processEvent(EventRequest portletReq, EventResponse portletResp)
+         throws PortletException, IOException {
+      LOGGER.entering(LOG_CLASS, "event companion processEvent");
+
+
+      portletResp.setRenderParameters(portletReq);
+
+      long tid = Thread.currentThread().getId();
+      portletReq.setAttribute(THREADID_ATTR, tid);
+
+      StringWriter writer = new StringWriter();
+
+      JSR286SpecTestCaseDetails tcd = new JSR286SpecTestCaseDetails();
+
+      // Create result objects for the tests
+
+      /* TestCase: V2AddlRequestTests_SPEC2_11_EventAttr_attributes1          */
+      /* Details: "The portlet can access a map with user information         */
+      /* attributes via the request attribute PortletRequest.USER_INFO"       */
+      TestResult tr0 = tcd.getTestResultFailed(V2ADDLREQUESTTESTS_SPEC2_11_EVENTATTR_ATTRIBUTES1);
+      /* TODO: implement test */
+      tr0.appendTcDetail("Not implemented.");
+      tr0.writeTo(writer);
+
+      /* TestCase: V2AddlRequestTests_SPEC2_11_EventAttr_attributes2          */
+      /* Details: "The PortletRequest.CCPP_PROFILE request attribute must     */
+      /* return a javax.ccpp.Profile based on the current portlet request"    */
+      TestResult tr1 = tcd.getTestResultFailed(V2ADDLREQUESTTESTS_SPEC2_11_EVENTATTR_ATTRIBUTES2);
+      /* TODO: implement test */
+      tr1.appendTcDetail("Not implemented.");
+      tr1.writeTo(writer);
+
+      /* TestCase: V2AddlRequestTests_SPEC2_11_EventAttr_attributes7          */
+      /* Details: "During event processing, the LIFECYCLE_PHASE               */
+      /* (\"javax.portlet.lifecycle_phase\") attribute will contain the       */
+      /* string \"EVENT_PHASE\""                                              */
+      TestResult tr2 = tcd.getTestResultFailed(V2ADDLREQUESTTESTS_SPEC2_11_EVENTATTR_ATTRIBUTES7);
+      /* TODO: implement test */
+      tr2.appendTcDetail("Not implemented.");
+      tr2.writeTo(writer);
+
+      portletReq.getPortletSession().setAttribute(
+                   Constants.RESULT_ATTR_PREFIX + "AddlRequestTests_SPEC2_11_EventAttr",
+                   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>AddlRequestTests_SPEC2_11_EventAttr_event</p>\n");
+
+      String msg = (String) portletReq.getPortletSession()
+            .getAttribute(RESULT_ATTR_PREFIX + "AddlRequestTests_SPEC2_11_EventAttr", APPLICATION_SCOPE);
+      msg = (msg==null) ? "Not ready. click test case link." : msg;
+      writer.write("<p>" + msg + "</p>\n");
+
+   }
+
+}

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/23a1c547/portlet-tck_3.0/V2AddlRequestTests/src/main/java/javax/portlet/tck/portlets/AddlRequestTests_SPEC2_11_EventReq.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlRequestTests/src/main/java/javax/portlet/tck/portlets/AddlRequestTests_SPEC2_11_EventReq.java b/portlet-tck_3.0/V2AddlRequestTests/src/main/java/javax/portlet/tck/portlets/AddlRequestTests_SPEC2_11_EventReq.java
new file mode 100644
index 0000000..43770d8
--- /dev/null
+++ b/portlet-tck_3.0/V2AddlRequestTests/src/main/java/javax/portlet/tck/portlets/AddlRequestTests_SPEC2_11_EventReq.java
@@ -0,0 +1,190 @@
+/*  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 AddlRequestTests_SPEC2_11_EventReq_event
+ *
+ */
+public class AddlRequestTests_SPEC2_11_EventReq implements Portlet, ResourceServingPortlet {
+   private static final String LOG_CLASS = 
+         AddlRequestTests_SPEC2_11_EventReq.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();
+
+      QName eventQName = new QName(TCKNAMESPACE,
+             "AddlRequestTests_SPEC2_11_EventReq");
+      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: V2AddlRequestTests_SPEC2_11_EventReq_contentType1          */
+      /* Details: "The getResponseContentType method returns a String         */
+      /* representing the default content type the portlet container          */
+      /* assumes for the output"                                              */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2AddlRequestTests_SPEC2_11_EventReq_contentType1", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2AddlRequestTests_SPEC2_11_EventReq_contentType2          */
+      /* Details: "The getResponseContentTypes method returns an              */
+      /* Enumeration of String elements representing the acceptable content   */
+      /* types for the output in order of preference"                         */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2AddlRequestTests_SPEC2_11_EventReq_contentType2", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2AddlRequestTests_SPEC2_11_EventReq_contentType3          */
+      /* Details: "The first element of the Enumeration returned by the       */
+      /* getResponseContentTypes method must equal the value returned by      */
+      /* the getResponseContentType method"                                   */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2AddlRequestTests_SPEC2_11_EventReq_contentType3", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2AddlRequestTests_SPEC2_11_EventReq_contentType4          */
+      /* Details: "If a portlet defines support for all content types using   */
+      /* a wildcard and the portlet container supports all content types,     */
+      /* the getResponseContentType may return the wildcard"                  */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2AddlRequestTests_SPEC2_11_EventReq_contentType4", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2AddlRequestTests_SPEC2_11_EventReq_contentType5          */
+      /* Details: "If a portlet defines support for all content types using   */
+      /* a wildcard and the portlet container supports all content types,     */
+      /* the getResponseContentType may return the preferred content type"    */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2AddlRequestTests_SPEC2_11_EventReq_contentType5", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2AddlRequestTests_SPEC2_11_EventReq_windowId4             */
+      /* Details: "The string returned by getWindowID method must be the      */
+      /* same ID used for scoping portlet-scope session attributes"           */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2AddlRequestTests_SPEC2_11_EventReq_windowId4", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2AddlRequestTests_SPEC2_11_EventReq_contentType8          */
+      /* Details: "Within the processEvent method, the content type must      */
+      /* include only the MIME type, not the character set"                   */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2AddlRequestTests_SPEC2_11_EventReq_contentType8", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2AddlRequestTests_SPEC2_11_EventReq_contentType9          */
+      /* Details: "Within the processEvent method, the                        */
+      /* getResponseContentTypes method must return only the content types    */
+      /* supported by the current portlet mode"                               */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2AddlRequestTests_SPEC2_11_EventReq_contentType9", aurl);
+         tb.writeTo(writer);
+      }
+
+   }
+
+}

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/23a1c547/portlet-tck_3.0/V2AddlRequestTests/src/main/java/javax/portlet/tck/portlets/AddlRequestTests_SPEC2_11_EventReq_event.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlRequestTests/src/main/java/javax/portlet/tck/portlets/AddlRequestTests_SPEC2_11_EventReq_event.java b/portlet-tck_3.0/V2AddlRequestTests/src/main/java/javax/portlet/tck/portlets/AddlRequestTests_SPEC2_11_EventReq_event.java
new file mode 100644
index 0000000..5799f86
--- /dev/null
+++ b/portlet-tck_3.0/V2AddlRequestTests/src/main/java/javax/portlet/tck/portlets/AddlRequestTests_SPEC2_11_EventReq_event.java
@@ -0,0 +1,179 @@
+/*  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.constants.Constants.*;
+import static javax.portlet.tck.beans.JSR286SpecTestCaseDetails.*;
+import static javax.portlet.PortletSession.*;
+
+/**
+ * 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 AddlRequestTests_SPEC2_11_EventReq_event implements Portlet, EventPortlet, ResourceServingPortlet {
+   private static final String LOG_CLASS = 
+         AddlRequestTests_SPEC2_11_EventReq_event.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, "event companion processAction - ERROR!!");
+   }
+
+   @Override
+   public void serveResource(ResourceRequest portletReq, ResourceResponse portletResp)
+         throws PortletException, IOException {
+      LOGGER.entering(LOG_CLASS, "event companion serveResource - ERROR!!");
+   }
+
+   @Override
+   public void processEvent(EventRequest portletReq, EventResponse portletResp)
+         throws PortletException, IOException {
+      LOGGER.entering(LOG_CLASS, "event companion processEvent");
+
+
+      portletResp.setRenderParameters(portletReq);
+
+      long tid = Thread.currentThread().getId();
+      portletReq.setAttribute(THREADID_ATTR, tid);
+
+      StringWriter writer = new StringWriter();
+
+      JSR286SpecTestCaseDetails tcd = new JSR286SpecTestCaseDetails();
+
+      // Create result objects for the tests
+
+      /* TestCase: V2AddlRequestTests_SPEC2_11_EventReq_contentType1          */
+      /* Details: "The getResponseContentType method returns a String         */
+      /* representing the default content type the portlet container          */
+      /* assumes for the output"                                              */
+      TestResult tr0 = tcd.getTestResultFailed(V2ADDLREQUESTTESTS_SPEC2_11_EVENTREQ_CONTENTTYPE1);
+      /* TODO: implement test */
+      tr0.appendTcDetail("Not implemented.");
+      tr0.writeTo(writer);
+
+      /* TestCase: V2AddlRequestTests_SPEC2_11_EventReq_contentType2          */
+      /* Details: "The getResponseContentTypes method returns an              */
+      /* Enumeration of String elements representing the acceptable content   */
+      /* types for the output in order of preference"                         */
+      TestResult tr1 = tcd.getTestResultFailed(V2ADDLREQUESTTESTS_SPEC2_11_EVENTREQ_CONTENTTYPE2);
+      /* TODO: implement test */
+      tr1.appendTcDetail("Not implemented.");
+      tr1.writeTo(writer);
+
+      /* TestCase: V2AddlRequestTests_SPEC2_11_EventReq_contentType3          */
+      /* Details: "The first element of the Enumeration returned by the       */
+      /* getResponseContentTypes method must equal the value returned by      */
+      /* the getResponseContentType method"                                   */
+      TestResult tr2 = tcd.getTestResultFailed(V2ADDLREQUESTTESTS_SPEC2_11_EVENTREQ_CONTENTTYPE3);
+      /* TODO: implement test */
+      tr2.appendTcDetail("Not implemented.");
+      tr2.writeTo(writer);
+
+      /* TestCase: V2AddlRequestTests_SPEC2_11_EventReq_contentType4          */
+      /* Details: "If a portlet defines support for all content types using   */
+      /* a wildcard and the portlet container supports all content types,     */
+      /* the getResponseContentType may return the wildcard"                  */
+      TestResult tr3 = tcd.getTestResultFailed(V2ADDLREQUESTTESTS_SPEC2_11_EVENTREQ_CONTENTTYPE4);
+      /* TODO: implement test */
+      tr3.appendTcDetail("Not implemented.");
+      tr3.writeTo(writer);
+
+      /* TestCase: V2AddlRequestTests_SPEC2_11_EventReq_contentType5          */
+      /* Details: "If a portlet defines support for all content types using   */
+      /* a wildcard and the portlet container supports all content types,     */
+      /* the getResponseContentType may return the preferred content type"    */
+      TestResult tr4 = tcd.getTestResultFailed(V2ADDLREQUESTTESTS_SPEC2_11_EVENTREQ_CONTENTTYPE5);
+      /* TODO: implement test */
+      tr4.appendTcDetail("Not implemented.");
+      tr4.writeTo(writer);
+
+      /* TestCase: V2AddlRequestTests_SPEC2_11_EventReq_windowId4             */
+      /* Details: "The string returned by getWindowID method must be the      */
+      /* same ID used for scoping portlet-scope session attributes"           */
+      TestResult tr5 = tcd.getTestResultFailed(V2ADDLREQUESTTESTS_SPEC2_11_EVENTREQ_WINDOWID4);
+      /* TODO: implement test */
+      tr5.appendTcDetail("Not implemented.");
+      tr5.writeTo(writer);
+
+      /* TestCase: V2AddlRequestTests_SPEC2_11_EventReq_contentType8          */
+      /* Details: "Within the processEvent method, the content type must      */
+      /* include only the MIME type, not the character set"                   */
+      TestResult tr6 = tcd.getTestResultFailed(V2ADDLREQUESTTESTS_SPEC2_11_EVENTREQ_CONTENTTYPE8);
+      /* TODO: implement test */
+      tr6.appendTcDetail("Not implemented.");
+      tr6.writeTo(writer);
+
+      /* TestCase: V2AddlRequestTests_SPEC2_11_EventReq_contentType9          */
+      /* Details: "Within the processEvent method, the                        */
+      /* getResponseContentTypes method must return only the content types    */
+      /* supported by the current portlet mode"                               */
+      TestResult tr7 = tcd.getTestResultFailed(V2ADDLREQUESTTESTS_SPEC2_11_EVENTREQ_CONTENTTYPE9);
+      /* TODO: implement test */
+      tr7.appendTcDetail("Not implemented.");
+      tr7.writeTo(writer);
+
+      portletReq.getPortletSession().setAttribute(
+                   Constants.RESULT_ATTR_PREFIX + "AddlRequestTests_SPEC2_11_EventReq",
+                   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>AddlRequestTests_SPEC2_11_EventReq_event</p>\n");
+
+      String msg = (String) portletReq.getPortletSession()
+            .getAttribute(RESULT_ATTR_PREFIX + "AddlRequestTests_SPEC2_11_EventReq", APPLICATION_SCOPE);
+      msg = (msg==null) ? "Not ready. click test case link." : msg;
+      writer.write("<p>" + msg + "</p>\n");
+
+   }
+
+}

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/23a1c547/portlet-tck_3.0/V2AddlRequestTests/src/main/java/javax/portlet/tck/portlets/AddlRequestTests_SPEC2_11_Event_event.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlRequestTests/src/main/java/javax/portlet/tck/portlets/AddlRequestTests_SPEC2_11_Event_event.java b/portlet-tck_3.0/V2AddlRequestTests/src/main/java/javax/portlet/tck/portlets/AddlRequestTests_SPEC2_11_Event_event.java
new file mode 100644
index 0000000..11b165a
--- /dev/null
+++ b/portlet-tck_3.0/V2AddlRequestTests/src/main/java/javax/portlet/tck/portlets/AddlRequestTests_SPEC2_11_Event_event.java
@@ -0,0 +1,170 @@
+/*  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.constants.Constants.*;
+import static javax.portlet.tck.beans.JSR286SpecTestCaseDetails.*;
+import static javax.portlet.PortletSession.*;
+
+/**
+ * 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 AddlRequestTests_SPEC2_11_Event_event implements Portlet, EventPortlet, ResourceServingPortlet {
+   private static final String LOG_CLASS = 
+         AddlRequestTests_SPEC2_11_Event_event.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, "event companion processAction - ERROR!!");
+   }
+
+   @Override
+   public void serveResource(ResourceRequest portletReq, ResourceResponse portletResp)
+         throws PortletException, IOException {
+      LOGGER.entering(LOG_CLASS, "event companion serveResource - ERROR!!");
+   }
+
+   @Override
+   public void processEvent(EventRequest portletReq, EventResponse portletResp)
+         throws PortletException, IOException {
+      LOGGER.entering(LOG_CLASS, "event companion processEvent");
+
+
+      portletResp.setRenderParameters(portletReq);
+
+      long tid = Thread.currentThread().getId();
+      portletReq.setAttribute(THREADID_ATTR, tid);
+
+      StringWriter writer = new StringWriter();
+
+      JSR286SpecTestCaseDetails tcd = new JSR286SpecTestCaseDetails();
+
+      // Create result objects for the tests
+
+      /* TestCase: V2AddlRequestTests_SPEC2_11_Event_parameters1              */
+      /* Details: "If a portlet receives a request from a client request      */
+      /* targeted to the portlet itself, the parameters must be the string    */
+      /* parameters encoded in the URL (added when creating the PortletURL)   */
+      /* and the string parameters sent by the client to the portlet as       */
+      /* part of the client request"                                          */
+      TestResult tr0 = tcd.getTestResultFailed(V2ADDLREQUESTTESTS_SPEC2_11_EVENT_PARAMETERS1);
+      /* TODO: implement test */
+      tr0.appendTcDetail("Not implemented.");
+      tr0.writeTo(writer);
+
+      /* TestCase: V2AddlRequestTests_SPEC2_11_Event_parameters2              */
+      /* Details: "The parameters the request object returns must be          */
+      /* \"x-www-form-urlencoded\" decoded"                                   */
+      TestResult tr1 = tcd.getTestResultFailed(V2ADDLREQUESTTESTS_SPEC2_11_EVENT_PARAMETERS2);
+      /* TODO: implement test */
+      tr1.appendTcDetail("Not implemented.");
+      tr1.writeTo(writer);
+
+      /* TestCase: V2AddlRequestTests_SPEC2_11_Event_parameters6              */
+      /* Details: "The getParameterMap method must return an unmodifiable     */
+      /* Map object"                                                          */
+      TestResult tr2 = tcd.getTestResultFailed(V2ADDLREQUESTTESTS_SPEC2_11_EVENT_PARAMETERS6);
+      /* TODO: implement test */
+      tr2.appendTcDetail("Not implemented.");
+      tr2.writeTo(writer);
+
+      /* TestCase: V2AddlRequestTests_SPEC2_11_Event_parameters12             */
+      /* Details: "If a portlet receives an event that is the result of a     */
+      /* client request targeted to another portlet in the portal page, the   */
+      /* parameters should be the same parameters as of the previous render   */
+      /* request from this client"                                            */
+      TestResult tr3 = tcd.getTestResultFailed(V2ADDLREQUESTTESTS_SPEC2_11_EVENT_PARAMETERS12);
+      /* TODO: implement test */
+      tr3.appendTcDetail("Not implemented.");
+      tr3.writeTo(writer);
+
+      /* TestCase: V2AddlRequestTests_SPEC2_11_Event_publicRenderParameters15 */
+      /* Details: "A map of private parameters can be obtained through the    */
+      /* getPrivateParameterMap method"                                       */
+      TestResult tr4 = tcd.getTestResultFailed(V2ADDLREQUESTTESTS_SPEC2_11_EVENT_PUBLICRENDERPARAMETERS15);
+      /* TODO: implement test */
+      tr4.appendTcDetail("Not implemented.");
+      tr4.writeTo(writer);
+
+      /* TestCase: V2AddlRequestTests_SPEC2_11_Event_publicRenderParameters16 */
+      /* Details: "A map of public parameters can be obtained through the     */
+      /* getPublicParameterMap method"                                        */
+      TestResult tr5 = tcd.getTestResultFailed(V2ADDLREQUESTTESTS_SPEC2_11_EVENT_PUBLICRENDERPARAMETERS16);
+      /* TODO: implement test */
+      tr5.appendTcDetail("Not implemented.");
+      tr5.writeTo(writer);
+
+      /* TestCase: V2AddlRequestTests_SPEC2_11_Event_publicRenderParameters5  */
+      /* Details: "Public render parameters are available in the              */
+      /* processEvent method"                                                 */
+      TestResult tr6 = tcd.getTestResultFailed(V2ADDLREQUESTTESTS_SPEC2_11_EVENT_PUBLICRENDERPARAMETERS5);
+      /* TODO: implement test */
+      tr6.appendTcDetail("Not implemented.");
+      tr6.writeTo(writer);
+
+      portletReq.getPortletSession().setAttribute(
+                   Constants.RESULT_ATTR_PREFIX + "AddlRequestTests_SPEC2_11_Event",
+                   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>AddlRequestTests_SPEC2_11_Event_event</p>\n");
+
+      String msg = (String) portletReq.getPortletSession()
+            .getAttribute(RESULT_ATTR_PREFIX + "AddlRequestTests_SPEC2_11_Event", APPLICATION_SCOPE);
+      msg = (msg==null) ? "Not ready. click test case link." : msg;
+      writer.write("<p>" + msg + "</p>\n");
+
+   }
+
+}


[02/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.

Posted by ms...@apache.org.
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/23a1c547/portlet-tck_3.0/common/src/main/java/javax/portlet/tck/beans/JSR286SpecTestCaseDetails.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/common/src/main/java/javax/portlet/tck/beans/JSR286SpecTestCaseDetails.java b/portlet-tck_3.0/common/src/main/java/javax/portlet/tck/beans/JSR286SpecTestCaseDetails.java
index 322e3db..9fc6cab 100644
--- a/portlet-tck_3.0/common/src/main/java/javax/portlet/tck/beans/JSR286SpecTestCaseDetails.java
+++ b/portlet-tck_3.0/common/src/main/java/javax/portlet/tck/beans/JSR286SpecTestCaseDetails.java
@@ -33,1077 +33,1423 @@ import java.util.Map;
  */
 public class JSR286SpecTestCaseDetails extends TestCaseDetails {
 
-   public final static String SPEC2_2_COMPATIBILITY_DEPLOYJSR168_1 = "SPEC2_2_Compatibility_deployJSR168_1";
-   public final static String SPEC2_2_COMPATIBILITY_DEPLOYJSR168_2 = "SPEC2_2_Compatibility_deployJSR168_2";
-   public final static String SPEC2_5_INITIALIZATION_INITIALIZATION6 = "SPEC2_5_Initialization_initialization6";
-   public final static String SPEC2_5_REQUESTHANDLING_ACTION2 = "SPEC2_5_RequestHandling_action2";
-   public final static String SPEC2_5_REQUESTHANDLING_ACTION5 = "SPEC2_5_RequestHandling_action5";
-   public final static String SPEC2_5_REQUESTHANDLING_ACTION6 = "SPEC2_5_RequestHandling_action6";
-   public final static String SPEC2_5_REQUESTHANDLING_ACTION7 = "SPEC2_5_RequestHandling_action7";
-   public final static String SPEC2_5_REQUESTHANDLING_RENDER1 = "SPEC2_5_RequestHandling_render1";
-   public final static String SPEC2_5_REQUESTHANDLING_RENDER3 = "SPEC2_5_RequestHandling_render3";
-   public final static String SPEC2_5_REQUESTHANDLING_RESOURCE1 = "SPEC2_5_RequestHandling_resource1";
-   public final static String SPEC2_5_REQUESTHANDLING_RESOURCE3 = "SPEC2_5_RequestHandling_resource3";
-   public final static String SPEC2_5_REQUESTHANDLING_EXCEPTION1 = "SPEC2_5_RequestHandling_exception1";
-   public final static String SPEC2_5_REQUESTHANDLING_EXCEPTION2 = "SPEC2_5_RequestHandling_exception2";
-   public final static String SPEC2_5_REQUESTHANDLING_EXCEPTION4 = "SPEC2_5_RequestHandling_exception4";
-   public final static String SPEC2_5_REQUESTHANDLING_EXCEPTION5 = "SPEC2_5_RequestHandling_exception5";
-   public final static String SPEC2_5_GENERICPORTLET_ACTIONDISPATCHING2 = "SPEC2_5_GenericPortlet_actionDispatching2";
-   public final static String SPEC2_5_GENERICPORTLET_EVENTDISPATCHING1 = "SPEC2_5_GenericPortlet_eventDispatching1";
-   public final static String SPEC2_5_GENERICPORTLET_EVENTDISPATCHING2 = "SPEC2_5_GenericPortlet_eventDispatching2";
-   public final static String SPEC2_5_GENERICPORTLET_RENDERDISPATCHING8 = "SPEC2_5_GenericPortlet_renderDispatching8";
-   public final static String SPEC2_5_GENERICPORTLET_RENDERDISPATCHING9 = "SPEC2_5_GenericPortlet_renderDispatching9";
-   public final static String SPEC2_6_CONFIG_GETRESOURCEBUNDLE1 = "SPEC2_6_Config_getResourceBundle1";
-   public final static String SPEC2_6_CONFIG_GETRESOURCEBUNDLE2 = "SPEC2_6_Config_getResourceBundle2";
-   public final static String SPEC2_6_CONFIG_GETRESOURCEBUNDLE3 = "SPEC2_6_Config_getResourceBundle3";
-   public final static String SPEC2_6_CONFIG_GETRESOURCEBUNDLE4 = "SPEC2_6_Config_getResourceBundle4";
-   public final static String SPEC2_6_CONFIG_GETRESOURCEBUNDLE5 = "SPEC2_6_Config_getResourceBundle5";
-   public final static String SPEC2_6_CONFIG_GETRESOURCEBUNDLE6 = "SPEC2_6_Config_getResourceBundle6";
-   public final static String SPEC2_6_CONFIG_GETRESOURCEBUNDLE7 = "SPEC2_6_Config_getResourceBundle7";
-   public final static String SPEC2_6_CONFIG_GETRESOURCEBUNDLE8 = "SPEC2_6_Config_getResourceBundle8";
-   public final static String SPEC2_6_CONFIG_GETRESOURCEBUNDLE9 = "SPEC2_6_Config_getResourceBundle9";
-   public final static String SPEC2_6_CONFIG_GETRESOURCEBUNDLE10 = "SPEC2_6_Config_getResourceBundle10";
-   public final static String SPEC2_6_CONFIG_GETPUBLISHINGEVENTQNAMES3 = "SPEC2_6_Config_getPublishingEventQnames3";
-   public final static String SPEC2_6_CONFIG_GETPUBLISHINGEVENTQNAMES4 = "SPEC2_6_Config_getPublishingEventQnames4";
-   public final static String SPEC2_6_CONFIG_GETPROCESSINGEVENTQNAMES3 = "SPEC2_6_Config_getProcessingEventQnames3";
-   public final static String SPEC2_6_CONFIG_GETPROCESSINGEVENTQNAMES4 = "SPEC2_6_Config_getProcessingEventQnames4";
-   public final static String SPEC2_6_CONFIG_GETCONTAINERRUNTIMEOPTIONS6 = "SPEC2_6_Config_getContainerRuntimeOptions6";
-   public final static String SPEC2_6_CONFIG_GETCONTAINERRUNTIMEOPTIONS7 = "SPEC2_6_Config_getContainerRuntimeOptions7";
-   public final static String SPEC2_6_CONFIG_GETCONTAINERRUNTIMEOPTIONS8 = "SPEC2_6_Config_getContainerRuntimeOptions8";
-   public final static String SPEC2_6_CONFIG_GETCONTAINERRUNTIMEOPTIONS9 = "SPEC2_6_Config_getContainerRuntimeOptions9";
-   public final static String SPEC2_8_PORTLETMODES_DECLARINGPORTLETMODES1 = "SPEC2_8_PortletModes_declaringPortletModes1";
-   public final static String SPEC2_8_PORTLETMODES_DECLARINGPORTLETMODES2 = "SPEC2_8_PortletModes_declaringPortletModes2";
-   public final static String SPEC2_8_PORTLETMODES_DECLARINGPORTLETMODES3 = "SPEC2_8_PortletModes_declaringPortletModes3";
-   public final static String SPEC2_8_PORTLETMODES_DECLARINGPORTLETMODES4 = "SPEC2_8_PortletModes_declaringPortletModes4";
-   public final static String SPEC2_8_PORTLETMODES_DECLARINGPORTLETMODES5 = "SPEC2_8_PortletModes_declaringPortletModes5";
-   public final static String SPEC2_8_PORTLETMODES_DECLARINGPORTLETMODES6 = "SPEC2_8_PortletModes_declaringPortletModes6";
-   public final static String SPEC2_8_PORTLETMODES_DECLARINGPORTLETMODES7 = "SPEC2_8_PortletModes_declaringPortletModes7";
-   public final static String SPEC2_8_PORTLETMODES_DECLARINGPORTLETMODES8 = "SPEC2_8_PortletModes_declaringPortletModes8";
-   public final static String SPEC2_8_PORTLETMODES_DECLARINGPORTLETMODES9 = "SPEC2_8_PortletModes_declaringPortletModes9";
-   public final static String SPEC2_9_WINDOWSTATES_DECLARINGWINDOWSTATES1 = "SPEC2_9_WindowStates_declaringWindowStates1";
-   public final static String SPEC2_9_WINDOWSTATES_DECLARINGWINDOWSTATES2 = "SPEC2_9_WindowStates_declaringWindowStates2";
-   public final static String SPEC2_9_WINDOWSTATES_DECLARINGWINDOWSTATES3 = "SPEC2_9_WindowStates_declaringWindowStates3";
-   public final static String SPEC2_9_WINDOWSTATES_DECLARINGWINDOWSTATES4 = "SPEC2_9_WindowStates_declaringWindowStates4";
-   public final static String SPEC2_9_WINDOWSTATES_DECLARINGWINDOWSTATES5 = "SPEC2_9_WindowStates_declaringWindowStates5";
-   public final static String SPEC2_9_WINDOWSTATES_DECLARINGWINDOWSTATES6 = "SPEC2_9_WindowStates_declaringWindowStates6";
-   public final static String SPEC2_9_WINDOWSTATES_DECLARINGWINDOWSTATES7 = "SPEC2_9_WindowStates_declaringWindowStates7";
-   public final static String SPEC2_13_RESOURCESERVING_PROPERTIES3 = "SPEC2_13_ResourceServing_properties3";
-   public final static String SPEC2_13_RESOURCESERVING_PROPERTIES4 = "SPEC2_13_ResourceServing_properties4";
-   public final static String SPEC2_13_RESOURCESERVING_PROPERTIES7 = "SPEC2_13_ResourceServing_properties7";
-   public final static String SPEC2_13_RESOURCESERVING_PROPERTIES8 = "SPEC2_13_ResourceServing_properties8";
-   public final static String SPEC2_13_RESOURCESERVING_RESOURCEURLS2 = "SPEC2_13_ResourceServing_resourceURLs2";
-   public final static String SPEC2_13_RESOURCESERVING_RESOURCEURLS3 = "SPEC2_13_ResourceServing_resourceURLs3";
-   public final static String SPEC2_13_RESOURCESERVING_RESOURCEURLS4 = "SPEC2_13_ResourceServing_resourceURLs4";
-   public final static String SPEC2_13_RESOURCESERVING_RESOURCEURLS5 = "SPEC2_13_ResourceServing_resourceURLs5";
-   public final static String SPEC2_13_RESOURCESERVING_RESOURCEURLS6 = "SPEC2_13_ResourceServing_resourceURLs6";
-   public final static String SPEC2_13_RESOURCESERVING_RESOURCEURLS7 = "SPEC2_13_ResourceServing_resourceURLs7";
-   public final static String SPEC2_13_RESOURCESERVING_RESOURCEURLS8 = "SPEC2_13_ResourceServing_resourceURLs8";
-   public final static String SPEC2_13_RESOURCESERVING_RESOURCEURLS9 = "SPEC2_13_ResourceServing_resourceURLs9";
-   public final static String SPEC2_13_RESOURCESERVINGCACHE_CACHING1 = "SPEC2_13_ResourceServingCache_caching1";
-   public final static String SPEC2_13_RESOURCESERVINGCACHE_CACHING2 = "SPEC2_13_ResourceServingCache_caching2";
-   public final static String SPEC2_13_RESOURCESERVINGCACHE_CACHING3 = "SPEC2_13_ResourceServingCache_caching3";
-   public final static String SPEC2_13_RESOURCESERVINGCACHE_CACHINGFULL1 = "SPEC2_13_ResourceServingCache_cachingFULL1";
-   public final static String SPEC2_13_RESOURCESERVINGCACHE_CACHINGFULL2 = "SPEC2_13_ResourceServingCache_cachingFULL2";
-   public final static String SPEC2_13_RESOURCESERVINGCACHE_CACHINGFULL3 = "SPEC2_13_ResourceServingCache_cachingFULL3";
-   public final static String SPEC2_13_RESOURCESERVINGCACHE_CACHINGFULL4 = "SPEC2_13_ResourceServingCache_cachingFULL4";
-   public final static String SPEC2_13_RESOURCESERVINGCACHE_CACHINGFULL5 = "SPEC2_13_ResourceServingCache_cachingFULL5";
-   public final static String SPEC2_13_RESOURCESERVINGCACHE_CACHINGFULL6 = "SPEC2_13_ResourceServingCache_cachingFULL6";
-   public final static String SPEC2_13_RESOURCESERVINGCACHE_CACHINGFULL7 = "SPEC2_13_ResourceServingCache_cachingFULL7";
-   public final static String SPEC2_13_RESOURCESERVINGCACHE_CACHINGFULL8 = "SPEC2_13_ResourceServingCache_cachingFULL8";
-   public final static String SPEC2_13_RESOURCESERVINGCACHE_CACHINGFULL9 = "SPEC2_13_ResourceServingCache_cachingFULL9";
-   public final static String SPEC2_13_RESOURCESERVINGCACHE_CACHINGPORTLET1 = "SPEC2_13_ResourceServingCache_cachingPORTLET1";
-   public final static String SPEC2_13_RESOURCESERVINGCACHE_CACHINGPORTLET2 = "SPEC2_13_ResourceServingCache_cachingPORTLET2";
-   public final static String SPEC2_13_RESOURCESERVINGCACHE_CACHINGPORTLET3 = "SPEC2_13_ResourceServingCache_cachingPORTLET3";
-   public final static String SPEC2_13_RESOURCESERVINGCACHE_CACHINGPORTLET4 = "SPEC2_13_ResourceServingCache_cachingPORTLET4";
-   public final static String SPEC2_13_RESOURCESERVINGCACHE_CACHINGPORTLET5 = "SPEC2_13_ResourceServingCache_cachingPORTLET5";
-   public final static String SPEC2_13_RESOURCESERVINGCACHE_CACHINGPORTLET6 = "SPEC2_13_ResourceServingCache_cachingPORTLET6";
-   public final static String SPEC2_13_RESOURCESERVINGCACHE_CACHINGPORTLET7 = "SPEC2_13_ResourceServingCache_cachingPORTLET7";
-   public final static String SPEC2_13_RESOURCESERVINGCACHE_CACHINGPORTLET8 = "SPEC2_13_ResourceServingCache_cachingPORTLET8";
-   public final static String SPEC2_13_RESOURCESERVINGCACHE_CACHINGPORTLET9 = "SPEC2_13_ResourceServingCache_cachingPORTLET9";
-   public final static String SPEC2_13_RESOURCESERVINGCACHE_CACHINGPAGE1 = "SPEC2_13_ResourceServingCache_cachingPAGE1";
-   public final static String SPEC2_13_RESOURCESERVINGCACHE_CACHINGPAGE2 = "SPEC2_13_ResourceServingCache_cachingPAGE2";
-   public final static String SPEC2_13_RESOURCESERVINGCACHE_CACHINGPAGE3 = "SPEC2_13_ResourceServingCache_cachingPAGE3";
-   public final static String SPEC2_13_RESOURCESERVINGCACHE_CACHINGPAGE4 = "SPEC2_13_ResourceServingCache_cachingPAGE4";
-   public final static String SPEC2_13_RESOURCESERVINGCACHE_CACHINGPAGE5 = "SPEC2_13_ResourceServingCache_cachingPAGE5";
-   public final static String SPEC2_13_RESOURCESERVINGCACHE_CACHINGPAGE6 = "SPEC2_13_ResourceServingCache_cachingPAGE6";
-   public final static String SPEC2_13_RESOURCESERVINGCACHE_CACHINGPAGE7 = "SPEC2_13_ResourceServingCache_cachingPAGE7";
-   public final static String SPEC2_13_RESOURCESERVINGCACHE_CACHINGPAGE8 = "SPEC2_13_ResourceServingCache_cachingPAGE8";
-   public final static String SPEC2_13_RESOURCESERVINGCACHE_CACHINGPAGE9 = "SPEC2_13_ResourceServingCache_cachingPAGE9";
-   public final static String SPEC2_15_EVENT_EVENT1 = "SPEC2_15_Event_event1";
-   public final static String SPEC2_15_EVENT_EVENT2 = "SPEC2_15_Event_event2";
-   public final static String SPEC2_15_EVENT_EVENT3 = "SPEC2_15_Event_event3";
-   public final static String SPEC2_15_EVENT_EVENT4 = "SPEC2_15_Event_event4";
-   public final static String SPEC2_15_EVENT_EVENT5 = "SPEC2_15_Event_event5";
-   public final static String SPEC2_15_EVENT_EVENT6 = "SPEC2_15_Event_event6";
-   public final static String SPEC2_15_EVENT_EVENT7 = "SPEC2_15_Event_event7";
-   public final static String SPEC2_15_EVENT_EVENT8 = "SPEC2_15_Event_event8";
-   public final static String SPEC2_15_EVENT_EVENT9 = "SPEC2_15_Event_event9";
-   public final static String SPEC2_15_EVENT_EVENT10 = "SPEC2_15_Event_event10";
-   public final static String SPEC2_15_EVENT_EVENT11 = "SPEC2_15_Event_event11";
-   public final static String SPEC2_15_EVENT_EVENT12 = "SPEC2_15_Event_event12";
-   public final static String SPEC2_15_EVENT_EVENT13 = "SPEC2_15_Event_event13";
-   public final static String SPEC2_15_EVENT_EVENT14 = "SPEC2_15_Event_event14";
-   public final static String SPEC2_15_EVENT_EVENT15 = "SPEC2_15_Event_event15";
-   public final static String SPEC2_15_EVENT_EVENT16 = "SPEC2_15_Event_event16";
-   public final static String SPEC2_15_EVENT_EVENTPROCESSACTION1 = "SPEC2_15_Event_eventProcessAction1";
-   public final static String SPEC2_15_EVENT_EVENTPROCESSACTION2 = "SPEC2_15_Event_eventProcessAction2";
-   public final static String SPEC2_15_EVENT_EVENTPROCESSACTION3 = "SPEC2_15_Event_eventProcessAction3";
-   public final static String SPEC2_15_EVENT_EVENTPROCESSACTION4 = "SPEC2_15_Event_eventProcessAction4";
-   public final static String SPEC2_15_EVENT_EVENTPROCESSACTION5 = "SPEC2_15_Event_eventProcessAction5";
-   public final static String SPEC2_15_EVENT_EVENTPROCESSACTION6 = "SPEC2_15_Event_eventProcessAction6";
-   public final static String SPEC2_15_EVENT_EVENTPROCESSACTION7 = "SPEC2_15_Event_eventProcessAction7";
-   public final static String SPEC2_15_EVENT_EVENTPROCESSACTION8 = "SPEC2_15_Event_eventProcessAction8";
-   public final static String SPEC2_15_EVENT_EVENTPROCESSACTION9 = "SPEC2_15_Event_eventProcessAction9";
-   public final static String SPEC2_15_EVENT_EVENTPROCESSEVENT1 = "SPEC2_15_Event_eventProcessEvent1";
-   public final static String SPEC2_15_EVENT_EVENTPROCESSEVENT2 = "SPEC2_15_Event_eventProcessEvent2";
-   public final static String SPEC2_15_EVENT_EVENTPROCESSEVENT3 = "SPEC2_15_Event_eventProcessEvent3";
-   public final static String SPEC2_15_EVENT_EVENTPROCESSEVENT4 = "SPEC2_15_Event_eventProcessEvent4";
-   public final static String SPEC2_15_EVENT_EVENTPROCESSEVENT5 = "SPEC2_15_Event_eventProcessEvent5";
-   public final static String SPEC2_15_EVENT_EVENTPROCESSEVENT6 = "SPEC2_15_Event_eventProcessEvent6";
-   public final static String SPEC2_15_EVENT_EVENTPROCESSEVENT7 = "SPEC2_15_Event_eventProcessEvent7";
-   public final static String SPEC2_15_EVENT_EVENTPROCESSEVENT8 = "SPEC2_15_Event_eventProcessEvent8";
-   public final static String SPEC2_15_EVENT_EVENTPROCESSEVENT9 = "SPEC2_15_Event_eventProcessEvent9";
-   public final static String SPEC2_7_URLRENDER_RENDERURL0 = "SPEC2_7_UrlRender_renderURL0";
-   public final static String SPEC2_7_URLRENDER_RENDERURL1 = "SPEC2_7_UrlRender_renderURL1";
-   public final static String SPEC2_7_URLRENDER_RENDERURL2 = "SPEC2_7_UrlRender_renderURL2";
-   public final static String SPEC2_7_URLRENDER_RENDERURL3 = "SPEC2_7_UrlRender_renderURL3";
-   public final static String SPEC2_7_URLRENDER_RENDERURL4 = "SPEC2_7_UrlRender_renderURL4";
-   public final static String SPEC2_7_URLRENDER_RENDERURL5 = "SPEC2_7_UrlRender_renderURL5";
-   public final static String SPEC2_7_URLRENDER_RENDERURL6 = "SPEC2_7_UrlRender_renderURL6";
-   public final static String SPEC2_7_URLRENDER_RENDERURL7 = "SPEC2_7_UrlRender_renderURL7";
-   public final static String SPEC2_7_URLRENDER_RENDERURL8 = "SPEC2_7_UrlRender_renderURL8";
-   public final static String SPEC2_7_URLRENDER_RENDERURL9 = "SPEC2_7_UrlRender_renderURL9";
-   public final static String SPEC2_7_URLRENDER_RENDERURL10 = "SPEC2_7_UrlRender_renderURL10";
-   public final static String SPEC2_7_URLRENDER_RENDERURL11 = "SPEC2_7_UrlRender_renderURL11";
-   public final static String SPEC2_7_URLACTION_ACTIONURL1 = "SPEC2_7_UrlAction_actionURL1";
-   public final static String SPEC2_7_URLACTION_ACTIONURL2 = "SPEC2_7_UrlAction_actionURL2";
-   public final static String SPEC2_7_URLACTION_ACTIONURL3 = "SPEC2_7_UrlAction_actionURL3";
-   public final static String SPEC2_7_URLACTION_ACTIONURL4 = "SPEC2_7_UrlAction_actionURL4";
-   public final static String SPEC2_7_URLACTION_ACTIONURL5 = "SPEC2_7_UrlAction_actionURL5";
-   public final static String SPEC2_7_URLACTION_ACTIONURL6 = "SPEC2_7_UrlAction_actionURL6";
-   public final static String SPEC2_7_URLACTION_ACTIONURL7 = "SPEC2_7_UrlAction_actionURL7";
-   public final static String SPEC2_7_URLACTION_ACTIONURL8 = "SPEC2_7_UrlAction_actionURL8";
-   public final static String SPEC2_7_URLRESOURCE_RESOURCEURL1 = "SPEC2_7_UrlResource_resourceURL1";
-   public final static String SPEC2_7_URLRESOURCE_RESOURCEURL2 = "SPEC2_7_UrlResource_resourceURL2";
-   public final static String SPEC2_7_URLRESOURCE_RESOURCEURL3 = "SPEC2_7_UrlResource_resourceURL3";
-   public final static String SPEC2_7_URLRESOURCE_RESOURCEURL4 = "SPEC2_7_UrlResource_resourceURL4";
-   public final static String SPEC2_7_URLRESOURCE_RESOURCEURL5 = "SPEC2_7_UrlResource_resourceURL5";
-   public final static String SPEC2_7_URLRESOURCE_RESOURCEURL6 = "SPEC2_7_UrlResource_resourceURL6";
-   public final static String SPEC2_7_URLRESOURCE_RESOURCEURL7 = "SPEC2_7_UrlResource_resourceURL7";
-   public final static String SPEC2_7_URLRESOURCE_RESOURCEURL8 = "SPEC2_7_UrlResource_resourceURL8";
-   public final static String SPEC2_7_URLRESOURCE_RESOURCEURL9 = "SPEC2_7_UrlResource_resourceURL9";
-   public final static String SPEC2_7_URL_PORTLETMODE1 = "SPEC2_7_Url_portletMode1";
-   public final static String SPEC2_7_URL_PORTLETMODE2 = "SPEC2_7_Url_portletMode2";
-   public final static String SPEC2_7_URL_PORTLETMODE4 = "SPEC2_7_Url_portletMode4";
-   public final static String SPEC2_7_URL_WINDOWSTATE1 = "SPEC2_7_Url_windowState1";
-   public final static String SPEC2_7_URL_WINDOWSTATE2 = "SPEC2_7_Url_windowState2";
-   public final static String SPEC2_7_URL_WINDOWSTATE4 = "SPEC2_7_Url_windowState4";
-   public final static String SPEC2_7_URL_SETSECURE1 = "SPEC2_7_Url_setSecure1";
-   public final static String SPEC2_7_URL_SETSECURE3 = "SPEC2_7_Url_setSecure3";
-   public final static String SPEC2_7_URLLISTENER_PORTLETURLGENERATIONLISTENER6 = "SPEC2_7_UrlListener_portletURLGenerationListener6";
-   public final static String SPEC2_10_CONTEXT_PORTLETCONTEXTSERVLETCONTEXT1 = "SPEC2_10_Context_portletContextServletContext1";
-   public final static String SPEC2_10_CONTEXT_PORTLETCONTEXTSERVLETCONTEXT2 = "SPEC2_10_Context_portletContextServletContext2";
-   public final static String SPEC2_10_CONTEXT_PORTLETCONTEXTSERVLETCONTEXT3 = "SPEC2_10_Context_portletContextServletContext3";
-   public final static String SPEC2_10_CONTEXT_PORTLETCONTEXTSERVLETCONTEXT4 = "SPEC2_10_Context_portletContextServletContext4";
-   public final static String SPEC2_10_CONTEXT_PORTLETCONTEXTSERVLETCONTEXT7 = "SPEC2_10_Context_portletContextServletContext7";
-   public final static String SPEC2_10_CONTEXT_PORTLETCONTEXTSERVLETCONTEXT8 = "SPEC2_10_Context_portletContextServletContext8";
-   public final static String SPEC2_10_CONTEXT_PORTLETCONTEXTSERVLETCONTEXT9 = "SPEC2_10_Context_portletContextServletContext9";
-   public final static String SPEC2_10_CONTEXT_PORTLETCONTEXTSERVLETCONTEXT10 = "SPEC2_10_Context_portletContextServletContext10";
-   public final static String SPEC2_10_CONTEXT_PORTLETCONTEXTSERVLETCONTEXT11 = "SPEC2_10_Context_portletContextServletContext11";
-   public final static String SPEC2_10_CONTEXT_PORTLETCONTEXTSERVLETCONTEXT12 = "SPEC2_10_Context_portletContextServletContext12";
-   public final static String SPEC2_10_CONTEXT_PORTLETCONTEXTSERVLETCONTEXT13 = "SPEC2_10_Context_portletContextServletContext13";
-   public final static String SPEC2_10_CONTEXT_PORTLETCONTEXTSERVLETCONTEXT14 = "SPEC2_10_Context_portletContextServletContext14";
-   public final static String SPEC2_10_CONTEXT_PORTLETCONTEXTSERVLETCONTEXT15 = "SPEC2_10_Context_portletContextServletContext15";
-   public final static String SPEC2_10_CONTEXT_PORTLETCONTEXTSERVLETCONTEXT16 = "SPEC2_10_Context_portletContextServletContext16";
-   public final static String SPEC2_10_CONTEXT_PORTLETCONTEXTSERVLETCONTEXT17 = "SPEC2_10_Context_portletContextServletContext17";
-   public final static String SPEC2_10_CONTEXT_PORTLETCONTEXTSERVLETCONTEXT18 = "SPEC2_10_Context_portletContextServletContext18";
-   public final static String SPEC2_10_CONTEXTOPTIONS_CONTAINERRUNTIMEOPTIONS1 = "SPEC2_10_ContextOptions_containerRuntimeOptions1";
-   public final static String SPEC2_10_CONTEXTOPTIONS_ACTIONSCOPEDREQUESTATTRIBUTES1 = "SPEC2_10_ContextOptions_actionScopedRequestAttributes1";
-   public final static String SPEC2_10_CONTEXTOPTIONS_ACTIONSCOPEDREQUESTATTRIBUTES2 = "SPEC2_10_ContextOptions_actionScopedRequestAttributes2";
-   public final static String SPEC2_10_CONTEXTOPTIONS_ACTIONSCOPEDREQUESTATTRIBUTES3 = "SPEC2_10_ContextOptions_actionScopedRequestAttributes3";
-   public final static String SPEC2_10_CONTEXTOPTIONS_ACTIONSCOPEDREQUESTATTRIBUTES4 = "SPEC2_10_ContextOptions_actionScopedRequestAttributes4";
-   public final static String SPEC2_10_CONTEXTOPTIONS_ACTIONSCOPEDREQUESTATTRIBUTES5 = "SPEC2_10_ContextOptions_actionScopedRequestAttributes5";
-   public final static String SPEC2_10_CONTEXTOPTIONS_ACTIONSCOPEDREQUESTATTRIBUTES6 = "SPEC2_10_ContextOptions_actionScopedRequestAttributes6";
-   public final static String SPEC2_10_CONTEXTOPTIONS_ACTIONSCOPEDREQUESTATTRIBUTES7 = "SPEC2_10_ContextOptions_actionScopedRequestAttributes7";
-   public final static String SPEC2_10_CONTEXTOPTIONS_ACTIONSCOPEDREQUESTATTRIBUTES8 = "SPEC2_10_ContextOptions_actionScopedRequestAttributes8";
-   public final static String SPEC2_10_CONTEXTOPTIONS_ACTIONSCOPEDREQUESTATTRIBUTES9 = "SPEC2_10_ContextOptions_actionScopedRequestAttributes9";
-   public final static String SPEC2_10_CONTEXTOPTIONS_ACTIONSCOPEDREQUESTATTRIBUTES0 = "SPEC2_10_ContextOptions_actionScopedRequestAttributes0";
-   public final static String SPEC2_10_CONTEXTOPTIONS_ACTIONSCOPEDREQUESTATTRIBUTES11 = "SPEC2_10_ContextOptions_actionScopedRequestAttributes11";
-   public final static String SPEC2_10_CONTEXTOPTIONS_ACTIONSCOPEDREQUESTATTRIBUTES12 = "SPEC2_10_ContextOptions_actionScopedRequestAttributes12";
-   public final static String SPEC2_10_CONTEXTOPTIONS_ACTIONSCOPEDREQUESTATTRIBUTES13 = "SPEC2_10_ContextOptions_actionScopedRequestAttributes13";
-   public final static String SPEC2_17_PREFERENCES_VALUES6 = "SPEC2_17_Preferences_values6";
-   public final static String SPEC2_17_PREFERENCES_VALUES7 = "SPEC2_17_Preferences_values7";
-   public final static String SPEC2_17_PREFERENCES_VALUES8 = "SPEC2_17_Preferences_values8";
-   public final static String SPEC2_17_PREFERENCES_VALUES9 = "SPEC2_17_Preferences_values9";
-   public final static String SPEC2_17_PREFERENCES_VALUES10 = "SPEC2_17_Preferences_values10";
-   public final static String SPEC2_17_PREFERENCES_SETVALUES4 = "SPEC2_17_Preferences_setValues4";
-   public final static String SPEC2_17_PREFERENCES_RESET1 = "SPEC2_17_Preferences_reset1";
-   public final static String SPEC2_17_PREFERENCES_RESET2 = "SPEC2_17_Preferences_reset2";
-   public final static String SPEC2_17_PREFERENCES_STORE1 = "SPEC2_17_Preferences_store1";
-   public final static String SPEC2_17_PREFERENCES_STORE2 = "SPEC2_17_Preferences_store2";
-   public final static String SPEC2_17_PREFERENCES_STORE3 = "SPEC2_17_Preferences_store3";
-   public final static String SPEC2_17_PREFERENCES_STORE4 = "SPEC2_17_Preferences_store4";
-   public final static String SPEC2_17_PREFERENCES_STORE5 = "SPEC2_17_Preferences_store5";
-   public final static String SPEC2_17_PREFERENCES_STORE6 = "SPEC2_17_Preferences_store6";
-   public final static String SPEC2_17_PREFERENCES_DEPLOYMENT1 = "SPEC2_17_Preferences_deployment1";
-   public final static String SPEC2_17_PREFERENCES_DEPLOYMENT2 = "SPEC2_17_Preferences_deployment2";
-   public final static String SPEC2_17_PREFERENCES_DEPLOYMENT3 = "SPEC2_17_Preferences_deployment3";
-   public final static String SPEC2_17_PREFERENCES_DEPLOYMENT4 = "SPEC2_17_Preferences_deployment4";
-   public final static String SPEC2_17_PREFERENCES_DEPLOYMENT5 = "SPEC2_17_Preferences_deployment5";
-   public final static String SPEC2_17_PREFERENCES_DEPLOYMENT6 = "SPEC2_17_Preferences_deployment6";
-   public final static String SPEC2_17_PREFERENCES_DEPLOYMENT7 = "SPEC2_17_Preferences_deployment7";
-   public final static String SPEC2_17_PREFERENCES_DEPLOYMENT8 = "SPEC2_17_Preferences_deployment8";
-   public final static String SPEC2_17_PREFERENCES_DEPLOYMENT9 = "SPEC2_17_Preferences_deployment9";
-   public final static String SPEC2_17_PREFERENCES_DEPLOYMENT10 = "SPEC2_17_Preferences_deployment10";
-   public final static String SPEC2_17_PREFERENCES_DEPLOYMENT11 = "SPEC2_17_Preferences_deployment11";
-   public final static String SPEC2_17_PREFERENCES_DEPLOYMENT12 = "SPEC2_17_Preferences_deployment12";
-   public final static String SPEC2_18_SESSIONS_SCOPE1 = "SPEC2_18_Sessions_scope1";
-   public final static String SPEC2_18_SESSIONS_SCOPE2 = "SPEC2_18_Sessions_scope2";
-   public final static String SPEC2_18_SESSIONS_SCOPE3 = "SPEC2_18_Sessions_scope3";
-   public final static String SPEC2_18_SESSIONS_SCOPE4 = "SPEC2_18_Sessions_scope4";
-   public final static String SPEC2_18_SESSIONS_SCOPE5 = "SPEC2_18_Sessions_scope5";
-   public final static String SPEC2_18_SESSIONS_SETATTRIBUTE1 = "SPEC2_18_Sessions_setAttribute1";
-   public final static String SPEC2_18_SESSIONS_SETATTRIBUTE2 = "SPEC2_18_Sessions_setAttribute2";
-   public final static String SPEC2_18_SESSIONS_SETATTRIBUTE3 = "SPEC2_18_Sessions_setAttribute3";
-   public final static String SPEC2_18_SESSIONS_GETATTRIBUTE1 = "SPEC2_18_Sessions_getAttribute1";
-   public final static String SPEC2_18_SESSIONS_GETATTRIBUTE2 = "SPEC2_18_Sessions_getAttribute2";
-   public final static String SPEC2_18_SESSIONS_GETATTRIBUTE3 = "SPEC2_18_Sessions_getAttribute3";
-   public final static String SPEC2_18_SESSIONS_REMOVEATTRIBUTE1 = "SPEC2_18_Sessions_removeAttribute1";
-   public final static String SPEC2_18_SESSIONS_REMOVEATTRIBUTE2 = "SPEC2_18_Sessions_removeAttribute2";
-   public final static String SPEC2_18_SESSIONS_REMOVEATTRIBUTE3 = "SPEC2_18_Sessions_removeAttribute3";
-   public final static String SPEC2_18_SESSIONS_GETATTRIBUTENAMES1 = "SPEC2_18_Sessions_getAttributeNames1";
-   public final static String SPEC2_18_SESSIONS_GETATTRIBUTENAMES2 = "SPEC2_18_Sessions_getAttributeNames2";
-   public final static String SPEC2_18_SESSIONS_GETATTRIBUTENAMES3 = "SPEC2_18_Sessions_getAttributeNames3";
-   public final static String SPEC2_18_SESSIONS_DECODEATTRIBUTENAME1 = "SPEC2_18_Sessions_decodeAttributeName1";
-   public final static String SPEC2_18_SESSIONS_DECODEATTRIBUTENAME2 = "SPEC2_18_Sessions_decodeAttributeName2";
-   public final static String SPEC2_18_SESSIONS_HTTPSESSION1 = "SPEC2_18_Sessions_httpSession1";
-   public final static String SPEC2_18_SESSIONS_HTTPSESSION2 = "SPEC2_18_Sessions_httpSession2";
-   public final static String SPEC2_18_SESSIONS_HTTPSESSION3 = "SPEC2_18_Sessions_httpSession3";
-   public final static String SPEC2_18_SESSIONS_HTTPSESSION4 = "SPEC2_18_Sessions_httpSession4";
-   public final static String SPEC2_18_SESSIONS_HTTPSESSION5 = "SPEC2_18_Sessions_httpSession5";
-   public final static String SPEC2_18_SESSIONS_HTTPSESSION6 = "SPEC2_18_Sessions_httpSession6";
-   public final static String SPEC2_18_SESSIONS_HTTPSESSION7 = "SPEC2_18_Sessions_httpSession7";
-   public final static String SPEC2_18_SESSIONS_HTTPSESSION8 = "SPEC2_18_Sessions_httpSession8";
-   public final static String SPEC2_18_SESSIONS_HTTPSESSION9 = "SPEC2_18_Sessions_httpSession9";
-   public final static String SPEC2_18_SESSIONS_HTTPSESSION11 = "SPEC2_18_Sessions_httpSession11";
-   public final static String SPEC2_18_SESSIONS_HTTPSESSION12 = "SPEC2_18_Sessions_httpSession12";
-   public final static String SPEC2_18_SESSIONS_HTTPSESSION13 = "SPEC2_18_Sessions_httpSession13";
-   public final static String SPEC2_18_SESSIONS_HTTPSESSION14 = "SPEC2_18_Sessions_httpSession14";
-   public final static String SPEC2_18_SESSIONS_HTTPSESSION15 = "SPEC2_18_Sessions_httpSession15";
-   public final static String SPEC2_18_SESSIONS_HTTPSESSION16 = "SPEC2_18_Sessions_httpSession16";
-   public final static String SPEC2_18_SESSIONS_HTTPSESSION17 = "SPEC2_18_Sessions_httpSession17";
-   public final static String SPEC2_18_SESSIONS_HTTPSESSION18 = "SPEC2_18_Sessions_httpSession18";
-   public final static String SPEC2_11_REQUESTPARAMSPROPS_PARAMETERS1 = "SPEC2_11_RequestParamsProps_parameters1";
-   public final static String SPEC2_11_REQUESTPARAMSPROPS_PARAMETERS2 = "SPEC2_11_RequestParamsProps_parameters2";
-   public final static String SPEC2_11_REQUESTPARAMSPROPS_PARAMETERS6 = "SPEC2_11_RequestParamsProps_parameters6";
-   public final static String SPEC2_11_REQUESTPARAMSPROPS_PARAMETERS8 = "SPEC2_11_RequestParamsProps_parameters8";
-   public final static String SPEC2_11_REQUESTPARAMSPROPS_PARAMETERS9 = "SPEC2_11_RequestParamsProps_parameters9";
-   public final static String SPEC2_11_REQUESTPARAMSPROPS_PARAMETERS10 = "SPEC2_11_RequestParamsProps_parameters10";
-   public final static String SPEC2_11_REQUESTPARAMSPROPS_PARAMETERS11 = "SPEC2_11_RequestParamsProps_parameters11";
-   public final static String SPEC2_11_REQUESTPARAMSPROPS_PARAMETERS12 = "SPEC2_11_RequestParamsProps_parameters12";
-   public final static String SPEC2_11_REQUESTPARAMSPROPS_PARAMETERS13 = "SPEC2_11_RequestParamsProps_parameters13";
-   public final static String SPEC2_11_REQUESTPARAMSPROPS_PARAMETERS15 = "SPEC2_11_RequestParamsProps_parameters15";
-   public final static String SPEC2_11_REQUESTPARAMSPROPS_PARAMETERS17 = "SPEC2_11_RequestParamsProps_parameters17";
-   public final static String SPEC2_11_REQUESTPRP_PUBLICRENDERPARAMETERS1 = "SPEC2_11_RequestPRP_publicRenderParameters1";
-   public final static String SPEC2_11_REQUESTPRP_PUBLICRENDERPARAMETERS2 = "SPEC2_11_RequestPRP_publicRenderParameters2";
-   public final static String SPEC2_11_REQUESTPRP_PUBLICRENDERPARAMETERS4 = "SPEC2_11_RequestPRP_publicRenderParameters4";
-   public final static String SPEC2_11_REQUESTPRP_PUBLICRENDERPARAMETERS5 = "SPEC2_11_RequestPRP_publicRenderParameters5";
-   public final static String SPEC2_11_REQUESTPRP_PUBLICRENDERPARAMETERS6 = "SPEC2_11_RequestPRP_publicRenderParameters6";
-   public final static String SPEC2_11_REQUESTPRP_PUBLICRENDERPARAMETERS7 = "SPEC2_11_RequestPRP_publicRenderParameters7";
-   public final static String SPEC2_11_REQUESTPRP_PUBLICRENDERPARAMETERS8 = "SPEC2_11_RequestPRP_publicRenderParameters8";
-   public final static String SPEC2_11_REQUESTPRP_PUBLICRENDERPARAMETERS9 = "SPEC2_11_RequestPRP_publicRenderParameters9";
-   public final static String SPEC2_11_REQUESTPRP_PUBLICRENDERPARAMETERS10 = "SPEC2_11_RequestPRP_publicRenderParameters10";
-   public final static String SPEC2_11_REQUESTPRP_PUBLICRENDERPARAMETERS11 = "SPEC2_11_RequestPRP_publicRenderParameters11";
-   public final static String SPEC2_11_REQUESTPRP_PUBLICRENDERPARAMETERS12 = "SPEC2_11_RequestPRP_publicRenderParameters12";
-   public final static String SPEC2_11_REQUESTPRP_PUBLICRENDERPARAMETERS13 = "SPEC2_11_RequestPRP_publicRenderParameters13";
-   public final static String SPEC2_11_REQUESTPRP_PUBLICRENDERPARAMETERS15 = "SPEC2_11_RequestPRP_publicRenderParameters15";
-   public final static String SPEC2_11_REQUESTPRP_PUBLICRENDERPARAMETERS16 = "SPEC2_11_RequestPRP_publicRenderParameters16";
-   public final static String SPEC2_11_REQUEST_ATTRIBUTES1 = "SPEC2_11_Request_attributes1";
-   public final static String SPEC2_11_REQUEST_ATTRIBUTES2 = "SPEC2_11_Request_attributes2";
-   public final static String SPEC2_11_REQUEST_ATTRIBUTES3 = "SPEC2_11_Request_attributes3";
-   public final static String SPEC2_11_REQUEST_ATTRIBUTES4 = "SPEC2_11_Request_attributes4";
-   public final static String SPEC2_11_REQUEST_ATTRIBUTES5 = "SPEC2_11_Request_attributes5";
-   public final static String SPEC2_11_REQUEST_ATTRIBUTES6 = "SPEC2_11_Request_attributes6";
-   public final static String SPEC2_11_REQUEST_ATTRIBUTES7 = "SPEC2_11_Request_attributes7";
-   public final static String SPEC2_11_REQUEST_ATTRIBUTES8 = "SPEC2_11_Request_attributes8";
-   public final static String SPEC2_11_REQUEST_ATTRIBUTES9 = "SPEC2_11_Request_attributes9";
-   public final static String SPEC2_11_REQUEST_CONTENTTYPE1 = "SPEC2_11_Request_contentType1";
-   public final static String SPEC2_11_REQUEST_CONTENTTYPE2 = "SPEC2_11_Request_contentType2";
-   public final static String SPEC2_11_REQUEST_CONTENTTYPE3 = "SPEC2_11_Request_contentType3";
-   public final static String SPEC2_11_REQUEST_CONTENTTYPE4 = "SPEC2_11_Request_contentType4";
-   public final static String SPEC2_11_REQUEST_CONTENTTYPE5 = "SPEC2_11_Request_contentType5";
-   public final static String SPEC2_11_REQUEST_CONTENTTYPE6 = "SPEC2_11_Request_contentType6";
-   public final static String SPEC2_11_REQUEST_CONTENTTYPE7 = "SPEC2_11_Request_contentType7";
-   public final static String SPEC2_11_REQUEST_CONTENTTYPE8 = "SPEC2_11_Request_contentType8";
-   public final static String SPEC2_11_REQUEST_CONTENTTYPE9 = "SPEC2_11_Request_contentType9";
-   public final static String SPEC2_11_REQUEST_CONTENTTYPE10 = "SPEC2_11_Request_contentType10";
-   public final static String SPEC2_11_REQUEST_CONTENTTYPE11 = "SPEC2_11_Request_contentType11";
-   public final static String SPEC2_11_REQUEST_CONTENTTYPE12 = "SPEC2_11_Request_contentType12";
-   public final static String SPEC2_11_REQUEST_CONTENTTYPE13 = "SPEC2_11_Request_contentType13";
-   public final static String SPEC2_11_REQUEST_WINDOWID4 = "SPEC2_11_Request_windowId4";
-   public final static String SPEC2_12_RESPONSEPROPERTIES_NAMESPACE2 = "SPEC2_12_ResponseProperties_namespace2";
-   public final static String SPEC2_12_RESPONSEPROPERTIES_NAMESPACE4 = "SPEC2_12_ResponseProperties_namespace4";
-   public final static String SPEC2_12_RESPONSEPROPERTIES_COOKIE1 = "SPEC2_12_ResponseProperties_cookie1";
-   public final static String SPEC2_12_RESPONSEPROPERTIES_COOKIE2 = "SPEC2_12_ResponseProperties_cookie2";
-   public final static String SPEC2_12_RESPONSEPROPERTIES_COOKIE3 = "SPEC2_12_ResponseProperties_cookie3";
-   public final static String SPEC2_12_RESPONSEPROPERTIES_COOKIE4 = "SPEC2_12_ResponseProperties_cookie4";
-   public final static String SPEC2_12_RESPONSEPROPERTIES_COOKIE5 = "SPEC2_12_ResponseProperties_cookie5";
-   public final static String SPEC2_12_RESPONSEPROPERTIES_COOKIE6 = "SPEC2_12_ResponseProperties_cookie6";
-   public final static String SPEC2_12_RESPONSEPROPERTIES_COOKIE7 = "SPEC2_12_ResponseProperties_cookie7";
-   public final static String SPEC2_12_RESPONSEPROPERTIES_COOKIE8 = "SPEC2_12_ResponseProperties_cookie8";
-   public final static String SPEC2_12_RESPONSEPROPERTIES_COOKIE9 = "SPEC2_12_ResponseProperties_cookie9";
-   public final static String SPEC2_12_RESPONSEPROPERTIES_COOKIE10 = "SPEC2_12_ResponseProperties_cookie10";
-   public final static String SPEC2_12_RESPONSEPROPERTIES_COOKIE11 = "SPEC2_12_ResponseProperties_cookie11";
-   public final static String SPEC2_12_RESPONSEPROPERTIES_COOKIE12 = "SPEC2_12_ResponseProperties_cookie12";
-   public final static String SPEC2_12_RESPONSEPROPERTIES_COOKIE13 = "SPEC2_12_ResponseProperties_cookie13";
-   public final static String SPEC2_12_RESPONSEPROPERTIES_COOKIE14 = "SPEC2_12_ResponseProperties_cookie14";
-   public final static String SPEC2_12_RESPONSEPROPERTIES_COOKIE15 = "SPEC2_12_ResponseProperties_cookie15";
-   public final static String SPEC2_12_RESPONSEPROPERTIES_COOKIE16 = "SPEC2_12_ResponseProperties_cookie16";
-   public final static String SPEC2_12_RESPONSEPROPERTIES_COOKIE17 = "SPEC2_12_ResponseProperties_cookie17";
-   public final static String SPEC2_12_RESPONSEREDIRECT_REDIRECT1 = "SPEC2_12_ResponseRedirect_redirect1";
-   public final static String SPEC2_12_RESPONSEREDIRECT_REDIRECT12 = "SPEC2_12_ResponseRedirect_redirect12";
-   public final static String SPEC2_12_RESPONSEREDIRECT_REDIRECT14 = "SPEC2_12_ResponseRedirect_redirect14";
-   public final static String SPEC2_12_RESPONSECONTENT_CONTENTTYPE5 = "SPEC2_12_ResponseContent_contentType5";
-   public final static String SPEC2_12_RESPONSECONTENT_BUFFERING9 = "SPEC2_12_ResponseContent_buffering9";
-   public final static String SPEC2_12_RESPONSECONTENT_BUFFERING10 = "SPEC2_12_ResponseContent_buffering10";
-   public final static String SPEC2_12_RESPONSECONTENT_BUFFERING11 = "SPEC2_12_ResponseContent_buffering11";
-   public final static String SPEC2_12_RESPONSECONTENT_BUFFERING13 = "SPEC2_12_ResponseContent_buffering13";
-   public final static String SPEC2_12_RESPONSECONTENT_CHARACTERENCODING2 = "SPEC2_12_ResponseContent_characterEncoding2";
-   public final static String SPEC2_12_RESPONSECONTENT_CHARACTERENCODING3 = "SPEC2_12_ResponseContent_characterEncoding3";
-   public final static String SPEC2_12_RESPONSECONTENT_CHARACTERENCODING4 = "SPEC2_12_ResponseContent_characterEncoding4";
-   public final static String SPEC2_20_PORTLETFILTER_FILTER1 = "SPEC2_20_PortletFilter_filter1";
-   public final static String SPEC2_20_PORTLETFILTER_FILTER2 = "SPEC2_20_PortletFilter_filter2";
-   public final static String SPEC2_20_PORTLETFILTER_FILTER3 = "SPEC2_20_PortletFilter_filter3";
-   public final static String SPEC2_20_PORTLETFILTER_FILTER4 = "SPEC2_20_PortletFilter_filter4";
-   public final static String SPEC2_20_PORTLETFILTER_FILTER5 = "SPEC2_20_PortletFilter_filter5";
-   public final static String SPEC2_20_PORTLETFILTER_FILTER6 = "SPEC2_20_PortletFilter_filter6";
-   public final static String SPEC2_20_PORTLETFILTER_FILTER7 = "SPEC2_20_PortletFilter_filter7";
-   public final static String SPEC2_20_PORTLETFILTER_FILTER8 = "SPEC2_20_PortletFilter_filter8";
-   public final static String SPEC2_20_PORTLETFILTER_FILTER9 = "SPEC2_20_PortletFilter_filter9";
-   public final static String SPEC2_20_PORTLETFILTER_FILTER10 = "SPEC2_20_PortletFilter_filter10";
-   public final static String SPEC2_20_PORTLETFILTER_FILTER11 = "SPEC2_20_PortletFilter_filter11";
-   public final static String SPEC2_20_PORTLETFILTER_FILTER12 = "SPEC2_20_PortletFilter_filter12";
-   public final static String SPEC2_20_PORTLETFILTER_FILTER13 = "SPEC2_20_PortletFilter_filter13";
-   public final static String SPEC2_20_PORTLETFILTER_FILTER14 = "SPEC2_20_PortletFilter_filter14";
-   public final static String SPEC2_20_PORTLETFILTER_FILTER15 = "SPEC2_20_PortletFilter_filter15";
-   public final static String SPEC2_20_PORTLETFILTER_FILTERWRAPPER1 = "SPEC2_20_PortletFilter_filterWrapper1";
-   public final static String SPEC2_20_PORTLETFILTER_FILTERWRAPPER2 = "SPEC2_20_PortletFilter_filterWrapper2";
-   public final static String SPEC2_20_PORTLETFILTER_FILTERWRAPPER3 = "SPEC2_20_PortletFilter_filterWrapper3";
-   public final static String SPEC2_20_PORTLETFILTER_FILTERWRAPPER4 = "SPEC2_20_PortletFilter_filterWrapper4";
-   public final static String SPEC2_20_PORTLETFILTER_FILTERWRAPPER5 = "SPEC2_20_PortletFilter_filterWrapper5";
-   public final static String SPEC2_20_PORTLETFILTER_FILTERWRAPPER6 = "SPEC2_20_PortletFilter_filterWrapper6";
-   public final static String SPEC2_20_PORTLETFILTER_FILTERWRAPPER7 = "SPEC2_20_PortletFilter_filterWrapper7";
-   public final static String SPEC2_20_PORTLETFILTER_FILTERWRAPPER8 = "SPEC2_20_PortletFilter_filterWrapper8";
-   public final static String SPEC2_26_TAGLIBV1_DEFINEOBJECTS3 = "SPEC2_26_TagLibV1_defineObjects3";
-   public final static String SPEC2_26_TAGLIBACTION_DEFINEOBJECTSACTION1 = "SPEC2_26_TagLibAction_defineObjectsAction1";
-   public final static String SPEC2_26_TAGLIBACTION_DEFINEOBJECTSACTION2 = "SPEC2_26_TagLibAction_defineObjectsAction2";
-   public final static String SPEC2_26_TAGLIBACTION_DEFINEOBJECTSACTION3 = "SPEC2_26_TagLibAction_defineObjectsAction3";
-   public final static String SPEC2_26_TAGLIBACTION_DEFINEOBJECTSACTION4 = "SPEC2_26_TagLibAction_defineObjectsAction4";
-   public final static String SPEC2_26_TAGLIBACTION_DEFINEOBJECTSACTION5 = "SPEC2_26_TagLibAction_defineObjectsAction5";
-   public final static String SPEC2_26_TAGLIBACTION_DEFINEOBJECTSACTION6 = "SPEC2_26_TagLibAction_defineObjectsAction6";
-   public final static String SPEC2_26_TAGLIBACTION_DEFINEOBJECTSACTION7 = "SPEC2_26_TagLibAction_defineObjectsAction7";
-   public final static String SPEC2_26_TAGLIBACTION_DEFINEOBJECTSACTION8 = "SPEC2_26_TagLibAction_defineObjectsAction8";
-   public final static String SPEC2_26_TAGLIBACTION_DEFINEOBJECTSACTION9 = "SPEC2_26_TagLibAction_defineObjectsAction9";
-   public final static String SPEC2_26_TAGLIBACTION_DEFINEOBJECTSACTION10 = "SPEC2_26_TagLibAction_defineObjectsAction10";
-   public final static String SPEC2_26_TAGLIBACTION_DEFINEOBJECTSACTION11 = "SPEC2_26_TagLibAction_defineObjectsAction11";
-   public final static String SPEC2_26_TAGLIBACTION_DEFINEOBJECTSACTION12 = "SPEC2_26_TagLibAction_defineObjectsAction12";
-   public final static String SPEC2_26_TAGLIBACTION_DEFINEOBJECTSACTION13 = "SPEC2_26_TagLibAction_defineObjectsAction13";
-   public final static String SPEC2_26_TAGLIBACTION_DEFINEOBJECTSEVENT1 = "SPEC2_26_TagLibAction_defineObjectsEvent1";
-   public final static String SPEC2_26_TAGLIBACTION_DEFINEOBJECTSEVENT2 = "SPEC2_26_TagLibAction_defineObjectsEvent2";
-   public final static String SPEC2_26_TAGLIBACTION_DEFINEOBJECTSEVENT3 = "SPEC2_26_TagLibAction_defineObjectsEvent3";
-   public final static String SPEC2_26_TAGLIBACTION_DEFINEOBJECTSEVENT4 = "SPEC2_26_TagLibAction_defineObjectsEvent4";
-   public final static String SPEC2_26_TAGLIBACTION_DEFINEOBJECTSEVENT5 = "SPEC2_26_TagLibAction_defineObjectsEvent5";
-   public final static String SPEC2_26_TAGLIBACTION_DEFINEOBJECTSEVENT6 = "SPEC2_26_TagLibAction_defineObjectsEvent6";
-   public final static String SPEC2_26_TAGLIBACTION_DEFINEOBJECTSEVENT7 = "SPEC2_26_TagLibAction_defineObjectsEvent7";
-   public final static String SPEC2_26_TAGLIBACTION_DEFINEOBJECTSEVENT8 = "SPEC2_26_TagLibAction_defineObjectsEvent8";
-   public final static String SPEC2_26_TAGLIBACTION_DEFINEOBJECTSEVENT9 = "SPEC2_26_TagLibAction_defineObjectsEvent9";
-   public final static String SPEC2_26_TAGLIBACTION_DEFINEOBJECTSEVENT10 = "SPEC2_26_TagLibAction_defineObjectsEvent10";
-   public final static String SPEC2_26_TAGLIBACTION_DEFINEOBJECTSEVENT11 = "SPEC2_26_TagLibAction_defineObjectsEvent11";
-   public final static String SPEC2_26_TAGLIBACTION_DEFINEOBJECTSEVENT12 = "SPEC2_26_TagLibAction_defineObjectsEvent12";
-   public final static String SPEC2_26_TAGLIBACTION_DEFINEOBJECTSEVENT13 = "SPEC2_26_TagLibAction_defineObjectsEvent13";
-   public final static String SPEC2_26_TAGLIBACTION_ACTIONURL1 = "SPEC2_26_TagLibAction_actionURL1";
-   public final static String SPEC2_26_TAGLIBACTION_ACTIONURL2 = "SPEC2_26_TagLibAction_actionURL2";
-   public final static String SPEC2_26_TAGLIBACTION_ACTIONURL3 = "SPEC2_26_TagLibAction_actionURL3";
-   public final static String SPEC2_26_TAGLIBACTION_ACTIONURL4 = "SPEC2_26_TagLibAction_actionURL4";
-   public final static String SPEC2_26_TAGLIBACTION_ACTIONURL5 = "SPEC2_26_TagLibAction_actionURL5";
-   public final static String SPEC2_26_TAGLIBACTION_ACTIONURL6 = "SPEC2_26_TagLibAction_actionURL6";
-   public final static String SPEC2_26_TAGLIBACTION_ACTIONURL7 = "SPEC2_26_TagLibAction_actionURL7";
-   public final static String SPEC2_26_TAGLIBACTION_ACTIONURL8 = "SPEC2_26_TagLibAction_actionURL8";
-   public final static String SPEC2_26_TAGLIBACTION_ACTIONURL9 = "SPEC2_26_TagLibAction_actionURL9";
-   public final static String SPEC2_26_TAGLIBACTION_ACTIONURL10 = "SPEC2_26_TagLibAction_actionURL10";
-   public final static String SPEC2_26_TAGLIBACTION_ACTIONURL11 = "SPEC2_26_TagLibAction_actionURL11";
-   public final static String SPEC2_26_TAGLIBACTION_ACTIONURL12 = "SPEC2_26_TagLibAction_actionURL12";
-   public final static String SPEC2_26_TAGLIBACTION_ACTIONURL13 = "SPEC2_26_TagLibAction_actionURL13";
-   public final static String SPEC2_26_TAGLIBACTION_ACTIONURL14 = "SPEC2_26_TagLibAction_actionURL14";
-   public final static String SPEC2_26_TAGLIBACTION_ACTIONURL15 = "SPEC2_26_TagLibAction_actionURL15";
-   public final static String SPEC2_26_TAGLIBACTION_ACTIONURL17 = "SPEC2_26_TagLibAction_actionURL17";
-   public final static String SPEC2_26_TAGLIBACTION_ACTIONURL18 = "SPEC2_26_TagLibAction_actionURL18";
-   public final static String SPEC2_26_TAGLIBACTION_ACTIONURL19 = "SPEC2_26_TagLibAction_actionURL19";
-   public final static String SPEC2_26_TAGLIBACTION_ACTIONURL20 = "SPEC2_26_TagLibAction_actionURL20";
-   public final static String SPEC2_26_TAGLIBACTION_ACTIONURL21 = "SPEC2_26_TagLibAction_actionURL21";
-   public final static String SPEC2_26_TAGLIBACTION_ACTIONURL22 = "SPEC2_26_TagLibAction_actionURL22";
-   public final static String SPEC2_26_TAGLIBACTION_ACTIONURL23 = "SPEC2_26_TagLibAction_actionURL23";
-   public final static String SPEC2_26_TAGLIBACTION_ACTIONURL25 = "SPEC2_26_TagLibAction_actionURL25";
-   public final static String SPEC2_26_TAGLIBACTION_ACTIONURL26 = "SPEC2_26_TagLibAction_actionURL26";
-   public final static String SPEC2_26_TAGLIBACTION_ACTIONURL27 = "SPEC2_26_TagLibAction_actionURL27";
-   public final static String SPEC2_26_TAGLIBACTION_ACTIONURL28 = "SPEC2_26_TagLibAction_actionURL28";
-   public final static String SPEC2_26_TAGLIBACTION_ACTIONURL29 = "SPEC2_26_TagLibAction_actionURL29";
-   public final static String SPEC2_26_TAGLIBACTION_ACTIONURL30 = "SPEC2_26_TagLibAction_actionURL30";
-   public final static String SPEC2_26_TAGLIBRENDER_DEFINEOBJECTSRENDER1 = "SPEC2_26_TagLibRender_defineObjectsRender1";
-   public final static String SPEC2_26_TAGLIBRENDER_DEFINEOBJECTSRENDER2 = "SPEC2_26_TagLibRender_defineObjectsRender2";
-   public final static String SPEC2_26_TAGLIBRENDER_DEFINEOBJECTSRENDER3 = "SPEC2_26_TagLibRender_defineObjectsRender3";
-   public final static String SPEC2_26_TAGLIBRENDER_DEFINEOBJECTSRENDER4 = "SPEC2_26_TagLibRender_defineObjectsRender4";
-   public final static String SPEC2_26_TAGLIBRENDER_DEFINEOBJECTSRENDER5 = "SPEC2_26_TagLibRender_defineObjectsRender5";
-   public final static String SPEC2_26_TAGLIBRENDER_DEFINEOBJECTSRENDER6 = "SPEC2_26_TagLibRender_defineObjectsRender6";
-   public final static String SPEC2_26_TAGLIBRENDER_DEFINEOBJECTSRENDER7 = "SPEC2_26_TagLibRender_defineObjectsRender7";
-   public final static String SPEC2_26_TAGLIBRENDER_DEFINEOBJECTSRENDER8 = "SPEC2_26_TagLibRender_defineObjectsRender8";
-   public final static String SPEC2_26_TAGLIBRENDER_DEFINEOBJECTSRENDER9 = "SPEC2_26_TagLibRender_defineObjectsRender9";
-   public final static String SPEC2_26_TAGLIBRENDER_DEFINEOBJECTSRENDER10 = "SPEC2_26_TagLibRender_defineObjectsRender10";
-   public final static String SPEC2_26_TAGLIBRENDER_DEFINEOBJECTSRENDER11 = "SPEC2_26_TagLibRender_defineObjectsRender11";
-   public final static String SPEC2_26_TAGLIBRENDER_DEFINEOBJECTSRENDER12 = "SPEC2_26_TagLibRender_defineObjectsRender12";
-   public final static String SPEC2_26_TAGLIBRENDER_DEFINEOBJECTSRENDER13 = "SPEC2_26_TagLibRender_defineObjectsRender13";
-   public final static String SPEC2_26_TAGLIBRENDER_RENDERURL1 = "SPEC2_26_TagLibRender_renderURL1";
-   public final static String SPEC2_26_TAGLIBRENDER_RENDERURL2 = "SPEC2_26_TagLibRender_renderURL2";
-   public final static String SPEC2_26_TAGLIBRENDER_RENDERURL3 = "SPEC2_26_TagLibRender_renderURL3";
-   public final static String SPEC2_26_TAGLIBRENDER_RENDERURL4 = "SPEC2_26_TagLibRender_renderURL4";
-   public final static String SPEC2_26_TAGLIBRENDER_RENDERURL5 = "SPEC2_26_TagLibRender_renderURL5";
-   public final static String SPEC2_26_TAGLIBRENDER_RENDERURL6 = "SPEC2_26_TagLibRender_renderURL6";
-   public final static String SPEC2_26_TAGLIBRENDER_RENDERURL7 = "SPEC2_26_TagLibRender_renderURL7";
-   public final static String SPEC2_26_TAGLIBRENDER_RENDERURL8 = "SPEC2_26_TagLibRender_renderURL8";
-   public final static String SPEC2_26_TAGLIBRENDER_RENDERURL9 = "SPEC2_26_TagLibRender_renderURL9";
-   public final static String SPEC2_26_TAGLIBRENDER_RENDERURL10 = "SPEC2_26_TagLibRender_renderURL10";
-   public final static String SPEC2_26_TAGLIBRENDER_RENDERURL11 = "SPEC2_26_TagLibRender_renderURL11";
-   public final static String SPEC2_26_TAGLIBRENDER_RENDERURL12 = "SPEC2_26_TagLibRender_renderURL12";
-   public final static String SPEC2_26_TAGLIBRENDER_RENDERURL13 = "SPEC2_26_TagLibRender_renderURL13";
-   public final static String SPEC2_26_TAGLIBRENDER_RENDERURL14 = "SPEC2_26_TagLibRender_renderURL14";
-   public final static String SPEC2_26_TAGLIBRENDER_RENDERURL15 = "SPEC2_26_TagLibRender_renderURL15";
-   public final static String SPEC2_26_TAGLIBRENDER_RENDERURL17 = "SPEC2_26_TagLibRender_renderURL17";
-   public final static String SPEC2_26_TAGLIBRENDER_RENDERURL18 = "SPEC2_26_TagLibRender_renderURL18";
-   public final static String SPEC2_26_TAGLIBRENDER_RENDERURL19 = "SPEC2_26_TagLibRender_renderURL19";
-   public final static String SPEC2_26_TAGLIBRENDER_RENDERURL20 = "SPEC2_26_TagLibRender_renderURL20";
-   public final static String SPEC2_26_TAGLIBRENDER_RENDERURL21 = "SPEC2_26_TagLibRender_renderURL21";
-   public final static String SPEC2_26_TAGLIBRENDER_RENDERURL22 = "SPEC2_26_TagLibRender_renderURL22";
-   public final static String SPEC2_26_TAGLIBRENDER_RENDERURL23 = "SPEC2_26_TagLibRender_renderURL23";
-   public final static String SPEC2_26_TAGLIBRENDER_RENDERURL25 = "SPEC2_26_TagLibRender_renderURL25";
-   public final static String SPEC2_26_TAGLIBRENDER_RENDERURL26 = "SPEC2_26_TagLibRender_renderURL26";
-   public final static String SPEC2_26_TAGLIBRESOURCE_DEFINEOBJECTSRESOURCE1 = "SPEC2_26_TagLibResource_defineObjectsResource1";
-   public final static String SPEC2_26_TAGLIBRESOURCE_DEFINEOBJECTSRESOURCE2 = "SPEC2_26_TagLibResource_defineObjectsResource2";
-   public final static String SPEC2_26_TAGLIBRESOURCE_DEFINEOBJECTSRESOURCE3 = "SPEC2_26_TagLibResource_defineObjectsResource3";
-   public final static String SPEC2_26_TAGLIBRESOURCE_DEFINEOBJECTSRESOURCE4 = "SPEC2_26_TagLibResource_defineObjectsResource4";
-   public final static String SPEC2_26_TAGLIBRESOURCE_DEFINEOBJECTSRESOURCE5 = "SPEC2_26_TagLibResource_defineObjectsResource5";
-   public final static String SPEC2_26_TAGLIBRESOURCE_DEFINEOBJECTSRESOURCE6 = "SPEC2_26_TagLibResource_defineObjectsResource6";
-   public final static String SPEC2_26_TAGLIBRESOURCE_DEFINEOBJECTSRESOURCE7 = "SPEC2_26_TagLibResource_defineObjectsResource7";
-   public final static String SPEC2_26_TAGLIBRESOURCE_DEFINEOBJECTSRESOURCE8 = "SPEC2_26_TagLibResource_defineObjectsResource8";
-   public final static String SPEC2_26_TAGLIBRESOURCE_DEFINEOBJECTSRESOURCE9 = "SPEC2_26_TagLibResource_defineObjectsResource9";
-   public final static String SPEC2_26_TAGLIBRESOURCE_DEFINEOBJECTSRESOURCE10 = "SPEC2_26_TagLibResource_defineObjectsResource10";
-   public final static String SPEC2_26_TAGLIBRESOURCE_DEFINEOBJECTSRESOURCE11 = "SPEC2_26_TagLibResource_defineObjectsResource11";
-   public final static String SPEC2_26_TAGLIBRESOURCE_DEFINEOBJECTSRESOURCE12 = "SPEC2_26_TagLibResource_defineObjectsResource12";
-   public final static String SPEC2_26_TAGLIBRESOURCE_DEFINEOBJECTSRESOURCE13 = "SPEC2_26_TagLibResource_defineObjectsResource13";
-   public final static String SPEC2_26_TAGLIBRESOURCE_RESOURCEURL1 = "SPEC2_26_TagLibResource_resourceURL1";
-   public final static String SPEC2_26_TAGLIBRESOURCE_RESOURCEURL2 = "SPEC2_26_TagLibResource_resourceURL2";
-   public final static String SPEC2_26_TAGLIBRESOURCE_RESOURCEURL3 = "SPEC2_26_TagLibResource_resourceURL3";
-   public final static String SPEC2_26_TAGLIBRESOURCE_RESOURCEURL4 = "SPEC2_26_TagLibResource_resourceURL4";
-   public final static String SPEC2_26_TAGLIBRESOURCE_RESOURCEURL5 = "SPEC2_26_TagLibResource_resourceURL5";
-   public final static String SPEC2_26_TAGLIBRESOURCE_RESOURCEURL6 = "SPEC2_26_TagLibResource_resourceURL6";
-   public final static String SPEC2_26_TAGLIBRESOURCE_RESOURCEURL7 = "SPEC2_26_TagLibResource_resourceURL7";
-   public final static String SPEC2_26_TAGLIBRESOURCE_RESOURCEURL8 = "SPEC2_26_TagLibResource_resourceURL8";
-   public final static String SPEC2_26_TAGLIBRESOURCE_RESOURCEURL9 = "SPEC2_26_TagLibResource_resourceURL9";
-   public final static String SPEC2_26_TAGLIBRESOURCE_RESOURCEURL11 = "SPEC2_26_TagLibResource_resourceURL11";
-   public final static String SPEC2_26_TAGLIBRESOURCE_RESOURCEURL12 = "SPEC2_26_TagLibResource_resourceURL12";
-   public final static String SPEC2_26_TAGLIBRESOURCE_RESOURCEURL13 = "SPEC2_26_TagLibResource_resourceURL13";
-   public final static String SPEC2_26_TAGLIBRESOURCE_RESOURCEURL14 = "SPEC2_26_TagLibResource_resourceURL14";
-   public final static String SPEC2_26_TAGLIBRESOURCE_RESOURCEURL15 = "SPEC2_26_TagLibResource_resourceURL15";
-   public final static String SPEC2_26_TAGLIBRESOURCE_RESOURCEURL16 = "SPEC2_26_TagLibResource_resourceURL16";
-   public final static String SPEC2_26_TAGLIBRESOURCE_RESOURCEURL17 = "SPEC2_26_TagLibResource_resourceURL17";
-   public final static String SPEC2_26_TAGLIBRESOURCE_RESOURCEURL19 = "SPEC2_26_TagLibResource_resourceURL19";
-   public final static String SPEC2_26_TAGLIBRESOURCE_RESOURCEURL20 = "SPEC2_26_TagLibResource_resourceURL20";
-   public final static String SPEC2_26_TAGLIBRESOURCE_RESOURCEURL21 = "SPEC2_26_TagLibResource_resourceURL21";
-   public final static String SPEC2_26_TAGLIBRESOURCE_RESOURCEURL22 = "SPEC2_26_TagLibResource_resourceURL22";
-   public final static String SPEC2_26_TAGLIBRESOURCE_RESOURCEURL23 = "SPEC2_26_TagLibResource_resourceURL23";
-   public final static String SPEC2_26_TAGLIBRESOURCE_RESOURCEURL24 = "SPEC2_26_TagLibResource_resourceURL24";
-   public final static String SPEC2_26_TAGLIBRESOURCE_RESOURCEURL25 = "SPEC2_26_TagLibResource_resourceURL25";
-   public final static String SPEC2_26_TAGLIBRESOURCE_RESOURCEURL26 = "SPEC2_26_TagLibResource_resourceURL26";
-   public final static String SPEC2_26_TAGLIBRESOURCE_RESOURCEURL27 = "SPEC2_26_TagLibResource_resourceURL27";
-   public final static String SPEC2_26_TAGLIBPARAM_PARAMACTION1 = "SPEC2_26_TagLibParam_paramAction1";
-   public final static String SPEC2_26_TAGLIBPARAM_PARAMACTION2 = "SPEC2_26_TagLibParam_paramAction2";
-   public final static String SPEC2_26_TAGLIBPARAM_PARAMACTION3 = "SPEC2_26_TagLibParam_paramAction3";
-   public final static String SPEC2_26_TAGLIBPARAM_PARAMACTION4 = "SPEC2_26_TagLibParam_paramAction4";
-   public final static String SPEC2_26_TAGLIBPARAM_PARAMACTION5 = "SPEC2_26_TagLibParam_paramAction5";
-   public final static String SPEC2_26_TAGLIBPARAM_PARAMACTION6 = "SPEC2_26_TagLibParam_paramAction6";
-   public final static String SPEC2_26_TAGLIBPARAM_PARAMRENDER1 = "SPEC2_26_TagLibParam_paramRender1";
-   public final static String SPEC2_26_TAGLIBPARAM_PARAMRENDER2 = "SPEC2_26_TagLibParam_paramRender2";
-   public final static String SPEC2_26_TAGLIBPARAM_PARAMRENDER3 = "SPEC2_26_TagLibParam_paramRender3";
-   public final static String SPEC2_26_TAGLIBPARAM_PARAMRENDER4 = "SPEC2_26_TagLibParam_paramRender4";
-   public final static String SPEC2_26_TAGLIBPARAM_PARAMRENDER5 = "SPEC2_26_TagLibParam_paramRender5";
-   public final static String SPEC2_26_TAGLIBPARAM_PARAMRENDER6 = "SPEC2_26_TagLibParam_paramRender6";
-   public final static String SPEC2_26_TAGLIBPARAM_PARAMRESOURCE1 = "SPEC2_26_TagLibParam_paramResource1";
-   public final static String SPEC2_26_TAGLIBPARAM_PARAMRESOURCE2 = "SPEC2_26_TagLibParam_paramResource2";
-   public final static String SPEC2_26_TAGLIBPARAM_PARAMRESOURCE3 = "SPEC2_26_TagLibParam_paramResource3";
-   public final static String SPEC2_26_TAGLIBPARAM_PARAMRESOURCE4 = "SPEC2_26_TagLibParam_paramResource4";
-   public final static String SPEC2_26_TAGLIBPARAM_PARAMRESOURCE5 = "SPEC2_26_TagLibParam_paramResource5";
-   public final static String SPEC2_26_TAGLIBPARAM_PARAMRESOURCE6 = "SPEC2_26_TagLibParam_paramResource6";
-   public final static String SPEC2_26_TAGLIBPROPERTY_PROPERTYACTION1 = "SPEC2_26_TagLibProperty_propertyAction1";
-   public final static String SPEC2_26_TAGLIBPROPERTY_PROPERTYACTION2 = "SPEC2_26_TagLibProperty_propertyAction2";
-   public final static String SPEC2_26_TAGLIBPROPERTY_PROPERTYACTION3 = "SPEC2_26_TagLibProperty_propertyAction3";
-   public final static String SPEC2_26_TAGLIBPROPERTY_PROPERTYACTION4 = "SPEC2_26_TagLibProperty_propertyAction4";
-   public final static String SPEC2_26_TAGLIBPROPERTY_PROPERTYACTION5 = "SPEC2_26_TagLibProperty_propertyAction5";
-   public final static String SPEC2_26_TAGLIBPROPERTY_PROPERTYACTION6 = "SPEC2_26_TagLibProperty_propertyAction6";
-   public final static String SPEC2_26_TAGLIBPROPERTY_PROPERTYRENDER1 = "SPEC2_26_TagLibProperty_propertyRender1";
-   public final static String SPEC2_26_TAGLIBPROPERTY_PROPERTYRENDER2 = "SPEC2_26_TagLibProperty_propertyRender2";
-   public final static String SPEC2_26_TAGLIBPROPERTY_PROPERTYRENDER3 = "SPEC2_26_TagLibProperty_propertyRender3";
-   public final static String SPEC2_26_TAGLIBPROPERTY_PROPERTYRENDER4 = "SPEC2_26_TagLibProperty_propertyRender4";
-   public final static String SPEC2_26_TAGLIBPROPERTY_PROPERTYRENDER5 = "SPEC2_26_TagLibProperty_propertyRender5";
-   public final static String SPEC2_26_TAGLIBPROPERTY_PROPERTYRENDER6 = "SPEC2_26_TagLibProperty_propertyRender6";
-   public final static String SPEC2_26_TAGLIBPROPERTY_PROPERTYRESOURCE1 = "SPEC2_26_TagLibProperty_propertyResource1";
-   public final static String SPEC2_26_TAGLIBPROPERTY_PROPERTYRESOURCE2 = "SPEC2_26_TagLibProperty_propertyResource2";
-   public final static String SPEC2_26_TAGLIBPROPERTY_PROPERTYRESOURCE3 = "SPEC2_26_TagLibProperty_propertyResource3";
-   public final static String SPEC2_26_TAGLIBPROPERTY_PROPERTYRESOURCE4 = "SPEC2_26_TagLibProperty_propertyResource4";
-   public final static String SPEC2_26_TAGLIBPROPERTY_PROPERTYRESOURCE5 = "SPEC2_26_TagLibProperty_propertyResource5";
-   public final static String SPEC2_26_TAGLIBPROPERTY_PROPERTYRESOURCE6 = "SPEC2_26_TagLibProperty_propertyResource6";
-   public final static String SPEC2_26_TAGLIB_DEFINEOBJECTS1 = "SPEC2_26_TagLib_defineObjects1";
-   public final static String SPEC2_26_TAGLIB_DEFINEOBJECTS2 = "SPEC2_26_TagLib_defineObjects2";
-   public final static String SPEC2_26_TAGLIB_DEFINEOBJECTS4 = "SPEC2_26_TagLib_defineObjects4";
-   public final static String SPEC2_26_TAGLIB_NAMESPACE = "SPEC2_26_TagLib_namespace";
-   public final static String SPEC2_26_TAGLIB_ESCAPEXML1 = "SPEC2_26_TagLib_escapeXML1";
-   public final static String SPEC2_26_TAGLIB_ESCAPEXML2 = "SPEC2_26_TagLib_escapeXML2";
+   public final static String V2ADDLPORTLETTESTS_SPEC2_2_COMPATIBILITY_DEPLOYJSR168_1 = "V2AddlPortletTests_SPEC2_2_Compatibility_deployJSR168_1";
+   public final static String V2ADDLPORTLETTESTS_SPEC2_2_COMPATIBILITY_DEPLOYJSR168_2 = "V2AddlPortletTests_SPEC2_2_Compatibility_deployJSR168_2";
+   public final static String V2ADDLPORTLETTESTS_SPEC2_5_INITIALIZATION_INITIALIZATION6 = "V2AddlPortletTests_SPEC2_5_Initialization_initialization6";
+   public final static String V2ADDLPORTLETTESTS_SPEC2_5_ACTIONHANDLING_ACTION5 = "V2AddlPortletTests_SPEC2_5_ActionHandling_action5";
+   public final static String V2ADDLPORTLETTESTS_SPEC2_5_ACTIONHANDLING_ACTION6 = "V2AddlPortletTests_SPEC2_5_ActionHandling_action6";
+   public final static String V2ADDLPORTLETTESTS_SPEC2_5_ACTIONHANDLING_ACTION7 = "V2AddlPortletTests_SPEC2_5_ActionHandling_action7";
+   public final static String V2ADDLPORTLETTESTS_SPEC2_5_ACTIONHANDLING_EXCEPTION1 = "V2AddlPortletTests_SPEC2_5_ActionHandling_exception1";
+   public final static String V2ADDLPORTLETTESTS_SPEC2_5_ACTIONHANDLING_EXCEPTION2 = "V2AddlPortletTests_SPEC2_5_ActionHandling_exception2";
+   public final static String V2ADDLPORTLETTESTS_SPEC2_5_RENDERHANDLING_RENDER1 = "V2AddlPortletTests_SPEC2_5_RenderHandling_render1";
+   public final static String V2ADDLPORTLETTESTS_SPEC2_5_RESOURCEHANDLING_RESOURCE1 = "V2AddlPortletTests_SPEC2_5_ResourceHandling_resource1";
+   public final static String V2ADDLPORTLETTESTS_SPEC2_5_EVENTHANDLING_EXCEPTION4 = "V2AddlPortletTests_SPEC2_5_EventHandling_exception4";
+   public final static String V2ADDLPORTLETTESTS_SPEC2_5_EVENTHANDLING_EXCEPTION5 = "V2AddlPortletTests_SPEC2_5_EventHandling_exception5";
+   public final static String V2ADDLPORTLETTESTS_SPEC2_5_RENDERGENERICPORTLET_ACTIONDISPATCHING2 = "V2AddlPortletTests_SPEC2_5_RenderGenericPortlet_actionDispatching2";
+   public final static String V2ADDLPORTLETTESTS_SPEC2_5_RENDERGENERICPORTLET_EVENTDISPATCHING1 = "V2AddlPortletTests_SPEC2_5_RenderGenericPortlet_eventDispatching1";
+   public final static String V2ADDLPORTLETTESTS_SPEC2_5_RENDERGENERICPORTLET_EVENTDISPATCHING2 = "V2AddlPortletTests_SPEC2_5_RenderGenericPortlet_eventDispatching2";
+   public final static String V2ADDLPORTLETTESTS_SPEC2_5_RENDERGENERICPORTLET_RENDERDISPATCHING8 = "V2AddlPortletTests_SPEC2_5_RenderGenericPortlet_renderDispatching8";
+   public final static String V2ADDLPORTLETTESTS_SPEC2_5_RENDERGENERICPORTLET_RENDERDISPATCHING9 = "V2AddlPortletTests_SPEC2_5_RenderGenericPortlet_renderDispatching9";
+   public final static String V2ADDLPORTLETTESTS_SPEC2_6_RENDERCONFIG_GETRESOURCEBUNDLE1 = "V2AddlPortletTests_SPEC2_6_RenderConfig_getResourceBundle1";
+   public final static String V2ADDLPORTLETTESTS_SPEC2_6_RENDERCONFIG_GETRESOURCEBUNDLE2 = "V2AddlPortletTests_SPEC2_6_RenderConfig_getResourceBundle2";
+   public final static String V2ADDLPORTLETTESTS_SPEC2_6_RENDERCONFIG_GETRESOURCEBUNDLE3 = "V2AddlPortletTests_SPEC2_6_RenderConfig_getResourceBundle3";
+   public final static String V2ADDLPORTLETTESTS_SPEC2_6_RENDERCONFIG_GETRESOURCEBUNDLE4 = "V2AddlPortletTests_SPEC2_6_RenderConfig_getResourceBundle4";
+   public final static String V2ADDLPORTLETTESTS_SPEC2_6_RENDERCONFIG_GETPUBLISHINGEVENTQNAMES3 = "V2AddlPortletTests_SPEC2_6_RenderConfig_getPublishingEventQnames3";
+   public final static String V2ADDLPORTLETTESTS_SPEC2_6_RENDERCONFIG_GETPUBLISHINGEVENTQNAMES4 = "V2AddlPortletTests_SPEC2_6_RenderConfig_getPublishingEventQnames4";
+   public final static String V2ADDLPORTLETTESTS_SPEC2_6_RENDERCONFIG_GETPROCESSINGEVENTQNAMES3 = "V2AddlPortletTests_SPEC2_6_RenderConfig_getProcessingEventQnames3";
+   public final static String V2ADDLPORTLETTESTS_SPEC2_6_RENDERCONFIG_GETPROCESSINGEVENTQNAMES4 = "V2AddlPortletTests_SPEC2_6_RenderConfig_getProcessingEventQnames4";
+   public final static String V2ADDLPORTLETTESTS_SPEC2_6_RENDERCONFIG_GETCONTAINERRUNTIMEOPTIONS6 = "V2AddlPortletTests_SPEC2_6_RenderConfig_getContainerRuntimeOptions6";
+   public final static String V2ADDLPORTLETTESTS_SPEC2_6_RENDERCONFIG_GETCONTAINERRUNTIMEOPTIONS7 = "V2AddlPortletTests_SPEC2_6_RenderConfig_getContainerRuntimeOptions7";
+   public final static String V2ADDLPORTLETTESTS_SPEC2_6_RENDERCONFIG_GETCONTAINERRUNTIMEOPTIONS8 = "V2AddlPortletTests_SPEC2_6_RenderConfig_getContainerRuntimeOptions8";
+   public final static String V2ADDLPORTLETTESTS_SPEC2_6_RENDERCONFIG_GETCONTAINERRUNTIMEOPTIONS9 = "V2AddlPortletTests_SPEC2_6_RenderConfig_getContainerRuntimeOptions9";
+   public final static String V2ADDLPORTLETTESTS_SPEC2_6_RENDERCONFIG2_GETRESOURCEBUNDLE8 = "V2AddlPortletTests_SPEC2_6_RenderConfig2_getResourceBundle8";
+   public final static String V2ADDLPORTLETTESTS_SPEC2_6_RENDERCONFIG2_GETRESOURCEBUNDLE9 = "V2AddlPortletTests_SPEC2_6_RenderConfig2_getResourceBundle9";
+   public final static String V2ADDLPORTLETTESTS_SPEC2_6_RENDERCONFIG2_GETRESOURCEBUNDLE10 = "V2AddlPortletTests_SPEC2_6_RenderConfig2_getResourceBundle10";
+   public final static String V2ADDLPORTLETTESTS_SPEC2_6_RENDERCONFIG3_GETRESOURCEBUNDLE5 = "V2AddlPortletTests_SPEC2_6_RenderConfig3_getResourceBundle5";
+   public final static String V2ADDLPORTLETTESTS_SPEC2_6_RENDERCONFIG3_GETRESOURCEBUNDLE6 = "V2AddlPortletTests_SPEC2_6_RenderConfig3_getResourceBundle6";
+   public final static String V2ADDLPORTLETTESTS_SPEC2_6_RENDERCONFIG3_GETRESOURCEBUNDLE7 = "V2AddlPortletTests_SPEC2_6_RenderConfig3_getResourceBundle7";
+   public final static String V2ADDLPORTLETTESTS_SPEC2_8_PORTLETMODES_DECLARINGPORTLETMODES1 = "V2AddlPortletTests_SPEC2_8_PortletModes_declaringPortletModes1";
+   public final static String V2ADDLPORTLETTESTS_SPEC2_8_PORTLETMODES_DECLARINGPORTLETMODES2 = "V2AddlPortletTests_SPEC2_8_PortletModes_declaringPortletModes2";
+   public final static String V2ADDLPORTLETTESTS_SPEC2_8_PORTLETMODES_DECLARINGPORTLETMODES3 = "V2AddlPortletTests_SPEC2_8_PortletModes_declaringPortletModes3";
+   public final static String V2ADDLPORTLETTESTS_SPEC2_8_PORTLETMODES_DECLARINGPORTLETMODES4 = "V2AddlPortletTests_SPEC2_8_PortletModes_declaringPortletModes4";
+   public final static String V2ADDLPORTLETTESTS_SPEC2_8_PORTLETMODES_DECLARINGPORTLETMODES5 = "V2AddlPortletTests_SPEC2_8_PortletModes_declaringPortletModes5";
+   public final static String V2ADDLPORTLETTESTS_SPEC2_8_PORTLETMODES_DECLARINGPORTLETMODES6 = "V2AddlPortletTests_SPEC2_8_PortletModes_declaringPortletModes6";
+   public final static String V2ADDLPORTLETTESTS_SPEC2_8_PORTLETMODES_DECLARINGPORTLETMODES7 = "V2AddlPortletTests_SPEC2_8_PortletModes_declaringPortletModes7";
+   public final static String V2ADDLPORTLETTESTS_SPEC2_8_PORTLETMODES_DECLARINGPORTLETMODES8 = "V2AddlPortletTests_SPEC2_8_PortletModes_declaringPortletModes8";
+   public final static String V2ADDLPORTLETTESTS_SPEC2_8_PORTLETMODES_DECLARINGPORTLETMODES9 = "V2AddlPortletTests_SPEC2_8_PortletModes_declaringPortletModes9";
+   public final static String V2ADDLPORTLETTESTS_SPEC2_9_WINDOWSTATES_DECLARINGWINDOWSTATES1 = "V2AddlPortletTests_SPEC2_9_WindowStates_declaringWindowStates1";
+   public final static String V2ADDLPORTLETTESTS_SPEC2_9_WINDOWSTATES_DECLARINGWINDOWSTATES2 = "V2AddlPortletTests_SPEC2_9_WindowStates_declaringWindowStates2";
+   public final static String V2ADDLPORTLETTESTS_SPEC2_9_WINDOWSTATES_DECLARINGWINDOWSTATES3 = "V2AddlPortletTests_SPEC2_9_WindowStates_declaringWindowStates3";
+   public final static String V2ADDLPORTLETTESTS_SPEC2_9_WINDOWSTATES_DECLARINGWINDOWSTATES4 = "V2AddlPortletTests_SPEC2_9_WindowStates_declaringWindowStates4";
+   public final static String V2ADDLPORTLETTESTS_SPEC2_9_WINDOWSTATES_DECLARINGWINDOWSTATES5 = "V2AddlPortletTests_SPEC2_9_WindowStates_declaringWindowStates5";
+   public final static String V2ADDLPORTLETTESTS_SPEC2_9_WINDOWSTATES_DECLARINGWINDOWSTATES6 = "V2AddlPortletTests_SPEC2_9_WindowStates_declaringWindowStates6";
+   public final static String V2ADDLPORTLETTESTS_SPEC2_9_WINDOWSTATES_DECLARINGWINDOWSTATES7 = "V2AddlPortletTests_SPEC2_9_WindowStates_declaringWindowStates7";
+   public final static String V2ADDLPORTLETTESTS_SPEC2_13_RESOURCESERVING_RESOURCEURLS2 = "V2AddlPortletTests_SPEC2_13_ResourceServing_resourceURLs2";
+   public final static String V2ADDLPORTLETTESTS_SPEC2_13_RESOURCESERVING_RESOURCEURLS4 = "V2AddlPortletTests_SPEC2_13_ResourceServing_resourceURLs4";
+   public final static String V2ADDLPORTLETTESTS_SPEC2_13_RESOURCESERVING_RESOURCEURLS5 = "V2AddlPortletTests_SPEC2_13_ResourceServing_resourceURLs5";
+   public final static String V2ADDLPORTLETTESTS_SPEC2_13_RESOURCESERVING_RESOURCEURLS6 = "V2AddlPortletTests_SPEC2_13_ResourceServing_resourceURLs6";
+   public final static String V2ADDLPORTLETTESTS_SPEC2_13_RESOURCESERVING_RESOURCEURLS7 = "V2AddlPortletTests_SPEC2_13_ResourceServing_resourceURLs7";
+   public final static String V2ADDLPORTLETTESTS_SPEC2_13_RESOURCESERVING_RESOURCEURLS8 = "V2AddlPortletTests_SPEC2_13_ResourceServing_resourceURLs8";
+   public final static String V2ADDLPORTLETTESTS_SPEC2_13_RESOURCESERVING_RESOURCEURLS9 = "V2AddlPortletTests_SPEC2_13_ResourceServing_resourceURLs9";
+   public final static String V2ADDLPORTLETTESTS_SPEC2_13_RESOURCESERVINGCACHE_CACHING1 = "V2AddlPortletTests_SPEC2_13_ResourceServingCache_caching1";
+   public final static String V2ADDLPORTLETTESTS_SPEC2_13_RESOURCESERVINGCACHE_CACHING2 = "V2AddlPortletTests_SPEC2_13_ResourceServingCache_caching2";
+   public final static String V2ADDLPORTLETTESTS_SPEC2_13_RESOURCESERVINGCACHE_CACHING3 = "V2AddlPortletTests_SPEC2_13_ResourceServingCache_caching3";
+   public final static String V2ADDLPORTLETTESTS_SPEC2_13_RESOURCESERVINGCACHE_CACHINGFULL1 = "V2AddlPortletTests_SPEC2_13_ResourceServingCache_cachingFULL1";
+   public final static String V2ADDLPORTLETTESTS_SPEC2_13_RESOURCESERVINGCACHE_CACHINGFULL2 = "V2AddlPortletTests_SPEC2_13_ResourceServingCache_cachingFULL2";
+   public final static String V2ADDLPORTLETTESTS_SPEC2_13_RESOURCESERVINGCACHE_CACHINGFULL3 = "V2AddlPortletTests_SPEC2_13_ResourceServingCache_cachingFULL3";
+   public final static String V2ADDLPORTLETTESTS_SPEC2_13_RESOURCESERVINGCACHE_CACHINGFULL4 = "V2AddlPortletTests_SPEC2_13_ResourceServingCache_cachingFULL4";
+   public final static String V2ADDLPORTLETTESTS_SPEC2_13_RESOURCESERVINGCACHE_CACHINGFULL5 = "V2AddlPortletTests_SPEC2_13_ResourceServingCache_cachingFULL5";
+   public final static String V2ADDLPORTLETTESTS_SPEC2_13_RESOURCESERVINGCACHE_CACHINGFULL6 = "V2AddlPortletTests_SPEC2_13_ResourceServingCache_cachingFULL6";
+   public final static String V2ADDLPORTLETTESTS_SPEC2_13_RESOURCESERVINGCACHE_CACHINGFULL7 = "V2AddlPortletTests_SPEC2_13_ResourceServingCache_cachingFULL7";
+   public final static String V2ADDLPORTLETTESTS_SPEC2_13_RESOURCESERVINGCACHE_CACHINGFULL8 = "V2AddlPortletTests_SPEC2_13_ResourceServingCache_cachingFULL8";
+   public final static String V2ADDLPORTLETTESTS_SPEC2_13_RESOURCESERVINGCACHE_CACHINGFULL9 = "V2AddlPortletTests_SPEC2_13_ResourceServingCache_cachingFULL9";
+   public final static String V2ADDLPORTLETTESTS_SPEC2_13_RESOURCESERVINGCACHE_CACHINGPORTLET1 = "V2AddlPortletTests_SPEC2_13_ResourceServingCache_cachingPORTLET1";
+   public final static String V2ADDLPORTLETTESTS_SPEC2_13_RESOURCESERVINGCACHE_CACHINGPORTLET2 = "V2AddlPortletTests_SPEC2_13_ResourceServingCache_cachingPORTLET2";
+   public final static String V2ADDLPORTLETTESTS_SPEC2_13_RESOURCESERVINGCACHE_CACHINGPORTLET3 = "V2AddlPortletTests_SPEC2_13_ResourceServingCache_cachingPORTLET3";
+   public final static String V2ADDLPORTLETTESTS_SPEC2_13_RESOURCESERVINGCACHE_CACHINGPORTLET4 = "V2AddlPortletTests_SPEC2_13_ResourceServingCache_cachingPORTLET4";
+   public final static String V2ADDLPORTLETTESTS_SPEC2_13_RESOURCESERVINGCACHE_CACHINGPORTLET5 = "V2AddlPortletTests_SPEC2_13_ResourceServingCache_cachingPORTLET5";
+   public final static String V2ADDLPORTLETTESTS_SPEC2_13_RESOURCESERVINGCACHE_CACHINGPORTLET6 = "V2AddlPortletTests_SPEC2_13_ResourceServingCache_cachingPORTLET6";
+   public final static String V2ADDLPORTLETTESTS_SPEC2_13_RESOURCESERVINGCACHE_CACHINGPORTLET7 = "V2AddlPortletTests_SPEC2_13_ResourceServingCache_cachingPORTLET7";
+   public final static String V2ADDLPORTLETTESTS_SPEC2_13_RESOURCESERVINGCACHE_CACHINGPORTLET8 = "V2AddlPortletTests_SPEC2_13_ResourceServingCache_cachingPORTLET8";
+   public final static String V2ADDLPORTLETTESTS_SPEC2_13_RESOURCESERVINGCACHE_CACHINGPORTLET9 = "V2AddlPortletTests_SPEC2_13_ResourceServingCache_cachingPORTLET9";
+   public final static String V2ADDLPORTLETTESTS_SPEC2_13_RESOURCESERVINGCACHE_CACHINGPAGE1 = "V2AddlPortletTests_SPEC2_13_ResourceServingCache_cachingPAGE1";
+   public final static String V2ADDLPORTLETTESTS_SPEC2_13_RESOURCESERVINGCACHE_CACHINGPAGE2 = "V2AddlPortletTests_SPEC2_13_ResourceServingCache_cachingPAGE2";
+   public final static String V2ADDLPORTLETTESTS_SPEC2_13_RESOURCESERVINGCACHE_CACHINGPAGE3 = "V2AddlPortletTests_SPEC2_13_ResourceServingCache_cachingPAGE3";
+   public final static String V2ADDLPORTLETTESTS_SPEC2_13_RESOURCESERVINGCACHE_CACHINGPAGE4 = "V2AddlPortletTests_SPEC2_13_ResourceServingCache_cachingPAGE4";
+   public final static String V2ADDLPORTLETTESTS_SPEC2_13_RESOURCESERVINGCACHE_CACHINGPAGE5 = "V2AddlPortletTests_SPEC2_13_ResourceServingCache_cachingPAGE5";
+   public final static String V2ADDLPORTLETTESTS_SPEC2_13_RESOURCESERVINGCACHE_CACHINGPAGE6 = "V2AddlPortletTests_SPEC2_13_ResourceServingCache_cachingPAGE6";
+   public final static String V2ADDLPORTLETTESTS_SPEC2_13_RESOURCESERVINGCACHE_CACHINGPAGE7 = "V2AddlPortletTests_SPEC2_13_ResourceServingCache_cachingPAGE7";
+   public final static String V2ADDLPORTLETTESTS_SPEC2_13_RESOURCESERVINGCACHE_CACHINGPAGE8 = "V2AddlPortletTests_SPEC2_13_ResourceServingCache_cachingPAGE8";
+   public final static String V2ADDLPORTLETTESTS_SPEC2_13_RESOURCESERVINGCACHE_CACHINGPAGE9 = "V2AddlPortletTests_SPEC2_13_ResourceServingCache_cachingPAGE9";
+   public final static String V2ADDLPORTLETTESTS_SPEC2_15_EVENT_EVENT1 = "V2AddlPortletTests_SPEC2_15_Event_event1";
+   public final static String V2ADDLPORTLETTESTS_SPEC2_15_RENDEREVENTHANDLING_EVENT2 = "V2AddlPortletTests_SPEC2_15_RenderEventHandling_event2";
+   public final static String V2ADDLPORTLETTESTS_SPEC2_15_RENDEREVENTHANDLING_EVENT3 = "V2AddlPortletTests_SPEC2_15_RenderEventHandling_event3";
+   public final static String V2ADDLPORTLETTESTS_SPEC2_15_RENDEREVENTHANDLING_EVENT4 = "V2AddlPortletTests_SPEC2_15_RenderEventHandling_event4";
+   public final static String V2ADDLPORTLETTESTS_SPEC2_15_EVENTEVENTHANDLING_EVENT5 = "V2AddlPortletTests_SPEC2_15_EventEventHandling_event5";
+   public final static String V2ADDLPORTLETTESTS_SPEC2_15_EVENTEVENTHANDLING_EVENT6 = "V2AddlPortletTests_SPEC2_15_EventEventHandling_event6";
+   public final static String V2ADDLPORTLETTESTS_SPEC2_15_EVENTEVENTHANDLING_EVENT7 = "V2AddlPortletTests_SPEC2_15_EventEventHandling_event7";
+   public final static String V2ADDLPORTLETTESTS_SPEC2_15_EVENTEVENTHANDLING_EVENT8 = "V2AddlPortletTests_SPEC2_15_EventEventHandling_event8";
+   public final static String V2ADDLPORTLETTESTS_SPEC2_15_EVENTEVENTHANDLING_EVENT9 = "V2AddlPortletTests_SPEC2_15_EventEventHandling_event9";
+   public final static String V2ADDLPORTLETTESTS_SPEC2_15_EVENTEVENTHANDLING_EVENT10 = "V2AddlPortletTests_SPEC2_15_EventEventHandling_event10";
+   public final static String V2ADDLPORTLETTESTS_SPEC2_15_EVENTEVENTHANDLING_EVENT11 = "V2AddlPortletTests_SPEC2_15_EventEventHandling_event11";
+   public final static String V2ADDLPORTLETTESTS_SPEC2_15_EVENTEVENTHANDLING_EVENT15 = "V2AddlPortletTests_SPEC2_15_EventEventHandling_event15";
+   public final static String V2ADDLPORTLETTESTS_SPEC2_15_EVENTEVENTHANDLING_EVENT16 = "V2AddlPortletTests_SPEC2_15_EventEventHandling_event16";
+   public final static String V2ADDLPORTLETTESTS_SPEC2_15_EVENTEVENTHANDLING_EVENTPROCESSEVENT1 = "V2AddlPortletTests_SPEC2_15_EventEventHandling_eventProcessEvent1";
+   public final static String V2ADDLPORTLETTESTS_SPEC2_15_EVENTEVENTHANDLING_EVENTPROCESSEVENT2 = "V2AddlPortletTests_SPEC2_15_EventEventHandling_eventProcessEvent2";
+   public final static String V2ADDLPORTLETTESTS_SPEC2_15_EVENTEVENTHANDLING_EVENTPROCESSEVENT3 = "V2AddlPortletTests_SPEC2_15_EventEventHandling_eventProcessEvent3";
+   public final static String V2ADDLPORTLETTESTS_SPEC2_15_EVENTEVENTHANDLING_EVENTPROCESSEVENT4 = "V2AddlPortletTests_SPEC2_15_EventEventHandling_eventProcessEvent4";
+   public final static String V2ADDLPORTLETTESTS_SPEC2_15_EVENTEVENTHANDLING_EVENTPROCESSEVENT5 = "V2AddlPortletTests_SPEC2_15_EventEventHandling_eventProcessEvent5";
+   public final static String V2ADDLPORTLETTESTS_SPEC2_15_EVENTEVENTHANDLING_EVENTPROCESSEVENT6 = "V2AddlPortletTests_SPEC2_15_EventEventHandling_eventProcessEvent6";
+   public final static String V2ADDLPORTLETTESTS_SPEC2_15_EVENTEVENTHANDLING_EVENTPROCESSEVENT7 = "V2AddlPortletTests_SPEC2_15_EventEventHandling_eventProcessEvent7";
+   public final static String V2ADDLPORTLETTESTS_SPEC2_15_EVENTEVENTHANDLING_EVENTPROCESSEVENT8 = "V2AddlPortletTests_SPEC2_15_EventEventHandling_eventProcessEvent8";
+   public final static String V2ADDLPORTLETTESTS_SPEC2_15_EVENTEVENTHANDLING_EVENTPROCESSEVENT9 = "V2AddlPortletTests_SPEC2_15_EventEventHandling_eventProcessEvent9";
+   public final static String V2ADDLPORTLETTESTS_SPEC2_15_ACTIONEVENTHANDLING_EVENTPROCESSACTION1 = "V2AddlPortletTests_SPEC2_15_ActionEventHandling_eventProcessAction1";
+   public final static String V2ADDLPORTLETTESTS_SPEC2_15_ACTIONEVENTHANDLING_EVENTPROCESSACTION2 = "V2AddlPortletTests_SPEC2_15_ActionEventHandling_eventProcessAction2";
+   public final static String V2ADDLPORTLETTESTS_SPEC2_15_ACTIONEVENTHANDLING_EVENTPROCESSACTION3 = "V2AddlPortletTests_SPEC2_15_ActionEventHandling_eventProcessAction3";
+   public final static String V2ADDLPORTLETTESTS_SPEC2_15_ACTIONEVENTHANDLING_EVENTPROCESSACTION4 = "V2AddlPortletTests_SPEC2_15_ActionEventHandling_eventProcessAction4";
+   public final static String V2ADDLPORTLETTESTS_SPEC2_15_ACTIONEVENTHANDLING_EVENTPROCESSACTION5 = "V2AddlPortletTests_SPEC2_15_ActionEventHandling_eventProcessAction5";
+   public final static String V2ADDLPORTLETTESTS_SPEC2_15_ACTIONEVENTHANDLING_EVENTPROCESSACTION6 = "V2AddlPortletTests_SPEC2_15_ActionEventHandling_eventProcessAction6";
+   public final static String V2ADDLPORTLETTESTS_SPEC2_15_ACTIONEVENTHANDLING_EVENTPROCESSACTION7 = "V2AddlPortletTests_SPEC2_15_ActionEventHandling_eventProcessAction7";
+   public final static String V2ADDLPORTLETTESTS_SPEC2_15_ACTIONEVENTHANDLING_EVENTPROCESSACTION8 = "V2AddlPortletTests_SPEC2_15_ActionEventHandling_eventProcessAction8";
+   public final static String V2ADDLPORTLETTESTS_SPEC2_15_ACTIONEVENTHANDLING_EVENTPROCESSACTION9 = "V2AddlPortletTests_SPEC2_15_ActionEventHandling_eventProcessAction9";
+   public final static String V2ADDLURLTESTS_SPEC2_7_URLRENDER_RENDERURL1 = "V2AddlUrlTests_SPEC2_7_UrlRender_renderURL1";
+   public final static String V2ADDLURLTESTS_SPEC2_7_URLRENDER_RENDERURL2 = "V2AddlUrlTests_SPEC2_7_UrlRender_renderURL2";
+   public final static String V2ADDLURLTESTS_SPEC2_7_URLRENDER_RENDERURL3 = "V2AddlUrlTests_SPEC2_7_UrlRender_renderURL3";
+   public final static String V2ADDLURLTESTS_SPEC2_7_URLRENDER_RENDERURL4 = "V2AddlUrlTests_SPEC2_7_UrlRender_renderURL4";
+   public final static String V2ADDLURLTESTS_SPEC2_7_URLRENDER_RENDERURL5 = "V2AddlUrlTests_SPEC2_7_UrlRender_renderURL5";
+   public final static String V2ADDLURLTESTS_SPEC2_7_URLRENDER_RENDERURL6 = "V2AddlUrlTests_SPEC2_7_UrlRender_renderURL6";
+   public final static String V2ADDLURLTESTS_SPEC2_7_URLRENDER_RENDERURL7 = "V2AddlUrlTests_SPEC2_7_UrlRender_renderURL7";
+   public final static String V2ADDLURLTESTS_SPEC2_7_URLRENDER_RENDERURL8 = "V2AddlUrlTests_SPEC2_7_UrlRender_renderURL8";
+   public final static String V2ADDLURLTESTS_SPEC2_7_URLRENDER_RENDERURL9 = "V2AddlUrlTests_SPEC2_7_UrlRender_renderURL9";
+   public final static String V2ADDLURLTESTS_SPEC2_7_URLRENDER_RENDERURL10 = "V2AddlUrlTests_SPEC2_7_UrlRender_renderURL10";
+   public final static String V2ADDLURLTESTS_SPEC2_7_URLRENDER_RENDERURL11 = "V2AddlUrlTests_SPEC2_7_UrlRender_renderURL11";
+   public final static String V2ADDLURLTESTS_SPEC2_7_URLRENDER_PORTLETMODE1 = "V2AddlUrlTests_SPEC2_7_UrlRender_portletMode1";
+   public final static String V2ADDLURLTESTS_SPEC2_7_URLRENDER_PORTLETMODE2 = "V2AddlUrlTests_SPEC2_7_UrlRender_portletMode2";
+   public final static String V2ADDLURLTESTS_SPEC2_7_URLRENDER_PORTLETMODE4 = "V2AddlUrlTests_SPEC2_7_UrlRender_portletMode4";
+   public final static String V2ADDLURLTESTS_SPEC2_7_URLRENDER_WINDOWSTATE1 = "V2AddlUrlTests_SPEC2_7_UrlRender_windowState1";
+   public final static String V2ADDLURLTESTS_SPEC2_7_URLRENDER_WINDOWSTATE2 = "V2AddlUrlTests_SPEC2_7_UrlRender_windowState2";
+   public final static String V2ADDLURLTESTS_SPEC2_7_URLRENDER_WINDOWSTATE4 = "V2AddlUrlTests_SPEC2_7_UrlRender_windowState4";
+   public final static String V2ADDLURLTESTS_SPEC2_7_URLRENDER_SETSECURE1 = "V2AddlUrlTests_SPEC2_7_UrlRender_setSecure1";
+   public final static String V2ADDLURLTESTS_SPEC2_7_URLRENDER_SETSECURE3 = "V2AddlUrlTests_SPEC2_7_UrlRender_setSecure3";
+   public final static String V2ADDLURLTESTS_SPEC2_7_URLACTION_ACTIONURL1 = "V2AddlUrlTests_SPEC2_7_UrlAction_actionURL1";
+   public final static String V2ADDLURLTESTS_SPEC2_7_URLACTION_ACTIONURL2 = "V2AddlUrlTests_SPEC2_7_UrlAction_actionURL2";
+   public final static String V2ADDLURLTESTS_SPEC2_7_URLACTION_ACTIONURL3 = "V2AddlUrlTests_SPEC2_7_UrlAction_actionURL3";
+   public final static String V2ADDLURLTESTS_SPEC2_7_URLACTION_ACTIONURL4 = "V2AddlUrlTests_SPEC2_7_UrlAction_actionURL4";
+   public final static String V2ADDLURLTESTS_SPEC2_7_URLACTION_ACTIONURL5 = "V2AddlUrlTests_SPEC2_7_UrlAction_actionURL5";
+   public final static String V2ADDLURLTESTS_SPEC2_7_URLACTION_ACTIONURL6 = "V2AddlUrlTests_SPEC2_7_UrlAction_actionURL6";
+   public final static String V2ADDLURLTESTS_SPEC2_7_URLACTION_ACTIONURL7 = "V2AddlUrlTests_SPEC2_7_UrlAction_actionURL7";
+   public final static String V2ADDLURLTESTS_SPEC2_7_URLACTION_ACTIONURL8 = "V2AddlUrlTests_SPEC2_7_UrlAction_actionURL8";
+   public final static String V2ADDLURLTESTS_SPEC2_7_URLRESOURCE_RESOURCEURL1 = "V2AddlUrlTests_SPEC2_7_UrlResource_resourceURL1";
+   public final static String V2ADDLURLTESTS_SPEC2_7_URLRESOURCE_RESOURCEURL2 = "V2AddlUrlTests_SPEC2_7_UrlResource_resourceURL2";
+   public final static String V2ADDLURLTESTS_SPEC2_7_URLRESOURCE_RESOURCEURL3 = "V2AddlUrlTests_SPEC2_7_UrlResource_resourceURL3";
+   public final static String V2ADDLURLTESTS_SPEC2_7_URLRESOURCE_RESOURCEURL4 = "V2AddlUrlTests_SPEC2_7_UrlResource_resourceURL4";
+   public final static String V2ADDLURLTESTS_SPEC2_7_URLRESOURCE_RESOURCEURL5 = "V2AddlUrlTests_SPEC2_7_UrlResource_resourceURL5";
+   public final static String V2ADDLURLTESTS_SPEC2_7_URLRESOURCE_RESOURCEURL6 = "V2AddlUrlTests_SPEC2_7_UrlResource_resourceURL6";
+   public final static String V2ADDLURLTESTS_SPEC2_7_URLRESOURCE_RESOURCEURL7 = "V2AddlUrlTests_SPEC2_7_UrlResource_resourceURL7";
+   public final static String V2ADDLURLTESTS_SPEC2_7_URLRESOURCE_RESOURCEURL8 = "V2AddlUrlTests_SPEC2_7_UrlResource_resourceURL8";
+   public final static String V2ADDLURLTESTS_SPEC2_7_URLRESOURCE_RESOURCEURL9 = "V2AddlUrlTests_SPEC2_7_UrlResource_resourceURL9";
+   public final static String V2ADDLURLTESTS_SPEC2_7_URLLISTENER_PORTLETURLGENERATIONLISTENER6 = "V2AddlUrlTests_SPEC2_7_UrlListener_portletURLGenerationListener6";
+   public final static String V2ADDLENVIRONMENTTESTS_SPEC2_10_CONTEXT_PORTLETCONTEXTSERVLETCONTEXT1 = "V2AddlEnvironmentTests_SPEC2_10_Context_portletContextServletContext1";
+   public final static String V2ADDLENVIRONMENTTESTS_SPEC2_10_CONTEXT_PORTLETCONTEXTSERVLETCONTEXT2 = "V2AddlEnvironmentTests_SPEC2_10_Context_portletContextServletContext2";
+   public final static String V2ADDLENVIRONMENTTESTS_SPEC2_10_CONTEXT_PORTLETCONTEXTSERVLETCONTEXT3 = "V2AddlEnvironmentTests_SPEC2_10_Context_portletContextServletContext3";
+   public final static String V2ADDLENVIRONMENTTESTS_SPEC2_10_CONTEXT_PORTLETCONTEXTSERVLETCONTEXT4 = "V2AddlEnvironmentTests_SPEC2_10_Context_portletContextServletContext4";
+   public final static String V2ADDLENVIRONMENTTESTS_SPEC2_10_CONTEXT_GETATTRIBUTE = "V2AddlEnvironmentTests_SPEC2_10_Context_getAttribute";
+   public final static String V2ADDLENVIRONMENTTESTS_SPEC2_10_CONTEXT_GETATTRIBUTENAMES = "V2AddlEnvironmentTests_SPEC2_10_Context_getAttributeNames";
+   public final static String V2ADDLENVIRONMENTTESTS_SPEC2_10_CONTEXT_GETINITPARAMETER = "V2AddlEnvironmentTests_SPEC2_10_Context_getInitParameter";
+   public final static String V2ADDLENVIRONMENTTESTS_SPEC2_10_CONTEXT_GETINITPARAMETERNAMES = "V2AddlEnvironmentTests_SPEC2_10_Context_getInitParameterNames";
+   public final static String V2ADDLENVIRONMENTTESTS_SPEC2_10_CONTEXT_GETMIMETYPE = "V2AddlEnvironmentTests_SPEC2_10_Context_getMimeType";
+   public final static String V2ADDLENVIRONMENTTESTS_SPEC2_10_CONTEXT_GETREALPATH = "V2AddlEnvironmentTests_SPEC2_10_Context_getRealPath";
+   public final static String V2ADDLENVIRONMENTTESTS_SPEC2_10_CONTEXT_GETRESOURCE = "V2AddlEnvironmentTests_SPEC2_10_Context_getResource";
+   public final static String V2ADDLENVIRONMENTTESTS_SPEC2_10_CONTEXT_GETRESOURCEPATHS = "V2AddlEnvironmentTests_SPEC2_10_Context_getResourcePaths";
+   public final static String V2ADDLENVIRONMENTTESTS_SPEC2_10_CONTEXT_GETRESOURCEASSTREAM = "V2AddlEnvironmentTests_SPEC2_10_Context_getResourceAsStream";
+   public final static String V2ADDLENVIRONMENTTESTS_SPEC2_10_CONTEXT_LOG = "V2AddlEnvironmentTests_SPEC2_10_Context_log";
+   public final static String V2ADDLENVIRONMENTTESTS_SPEC2_10_CONTEXT_REMOVEATTRIBUTE = "V2AddlEnvironmentTests_SPEC2_10_Context_removeAttribute";
+   public final static String V2ADDLENVIRONMENTTESTS_SPEC2_10_CONTEXT_SETATTRIBUTE = "V2AddlEnvironmentTests_SPEC2_10_Context_setAttribute";
+   public final static String V2ADDLENVIRONMENTTESTS_SPEC2_10_CONTEXTOPTIONS_CONTAINERRUNTIMEOPTIONS1 = "V2AddlEnvironmentTests_SPEC2_10_ContextOptions_containerRuntimeOptions1";
+   public final static String V2ADDLENVIRONMENTTESTS_SPEC2_10_CONTEXTOPTIONS_ACTIONSCOPEDREQUESTATTRIBUTES1 = "V2AddlEnvironmentTests_SPEC2_10_ContextOptions_actionScopedRequestAttributes1";
+   public final static String V2ADDLENVIRONMENTTESTS_SPEC2_10_CONTEXTOPTIONS_ACTIONSCOPEDREQUESTATTRIBUTES2 = "V2AddlEnvironmentTests_SPEC2_10_ContextOptions_actionScopedRequestAttributes2";
+   public final static String V2ADDLENVIRONMENTTESTS_SPEC2_10_CONTEXTOPTIONS_ACTIONSCOPEDREQUESTATTRIBUTES3 = "V2AddlEnvironmentTests_SPEC2_10_ContextOptions_actionScopedRequestAttributes3";
+   public final static String V2ADDLENVIRONMENTTESTS_SPEC2_10_CONTEXTOPTIONS_ACTIONSCOPEDREQUESTATTRIBUTES4 = "V2AddlEnvironmentTests_SPEC2_10_ContextOptions_actionScopedRequestAttributes4";
+   public final static String V2ADDLENVIRONMENTTESTS_SPEC2_10_CONTEXTOPTIONS_ACTIONSCOPEDREQUESTATTRIBUTES5 = "V2AddlEnvironmentTests_SPEC2_10_ContextOptions_actionScopedRequestAttributes5";
+   public final static String V2ADDLENVIRONMENTTESTS_SPEC2_10_CONTEXTOPTIONS_ACTIONSCOPEDREQUESTATTRIBUTES6 = "V2AddlEnvironmentTests_SPEC2_10_ContextOptions_actionScopedRequestAttributes6";
+   public final static String V2ADDLENVIRONMENTTESTS_SPEC2_10_CONTEXTOPTIONS_ACTIONSCOPEDREQUESTATTRIBUTES7 = "V2AddlEnvironmentTests_SPEC2_10_ContextOptions_actionScopedRequestAttributes7";
+   public final static String V2ADDLENVIRONMENTTESTS_SPEC2_10_CONTEXTOPTIONS_ACTIONSCOPEDREQUESTATTRIBUTES8 = "V2AddlEnvironmentTests_SPEC2_10_ContextOptions_actionScopedRequestAttributes8";
+   public final static String V2ADDLENVIRONMENTTESTS_SPEC2_10_CONTEXTOPTIONS_ACTIONSCOPEDREQUESTATTRIBUTES9 = "V2AddlEnvironmentTests_SPEC2_10_ContextOptions_actionScopedRequestAttributes9";
+   public final static String V2ADDLENVIRONMENTTESTS_SPEC2_10_CONTEXTOPTIONS_ACTIONSCOPEDREQUESTATTRIBUTES0 = "V2AddlEnvironmentTests_SPEC2_10_ContextOptions_actionScopedRequestAttributes0";
+   public final static String V2ADDLENVIRONMENTTESTS_SPEC2_10_CONTEXTOPTIONS_ACTIONSCOPEDREQUESTATTRIBUTES11 = "V2AddlEnvironmentTests_SPEC2_10_ContextOptions_actionScopedRequestAttributes11";
+   public final static String V2ADDLENVIRONMENTTESTS_SPEC2_10_CONTEXTOPTIONS_ACTIONSCOPEDREQUESTATTRIBUTES12 = "V2AddlEnvironmentTests_SPEC2_10_ContextOptions_actionScopedRequestAttributes12";
+   public final static String V2ADDLENVIRONMENTTESTS_SPEC2_10_CONTEXTOPTIONS_ACTIONSCOPEDREQUESTATTRIBUTES13 = "V2AddlEnvironmentTests_SPEC2_10_ContextOptions_actionScopedRequestAttributes13";
+   public final static String V2ADDLENVIRONMENTTESTS_SPEC2_17_ACTIONPREFERENCES_SETVALUES4 = "V2AddlEnvironmentTests_SPEC2_17_ActionPreferences_setValues4";
+   public final static String V2ADDLENVIRONMENTTESTS_SPEC2_17_ACTIONPREFERENCES_RESET1 = "V2AddlEnvironmentTests_SPEC2_17_ActionPreferences_reset1";
+   public final static String V2ADDLENVIRONMENTTESTS_SPEC2_17_ACTIONPREFERENCES_STORE1 = "V2AddlEnvironmentTests_SPEC2_17_ActionPreferences_store1";
+   public final static String V2ADDLENVIRONMENTTESTS_SPEC2_17_ACTIONPREFERENCES_STORE4 = "V2AddlEnvironmentTests_SPEC2_17_ActionPreferences_store4";
+   public final static String V2ADDLENVIRONMENTTESTS_SPEC2_17_ACTIONPREFERENCES_DEPLOYMENT3 = "V2AddlEnvironmentTests_SPEC2_17_ActionPreferences_deployment3";
+   public final static String V2ADDLENVIRONMENTTESTS_SPEC2_17_ACTIONPREFERENCES_DEPLOYMENT4 = "V2AddlEnvironmentTests_SPEC2_17_ActionPreferences_deployment4";
+   public final static String V2ADDLENVIRONMENTTESTS_SPEC2_17_ACTIONPREFERENCES_DEPLOYMENT7 = "V2AddlEnvironmentTests_SPEC2_17_ActionPreferences_deployment7";
+   public final static String V2ADDLENVIRONMENTTESTS_SPEC2_17_ACTIONPREFERENCES_DEPLOYMENT10 = "V2AddlEnvironmentTests_SPEC2_17_ActionPreferences_deployment10";
+   public final static String V2ADDLENVIRONMENTTESTS_SPEC2_17_EVENTPREFERENCES_SETVALUES4 = "V2AddlEnvironmentTests_SPEC2_17_EventPreferences_setValues4";
+   public final static String V2ADDLENVIRONMENTTESTS_SPEC2_17_EVENTPREFERENCES_RESET1 = "V2AddlEnvironmentTests

<TRUNCATED>

[22/22] git commit: Corrected implmentation of some dispatcher tests. Completed restructure of the spec tests (module names contain the string "Addl"). Completed restructuring the portlet tag library tests.

Posted by ms...@apache.org.
Corrected implmentation of some dispatcher tests. Completed restructure of
the spec tests (module names contain the string "Addl"). Completed
restructuring the portlet tag library tests.

All dispatcher tests, spec tests, and portlet tag library tests should now
have the test code inserted into the correct portlet / JSP / Servlet method.


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

Branch: refs/heads/master
Commit: 8bf37be80005a694be88aa687c9d6fd0ac177c72
Parents: 23a1c54
Author: Scott Nicklous <ms...@apache.org>
Authored: Mon Aug 25 10:42:41 2014 +0200
Committer: Scott Nicklous <ms...@apache.org>
Committed: Mon Aug 25 10:42:41 2014 +0200

----------------------------------------------------------------------
 .../AddlEnvironmentTests_SPEC2_18_Sessions.java |  17 +-
 .../AddlFilterTests_SPEC2_20_Action.java        |  30 ++--
 .../AddlFilterTests_SPEC2_20_Event.java         |  15 +-
 .../AddlFilterTests_SPEC2_20_Event_event.java   |  15 +-
 .../AddlFilterTests_SPEC2_20_Render.java        |  15 +-
 .../AddlFilterTests_SPEC2_20_Resource.java      |  16 +-
 ...rtletTests_SPEC2_5_RenderGenericPortlet.java |   8 +-
 .../AddlPortletTests_SPEC2_6_RenderConfig.java  |  44 +++---
 .../AddlPortletTests_SPEC2_6_RenderConfig2.java |  10 +-
 .../AddlPortletTests_SPEC2_6_RenderConfig3.java |   8 +-
 .../AddlPortletTests_SPEC2_8_PortletModes.java  |  18 +--
 .../AddlUrlTests_SPEC2_7_UrlAction.java         |   4 +-
 .../AddlUrlTests_SPEC2_7_UrlRender.java         |   4 +-
 .../AddlUrlTests_SPEC2_7_UrlResource.java       |   2 +-
 ...herTests_SPEC2_19_DispatchServletAction.java |   2 +-
 ...sts_SPEC2_19_DispatchServletEvent_event.java |   2 +-
 ...herTests_SPEC2_19_DispatchServletRender.java |   2 +-
 ...rTests_SPEC2_19_DispatchServletResource.java |   2 +-
 ...spatcherTests2_SPEC2_19_ForwardJSPAction.jsp |   1 +
 ...ispatcherTests2_SPEC2_19_ForwardJSPEvent.jsp |   1 +
 ...spatcherTests2_SPEC2_19_ForwardJSPRender.jsp |   1 +
 ...atcherTests2_SPEC2_19_ForwardJSPResource.jsp |   1 +
 ...spatcherTests2_SPEC2_19_IncludeJSPAction.jsp |   1 +
 ...ispatcherTests2_SPEC2_19_IncludeJSPEvent.jsp |   1 +
 ...spatcherTests2_SPEC2_19_IncludeJSPRender.jsp |   1 +
 ...atcherTests2_SPEC2_19_IncludeJSPResource.jsp |   1 +
 ...patcherTests3S_SPEC2_19_ForwardJSPAction.jsp |   1 +
 ...spatcherTests3S_SPEC2_19_ForwardJSPEvent.jsp |   1 +
 ...patcherTests3S_SPEC2_19_ForwardJSPRender.jsp |   1 +
 ...tcherTests3S_SPEC2_19_ForwardJSPResource.jsp |   1 +
 ...patcherTests3S_SPEC2_19_IncludeJSPAction.jsp |   1 +
 ...spatcherTests3S_SPEC2_19_IncludeJSPEvent.jsp |   1 +
 ...patcherTests3S_SPEC2_19_IncludeJSPRender.jsp |   1 +
 ...tcherTests3S_SPEC2_19_IncludeJSPResource.jsp |   1 +
 ...spatcherTests4_SPEC2_19_ForwardJSPAction.jsp |   1 +
 ...ispatcherTests4_SPEC2_19_ForwardJSPEvent.jsp |   1 +
 ...spatcherTests4_SPEC2_19_ForwardJSPRender.jsp |   1 +
 ...atcherTests4_SPEC2_19_ForwardJSPResource.jsp |   1 +
 ...spatcherTests4_SPEC2_19_IncludeJSPAction.jsp |   1 +
 ...ispatcherTests4_SPEC2_19_IncludeJSPEvent.jsp |   1 +
 ...spatcherTests4_SPEC2_19_IncludeJSPRender.jsp |   1 +
 ...atcherTests4_SPEC2_19_IncludeJSPResource.jsp |   1 +
 ...gLibraryTests_SPEC2_26_IncludeJSPAction.java |  13 +-
 ...agLibraryTests_SPEC2_26_IncludeJSPEvent.java |  13 +-
 ...agLibraryTests_SPEC2_26_IncludeJSPAction.jsp |  14 +-
 ...TagLibraryTests_SPEC2_26_IncludeJSPEvent.jsp |  14 +-
 ...gLibraryTests_SPEC2_26_IncludeJSPGeneral.jsp |  10 +-
 ...gLibraryTests2_SPEC2_26_IncludeJSPRender.jsp |  60 ++++----
 ...ibraryTests3_SPEC2_26_IncludeJSPResource.jsp |  60 ++++----
 .../tck/beans/JSR286SpecTestCaseDetails.java    | 154 +++++++++----------
 50 files changed, 305 insertions(+), 271 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/8bf37be8/portlet-tck_3.0/V2AddlEnvironmentTests/src/main/java/javax/portlet/tck/portlets/AddlEnvironmentTests_SPEC2_18_Sessions.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlEnvironmentTests/src/main/java/javax/portlet/tck/portlets/AddlEnvironmentTests_SPEC2_18_Sessions.java b/portlet-tck_3.0/V2AddlEnvironmentTests/src/main/java/javax/portlet/tck/portlets/AddlEnvironmentTests_SPEC2_18_Sessions.java
index f53739a..78208a2 100644
--- a/portlet-tck_3.0/V2AddlEnvironmentTests/src/main/java/javax/portlet/tck/portlets/AddlEnvironmentTests_SPEC2_18_Sessions.java
+++ b/portlet-tck_3.0/V2AddlEnvironmentTests/src/main/java/javax/portlet/tck/portlets/AddlEnvironmentTests_SPEC2_18_Sessions.java
@@ -139,8 +139,9 @@ public class AddlEnvironmentTests_SPEC2_18_Sessions implements Portlet, Resource
       /* TestCase: V2AddlEnvironmentTests_SPEC2_18_Sessions_scope5            */
       /* Details: "The PORTLET_SCOPE object must be stored in the             */
       /* APPLICATION_SCOPE with the attribute name                            */
-      /* 'javax.portlet.p.<ID>?<ATTRIBUTE_NAME>', where <ID> must be equal    */
-      /* to the ID returned by the PortletRequest.getWindowID()"              */
+      /* 'javax.portlet.p.&lt;ID&gt;?&lt;ATTRIBUTE_NAME&gt;', where           */
+      /* &lt;ID&gt; must be equal to the ID returned by the                   */
+      /* PortletRequest.getWindowID()"                                        */
       TestResult tr4 = tcd.getTestResultFailed(V2ADDLENVIRONMENTTESTS_SPEC2_18_SESSIONS_SCOPE5);
       /* TODO: implement test */
       tr4.appendTcDetail("Not implemented.");
@@ -222,8 +223,8 @@ public class AddlEnvironmentTests_SPEC2_18_Sessions implements Portlet, Resource
 
       /* TestCase: V2AddlEnvironmentTests_SPEC2_18_Sessions_getAttributeNames1 */
       /* Details: "The getAttributeNames method can retrieve an               */
-      /* Enumeration<String> of all attribute names stored in the session     */
-      /* in PORTLET_SCOPE"                                                    */
+      /* Enumeration&lt;String&gt; of all attribute names stored in the       */
+      /* session in PORTLET_SCOPE"                                            */
       TestResult tr14 = tcd.getTestResultFailed(V2ADDLENVIRONMENTTESTS_SPEC2_18_SESSIONS_GETATTRIBUTENAMES1);
       /* TODO: implement test */
       tr14.appendTcDetail("Not implemented.");
@@ -231,8 +232,8 @@ public class AddlEnvironmentTests_SPEC2_18_Sessions implements Portlet, Resource
 
       /* TestCase: V2AddlEnvironmentTests_SPEC2_18_Sessions_getAttributeNames2 */
       /* Details: "The getAttributeNames method that does not take a scope    */
-      /* parameter retrieves an Enumeration<String> of all attribute names    */
-      /* stored in the session in PORTLET_SCOPE"                              */
+      /* parameter retrieves an Enumeration&lt;String&gt; of all attribute    */
+      /* names stored in the session in PORTLET_SCOPE"                        */
       TestResult tr15 = tcd.getTestResultFailed(V2ADDLENVIRONMENTTESTS_SPEC2_18_SESSIONS_GETATTRIBUTENAMES2);
       /* TODO: implement test */
       tr15.appendTcDetail("Not implemented.");
@@ -240,8 +241,8 @@ public class AddlEnvironmentTests_SPEC2_18_Sessions implements Portlet, Resource
 
       /* TestCase: V2AddlEnvironmentTests_SPEC2_18_Sessions_getAttributeNames3 */
       /* Details: "The getAttributeNames method can retrieve an               */
-      /* Enumeration<String> of all attribute names stored in the session     */
-      /* in APPLICATION_SCOPE"                                                */
+      /* Enumeration&lt;String&gt; of all attribute names stored in the       */
+      /* session in APPLICATION_SCOPE"                                        */
       TestResult tr16 = tcd.getTestResultFailed(V2ADDLENVIRONMENTTESTS_SPEC2_18_SESSIONS_GETATTRIBUTENAMES3);
       /* TODO: implement test */
       tr16.appendTcDetail("Not implemented.");

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/8bf37be8/portlet-tck_3.0/V2AddlFilterTests/src/main/java/javax/portlet/tck/portlets/AddlFilterTests_SPEC2_20_Action.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlFilterTests/src/main/java/javax/portlet/tck/portlets/AddlFilterTests_SPEC2_20_Action.java b/portlet-tck_3.0/V2AddlFilterTests/src/main/java/javax/portlet/tck/portlets/AddlFilterTests_SPEC2_20_Action.java
index 9f443d8..a98aece 100644
--- a/portlet-tck_3.0/V2AddlFilterTests/src/main/java/javax/portlet/tck/portlets/AddlFilterTests_SPEC2_20_Action.java
+++ b/portlet-tck_3.0/V2AddlFilterTests/src/main/java/javax/portlet/tck/portlets/AddlFilterTests_SPEC2_20_Action.java
@@ -85,8 +85,8 @@ public class AddlFilterTests_SPEC2_20_Action implements Portlet, ResourceServing
       tr0.writeTo(writer);
 
       /* TestCase: V2AddlFilterTests_SPEC2_20_Action_filter6                  */
-      /* Details: "A filter declaration can contain multiple <lifecycle>      */
-      /* tags for a single filter class"                                      */
+      /* Details: "A filter declaration can contain multiple                  */
+      /* &lt;lifecycle&gt; tags for a single filter class"                    */
       TestResult tr1 = tcd.getTestResultFailed(V2ADDLFILTERTESTS_SPEC2_20_ACTION_FILTER6);
       /* TODO: implement test */
       tr1.appendTcDetail("Not implemented.");
@@ -147,7 +147,7 @@ public class AddlFilterTests_SPEC2_20_Action implements Portlet, ResourceServing
 
       /* TestCase: V2AddlFilterTests_SPEC2_20_Action_filter13                 */
       /* Details: "A filter declaration can be mapped to a portlet through    */
-      /* the deployment descriptor <filter-mapping> element"                  */
+      /* the deployment descriptor &lt;filter-mapping&gt; element"            */
       TestResult tr8 = tcd.getTestResultFailed(V2ADDLFILTERTESTS_SPEC2_20_ACTION_FILTER13);
       /* TODO: implement test */
       tr8.appendTcDetail("Not implemented.");
@@ -166,8 +166,8 @@ public class AddlFilterTests_SPEC2_20_Action implements Portlet, ResourceServing
       /* TestCase: V2AddlFilterTests_SPEC2_20_Action_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"                                               */
+      /* which the &lt;portlet-name&gt; matching filter mappings appear in    */
+      /* the deployment descriptor"                                           */
       TestResult tr10 = tcd.getTestResultFailed(V2ADDLFILTERTESTS_SPEC2_20_ACTION_FILTER15);
       /* TODO: implement test */
       tr10.appendTcDetail("Not implemented.");
@@ -190,8 +190,9 @@ public class AddlFilterTests_SPEC2_20_Action implements Portlet, ResourceServing
       tr12.writeTo(writer);
 
       /* TestCase: V2AddlFilterTests_SPEC2_20_Action_filter2                  */
-      /* Details: "If the filter declaration specifies the <lifecycle> tag    */
-      /* value ACTION_PHASE, the ActionFilter.doFilter method is called"      */
+      /* Details: "If the filter declaration specifies the                    */
+      /* &lt;lifecycle&gt; tag value ACTION_PHASE, the                        */
+      /* ActionFilter.doFilter method is called"                              */
       TestResult tr13 = tcd.getTestResultFailed(V2ADDLFILTERTESTS_SPEC2_20_ACTION_FILTER2);
       /* TODO: implement test */
       tr13.appendTcDetail("Not implemented.");
@@ -242,8 +243,8 @@ public class AddlFilterTests_SPEC2_20_Action implements Portlet, ResourceServing
       }
 
       /* TestCase: V2AddlFilterTests_SPEC2_20_Action_filter6                  */
-      /* Details: "A filter declaration can contain multiple <lifecycle>      */
-      /* tags for a single filter class"                                      */
+      /* Details: "A filter declaration can contain multiple                  */
+      /* &lt;lifecycle&gt; tags for a single filter class"                    */
       {
          PortletURL aurl = portletResp.createActionURL();
          aurl.setParameters(portletReq.getPrivateParameterMap());
@@ -318,7 +319,7 @@ public class AddlFilterTests_SPEC2_20_Action implements Portlet, ResourceServing
 
       /* TestCase: V2AddlFilterTests_SPEC2_20_Action_filter13                 */
       /* Details: "A filter declaration can be mapped to a portlet through    */
-      /* the deployment descriptor <filter-mapping> element"                  */
+      /* the deployment descriptor &lt;filter-mapping&gt; element"            */
       {
          PortletURL aurl = portletResp.createActionURL();
          aurl.setParameters(portletReq.getPrivateParameterMap());
@@ -341,8 +342,8 @@ public class AddlFilterTests_SPEC2_20_Action implements Portlet, ResourceServing
       /* TestCase: V2AddlFilterTests_SPEC2_20_Action_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"                                               */
+      /* which the &lt;portlet-name&gt; matching filter mappings appear in    */
+      /* the deployment descriptor"                                           */
       {
          PortletURL aurl = portletResp.createActionURL();
          aurl.setParameters(portletReq.getPrivateParameterMap());
@@ -371,8 +372,9 @@ public class AddlFilterTests_SPEC2_20_Action implements Portlet, ResourceServing
       }
 
       /* TestCase: V2AddlFilterTests_SPEC2_20_Action_filter2                  */
-      /* Details: "If the filter declaration specifies the <lifecycle> tag    */
-      /* value ACTION_PHASE, the ActionFilter.doFilter method is called"      */
+      /* Details: "If the filter declaration specifies the                    */
+      /* &lt;lifecycle&gt; tag value ACTION_PHASE, the                        */
+      /* ActionFilter.doFilter method is called"                              */
       {
          PortletURL aurl = portletResp.createActionURL();
          aurl.setParameters(portletReq.getPrivateParameterMap());

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/8bf37be8/portlet-tck_3.0/V2AddlFilterTests/src/main/java/javax/portlet/tck/portlets/AddlFilterTests_SPEC2_20_Event.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlFilterTests/src/main/java/javax/portlet/tck/portlets/AddlFilterTests_SPEC2_20_Event.java b/portlet-tck_3.0/V2AddlFilterTests/src/main/java/javax/portlet/tck/portlets/AddlFilterTests_SPEC2_20_Event.java
index 5568c38..cb3c1b8 100644
--- a/portlet-tck_3.0/V2AddlFilterTests/src/main/java/javax/portlet/tck/portlets/AddlFilterTests_SPEC2_20_Event.java
+++ b/portlet-tck_3.0/V2AddlFilterTests/src/main/java/javax/portlet/tck/portlets/AddlFilterTests_SPEC2_20_Event.java
@@ -110,8 +110,8 @@ public class AddlFilterTests_SPEC2_20_Event implements Portlet, ResourceServingP
       }
 
       /* TestCase: V2AddlFilterTests_SPEC2_20_Event_filter6                   */
-      /* Details: "A filter declaration can contain multiple <lifecycle>      */
-      /* tags for a single filter class"                                      */
+      /* Details: "A filter declaration can contain multiple                  */
+      /* &lt;lifecycle&gt; tags for a single filter class"                    */
       {
          PortletURL aurl = portletResp.createActionURL();
          aurl.setParameters(portletReq.getPrivateParameterMap());
@@ -186,7 +186,7 @@ public class AddlFilterTests_SPEC2_20_Event implements Portlet, ResourceServingP
 
       /* TestCase: V2AddlFilterTests_SPEC2_20_Event_filter13                  */
       /* Details: "A filter declaration can be mapped to a portlet through    */
-      /* the deployment descriptor <filter-mapping> element"                  */
+      /* the deployment descriptor &lt;filter-mapping&gt; element"            */
       {
          PortletURL aurl = portletResp.createActionURL();
          aurl.setParameters(portletReq.getPrivateParameterMap());
@@ -209,8 +209,8 @@ public class AddlFilterTests_SPEC2_20_Event implements Portlet, ResourceServingP
       /* TestCase: V2AddlFilterTests_SPEC2_20_Event_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"                                               */
+      /* which the &lt;portlet-name&gt; matching filter mappings appear in    */
+      /* the deployment descriptor"                                           */
       {
          PortletURL aurl = portletResp.createActionURL();
          aurl.setParameters(portletReq.getPrivateParameterMap());
@@ -239,8 +239,9 @@ public class AddlFilterTests_SPEC2_20_Event implements Portlet, ResourceServingP
       }
 
       /* TestCase: V2AddlFilterTests_SPEC2_20_Event_filter4                   */
-      /* Details: "If the filter declaration specifies the <lifecycle> tag    */
-      /* value EVENT_PHASE, the EventFilter.doFilter method is called"        */
+      /* Details: "If the filter declaration specifies the                    */
+      /* &lt;lifecycle&gt; tag value EVENT_PHASE, the EventFilter.doFilter    */
+      /* method is called"                                                    */
       {
          PortletURL aurl = portletResp.createActionURL();
          aurl.setParameters(portletReq.getPrivateParameterMap());

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/8bf37be8/portlet-tck_3.0/V2AddlFilterTests/src/main/java/javax/portlet/tck/portlets/AddlFilterTests_SPEC2_20_Event_event.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlFilterTests/src/main/java/javax/portlet/tck/portlets/AddlFilterTests_SPEC2_20_Event_event.java b/portlet-tck_3.0/V2AddlFilterTests/src/main/java/javax/portlet/tck/portlets/AddlFilterTests_SPEC2_20_Event_event.java
index 7f5b4e3..59929ee 100644
--- a/portlet-tck_3.0/V2AddlFilterTests/src/main/java/javax/portlet/tck/portlets/AddlFilterTests_SPEC2_20_Event_event.java
+++ b/portlet-tck_3.0/V2AddlFilterTests/src/main/java/javax/portlet/tck/portlets/AddlFilterTests_SPEC2_20_Event_event.java
@@ -91,8 +91,8 @@ public class AddlFilterTests_SPEC2_20_Event_event implements Portlet, EventPortl
       tr0.writeTo(writer);
 
       /* TestCase: V2AddlFilterTests_SPEC2_20_Event_filter6                   */
-      /* Details: "A filter declaration can contain multiple <lifecycle>      */
-      /* tags for a single filter class"                                      */
+      /* Details: "A filter declaration can contain multiple                  */
+      /* &lt;lifecycle&gt; tags for a single filter class"                    */
       TestResult tr1 = tcd.getTestResultFailed(V2ADDLFILTERTESTS_SPEC2_20_EVENT_FILTER6);
       /* TODO: implement test */
       tr1.appendTcDetail("Not implemented.");
@@ -153,7 +153,7 @@ public class AddlFilterTests_SPEC2_20_Event_event implements Portlet, EventPortl
 
       /* TestCase: V2AddlFilterTests_SPEC2_20_Event_filter13                  */
       /* Details: "A filter declaration can be mapped to a portlet through    */
-      /* the deployment descriptor <filter-mapping> element"                  */
+      /* the deployment descriptor &lt;filter-mapping&gt; element"            */
       TestResult tr8 = tcd.getTestResultFailed(V2ADDLFILTERTESTS_SPEC2_20_EVENT_FILTER13);
       /* TODO: implement test */
       tr8.appendTcDetail("Not implemented.");
@@ -172,8 +172,8 @@ public class AddlFilterTests_SPEC2_20_Event_event implements Portlet, EventPortl
       /* TestCase: V2AddlFilterTests_SPEC2_20_Event_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"                                               */
+      /* which the &lt;portlet-name&gt; matching filter mappings appear in    */
+      /* the deployment descriptor"                                           */
       TestResult tr10 = tcd.getTestResultFailed(V2ADDLFILTERTESTS_SPEC2_20_EVENT_FILTER15);
       /* TODO: implement test */
       tr10.appendTcDetail("Not implemented.");
@@ -196,8 +196,9 @@ public class AddlFilterTests_SPEC2_20_Event_event implements Portlet, EventPortl
       tr12.writeTo(writer);
 
       /* TestCase: V2AddlFilterTests_SPEC2_20_Event_filter4                   */
-      /* Details: "If the filter declaration specifies the <lifecycle> tag    */
-      /* value EVENT_PHASE, the EventFilter.doFilter method is called"        */
+      /* Details: "If the filter declaration specifies the                    */
+      /* &lt;lifecycle&gt; tag value EVENT_PHASE, the EventFilter.doFilter    */
+      /* method is called"                                                    */
       TestResult tr13 = tcd.getTestResultFailed(V2ADDLFILTERTESTS_SPEC2_20_EVENT_FILTER4);
       /* TODO: implement test */
       tr13.appendTcDetail("Not implemented.");

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/8bf37be8/portlet-tck_3.0/V2AddlFilterTests/src/main/java/javax/portlet/tck/portlets/AddlFilterTests_SPEC2_20_Render.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlFilterTests/src/main/java/javax/portlet/tck/portlets/AddlFilterTests_SPEC2_20_Render.java b/portlet-tck_3.0/V2AddlFilterTests/src/main/java/javax/portlet/tck/portlets/AddlFilterTests_SPEC2_20_Render.java
index 4c1996a..29ba5f3 100644
--- a/portlet-tck_3.0/V2AddlFilterTests/src/main/java/javax/portlet/tck/portlets/AddlFilterTests_SPEC2_20_Render.java
+++ b/portlet-tck_3.0/V2AddlFilterTests/src/main/java/javax/portlet/tck/portlets/AddlFilterTests_SPEC2_20_Render.java
@@ -109,8 +109,8 @@ public class AddlFilterTests_SPEC2_20_Render implements Portlet, ResourceServing
       tr0.writeTo(writer);
 
       /* TestCase: V2AddlFilterTests_SPEC2_20_Render_filter6                  */
-      /* Details: "A filter declaration can contain multiple <lifecycle>      */
-      /* tags for a single filter class"                                      */
+      /* Details: "A filter declaration can contain multiple                  */
+      /* &lt;lifecycle&gt; tags for a single filter class"                    */
       TestResult tr1 = tcd.getTestResultFailed(V2ADDLFILTERTESTS_SPEC2_20_RENDER_FILTER6);
       /* TODO: implement test */
       tr1.appendTcDetail("Not implemented.");
@@ -171,7 +171,7 @@ public class AddlFilterTests_SPEC2_20_Render implements Portlet, ResourceServing
 
       /* TestCase: V2AddlFilterTests_SPEC2_20_Render_filter13                 */
       /* Details: "A filter declaration can be mapped to a portlet through    */
-      /* the deployment descriptor <filter-mapping> element"                  */
+      /* the deployment descriptor &lt;filter-mapping&gt; element"            */
       TestResult tr8 = tcd.getTestResultFailed(V2ADDLFILTERTESTS_SPEC2_20_RENDER_FILTER13);
       /* TODO: implement test */
       tr8.appendTcDetail("Not implemented.");
@@ -190,8 +190,8 @@ public class AddlFilterTests_SPEC2_20_Render implements Portlet, ResourceServing
       /* TestCase: V2AddlFilterTests_SPEC2_20_Render_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"                                               */
+      /* which the &lt;portlet-name&gt; matching filter mappings appear in    */
+      /* the deployment descriptor"                                           */
       TestResult tr10 = tcd.getTestResultFailed(V2ADDLFILTERTESTS_SPEC2_20_RENDER_FILTER15);
       /* TODO: implement test */
       tr10.appendTcDetail("Not implemented.");
@@ -214,8 +214,9 @@ public class AddlFilterTests_SPEC2_20_Render implements Portlet, ResourceServing
       tr12.writeTo(writer);
 
       /* TestCase: V2AddlFilterTests_SPEC2_20_Render_filter3                  */
-      /* Details: "If the filter declaration specifies the <lifecycle> tag    */
-      /* value RENDER_PHASE, the RenderFilter.doFilter method is called"      */
+      /* Details: "If the filter declaration specifies the                    */
+      /* &lt;lifecycle&gt; tag value RENDER_PHASE, the                        */
+      /* RenderFilter.doFilter method is called"                              */
       TestResult tr13 = tcd.getTestResultFailed(V2ADDLFILTERTESTS_SPEC2_20_RENDER_FILTER3);
       /* TODO: implement test */
       tr13.appendTcDetail("Not implemented.");

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/8bf37be8/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
index 56fa7dc..e983cf8 100644
--- 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
@@ -97,8 +97,8 @@ public class AddlFilterTests_SPEC2_20_Resource implements Portlet, ResourceServi
       tr0.writeTo(writer);
 
       /* TestCase: V2AddlFilterTests_SPEC2_20_Resource_filter6                */
-      /* Details: "A filter declaration can contain multiple <lifecycle>      */
-      /* tags for a single filter class"                                      */
+      /* Details: "A filter declaration can contain multiple                  */
+      /* &lt;lifecycle&gt; tags for a single filter class"                    */
       TestResult tr1 = tcd.getTestResultFailed(V2ADDLFILTERTESTS_SPEC2_20_RESOURCE_FILTER6);
       /* TODO: implement test */
       tr1.appendTcDetail("Not implemented.");
@@ -159,7 +159,7 @@ public class AddlFilterTests_SPEC2_20_Resource implements Portlet, ResourceServi
 
       /* TestCase: V2AddlFilterTests_SPEC2_20_Resource_filter13               */
       /* Details: "A filter declaration can be mapped to a portlet through    */
-      /* the deployment descriptor <filter-mapping> element"                  */
+      /* the deployment descriptor &lt;filter-mapping&gt; element"            */
       TestResult tr8 = tcd.getTestResultFailed(V2ADDLFILTERTESTS_SPEC2_20_RESOURCE_FILTER13);
       /* TODO: implement test */
       tr8.appendTcDetail("Not implemented.");
@@ -178,17 +178,17 @@ public class AddlFilterTests_SPEC2_20_Resource implements Portlet, ResourceServi
       /* 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"                                               */
+      /* which the &lt;portlet-name&gt; 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"                                                              */
+      /* Details: "If the filter declaration specifies the                    */
+      /* &lt;lifecycle&gt; 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.");

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/8bf37be8/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_5_RenderGenericPortlet.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_5_RenderGenericPortlet.java b/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_5_RenderGenericPortlet.java
index f163888..f42a326 100644
--- a/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_5_RenderGenericPortlet.java
+++ b/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_5_RenderGenericPortlet.java
@@ -112,8 +112,8 @@ public class AddlPortletTests_SPEC2_5_RenderGenericPortlet implements Portlet, R
       /* TestCase: V2AddlPortletTests_SPEC2_5_RenderGenericPortlet_eventDispatching1 */
       /* Details: "The GenericPortlet processEvent method will dispatch the   */
       /* request to a subclass method annotated with the tag                  */
-      /* @ProcessEvent(qname=<eventname>), where <eventname> must be in the   */
-      /* format provided by Qname.toString()"                                 */
+      /* @ProcessEvent(qname=&lt;eventname&gt;), where &lt;eventname&gt;      */
+      /* must be in the format provided by Qname.toString()"                  */
       TestResult tr1 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_5_RENDERGENERICPORTLET_EVENTDISPATCHING1);
       /* TODO: implement test */
       tr1.appendTcDetail("Not implemented.");
@@ -122,7 +122,7 @@ public class AddlPortletTests_SPEC2_5_RenderGenericPortlet implements Portlet, R
       /* TestCase: V2AddlPortletTests_SPEC2_5_RenderGenericPortlet_eventDispatching2 */
       /* Details: "The GenericPortlet processEvent method will dispatch the   */
       /* request to a subclass method annotated with the tag                  */
-      /* @ProcessEvent(name=<event_name_local_part>)"                         */
+      /* @ProcessEvent(name=&lt;event_name_local_part&gt;)"                   */
       TestResult tr2 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_5_RENDERGENERICPORTLET_EVENTDISPATCHING2);
       /* TODO: implement test */
       tr2.appendTcDetail("Not implemented.");
@@ -140,7 +140,7 @@ public class AddlPortletTests_SPEC2_5_RenderGenericPortlet implements Portlet, R
       /* TestCase: V2AddlPortletTests_SPEC2_5_RenderGenericPortlet_renderDispatching9 */
       /* Details: "getTitle - If a ResourceBundle containing the title        */
       /* string is not defined in the deployment descriptor, the title        */
-      /* defined in the portlet descriptor <title> element is used"           */
+      /* defined in the portlet descriptor &lt;title&gt; element is used"     */
       TestResult tr4 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_5_RENDERGENERICPORTLET_RENDERDISPATCHING9);
       /* TODO: implement test */
       tr4.appendTcDetail("Not implemented.");

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/8bf37be8/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_6_RenderConfig.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_6_RenderConfig.java b/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_6_RenderConfig.java
index edc593b..eb05cae 100644
--- a/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_6_RenderConfig.java
+++ b/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_6_RenderConfig.java
@@ -102,7 +102,7 @@ public class AddlPortletTests_SPEC2_6_RenderConfig implements Portlet, ResourceS
 
       /* TestCase: V2AddlPortletTests_SPEC2_6_RenderConfig_getResourceBundle1 */
       /* Details: "The resource bundle defined in the deployment descriptor   */
-      /* <resource-bundle> element can be obtained through the                */
+      /* &lt;resource-bundle&gt; element can be obtained through the          */
       /* PortletConfig object"                                                */
       TestResult tr0 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_6_RENDERCONFIG_GETRESOURCEBUNDLE1);
       /* TODO: implement test */
@@ -138,9 +138,10 @@ public class AddlPortletTests_SPEC2_6_RenderConfig implements Portlet, ResourceS
 
       /* TestCase: V2AddlPortletTests_SPEC2_6_RenderConfig_getPublishingEventQnames3 */
       /* Details: "getPublishingEventQnames - If the event was defined        */
-      /* using the <name> element rather than the <qname> element, default    */
-      /* namespace defined with the <default-namespace> element must be       */
-      /* added as the event namespace"                                        */
+      /* using the &lt;name&gt; element rather than the &lt;qname&gt;         */
+      /* element, default namespace defined with the                          */
+      /* &lt;default-namespace&gt; element must be added as the event         */
+      /* namespace"                                                           */
       TestResult tr4 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_6_RENDERCONFIG_GETPUBLISHINGEVENTQNAMES3);
       /* TODO: implement test */
       tr4.appendTcDetail("Not implemented.");
@@ -148,8 +149,8 @@ public class AddlPortletTests_SPEC2_6_RenderConfig implements Portlet, ResourceS
 
       /* TestCase: V2AddlPortletTests_SPEC2_6_RenderConfig_getPublishingEventQnames4 */
       /* Details: "getPublishingEventQnames - If the event was defined        */
-      /* using the <name> element rather than the <qname> element and there   */
-      /* is no default namespace defined, the value                           */
+      /* using the &lt;name&gt; element rather than the &lt;qname&gt;         */
+      /* element and there is no default namespace defined, the value         */
       /* XMLConstants.NULL_NS_URI must be added as the event namespace"       */
       TestResult tr5 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_6_RENDERCONFIG_GETPUBLISHINGEVENTQNAMES4);
       /* TODO: implement test */
@@ -158,9 +159,10 @@ public class AddlPortletTests_SPEC2_6_RenderConfig implements Portlet, ResourceS
 
       /* TestCase: V2AddlPortletTests_SPEC2_6_RenderConfig_getProcessingEventQnames3 */
       /* Details: "getProcessingEventQnames - If the event was defined        */
-      /* using the <name> element rather than the <qname> element, default    */
-      /* namespace defined with the <default-namespace> element must be       */
-      /* added as the event namespace"                                        */
+      /* using the &lt;name&gt; element rather than the &lt;qname&gt;         */
+      /* element, default namespace defined with the                          */
+      /* &lt;default-namespace&gt; element must be added as the event         */
+      /* namespace"                                                           */
       TestResult tr6 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_6_RENDERCONFIG_GETPROCESSINGEVENTQNAMES3);
       /* TODO: implement test */
       tr6.appendTcDetail("Not implemented.");
@@ -168,8 +170,8 @@ public class AddlPortletTests_SPEC2_6_RenderConfig implements Portlet, ResourceS
 
       /* TestCase: V2AddlPortletTests_SPEC2_6_RenderConfig_getProcessingEventQnames4 */
       /* Details: "getProcessingEventQnames - If the event was defined        */
-      /* using the <name> element rather than the <qname> element and there   */
-      /* is no default namespace defined, the value                           */
+      /* using the &lt;name&gt; element rather than the &lt;qname&gt;         */
+      /* element and there is no default namespace defined, the value         */
       /* XMLConstants.NULL_NS_URI must be added as the event namespace"       */
       TestResult tr7 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_6_RENDERCONFIG_GETPROCESSINGEVENTQNAMES4);
       /* TODO: implement test */
@@ -178,8 +180,8 @@ public class AddlPortletTests_SPEC2_6_RenderConfig implements Portlet, ResourceS
 
       /* TestCase: V2AddlPortletTests_SPEC2_6_RenderConfig_getContainerRuntimeOptions6 */
       /* Details: "The returned Map contains values defined in the            */
-      /* deployment descriptor <container-runtime-option> elements at the     */
-      /* portlet application level"                                           */
+      /* deployment descriptor &lt;container-runtime-option&gt; elements at   */
+      /* the portlet application level"                                       */
       TestResult tr8 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_6_RENDERCONFIG_GETCONTAINERRUNTIMEOPTIONS6);
       /* TODO: implement test */
       tr8.appendTcDetail("Not implemented.");
@@ -187,8 +189,8 @@ public class AddlPortletTests_SPEC2_6_RenderConfig implements Portlet, ResourceS
 
       /* TestCase: V2AddlPortletTests_SPEC2_6_RenderConfig_getContainerRuntimeOptions7 */
       /* Details: "The returned Map contains values defined in the            */
-      /* deployment descriptor <container-runtime-option> elements at the     */
-      /* portlet level"                                                       */
+      /* deployment descriptor &lt;container-runtime-option&gt; elements at   */
+      /* the portlet level"                                                   */
       TestResult tr9 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_6_RENDERCONFIG_GETCONTAINERRUNTIMEOPTIONS7);
       /* TODO: implement test */
       tr9.appendTcDetail("Not implemented.");
@@ -196,9 +198,9 @@ public class AddlPortletTests_SPEC2_6_RenderConfig implements Portlet, ResourceS
 
       /* TestCase: V2AddlPortletTests_SPEC2_6_RenderConfig_getContainerRuntimeOptions8 */
       /* Details: "If the deployment descriptor contains                      */
-      /* <container-runtime-option> elements defined at both the portlet      */
-      /* and the portlet application levels, the returned Map contains a      */
-      /* merger of all values"                                                */
+      /* &lt;container-runtime-option&gt; elements defined at both the        */
+      /* portlet and the portlet application levels, the returned Map         */
+      /* contains a merger of all values"                                     */
       TestResult tr10 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_6_RENDERCONFIG_GETCONTAINERRUNTIMEOPTIONS8);
       /* TODO: implement test */
       tr10.appendTcDetail("Not implemented.");
@@ -206,9 +208,9 @@ public class AddlPortletTests_SPEC2_6_RenderConfig implements Portlet, ResourceS
 
       /* TestCase: V2AddlPortletTests_SPEC2_6_RenderConfig_getContainerRuntimeOptions9 */
       /* Details: "If the deployment descriptor contains                      */
-      /* <container-runtime-option> elements of the same name defined at      */
-      /* both the portlet and the portlet application levels, the returned    */
-      /* Map contains a the value defined at the portlet level"               */
+      /* &lt;container-runtime-option&gt; elements of the same name defined   */
+      /* at both the portlet and the portlet application levels, the          */
+      /* returned Map contains a the value defined at the portlet level"      */
       TestResult tr11 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_6_RENDERCONFIG_GETCONTAINERRUNTIMEOPTIONS9);
       /* TODO: implement test */
       tr11.appendTcDetail("Not implemented.");

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/8bf37be8/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_6_RenderConfig2.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_6_RenderConfig2.java b/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_6_RenderConfig2.java
index 870b2a4..72ddd08 100644
--- a/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_6_RenderConfig2.java
+++ b/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_6_RenderConfig2.java
@@ -102,7 +102,7 @@ public class AddlPortletTests_SPEC2_6_RenderConfig2 implements Portlet, Resource
 
       /* TestCase: V2AddlPortletTests_SPEC2_6_RenderConfig2_getResourceBundle8 */
       /* Details: "If no resource bundle is defined, the value defined in     */
-      /* the deployment descriptor <title> element is returned by the         */
+      /* the deployment descriptor &lt;title&gt; element is returned by the   */
       /* corresponding getString method call"                                 */
       TestResult tr0 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_6_RENDERCONFIG2_GETRESOURCEBUNDLE8);
       /* TODO: implement test */
@@ -111,8 +111,8 @@ public class AddlPortletTests_SPEC2_6_RenderConfig2 implements Portlet, Resource
 
       /* TestCase: V2AddlPortletTests_SPEC2_6_RenderConfig2_getResourceBundle9 */
       /* Details: "If no resource bundle is defined, the value defined in     */
-      /* the deployment descriptor <short-title> element is returned by the   */
-      /* corresponding getString method call"                                 */
+      /* the deployment descriptor &lt;short-title&gt; element is returned    */
+      /* by the corresponding getString method call"                          */
       TestResult tr1 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_6_RENDERCONFIG2_GETRESOURCEBUNDLE9);
       /* TODO: implement test */
       tr1.appendTcDetail("Not implemented.");
@@ -120,8 +120,8 @@ public class AddlPortletTests_SPEC2_6_RenderConfig2 implements Portlet, Resource
 
       /* TestCase: V2AddlPortletTests_SPEC2_6_RenderConfig2_getResourceBundle10 */
       /* Details: "If no resource bundle is defined, the value defined in     */
-      /* the deployment descriptor <keywords> element is returned by the      */
-      /* corresponding getString method call"                                 */
+      /* the deployment descriptor &lt;keywords&gt; element is returned by    */
+      /* the corresponding getString method call"                             */
       TestResult tr2 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_6_RENDERCONFIG2_GETRESOURCEBUNDLE10);
       /* TODO: implement test */
       tr2.appendTcDetail("Not implemented.");

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/8bf37be8/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_6_RenderConfig3.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_6_RenderConfig3.java b/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_6_RenderConfig3.java
index 425e7fa..349bfcc 100644
--- a/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_6_RenderConfig3.java
+++ b/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_6_RenderConfig3.java
@@ -103,7 +103,7 @@ public class AddlPortletTests_SPEC2_6_RenderConfig3 implements Portlet, Resource
       /* TestCase: V2AddlPortletTests_SPEC2_6_RenderConfig3_getResourceBundle5 */
       /* Details: "If the resource bundle does not contain a                  */
       /* \"javax.portlet.title\" property, the value defined in the           */
-      /* deployment descriptor <title> element is returned by the             */
+      /* deployment descriptor &lt;title&gt; element is returned by the       */
       /* corresponding getString method call"                                 */
       TestResult tr0 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_6_RENDERCONFIG3_GETRESOURCEBUNDLE5);
       /* TODO: implement test */
@@ -113,8 +113,8 @@ public class AddlPortletTests_SPEC2_6_RenderConfig3 implements Portlet, Resource
       /* TestCase: V2AddlPortletTests_SPEC2_6_RenderConfig3_getResourceBundle6 */
       /* Details: "If the resource bundle does not contain a                  */
       /* \"javax.portlet.short-title\" property, the value defined in the     */
-      /* deployment descriptor <short-title> element is returned by the       */
-      /* corresponding getString method call"                                 */
+      /* deployment descriptor &lt;short-title&gt; element is returned by     */
+      /* the corresponding getString method call"                             */
       TestResult tr1 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_6_RENDERCONFIG3_GETRESOURCEBUNDLE6);
       /* TODO: implement test */
       tr1.appendTcDetail("Not implemented.");
@@ -123,7 +123,7 @@ public class AddlPortletTests_SPEC2_6_RenderConfig3 implements Portlet, Resource
       /* TestCase: V2AddlPortletTests_SPEC2_6_RenderConfig3_getResourceBundle7 */
       /* Details: "If the resource bundle does not contain a                  */
       /* \"javax.portlet.keywords\" property, the value defined in the        */
-      /* deployment descriptor <keywords> element is returned by the          */
+      /* deployment descriptor &lt;keywords&gt; element is returned by the    */
       /* corresponding getString method call"                                 */
       TestResult tr2 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_6_RENDERCONFIG3_GETRESOURCEBUNDLE7);
       /* TODO: implement test */

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/8bf37be8/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_8_PortletModes.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_8_PortletModes.java b/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_8_PortletModes.java
index 0ac459e..33ef821 100644
--- a/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_8_PortletModes.java
+++ b/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_8_PortletModes.java
@@ -126,8 +126,8 @@ public class AddlPortletTests_SPEC2_8_PortletModes implements Portlet, ResourceS
 
       /* TestCase: V2AddlPortletTests_SPEC2_8_PortletModes_declaringPortletModes4 */
       /* Details: "A custom portlet mode with                                 */
-      /* <portal-managed>false</portal-managed> may be declared in the        */
-      /* deployment descriptor"                                               */
+      /* &lt;portal-managed&gt;false&lt;/portal-managed&gt; may be declared   */
+      /* in the deployment descriptor"                                        */
       TestResult tr3 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_8_PORTLETMODES_DECLARINGPORTLETMODES4);
       /* TODO: implement test */
       tr3.appendTcDetail("Not implemented.");
@@ -136,8 +136,8 @@ public class AddlPortletTests_SPEC2_8_PortletModes implements Portlet, ResourceS
       /* TestCase: V2AddlPortletTests_SPEC2_8_PortletModes_declaringPortletModes5 */
       /* Details: "The PortletRequest.isPortletModeAllowed method must        */
       /* return FALSE for a custom portlet mode with                          */
-      /* <portal-managed>true</portal-managed> that is not supported by the   */
-      /* portlet container"                                                   */
+      /* &lt;portal-managed&gt;true&lt;/portal-managed&gt; that is not        */
+      /* supported by the portlet container"                                  */
       TestResult tr4 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_8_PORTLETMODES_DECLARINGPORTLETMODES5);
       /* TODO: implement test */
       tr4.appendTcDetail("Not implemented.");
@@ -146,8 +146,8 @@ public class AddlPortletTests_SPEC2_8_PortletModes implements Portlet, ResourceS
       /* TestCase: V2AddlPortletTests_SPEC2_8_PortletModes_declaringPortletModes6 */
       /* Details: "The portlet container must ignore all custom portlet       */
       /* modes in the deployment descriptor with                              */
-      /* <portal-managed>true</portal-managed> that is not supported by the   */
-      /* portlet container"                                                   */
+      /* &lt;portal-managed&gt;true&lt;/portal-managed&gt; that is not        */
+      /* supported by the portlet container"                                  */
       TestResult tr5 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_8_PORTLETMODES_DECLARINGPORTLETMODES6);
       /* TODO: implement test */
       tr5.appendTcDetail("Not implemented.");
@@ -155,8 +155,8 @@ public class AddlPortletTests_SPEC2_8_PortletModes implements Portlet, ResourceS
 
       /* TestCase: V2AddlPortletTests_SPEC2_8_PortletModes_declaringPortletModes7 */
       /* Details: "A custom portlet mode with                                 */
-      /* <portal-managed>false</portal-managed> corresponds to the VIEW       */
-      /* mode from the portal point of view"                                  */
+      /* &lt;portal-managed&gt;false&lt;/portal-managed&gt; corresponds to    */
+      /* the VIEW mode from the portal point of view"                         */
       TestResult tr6 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_8_PORTLETMODES_DECLARINGPORTLETMODES7);
       /* TODO: implement test */
       tr6.appendTcDetail("Not implemented.");
@@ -165,7 +165,7 @@ public class AddlPortletTests_SPEC2_8_PortletModes implements Portlet, ResourceS
       /* TestCase: V2AddlPortletTests_SPEC2_8_PortletModes_declaringPortletModes8 */
       /* Details: "A custom portlet mode can have a localized decoration      */
       /* name in the resource bundle with the name of                         */
-      /* javax.portlet.app.custom-portlet-mode.<name>.decoration-name"        */
+      /* javax.portlet.app.custom-portlet-mode.&lt;name&gt;.decoration-name"  */
       TestResult tr7 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_8_PORTLETMODES_DECLARINGPORTLETMODES8);
       /* TODO: implement test */
       tr7.appendTcDetail("Not implemented.");

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/8bf37be8/portlet-tck_3.0/V2AddlUrlTests/src/main/java/javax/portlet/tck/portlets/AddlUrlTests_SPEC2_7_UrlAction.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlUrlTests/src/main/java/javax/portlet/tck/portlets/AddlUrlTests_SPEC2_7_UrlAction.java b/portlet-tck_3.0/V2AddlUrlTests/src/main/java/javax/portlet/tck/portlets/AddlUrlTests_SPEC2_7_UrlAction.java
index 0d200b2..263ba48 100644
--- a/portlet-tck_3.0/V2AddlUrlTests/src/main/java/javax/portlet/tck/portlets/AddlUrlTests_SPEC2_7_UrlAction.java
+++ b/portlet-tck_3.0/V2AddlUrlTests/src/main/java/javax/portlet/tck/portlets/AddlUrlTests_SPEC2_7_UrlAction.java
@@ -120,7 +120,7 @@ public class AddlUrlTests_SPEC2_7_UrlAction implements Portlet, ResourceServingP
 
       /* TestCase: V2AddlUrlTests_SPEC2_7_UrlAction_actionURL6                */
       /* Details: "Action parameters can be set on the action URL through     */
-      /* the setParameterMap(Map<String, String[]>) method"                   */
+      /* the setParameterMap(Map&lt;String, String[]&gt;) method"             */
       TestResult tr5 = tcd.getTestResultFailed(V2ADDLURLTESTS_SPEC2_7_URLACTION_ACTIONURL6);
       /* TODO: implement test */
       tr5.appendTcDetail("Not implemented.");
@@ -232,7 +232,7 @@ public class AddlUrlTests_SPEC2_7_UrlAction implements Portlet, ResourceServingP
 
       /* TestCase: V2AddlUrlTests_SPEC2_7_UrlAction_actionURL6                */
       /* Details: "Action parameters can be set on the action URL through     */
-      /* the setParameterMap(Map<String, String[]>) method"                   */
+      /* the setParameterMap(Map&lt;String, String[]&gt;) method"             */
       {
          PortletURL aurl = portletResp.createActionURL();
          aurl.setParameters(portletReq.getPrivateParameterMap());

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/8bf37be8/portlet-tck_3.0/V2AddlUrlTests/src/main/java/javax/portlet/tck/portlets/AddlUrlTests_SPEC2_7_UrlRender.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlUrlTests/src/main/java/javax/portlet/tck/portlets/AddlUrlTests_SPEC2_7_UrlRender.java b/portlet-tck_3.0/V2AddlUrlTests/src/main/java/javax/portlet/tck/portlets/AddlUrlTests_SPEC2_7_UrlRender.java
index afe75e0..744fce6 100644
--- a/portlet-tck_3.0/V2AddlUrlTests/src/main/java/javax/portlet/tck/portlets/AddlUrlTests_SPEC2_7_UrlRender.java
+++ b/portlet-tck_3.0/V2AddlUrlTests/src/main/java/javax/portlet/tck/portlets/AddlUrlTests_SPEC2_7_UrlRender.java
@@ -144,7 +144,7 @@ public class AddlUrlTests_SPEC2_7_UrlRender implements Portlet, ResourceServingP
 
       /* TestCase: V2AddlUrlTests_SPEC2_7_UrlRender_renderURL6                */
       /* Details: "Private render parameters can be set on the render URL     */
-      /* through the setParameterMap(Map<String, String[]>) method"           */
+      /* through the setParameterMap(Map&lt;String, String[]&gt;) method"     */
       TestResult tr5 = tcd.getTestResultFailed(V2ADDLURLTESTS_SPEC2_7_URLRENDER_RENDERURL6);
       /* TODO: implement test */
       tr5.appendTcDetail("Not implemented.");
@@ -168,7 +168,7 @@ public class AddlUrlTests_SPEC2_7_UrlRender implements Portlet, ResourceServingP
 
       /* TestCase: V2AddlUrlTests_SPEC2_7_UrlRender_renderURL9                */
       /* Details: "Public render parameters can be set on the render URL      */
-      /* through the setParameterMap(Map<String, String[]>) method"           */
+      /* through the setParameterMap(Map&lt;String, String[]&gt;) method"     */
       TestResult tr8 = tcd.getTestResultFailed(V2ADDLURLTESTS_SPEC2_7_URLRENDER_RENDERURL9);
       /* TODO: implement test */
       tr8.appendTcDetail("Not implemented.");

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/8bf37be8/portlet-tck_3.0/V2AddlUrlTests/src/main/java/javax/portlet/tck/portlets/AddlUrlTests_SPEC2_7_UrlResource.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlUrlTests/src/main/java/javax/portlet/tck/portlets/AddlUrlTests_SPEC2_7_UrlResource.java b/portlet-tck_3.0/V2AddlUrlTests/src/main/java/javax/portlet/tck/portlets/AddlUrlTests_SPEC2_7_UrlResource.java
index 923b7af..31b9b4b 100644
--- a/portlet-tck_3.0/V2AddlUrlTests/src/main/java/javax/portlet/tck/portlets/AddlUrlTests_SPEC2_7_UrlResource.java
+++ b/portlet-tck_3.0/V2AddlUrlTests/src/main/java/javax/portlet/tck/portlets/AddlUrlTests_SPEC2_7_UrlResource.java
@@ -132,7 +132,7 @@ public class AddlUrlTests_SPEC2_7_UrlResource implements Portlet, ResourceServin
 
       /* TestCase: V2AddlUrlTests_SPEC2_7_UrlResource_resourceURL6            */
       /* Details: "Resource parameters can be set on the resource URL         */
-      /* through the setParameterMap(Map<String, String[]>) method"           */
+      /* through the setParameterMap(Map&lt;String, String[]&gt;) method"     */
       TestResult tr5 = tcd.getTestResultFailed(V2ADDLURLTESTS_SPEC2_7_URLRESOURCE_RESOURCEURL6);
       /* TODO: implement test */
       tr5.appendTcDetail("Not implemented.");

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/8bf37be8/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/portlets/DispatcherTests_SPEC2_19_DispatchServletAction.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/portlets/DispatcherTests_SPEC2_19_DispatchServletAction.java b/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/portlets/DispatcherTests_SPEC2_19_DispatchServletAction.java
index 515d33e..b490147 100644
--- a/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/portlets/DispatcherTests_SPEC2_19_DispatchServletAction.java
+++ b/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/portlets/DispatcherTests_SPEC2_19_DispatchServletAction.java
@@ -116,7 +116,7 @@ public class DispatcherTests_SPEC2_19_DispatchServletAction implements Portlet,
       TestResult tr3 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_DISPATCHSERVLETACTION_DISPATCH4);
       try {
          PortletRequestDispatcher rd = portletConfig.getPortletContext()
-               .getRequestDispatcher("/Invalid/path.jsp");
+               .getRequestDispatcher(" Invalid path.jsp ");
          tr3.setTcSuccess(rd == null);
       } catch(Exception e) {tr3.appendTcDetail(e.toString());}
       tr3.writeTo(writer);

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/8bf37be8/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/portlets/DispatcherTests_SPEC2_19_DispatchServletEvent_event.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/portlets/DispatcherTests_SPEC2_19_DispatchServletEvent_event.java b/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/portlets/DispatcherTests_SPEC2_19_DispatchServletEvent_event.java
index 4f3d70c..6b96514 100644
--- a/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/portlets/DispatcherTests_SPEC2_19_DispatchServletEvent_event.java
+++ b/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/portlets/DispatcherTests_SPEC2_19_DispatchServletEvent_event.java
@@ -122,7 +122,7 @@ public class DispatcherTests_SPEC2_19_DispatchServletEvent_event implements Port
       TestResult tr3 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_DISPATCHSERVLETEVENT_DISPATCH4);
       try {
          PortletRequestDispatcher rd = portletConfig.getPortletContext()
-               .getRequestDispatcher("/Invalid/path.jsp");
+               .getRequestDispatcher(" Invalid path.jsp ");
          tr3.setTcSuccess(rd == null);
       } catch(Exception e) {tr3.appendTcDetail(e.toString());}
       tr3.writeTo(writer);

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/8bf37be8/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/portlets/DispatcherTests_SPEC2_19_DispatchServletRender.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/portlets/DispatcherTests_SPEC2_19_DispatchServletRender.java b/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/portlets/DispatcherTests_SPEC2_19_DispatchServletRender.java
index 343b3f7..50cfb40 100644
--- a/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/portlets/DispatcherTests_SPEC2_19_DispatchServletRender.java
+++ b/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/portlets/DispatcherTests_SPEC2_19_DispatchServletRender.java
@@ -140,7 +140,7 @@ public class DispatcherTests_SPEC2_19_DispatchServletRender implements Portlet,
       TestResult tr3 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_DISPATCHSERVLETRENDER_DISPATCH4);
       try {
          PortletRequestDispatcher rd = portletConfig.getPortletContext()
-               .getRequestDispatcher("/Invalid/path.jsp");
+               .getRequestDispatcher(" Invalid path.jsp ");
          tr3.setTcSuccess(rd == null);
       } catch(Exception e) {tr3.appendTcDetail(e.toString());}
       tr3.writeTo(writer);

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/8bf37be8/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/portlets/DispatcherTests_SPEC2_19_DispatchServletResource.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/portlets/DispatcherTests_SPEC2_19_DispatchServletResource.java b/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/portlets/DispatcherTests_SPEC2_19_DispatchServletResource.java
index e4c9655..5a92af3 100644
--- a/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/portlets/DispatcherTests_SPEC2_19_DispatchServletResource.java
+++ b/portlet-tck_3.0/V2DispatcherTests/src/main/java/javax/portlet/tck/portlets/DispatcherTests_SPEC2_19_DispatchServletResource.java
@@ -128,7 +128,7 @@ public class DispatcherTests_SPEC2_19_DispatchServletResource implements Portlet
       TestResult tr3 = tcd.getTestResultFailed(V2DISPATCHERTESTS_SPEC2_19_DISPATCHSERVLETRESOURCE_DISPATCH4);
       try {
          PortletRequestDispatcher rd = portletConfig.getPortletContext()
-               .getRequestDispatcher("/Invalid/path.jsp");
+               .getRequestDispatcher(" Invalid path.jsp ");
          tr3.setTcSuccess(rd == null);
       } catch(Exception e) {tr3.appendTcDetail(e.toString());}
       tr3.writeTo(writer);

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/8bf37be8/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_ForwardJSPAction.jsp
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_ForwardJSPAction.jsp b/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_ForwardJSPAction.jsp
index a71d855..fa60746 100644
--- a/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_ForwardJSPAction.jsp
+++ b/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_ForwardJSPAction.jsp
@@ -8,6 +8,7 @@
 <%@ page import="javax.portlet.tck.beans.*,javax.portlet.tck.constants.*" %>
 <%@ page import="static javax.portlet.tck.constants.Constants.*" %>
 <%@ page import="static javax.portlet.tck.beans.JSR286DispatcherTestCaseDetails.*" %>
+
 <%
 
       PortletRequest portletReq = (PortletRequest) request.getAttribute("javax.portlet.request");

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/8bf37be8/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_ForwardJSPEvent.jsp
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_ForwardJSPEvent.jsp b/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_ForwardJSPEvent.jsp
index b9db8a9..fbece83 100644
--- a/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_ForwardJSPEvent.jsp
+++ b/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_ForwardJSPEvent.jsp
@@ -8,6 +8,7 @@
 <%@ page import="javax.portlet.tck.beans.*,javax.portlet.tck.constants.*" %>
 <%@ page import="static javax.portlet.tck.constants.Constants.*" %>
 <%@ page import="static javax.portlet.tck.beans.JSR286DispatcherTestCaseDetails.*" %>
+
 <%
 
       PortletRequest portletReq = (PortletRequest) request.getAttribute("javax.portlet.request");

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/8bf37be8/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_ForwardJSPRender.jsp
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_ForwardJSPRender.jsp b/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_ForwardJSPRender.jsp
index 4a277cc..f52f175 100644
--- a/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_ForwardJSPRender.jsp
+++ b/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_ForwardJSPRender.jsp
@@ -8,6 +8,7 @@
 <%@ page import="javax.portlet.tck.beans.*,javax.portlet.tck.constants.*" %>
 <%@ page import="static javax.portlet.tck.constants.Constants.*" %>
 <%@ page import="static javax.portlet.tck.beans.JSR286DispatcherTestCaseDetails.*" %>
+
 <%
 
       PortletRequest portletReq = (PortletRequest) request.getAttribute("javax.portlet.request");

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/8bf37be8/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_ForwardJSPResource.jsp
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_ForwardJSPResource.jsp b/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_ForwardJSPResource.jsp
index 532ca56..0bae10f 100644
--- a/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_ForwardJSPResource.jsp
+++ b/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_ForwardJSPResource.jsp
@@ -8,6 +8,7 @@
 <%@ page import="javax.portlet.tck.beans.*,javax.portlet.tck.constants.*" %>
 <%@ page import="static javax.portlet.tck.constants.Constants.*" %>
 <%@ page import="static javax.portlet.tck.beans.JSR286DispatcherTestCaseDetails.*" %>
+
 <%
 
       PortletRequest portletReq = (PortletRequest) request.getAttribute("javax.portlet.request");

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/8bf37be8/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_IncludeJSPAction.jsp
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_IncludeJSPAction.jsp b/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_IncludeJSPAction.jsp
index f6374a4..c172966 100644
--- a/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_IncludeJSPAction.jsp
+++ b/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_IncludeJSPAction.jsp
@@ -8,6 +8,7 @@
 <%@ page import="javax.portlet.tck.beans.*,javax.portlet.tck.constants.*" %>
 <%@ page import="static javax.portlet.tck.constants.Constants.*" %>
 <%@ page import="static javax.portlet.tck.beans.JSR286DispatcherTestCaseDetails.*" %>
+
 <%
 
       PortletRequest portletReq = (PortletRequest) request.getAttribute("javax.portlet.request");

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/8bf37be8/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_IncludeJSPEvent.jsp
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_IncludeJSPEvent.jsp b/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_IncludeJSPEvent.jsp
index 953edef..2a117de 100644
--- a/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_IncludeJSPEvent.jsp
+++ b/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_IncludeJSPEvent.jsp
@@ -8,6 +8,7 @@
 <%@ page import="javax.portlet.tck.beans.*,javax.portlet.tck.constants.*" %>
 <%@ page import="static javax.portlet.tck.constants.Constants.*" %>
 <%@ page import="static javax.portlet.tck.beans.JSR286DispatcherTestCaseDetails.*" %>
+
 <%
 
       PortletRequest portletReq = (PortletRequest) request.getAttribute("javax.portlet.request");

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/8bf37be8/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_IncludeJSPRender.jsp
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_IncludeJSPRender.jsp b/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_IncludeJSPRender.jsp
index c1b6625..0fc5e11 100644
--- a/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_IncludeJSPRender.jsp
+++ b/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_IncludeJSPRender.jsp
@@ -8,6 +8,7 @@
 <%@ page import="javax.portlet.tck.beans.*,javax.portlet.tck.constants.*" %>
 <%@ page import="static javax.portlet.tck.constants.Constants.*" %>
 <%@ page import="static javax.portlet.tck.beans.JSR286DispatcherTestCaseDetails.*" %>
+
 <%
 
       PortletRequest portletReq = (PortletRequest) request.getAttribute("javax.portlet.request");

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/8bf37be8/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_IncludeJSPResource.jsp
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_IncludeJSPResource.jsp b/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_IncludeJSPResource.jsp
index a8b8447..8ea6f0b 100644
--- a/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_IncludeJSPResource.jsp
+++ b/portlet-tck_3.0/V2DispatcherTests2/src/main/webapp/WEB-INF/jsp/DispatcherTests2_SPEC2_19_IncludeJSPResource.jsp
@@ -8,6 +8,7 @@
 <%@ page import="javax.portlet.tck.beans.*,javax.portlet.tck.constants.*" %>
 <%@ page import="static javax.portlet.tck.constants.Constants.*" %>
 <%@ page import="static javax.portlet.tck.beans.JSR286DispatcherTestCaseDetails.*" %>
+
 <%
 
       PortletRequest portletReq = (PortletRequest) request.getAttribute("javax.portlet.request");

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/8bf37be8/portlet-tck_3.0/V2DispatcherTests3S/src/main/webapp/WEB-INF/jsp/DispatcherTests3S_SPEC2_19_ForwardJSPAction.jsp
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests3S/src/main/webapp/WEB-INF/jsp/DispatcherTests3S_SPEC2_19_ForwardJSPAction.jsp b/portlet-tck_3.0/V2DispatcherTests3S/src/main/webapp/WEB-INF/jsp/DispatcherTests3S_SPEC2_19_ForwardJSPAction.jsp
index 04123e4..bb6e20d 100644
--- a/portlet-tck_3.0/V2DispatcherTests3S/src/main/webapp/WEB-INF/jsp/DispatcherTests3S_SPEC2_19_ForwardJSPAction.jsp
+++ b/portlet-tck_3.0/V2DispatcherTests3S/src/main/webapp/WEB-INF/jsp/DispatcherTests3S_SPEC2_19_ForwardJSPAction.jsp
@@ -8,6 +8,7 @@
 <%@ page import="javax.portlet.tck.beans.*,javax.portlet.tck.constants.*" %>
 <%@ page import="static javax.portlet.tck.constants.Constants.*" %>
 <%@ page import="static javax.portlet.tck.beans.JSR286DispatcherTestCaseDetails.*" %>
+
 <%
 
       PortletRequest portletReq = (PortletRequest) request.getAttribute("javax.portlet.request");

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/8bf37be8/portlet-tck_3.0/V2DispatcherTests3S/src/main/webapp/WEB-INF/jsp/DispatcherTests3S_SPEC2_19_ForwardJSPEvent.jsp
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests3S/src/main/webapp/WEB-INF/jsp/DispatcherTests3S_SPEC2_19_ForwardJSPEvent.jsp b/portlet-tck_3.0/V2DispatcherTests3S/src/main/webapp/WEB-INF/jsp/DispatcherTests3S_SPEC2_19_ForwardJSPEvent.jsp
index 60aaba2..3d6a354 100644
--- a/portlet-tck_3.0/V2DispatcherTests3S/src/main/webapp/WEB-INF/jsp/DispatcherTests3S_SPEC2_19_ForwardJSPEvent.jsp
+++ b/portlet-tck_3.0/V2DispatcherTests3S/src/main/webapp/WEB-INF/jsp/DispatcherTests3S_SPEC2_19_ForwardJSPEvent.jsp
@@ -8,6 +8,7 @@
 <%@ page import="javax.portlet.tck.beans.*,javax.portlet.tck.constants.*" %>
 <%@ page import="static javax.portlet.tck.constants.Constants.*" %>
 <%@ page import="static javax.portlet.tck.beans.JSR286DispatcherTestCaseDetails.*" %>
+
 <%
 
       PortletRequest portletReq = (PortletRequest) request.getAttribute("javax.portlet.request");

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/8bf37be8/portlet-tck_3.0/V2DispatcherTests3S/src/main/webapp/WEB-INF/jsp/DispatcherTests3S_SPEC2_19_ForwardJSPRender.jsp
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests3S/src/main/webapp/WEB-INF/jsp/DispatcherTests3S_SPEC2_19_ForwardJSPRender.jsp b/portlet-tck_3.0/V2DispatcherTests3S/src/main/webapp/WEB-INF/jsp/DispatcherTests3S_SPEC2_19_ForwardJSPRender.jsp
index 6cc3201..1326ddb 100644
--- a/portlet-tck_3.0/V2DispatcherTests3S/src/main/webapp/WEB-INF/jsp/DispatcherTests3S_SPEC2_19_ForwardJSPRender.jsp
+++ b/portlet-tck_3.0/V2DispatcherTests3S/src/main/webapp/WEB-INF/jsp/DispatcherTests3S_SPEC2_19_ForwardJSPRender.jsp
@@ -8,6 +8,7 @@
 <%@ page import="javax.portlet.tck.beans.*,javax.portlet.tck.constants.*" %>
 <%@ page import="static javax.portlet.tck.constants.Constants.*" %>
 <%@ page import="static javax.portlet.tck.beans.JSR286DispatcherTestCaseDetails.*" %>
+
 <%
 
       PortletRequest portletReq = (PortletRequest) request.getAttribute("javax.portlet.request");

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/8bf37be8/portlet-tck_3.0/V2DispatcherTests3S/src/main/webapp/WEB-INF/jsp/DispatcherTests3S_SPEC2_19_ForwardJSPResource.jsp
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests3S/src/main/webapp/WEB-INF/jsp/DispatcherTests3S_SPEC2_19_ForwardJSPResource.jsp b/portlet-tck_3.0/V2DispatcherTests3S/src/main/webapp/WEB-INF/jsp/DispatcherTests3S_SPEC2_19_ForwardJSPResource.jsp
index 157c4a2..d00a03e 100644
--- a/portlet-tck_3.0/V2DispatcherTests3S/src/main/webapp/WEB-INF/jsp/DispatcherTests3S_SPEC2_19_ForwardJSPResource.jsp
+++ b/portlet-tck_3.0/V2DispatcherTests3S/src/main/webapp/WEB-INF/jsp/DispatcherTests3S_SPEC2_19_ForwardJSPResource.jsp
@@ -8,6 +8,7 @@
 <%@ page import="javax.portlet.tck.beans.*,javax.portlet.tck.constants.*" %>
 <%@ page import="static javax.portlet.tck.constants.Constants.*" %>
 <%@ page import="static javax.portlet.tck.beans.JSR286DispatcherTestCaseDetails.*" %>
+
 <%
 
       PortletRequest portletReq = (PortletRequest) request.getAttribute("javax.portlet.request");

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/8bf37be8/portlet-tck_3.0/V2DispatcherTests3S/src/main/webapp/WEB-INF/jsp/DispatcherTests3S_SPEC2_19_IncludeJSPAction.jsp
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests3S/src/main/webapp/WEB-INF/jsp/DispatcherTests3S_SPEC2_19_IncludeJSPAction.jsp b/portlet-tck_3.0/V2DispatcherTests3S/src/main/webapp/WEB-INF/jsp/DispatcherTests3S_SPEC2_19_IncludeJSPAction.jsp
index 9bf2bfa..31649f5 100644
--- a/portlet-tck_3.0/V2DispatcherTests3S/src/main/webapp/WEB-INF/jsp/DispatcherTests3S_SPEC2_19_IncludeJSPAction.jsp
+++ b/portlet-tck_3.0/V2DispatcherTests3S/src/main/webapp/WEB-INF/jsp/DispatcherTests3S_SPEC2_19_IncludeJSPAction.jsp
@@ -8,6 +8,7 @@
 <%@ page import="javax.portlet.tck.beans.*,javax.portlet.tck.constants.*" %>
 <%@ page import="static javax.portlet.tck.constants.Constants.*" %>
 <%@ page import="static javax.portlet.tck.beans.JSR286DispatcherTestCaseDetails.*" %>
+
 <%
 
       PortletRequest portletReq = (PortletRequest) request.getAttribute("javax.portlet.request");

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/8bf37be8/portlet-tck_3.0/V2DispatcherTests3S/src/main/webapp/WEB-INF/jsp/DispatcherTests3S_SPEC2_19_IncludeJSPEvent.jsp
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests3S/src/main/webapp/WEB-INF/jsp/DispatcherTests3S_SPEC2_19_IncludeJSPEvent.jsp b/portlet-tck_3.0/V2DispatcherTests3S/src/main/webapp/WEB-INF/jsp/DispatcherTests3S_SPEC2_19_IncludeJSPEvent.jsp
index 9f92787..4bb9d19 100644
--- a/portlet-tck_3.0/V2DispatcherTests3S/src/main/webapp/WEB-INF/jsp/DispatcherTests3S_SPEC2_19_IncludeJSPEvent.jsp
+++ b/portlet-tck_3.0/V2DispatcherTests3S/src/main/webapp/WEB-INF/jsp/DispatcherTests3S_SPEC2_19_IncludeJSPEvent.jsp
@@ -8,6 +8,7 @@
 <%@ page import="javax.portlet.tck.beans.*,javax.portlet.tck.constants.*" %>
 <%@ page import="static javax.portlet.tck.constants.Constants.*" %>
 <%@ page import="static javax.portlet.tck.beans.JSR286DispatcherTestCaseDetails.*" %>
+
 <%
 
       PortletRequest portletReq = (PortletRequest) request.getAttribute("javax.portlet.request");

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/8bf37be8/portlet-tck_3.0/V2DispatcherTests3S/src/main/webapp/WEB-INF/jsp/DispatcherTests3S_SPEC2_19_IncludeJSPRender.jsp
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests3S/src/main/webapp/WEB-INF/jsp/DispatcherTests3S_SPEC2_19_IncludeJSPRender.jsp b/portlet-tck_3.0/V2DispatcherTests3S/src/main/webapp/WEB-INF/jsp/DispatcherTests3S_SPEC2_19_IncludeJSPRender.jsp
index fd76a59..d158b06 100644
--- a/portlet-tck_3.0/V2DispatcherTests3S/src/main/webapp/WEB-INF/jsp/DispatcherTests3S_SPEC2_19_IncludeJSPRender.jsp
+++ b/portlet-tck_3.0/V2DispatcherTests3S/src/main/webapp/WEB-INF/jsp/DispatcherTests3S_SPEC2_19_IncludeJSPRender.jsp
@@ -8,6 +8,7 @@
 <%@ page import="javax.portlet.tck.beans.*,javax.portlet.tck.constants.*" %>
 <%@ page import="static javax.portlet.tck.constants.Constants.*" %>
 <%@ page import="static javax.portlet.tck.beans.JSR286DispatcherTestCaseDetails.*" %>
+
 <%
 
       PortletRequest portletReq = (PortletRequest) request.getAttribute("javax.portlet.request");

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/8bf37be8/portlet-tck_3.0/V2DispatcherTests3S/src/main/webapp/WEB-INF/jsp/DispatcherTests3S_SPEC2_19_IncludeJSPResource.jsp
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests3S/src/main/webapp/WEB-INF/jsp/DispatcherTests3S_SPEC2_19_IncludeJSPResource.jsp b/portlet-tck_3.0/V2DispatcherTests3S/src/main/webapp/WEB-INF/jsp/DispatcherTests3S_SPEC2_19_IncludeJSPResource.jsp
index 6bfcd18..9275745 100644
--- a/portlet-tck_3.0/V2DispatcherTests3S/src/main/webapp/WEB-INF/jsp/DispatcherTests3S_SPEC2_19_IncludeJSPResource.jsp
+++ b/portlet-tck_3.0/V2DispatcherTests3S/src/main/webapp/WEB-INF/jsp/DispatcherTests3S_SPEC2_19_IncludeJSPResource.jsp
@@ -8,6 +8,7 @@
 <%@ page import="javax.portlet.tck.beans.*,javax.portlet.tck.constants.*" %>
 <%@ page import="static javax.portlet.tck.constants.Constants.*" %>
 <%@ page import="static javax.portlet.tck.beans.JSR286DispatcherTestCaseDetails.*" %>
+
 <%
 
       PortletRequest portletReq = (PortletRequest) request.getAttribute("javax.portlet.request");

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/8bf37be8/portlet-tck_3.0/V2DispatcherTests4/src/main/webapp/WEB-INF/jsp/DispatcherTests4_SPEC2_19_ForwardJSPAction.jsp
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests4/src/main/webapp/WEB-INF/jsp/DispatcherTests4_SPEC2_19_ForwardJSPAction.jsp b/portlet-tck_3.0/V2DispatcherTests4/src/main/webapp/WEB-INF/jsp/DispatcherTests4_SPEC2_19_ForwardJSPAction.jsp
index 2c4f787..a8a7bbd 100644
--- a/portlet-tck_3.0/V2DispatcherTests4/src/main/webapp/WEB-INF/jsp/DispatcherTests4_SPEC2_19_ForwardJSPAction.jsp
+++ b/portlet-tck_3.0/V2DispatcherTests4/src/main/webapp/WEB-INF/jsp/DispatcherTests4_SPEC2_19_ForwardJSPAction.jsp
@@ -8,6 +8,7 @@
 <%@ page import="javax.portlet.tck.beans.*,javax.portlet.tck.constants.*" %>
 <%@ page import="static javax.portlet.tck.constants.Constants.*" %>
 <%@ page import="static javax.portlet.tck.beans.JSR286DispatcherTestCaseDetails.*" %>
+
 <%
 
       PortletRequest portletReq = (PortletRequest) request.getAttribute("javax.portlet.request");

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/8bf37be8/portlet-tck_3.0/V2DispatcherTests4/src/main/webapp/WEB-INF/jsp/DispatcherTests4_SPEC2_19_ForwardJSPEvent.jsp
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests4/src/main/webapp/WEB-INF/jsp/DispatcherTests4_SPEC2_19_ForwardJSPEvent.jsp b/portlet-tck_3.0/V2DispatcherTests4/src/main/webapp/WEB-INF/jsp/DispatcherTests4_SPEC2_19_ForwardJSPEvent.jsp
index b4d4f02..94a8713 100644
--- a/portlet-tck_3.0/V2DispatcherTests4/src/main/webapp/WEB-INF/jsp/DispatcherTests4_SPEC2_19_ForwardJSPEvent.jsp
+++ b/portlet-tck_3.0/V2DispatcherTests4/src/main/webapp/WEB-INF/jsp/DispatcherTests4_SPEC2_19_ForwardJSPEvent.jsp
@@ -8,6 +8,7 @@
 <%@ page import="javax.portlet.tck.beans.*,javax.portlet.tck.constants.*" %>
 <%@ page import="static javax.portlet.tck.constants.Constants.*" %>
 <%@ page import="static javax.portlet.tck.beans.JSR286DispatcherTestCaseDetails.*" %>
+
 <%
 
       PortletRequest portletReq = (PortletRequest) request.getAttribute("javax.portlet.request");

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/8bf37be8/portlet-tck_3.0/V2DispatcherTests4/src/main/webapp/WEB-INF/jsp/DispatcherTests4_SPEC2_19_ForwardJSPRender.jsp
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests4/src/main/webapp/WEB-INF/jsp/DispatcherTests4_SPEC2_19_ForwardJSPRender.jsp b/portlet-tck_3.0/V2DispatcherTests4/src/main/webapp/WEB-INF/jsp/DispatcherTests4_SPEC2_19_ForwardJSPRender.jsp
index 157a8d4..7913680 100644
--- a/portlet-tck_3.0/V2DispatcherTests4/src/main/webapp/WEB-INF/jsp/DispatcherTests4_SPEC2_19_ForwardJSPRender.jsp
+++ b/portlet-tck_3.0/V2DispatcherTests4/src/main/webapp/WEB-INF/jsp/DispatcherTests4_SPEC2_19_ForwardJSPRender.jsp
@@ -8,6 +8,7 @@
 <%@ page import="javax.portlet.tck.beans.*,javax.portlet.tck.constants.*" %>
 <%@ page import="static javax.portlet.tck.constants.Constants.*" %>
 <%@ page import="static javax.portlet.tck.beans.JSR286DispatcherTestCaseDetails.*" %>
+
 <%
 
       PortletRequest portletReq = (PortletRequest) request.getAttribute("javax.portlet.request");

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/8bf37be8/portlet-tck_3.0/V2DispatcherTests4/src/main/webapp/WEB-INF/jsp/DispatcherTests4_SPEC2_19_ForwardJSPResource.jsp
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests4/src/main/webapp/WEB-INF/jsp/DispatcherTests4_SPEC2_19_ForwardJSPResource.jsp b/portlet-tck_3.0/V2DispatcherTests4/src/main/webapp/WEB-INF/jsp/DispatcherTests4_SPEC2_19_ForwardJSPResource.jsp
index 2c43474..f962899 100644
--- a/portlet-tck_3.0/V2DispatcherTests4/src/main/webapp/WEB-INF/jsp/DispatcherTests4_SPEC2_19_ForwardJSPResource.jsp
+++ b/portlet-tck_3.0/V2DispatcherTests4/src/main/webapp/WEB-INF/jsp/DispatcherTests4_SPEC2_19_ForwardJSPResource.jsp
@@ -8,6 +8,7 @@
 <%@ page import="javax.portlet.tck.beans.*,javax.portlet.tck.constants.*" %>
 <%@ page import="static javax.portlet.tck.constants.Constants.*" %>
 <%@ page import="static javax.portlet.tck.beans.JSR286DispatcherTestCaseDetails.*" %>
+
 <%
 
       PortletRequest portletReq = (PortletRequest) request.getAttribute("javax.portlet.request");

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/8bf37be8/portlet-tck_3.0/V2DispatcherTests4/src/main/webapp/WEB-INF/jsp/DispatcherTests4_SPEC2_19_IncludeJSPAction.jsp
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests4/src/main/webapp/WEB-INF/jsp/DispatcherTests4_SPEC2_19_IncludeJSPAction.jsp b/portlet-tck_3.0/V2DispatcherTests4/src/main/webapp/WEB-INF/jsp/DispatcherTests4_SPEC2_19_IncludeJSPAction.jsp
index 8e4e959..9c61c10 100644
--- a/portlet-tck_3.0/V2DispatcherTests4/src/main/webapp/WEB-INF/jsp/DispatcherTests4_SPEC2_19_IncludeJSPAction.jsp
+++ b/portlet-tck_3.0/V2DispatcherTests4/src/main/webapp/WEB-INF/jsp/DispatcherTests4_SPEC2_19_IncludeJSPAction.jsp
@@ -8,6 +8,7 @@
 <%@ page import="javax.portlet.tck.beans.*,javax.portlet.tck.constants.*" %>
 <%@ page import="static javax.portlet.tck.constants.Constants.*" %>
 <%@ page import="static javax.portlet.tck.beans.JSR286DispatcherTestCaseDetails.*" %>
+
 <%
 
       PortletRequest portletReq = (PortletRequest) request.getAttribute("javax.portlet.request");

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/8bf37be8/portlet-tck_3.0/V2DispatcherTests4/src/main/webapp/WEB-INF/jsp/DispatcherTests4_SPEC2_19_IncludeJSPEvent.jsp
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests4/src/main/webapp/WEB-INF/jsp/DispatcherTests4_SPEC2_19_IncludeJSPEvent.jsp b/portlet-tck_3.0/V2DispatcherTests4/src/main/webapp/WEB-INF/jsp/DispatcherTests4_SPEC2_19_IncludeJSPEvent.jsp
index 65b9a09..b23404f 100644
--- a/portlet-tck_3.0/V2DispatcherTests4/src/main/webapp/WEB-INF/jsp/DispatcherTests4_SPEC2_19_IncludeJSPEvent.jsp
+++ b/portlet-tck_3.0/V2DispatcherTests4/src/main/webapp/WEB-INF/jsp/DispatcherTests4_SPEC2_19_IncludeJSPEvent.jsp
@@ -8,6 +8,7 @@
 <%@ page import="javax.portlet.tck.beans.*,javax.portlet.tck.constants.*" %>
 <%@ page import="static javax.portlet.tck.constants.Constants.*" %>
 <%@ page import="static javax.portlet.tck.beans.JSR286DispatcherTestCaseDetails.*" %>
+
 <%
 
       PortletRequest portletReq = (PortletRequest) request.getAttribute("javax.portlet.request");

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/8bf37be8/portlet-tck_3.0/V2DispatcherTests4/src/main/webapp/WEB-INF/jsp/DispatcherTests4_SPEC2_19_IncludeJSPRender.jsp
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests4/src/main/webapp/WEB-INF/jsp/DispatcherTests4_SPEC2_19_IncludeJSPRender.jsp b/portlet-tck_3.0/V2DispatcherTests4/src/main/webapp/WEB-INF/jsp/DispatcherTests4_SPEC2_19_IncludeJSPRender.jsp
index 59678aa..724d016 100644
--- a/portlet-tck_3.0/V2DispatcherTests4/src/main/webapp/WEB-INF/jsp/DispatcherTests4_SPEC2_19_IncludeJSPRender.jsp
+++ b/portlet-tck_3.0/V2DispatcherTests4/src/main/webapp/WEB-INF/jsp/DispatcherTests4_SPEC2_19_IncludeJSPRender.jsp
@@ -8,6 +8,7 @@
 <%@ page import="javax.portlet.tck.beans.*,javax.portlet.tck.constants.*" %>
 <%@ page import="static javax.portlet.tck.constants.Constants.*" %>
 <%@ page import="static javax.portlet.tck.beans.JSR286DispatcherTestCaseDetails.*" %>
+
 <%
 
       PortletRequest portletReq = (PortletRequest) request.getAttribute("javax.portlet.request");

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/8bf37be8/portlet-tck_3.0/V2DispatcherTests4/src/main/webapp/WEB-INF/jsp/DispatcherTests4_SPEC2_19_IncludeJSPResource.jsp
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2DispatcherTests4/src/main/webapp/WEB-INF/jsp/DispatcherTests4_SPEC2_19_IncludeJSPResource.jsp b/portlet-tck_3.0/V2DispatcherTests4/src/main/webapp/WEB-INF/jsp/DispatcherTests4_SPEC2_19_IncludeJSPResource.jsp
index b179dbc..b4ce253 100644
--- a/portlet-tck_3.0/V2DispatcherTests4/src/main/webapp/WEB-INF/jsp/DispatcherTests4_SPEC2_19_IncludeJSPResource.jsp
+++ b/portlet-tck_3.0/V2DispatcherTests4/src/main/webapp/WEB-INF/jsp/DispatcherTests4_SPEC2_19_IncludeJSPResource.jsp
@@ -8,6 +8,7 @@
 <%@ page import="javax.portlet.tck.beans.*,javax.portlet.tck.constants.*" %>
 <%@ page import="static javax.portlet.tck.constants.Constants.*" %>
 <%@ page import="static javax.portlet.tck.beans.JSR286DispatcherTestCaseDetails.*" %>
+
 <%
 
       PortletRequest portletReq = (PortletRequest) request.getAttribute("javax.portlet.request");


[06/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.

Posted by ms...@apache.org.
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/23a1c547/portlet-tck_3.0/V2PortletTagLibraryTests/src/main/java/javax/portlet/tck/portlets/PortletTagLibraryTests_SPEC2_26_TagLibResource.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2PortletTagLibraryTests/src/main/java/javax/portlet/tck/portlets/PortletTagLibraryTests_SPEC2_26_TagLibResource.java b/portlet-tck_3.0/V2PortletTagLibraryTests/src/main/java/javax/portlet/tck/portlets/PortletTagLibraryTests_SPEC2_26_TagLibResource.java
deleted file mode 100644
index caee30b..0000000
--- a/portlet-tck_3.0/V2PortletTagLibraryTests/src/main/java/javax/portlet/tck/portlets/PortletTagLibraryTests_SPEC2_26_TagLibResource.java
+++ /dev/null
@@ -1,385 +0,0 @@
-/*  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.IOException;
-import java.io.PrintWriter;
-
-import java.util.Enumeration;
-import java.util.Locale;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-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 static javax.portlet.tck.beans.JSR286SpecTestCaseDetails.*;
-import javax.portlet.tck.beans.TestResult;
-
-/**
- * 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.
- */
-public class PortletTagLibraryTests_SPEC2_26_TagLibResource implements Portlet {
-   private static final String LOG_CLASS = 
-         PortletTagLibraryTests_SPEC2_26_TagLibResource.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 actionRequest, ActionResponse actionResponse)
-         throws PortletException, IOException {
-   }
-
-   @Override
-   public void render(RenderRequest renderRequest, RenderResponse renderResponse)
-         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
-
-      /* TestCase: SPEC2_26_TagLibResource_defineObjectsResource1             */
-      /* Details: "When included in the Resource phase, the defineObjects     */
-      /* tag defines the variable RenderRequest renderRequest to be null or   */
-      /* undefined"                                                           */
-      TestResult tr0 = tcd.getTestResultFailed(SPEC2_26_TAGLIBRESOURCE_DEFINEOBJECTSRESOURCE1);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibResource_defineObjectsResource2             */
-      /* Details: "When included in the Resource phase, the defineObjects     */
-      /* tag defines the variable ResourceRequest resourceRequest to the      */
-      /* corresponding object"                                                */
-      TestResult tr1 = tcd.getTestResultFailed(SPEC2_26_TAGLIBRESOURCE_DEFINEOBJECTSRESOURCE2);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibResource_defineObjectsResource3             */
-      /* Details: "When included in the Resource phase, the defineObjects     */
-      /* tag defines the variable ActionRequest actionRequest to be null or   */
-      /* undefined"                                                           */
-      TestResult tr2 = tcd.getTestResultFailed(SPEC2_26_TAGLIBRESOURCE_DEFINEOBJECTSRESOURCE3);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibResource_defineObjectsResource4             */
-      /* Details: "When included in the Resource phase, the defineObjects     */
-      /* tag defines the variable EventRequest eventRequest to be null or     */
-      /* undefined"                                                           */
-      TestResult tr3 = tcd.getTestResultFailed(SPEC2_26_TAGLIBRESOURCE_DEFINEOBJECTSRESOURCE4);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibResource_defineObjectsResource5             */
-      /* Details: "When included in the Resource phase, the defineObjects     */
-      /* tag defines the variable RenderResponse renderResponse to be null    */
-      /* or undefined"                                                        */
-      TestResult tr4 = tcd.getTestResultFailed(SPEC2_26_TAGLIBRESOURCE_DEFINEOBJECTSRESOURCE5);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibResource_defineObjectsResource6             */
-      /* Details: "When included in the Resource phase, the defineObjects     */
-      /* tag defines the variable ResourceResponse resourceResponse to the    */
-      /* corresponding object"                                                */
-      TestResult tr5 = tcd.getTestResultFailed(SPEC2_26_TAGLIBRESOURCE_DEFINEOBJECTSRESOURCE6);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibResource_defineObjectsResource7             */
-      /* Details: "When included in the Resource phase, the defineObjects     */
-      /* tag defines the variable ActionResponse actionResponse to be null    */
-      /* or undefined"                                                        */
-      TestResult tr6 = tcd.getTestResultFailed(SPEC2_26_TAGLIBRESOURCE_DEFINEOBJECTSRESOURCE7);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibResource_defineObjectsResource8             */
-      /* Details: "When included in the Resource phase, the defineObjects     */
-      /* tag defines the variable EventResponse eventResponse to be null or   */
-      /* undefined"                                                           */
-      TestResult tr7 = tcd.getTestResultFailed(SPEC2_26_TAGLIBRESOURCE_DEFINEOBJECTSRESOURCE8);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibResource_defineObjectsResource9             */
-      /* Details: "When included in the Resource phase, the defineObjects     */
-      /* tag defines the variable PortletConfig portletConfig"                */
-      TestResult tr8 = tcd.getTestResultFailed(SPEC2_26_TAGLIBRESOURCE_DEFINEOBJECTSRESOURCE9);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibResource_defineObjectsResource10            */
-      /* Details: "When included in the Resource phase, the defineObjects     */
-      /* tag defines the variable PortletSession portletSession, providing    */
-      /* access to the portletSession, does not create a new session, only    */
-      /* returns an existing session or null if no session exists."           */
-      TestResult tr9 = tcd.getTestResultFailed(SPEC2_26_TAGLIBRESOURCE_DEFINEOBJECTSRESOURCE10);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibResource_defineObjectsResource11            */
-      /* Details: "When included in the Resource phase, the defineObjects     */
-      /* tag defines the variable Map<String, Object> portletSessionScope,    */
-      /* providing access to the portletSession attributes as a Map           */
-      /* equivalent to the PortletSession.getAttributeMap() call, does not    */
-      /* create a new session, only returns an existing session. If no        */
-      /* session attributes exist this method returns an empty Map."          */
-      TestResult tr10 = tcd.getTestResultFailed(SPEC2_26_TAGLIBRESOURCE_DEFINEOBJECTSRESOURCE11);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibResource_defineObjectsResource12            */
-      /* Details: "When included in the Resource phase, the defineObjects     */
-      /* tag defines the variable PortletPreferences portletPreferences,      */
-      /* providing access to the portlet preferences."                        */
-      TestResult tr11 = tcd.getTestResultFailed(SPEC2_26_TAGLIBRESOURCE_DEFINEOBJECTSRESOURCE12);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibResource_defineObjectsResource13            */
-      /* Details: "When included in the Resource phase, the defineObjects     */
-      /* tag defines the variable Map<String, String[]>                       */
-      /* portletPreferencesValues, providing access to the portlet            */
-      /* preferences as a Map, equivalent to the                              */
-      /* PortletPreferences.getMap() call. If no portlet preferences exist,   */
-      /* the Map is empty."                                                   */
-      TestResult tr12 = tcd.getTestResultFailed(SPEC2_26_TAGLIBRESOURCE_DEFINEOBJECTSRESOURCE13);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibResource_resourceURL1                       */
-      /* Details: "The portlet resourceURL tag creates a URL that must        */
-      /* point to the current portlet and must trigger an resource request    */
-      /* with the supplied parameters"                                        */
-      TestResult tr13 = tcd.getTestResultFailed(SPEC2_26_TAGLIBRESOURCE_RESOURCEURL1);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibResource_resourceURL2                       */
-      /* Details: "The resourceURL must preserve the current portlet mode,    */
-      /* window state and render parameters"                                  */
-      TestResult tr14 = tcd.getTestResultFailed(SPEC2_26_TAGLIBRESOURCE_RESOURCEURL2);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibResource_resourceURL3                       */
-      /* Details: "Resource parameters may be added to the URL by including   */
-      /* the param tag between the resourceURL start and end tags"            */
-      TestResult tr15 = tcd.getTestResultFailed(SPEC2_26_TAGLIBRESOURCE_RESOURCEURL3);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibResource_resourceURL4                       */
-      /* Details: "The resource parameters specified with the                 */
-      /* <portlet:param> element appear in the values array before the        */
-      /* render parameter values if there is a name conflict"                 */
-      TestResult tr16 = tcd.getTestResultFailed(SPEC2_26_TAGLIBRESOURCE_RESOURCEURL4);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibResource_resourceURL5                       */
-      /* Details: "The optional resourceURL \"var\" attribute can specify a   */
-      /* scoped variable for exporting the action URL"                        */
-      TestResult tr17 = tcd.getTestResultFailed(SPEC2_26_TAGLIBRESOURCE_RESOURCEURL5);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibResource_resourceURL6                       */
-      /* Details: "If the resourceURL \"var\" attribute is specified, the     */
-      /* URL is not written to the JspWriter"                                 */
-      TestResult tr18 = tcd.getTestResultFailed(SPEC2_26_TAGLIBRESOURCE_RESOURCEURL6);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibResource_resourceURL7                       */
-      /* Details: "If the resourceURL \"var\" attribute is not specified,     */
-      /* the URL is written to the JspWriter"                                 */
-      TestResult tr19 = tcd.getTestResultFailed(SPEC2_26_TAGLIBRESOURCE_RESOURCEURL7);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibResource_resourceURL8                       */
-      /* Details: "If the optional resourceURL \"secure\" attribute is set    */
-      /* to true, the resulting URL should require a secure connection"       */
-      TestResult tr20 = tcd.getTestResultFailed(SPEC2_26_TAGLIBRESOURCE_RESOURCEURL8);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibResource_resourceURL9                       */
-      /* Details: "If the optional resourceURL \"secure\" attribute is set    */
-      /* to false, the resulting URL does not need to require a secure        */
-      /* connection"                                                          */
-      TestResult tr21 = tcd.getTestResultFailed(SPEC2_26_TAGLIBRESOURCE_RESOURCEURL9);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibResource_resourceURL11                      */
-      /* Details: "The \"secure\" attribute is not specified, the security    */
-      /* setting is retained"                                                 */
-      TestResult tr22 = tcd.getTestResultFailed(SPEC2_26_TAGLIBRESOURCE_RESOURCEURL11);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibResource_resourceURL12                      */
-      /* Details: "If the optional resourceURL                                */
-      /* \"copyCurrentRenderParameters\" attribute is set to true, the        */
-      /* current private render parameters are attached to the URL"           */
-      TestResult tr23 = tcd.getTestResultFailed(SPEC2_26_TAGLIBRESOURCE_RESOURCEURL12);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibResource_resourceURL13                      */
-      /* Details: "If the optional resourceURL                                */
-      /* \"copyCurrentRenderParameters\" attribute is set to true,            */
-      /* additional parameters specified with the <portlet:param> element     */
-      /* are merged with the render parameters"                               */
-      TestResult tr24 = tcd.getTestResultFailed(SPEC2_26_TAGLIBRESOURCE_RESOURCEURL13);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibResource_resourceURL14                      */
-      /* Details: "If the optional resourceURL                                */
-      /* \"copyCurrentRenderParameters\" attribute is set to true,            */
-      /* additional parameters specified with the <portlet:param> element     */
-      /* appear in the values array before the render parameter values if     */
-      /* there is a name conflict"                                            */
-      TestResult tr25 = tcd.getTestResultFailed(SPEC2_26_TAGLIBRESOURCE_RESOURCEURL14);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibResource_resourceURL15                      */
-      /* Details: "If the optional resourceURL                                */
-      /* \"copyCurrentRenderParameters\" attribute is set to false, the       */
-      /* current render parameters are not attached to the URL"               */
-      TestResult tr26 = tcd.getTestResultFailed(SPEC2_26_TAGLIBRESOURCE_RESOURCEURL15);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibResource_resourceURL16                      */
-      /* Details: "If the \"copyCurrentRenderParameters\" attribute           */
-      /* specifies an invalid value, a JspException is thrown"                */
-      TestResult tr27 = tcd.getTestResultFailed(SPEC2_26_TAGLIBRESOURCE_RESOURCEURL16);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibResource_resourceURL17                      */
-      /* Details: "The \"copyCurrentRenderParameters\" attribute is not       */
-      /* specified, the security setting is retained"                         */
-      TestResult tr28 = tcd.getTestResultFailed(SPEC2_26_TAGLIBRESOURCE_RESOURCEURL17);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibResource_resourceURL19                      */
-      /* Details: "If the optional resourceURL \"escapeXML\" attribute is     */
-      /* set to false, the characters \"<>&'\\\"\" are not converted to       */
-      /* their entity codes"                                                  */
-      TestResult tr29 = tcd.getTestResultFailed(SPEC2_26_TAGLIBRESOURCE_RESOURCEURL19);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibResource_resourceURL20                      */
-      /* Details: "The \"escapeXML\" attribute default value is true"         */
-      TestResult tr30 = tcd.getTestResultFailed(SPEC2_26_TAGLIBRESOURCE_RESOURCEURL20);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibResource_resourceURL21                      */
-      /* Details: "If the optional resourceURL \"id\" attribute is set, the   */
-      /* provided id string is used by GenericPortlet to dispatch the         */
-      /* request to the coresponding annotated method"                        */
-      TestResult tr31 = tcd.getTestResultFailed(SPEC2_26_TAGLIBRESOURCE_RESOURCEURL21);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibResource_resourceURL22                      */
-      /* Details: "Setting the \"id\" attribute will add a parameter to the   */
-      /* action URL with the id of \"javax.portlet.action\""                  */
-      TestResult tr32 = tcd.getTestResultFailed(SPEC2_26_TAGLIBRESOURCE_RESOURCEURL22);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibResource_resourceURL23                      */
-      /* Details: "If the optional resourceURL \"cacheability\" attribute     */
-      /* is set, the cacheability is set accordingly"                         */
-      TestResult tr33 = tcd.getTestResultFailed(SPEC2_26_TAGLIBRESOURCE_RESOURCEURL23);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibResource_resourceURL24                      */
-      /* Details: "If the optional resourceURL \"cacheability\" attribute     */
-      /* is not set, the current cacheability setting is retained"            */
-      TestResult tr34 = tcd.getTestResultFailed(SPEC2_26_TAGLIBRESOURCE_RESOURCEURL24);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibResource_resourceURL25                      */
-      /* Details: "If the cacheability is set to PAGE in a Resource phase     */
-      /* include with cacheability = FULL, a JspException with the            */
-      /* IllegalStateException that caused this error is thrown"              */
-      TestResult tr35 = tcd.getTestResultFailed(SPEC2_26_TAGLIBRESOURCE_RESOURCEURL25);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibResource_resourceURL26                      */
-      /* Details: "If the cacheability is set to PORTLET in a Resource        */
-      /* phase include with cacheability = FULL, a JspException with the      */
-      /* IllegalStateException that caused this error is thrown"              */
-      TestResult tr36 = tcd.getTestResultFailed(SPEC2_26_TAGLIBRESOURCE_RESOURCEURL26);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_26_TagLibResource_resourceURL27                      */
-      /* Details: "If the cacheability is set to PAGE in a Resource phase     */
-      /* include with cacheability = PORTLET, a JspException with the         */
-      /* IllegalStateException that caused this error is thrown"              */
-      TestResult tr37 = tcd.getTestResultFailed(SPEC2_26_TAGLIBRESOURCE_RESOURCEURL27);
-      /* 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.writeTo(writer);
-      tr30.writeTo(writer);
-      tr31.writeTo(writer);
-      tr32.writeTo(writer);
-      tr33.writeTo(writer);
-      tr34.writeTo(writer);
-      tr35.writeTo(writer);
-      tr36.writeTo(writer);
-      tr37.writeTo(writer);
-
-
-   }
-
-}
-

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/23a1c547/portlet-tck_3.0/V2PortletTagLibraryTests/src/main/java/javax/portlet/tck/portlets/PortletTagLibraryTests_SPEC2_26_TagLibV1.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2PortletTagLibraryTests/src/main/java/javax/portlet/tck/portlets/PortletTagLibraryTests_SPEC2_26_TagLibV1.java b/portlet-tck_3.0/V2PortletTagLibraryTests/src/main/java/javax/portlet/tck/portlets/PortletTagLibraryTests_SPEC2_26_TagLibV1.java
deleted file mode 100644
index 6f46fd1..0000000
--- a/portlet-tck_3.0/V2PortletTagLibraryTests/src/main/java/javax/portlet/tck/portlets/PortletTagLibraryTests_SPEC2_26_TagLibV1.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*  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.IOException;
-import java.io.PrintWriter;
-
-import java.util.Enumeration;
-import java.util.Locale;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-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 static javax.portlet.tck.beans.JSR286SpecTestCaseDetails.*;
-import javax.portlet.tck.beans.TestResult;
-
-/**
- * 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.
- */
-public class PortletTagLibraryTests_SPEC2_26_TagLibV1 implements Portlet {
-   private static final String LOG_CLASS = 
-         PortletTagLibraryTests_SPEC2_26_TagLibV1.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 actionRequest, ActionResponse actionResponse)
-         throws PortletException, IOException {
-   }
-
-   @Override
-   public void render(RenderRequest renderRequest, RenderResponse renderResponse)
-         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
-
-      /* TestCase: SPEC2_26_TagLibV1_defineObjects3                           */
-      /* Details: "The version 1.0 tag library may be referenced using <%@    */
-      /* taglib uri=\"http://java.sun.com/portlet\" prefix=\"portlet\" %>"    */
-      TestResult tr0 = tcd.getTestResultFailed(SPEC2_26_TAGLIBV1_DEFINEOBJECTS3);
-      /* TODO: implement test */
-
-
-
-      // Write the results to the output stream
-
-      tr0.writeTo(writer);
-
-
-   }
-
-}
-

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/23a1c547/portlet-tck_3.0/V2PortletTagLibraryTests/src/main/resources/xml-resources/additionalTCs.xml
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2PortletTagLibraryTests/src/main/resources/xml-resources/additionalTCs.xml b/portlet-tck_3.0/V2PortletTagLibraryTests/src/main/resources/xml-resources/additionalTCs.xml
index 1d8a1f4..496a289 100644
--- a/portlet-tck_3.0/V2PortletTagLibraryTests/src/main/resources/xml-resources/additionalTCs.xml
+++ b/portlet-tck_3.0/V2PortletTagLibraryTests/src/main/resources/xml-resources/additionalTCs.xml
@@ -17,186 +17,40 @@
     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 PortletTagLibraryTests test case names and page mappings -->
-<entry key="SPEC2_26_TagLibV1_defineObjects3">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibAction_defineObjectsAction1">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibAction_defineObjectsAction2">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibAction_defineObjectsAction3">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibAction_defineObjectsAction4">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibAction_defineObjectsAction5">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibAction_defineObjectsAction6">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibAction_defineObjectsAction7">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibAction_defineObjectsAction8">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibAction_defineObjectsAction9">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibAction_defineObjectsAction10">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibAction_defineObjectsAction11">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibAction_defineObjectsAction12">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibAction_defineObjectsAction13">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibAction_defineObjectsEvent1">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibAction_defineObjectsEvent2">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibAction_defineObjectsEvent3">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibAction_defineObjectsEvent4">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibAction_defineObjectsEvent5">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibAction_defineObjectsEvent6">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibAction_defineObjectsEvent7">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibAction_defineObjectsEvent8">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibAction_defineObjectsEvent9">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibAction_defineObjectsEvent10">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibAction_defineObjectsEvent11">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibAction_defineObjectsEvent12">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibAction_defineObjectsEvent13">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibAction_actionURL1">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibAction_actionURL2">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibAction_actionURL3">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibAction_actionURL4">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibAction_actionURL5">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibAction_actionURL6">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibAction_actionURL7">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibAction_actionURL8">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibAction_actionURL9">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibAction_actionURL10">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibAction_actionURL11">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibAction_actionURL12">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibAction_actionURL13">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibAction_actionURL14">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibAction_actionURL15">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibAction_actionURL17">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibAction_actionURL18">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibAction_actionURL19">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibAction_actionURL20">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibAction_actionURL21">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibAction_actionURL22">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibAction_actionURL23">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibAction_actionURL25">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibAction_actionURL26">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibAction_actionURL27">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibAction_actionURL28">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibAction_actionURL29">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibAction_actionURL30">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibRender_defineObjectsRender1">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibRender_defineObjectsRender2">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibRender_defineObjectsRender3">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibRender_defineObjectsRender4">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibRender_defineObjectsRender5">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibRender_defineObjectsRender6">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibRender_defineObjectsRender7">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibRender_defineObjectsRender8">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibRender_defineObjectsRender9">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibRender_defineObjectsRender10">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibRender_defineObjectsRender11">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibRender_defineObjectsRender12">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibRender_defineObjectsRender13">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibRender_renderURL1">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibRender_renderURL2">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibRender_renderURL3">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibRender_renderURL4">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibRender_renderURL5">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibRender_renderURL6">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibRender_renderURL7">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibRender_renderURL8">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibRender_renderURL9">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibRender_renderURL10">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibRender_renderURL11">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibRender_renderURL12">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibRender_renderURL13">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibRender_renderURL14">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibRender_renderURL15">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibRender_renderURL17">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibRender_renderURL18">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibRender_renderURL19">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibRender_renderURL20">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibRender_renderURL21">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibRender_renderURL22">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibRender_renderURL23">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibRender_renderURL25">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibRender_renderURL26">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibResource_defineObjectsResource1">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibResource_defineObjectsResource2">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibResource_defineObjectsResource3">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibResource_defineObjectsResource4">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibResource_defineObjectsResource5">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibResource_defineObjectsResource6">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibResource_defineObjectsResource7">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibResource_defineObjectsResource8">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibResource_defineObjectsResource9">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibResource_defineObjectsResource10">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibResource_defineObjectsResource11">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibResource_defineObjectsResource12">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibResource_defineObjectsResource13">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibResource_resourceURL1">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibResource_resourceURL2">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibResource_resourceURL3">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibResource_resourceURL4">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibResource_resourceURL5">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibResource_resourceURL6">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibResource_resourceURL7">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibResource_resourceURL8">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibResource_resourceURL9">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibResource_resourceURL11">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibResource_resourceURL12">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibResource_resourceURL13">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibResource_resourceURL14">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibResource_resourceURL15">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibResource_resourceURL16">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibResource_resourceURL17">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibResource_resourceURL19">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibResource_resourceURL20">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibResource_resourceURL21">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibResource_resourceURL22">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibResource_resourceURL23">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibResource_resourceURL24">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibResource_resourceURL25">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibResource_resourceURL26">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibResource_resourceURL27">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibParam_paramAction1">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibParam_paramAction2">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibParam_paramAction3">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibParam_paramAction4">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibParam_paramAction5">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibParam_paramAction6">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibParam_paramRender1">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibParam_paramRender2">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibParam_paramRender3">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibParam_paramRender4">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibParam_paramRender5">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibParam_paramRender6">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibParam_paramResource1">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibParam_paramResource2">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibParam_paramResource3">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibParam_paramResource4">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibParam_paramResource5">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibParam_paramResource6">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibProperty_propertyAction1">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibProperty_propertyAction2">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibProperty_propertyAction3">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibProperty_propertyAction4">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibProperty_propertyAction5">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibProperty_propertyAction6">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibProperty_propertyRender1">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibProperty_propertyRender2">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibProperty_propertyRender3">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibProperty_propertyRender4">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibProperty_propertyRender5">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibProperty_propertyRender6">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibProperty_propertyResource1">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibProperty_propertyResource2">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibProperty_propertyResource3">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibProperty_propertyResource4">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibProperty_propertyResource5">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLibProperty_propertyResource6">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLib_defineObjects1">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLib_defineObjects2">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLib_defineObjects4">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLib_namespace">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLib_escapeXML1">V2PortletTagLibraryTests</entry>
-<entry key="SPEC2_26_TagLib_escapeXML2">V2PortletTagLibraryTests</entry>
-
+<entry key="V2PortletTagLibraryTests_SPEC2_26_IncludeJSPGeneral_defineObjects3">V2PortletTagLibraryTests</entry>
+<entry key="V2PortletTagLibraryTests_SPEC2_26_IncludeJSPGeneral_defineObjects1">V2PortletTagLibraryTests</entry>
+<entry key="V2PortletTagLibraryTests_SPEC2_26_IncludeJSPGeneral_defineObjects2">V2PortletTagLibraryTests</entry>
+<entry key="V2PortletTagLibraryTests_SPEC2_26_IncludeJSPGeneral_defineObjects4">V2PortletTagLibraryTests</entry>
+<entry key="V2PortletTagLibraryTests_SPEC2_26_IncludeJSPGeneral_namespace">V2PortletTagLibraryTests</entry>
+<entry key="V2PortletTagLibraryTests_SPEC2_26_IncludeJSPGeneral_escapeXML1">V2PortletTagLibraryTests</entry>
+<entry key="V2PortletTagLibraryTests_SPEC2_26_IncludeJSPGeneral_escapeXML2">V2PortletTagLibraryTests</entry>
+<entry key="V2PortletTagLibraryTests_SPEC2_26_IncludeJSPAction_defineObjects1">V2PortletTagLibraryTests</entry>
+<entry key="V2PortletTagLibraryTests_SPEC2_26_IncludeJSPAction_defineObjects2">V2PortletTagLibraryTests</entry>
+<entry key="V2PortletTagLibraryTests_SPEC2_26_IncludeJSPAction_defineObjects3">V2PortletTagLibraryTests</entry>
+<entry key="V2PortletTagLibraryTests_SPEC2_26_IncludeJSPAction_defineObjects4">V2PortletTagLibraryTests</entry>
+<entry key="V2PortletTagLibraryTests_SPEC2_26_IncludeJSPAction_defineObjects5">V2PortletTagLibraryTests</entry>
+<entry key="V2PortletTagLibraryTests_SPEC2_26_IncludeJSPAction_defineObjects6">V2PortletTagLibraryTests</entry>
+<entry key="V2PortletTagLibraryTests_SPEC2_26_IncludeJSPAction_defineObjects7">V2PortletTagLibraryTests</entry>
+<entry key="V2PortletTagLibraryTests_SPEC2_26_IncludeJSPAction_defineObjects8">V2PortletTagLibraryTests</entry>
+<entry key="V2PortletTagLibraryTests_SPEC2_26_IncludeJSPAction_defineObjects9">V2PortletTagLibraryTests</entry>
+<entry key="V2PortletTagLibraryTests_SPEC2_26_IncludeJSPAction_defineObjects10">V2PortletTagLibraryTests</entry>
+<entry key="V2PortletTagLibraryTests_SPEC2_26_IncludeJSPAction_defineObjects11">V2PortletTagLibraryTests</entry>
+<entry key="V2PortletTagLibraryTests_SPEC2_26_IncludeJSPAction_defineObjects12">V2PortletTagLibraryTests</entry>
+<entry key="V2PortletTagLibraryTests_SPEC2_26_IncludeJSPAction_defineObjects13">V2PortletTagLibraryTests</entry>
+<entry key="V2PortletTagLibraryTests_SPEC2_26_IncludeJSPEvent_defineObjects1">V2PortletTagLibraryTests</entry>
+<entry key="V2PortletTagLibraryTests_SPEC2_26_IncludeJSPEvent_defineObjects2">V2PortletTagLibraryTests</entry>
+<entry key="V2PortletTagLibraryTests_SPEC2_26_IncludeJSPEvent_defineObjects3">V2PortletTagLibraryTests</entry>
+<entry key="V2PortletTagLibraryTests_SPEC2_26_IncludeJSPEvent_defineObjects4">V2PortletTagLibraryTests</entry>
+<entry key="V2PortletTagLibraryTests_SPEC2_26_IncludeJSPEvent_defineObjects5">V2PortletTagLibraryTests</entry>
+<entry key="V2PortletTagLibraryTests_SPEC2_26_IncludeJSPEvent_defineObjects6">V2PortletTagLibraryTests</entry>
+<entry key="V2PortletTagLibraryTests_SPEC2_26_IncludeJSPEvent_defineObjects7">V2PortletTagLibraryTests</entry>
+<entry key="V2PortletTagLibraryTests_SPEC2_26_IncludeJSPEvent_defineObjects8">V2PortletTagLibraryTests</entry>
+<entry key="V2PortletTagLibraryTests_SPEC2_26_IncludeJSPEvent_defineObjects9">V2PortletTagLibraryTests</entry>
+<entry key="V2PortletTagLibraryTests_SPEC2_26_IncludeJSPEvent_defineObjects10">V2PortletTagLibraryTests</entry>
+<entry key="V2PortletTagLibraryTests_SPEC2_26_IncludeJSPEvent_defineObjects11">V2PortletTagLibraryTests</entry>
+<entry key="V2PortletTagLibraryTests_SPEC2_26_IncludeJSPEvent_defineObjects12">V2PortletTagLibraryTests</entry>
+<entry key="V2PortletTagLibraryTests_SPEC2_26_IncludeJSPEvent_defineObjects13">V2PortletTagLibraryTests</entry>
 </properties>

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/23a1c547/portlet-tck_3.0/V2PortletTagLibraryTests/src/main/webapp/WEB-INF/jsp/PortletTagLibraryTests_SPEC2_26_IncludeJSPAction.jsp
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2PortletTagLibraryTests/src/main/webapp/WEB-INF/jsp/PortletTagLibraryTests_SPEC2_26_IncludeJSPAction.jsp b/portlet-tck_3.0/V2PortletTagLibraryTests/src/main/webapp/WEB-INF/jsp/PortletTagLibraryTests_SPEC2_26_IncludeJSPAction.jsp
new file mode 100644
index 0000000..bb8d954
--- /dev/null
+++ b/portlet-tck_3.0/V2PortletTagLibraryTests/src/main/webapp/WEB-INF/jsp/PortletTagLibraryTests_SPEC2_26_IncludeJSPAction.jsp
@@ -0,0 +1,152 @@
+<%@ page session="false" %>
+<%@ taglib uri="http://java.sun.com/portlet_2_0"  prefix="portlet" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ page import="java.io.*,java.util.*,java.util.logging.*" %>
+<%@ page import="static java.util.logging.Logger.*" %>
+<%@ page import="javax.portlet.*,javax.portlet.filter.*" %>
+<%@ page import="javax.servlet.http.*,javax.servlet.*" %>
+<%@ page import="javax.portlet.tck.beans.*,javax.portlet.tck.constants.*" %>
+<%@ page import="static javax.portlet.tck.constants.Constants.*" %>
+<%@ page import="static javax.portlet.tck.beans.JSR286SpecTestCaseDetails.*" %>
+
+<%
+
+      PortletRequest portletReq = (PortletRequest) request.getAttribute("javax.portlet.request");
+      PortletResponse portletResp = (PortletResponse) request.getAttribute("javax.portlet.response");
+      PortletConfig portletConfig = (PortletConfig) request.getAttribute("javax.portlet.config");
+      long svtTid = Thread.currentThread().getId();
+      long reqTid = (Long) portletReq.getAttribute(THREADID_ATTR);
+
+      StringWriter writer = new StringWriter();
+
+      JSR286SpecTestCaseDetails tcd = new JSR286SpecTestCaseDetails();
+
+      // Create result objects for the tests
+
+      /* TestCase: V2PortletTagLibraryTests_SPEC2_26_IncludeJSPAction_defineObjects1 */
+      /* Details: "When included in the Action phase, the defineObjects tag   */
+      /* defines the variable RenderRequest renderRequest to be null or       */
+      /* undefined"                                                           */
+      TestResult tr0 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS_SPEC2_26_INCLUDEJSPACTION_DEFINEOBJECTS1);
+      /* TODO: implement test */
+      tr0.appendTcDetail("Not implemented.");
+      tr0.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests_SPEC2_26_IncludeJSPAction_defineObjects2 */
+      /* Details: "When included in the Action phase, the defineObjects tag   */
+      /* defines the variable ResourceRequest resourceRequest to be null or   */
+      /* undefined"                                                           */
+      TestResult tr1 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS_SPEC2_26_INCLUDEJSPACTION_DEFINEOBJECTS2);
+      /* TODO: implement test */
+      tr1.appendTcDetail("Not implemented.");
+      tr1.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests_SPEC2_26_IncludeJSPAction_defineObjects3 */
+      /* Details: "When included in the Action phase, the defineObjects tag   */
+      /* defines the variable ActionRequest actionRequest to the              */
+      /* corresponding object"                                                */
+      TestResult tr2 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS_SPEC2_26_INCLUDEJSPACTION_DEFINEOBJECTS3);
+      /* TODO: implement test */
+      tr2.appendTcDetail("Not implemented.");
+      tr2.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests_SPEC2_26_IncludeJSPAction_defineObjects4 */
+      /* Details: "When included in the Action phase, the defineObjects tag   */
+      /* defines the variable EventRequest eventRequest to be null or         */
+      /* undefined"                                                           */
+      TestResult tr3 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS_SPEC2_26_INCLUDEJSPACTION_DEFINEOBJECTS4);
+      /* TODO: implement test */
+      tr3.appendTcDetail("Not implemented.");
+      tr3.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests_SPEC2_26_IncludeJSPAction_defineObjects5 */
+      /* Details: "When included in the Action phase, the defineObjects tag   */
+      /* defines the variable RenderResponse renderResponse to be null or     */
+      /* undefined"                                                           */
+      TestResult tr4 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS_SPEC2_26_INCLUDEJSPACTION_DEFINEOBJECTS5);
+      /* TODO: implement test */
+      tr4.appendTcDetail("Not implemented.");
+      tr4.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests_SPEC2_26_IncludeJSPAction_defineObjects6 */
+      /* Details: "When included in the Action phase, the defineObjects tag   */
+      /* defines the variable ResourceResponse resourceResponse to be null    */
+      /* or undefined"                                                        */
+      TestResult tr5 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS_SPEC2_26_INCLUDEJSPACTION_DEFINEOBJECTS6);
+      /* TODO: implement test */
+      tr5.appendTcDetail("Not implemented.");
+      tr5.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests_SPEC2_26_IncludeJSPAction_defineObjects7 */
+      /* Details: "When included in the Action phase, the defineObjects tag   */
+      /* defines the variable ActionResponse actionResponse to the            */
+      /* corresponding object"                                                */
+      TestResult tr6 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS_SPEC2_26_INCLUDEJSPACTION_DEFINEOBJECTS7);
+      /* TODO: implement test */
+      tr6.appendTcDetail("Not implemented.");
+      tr6.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests_SPEC2_26_IncludeJSPAction_defineObjects8 */
+      /* Details: "When included in the Action phase, the defineObjects tag   */
+      /* defines the variable EventResponse eventResponse to be null or       */
+      /* undefined"                                                           */
+      TestResult tr7 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS_SPEC2_26_INCLUDEJSPACTION_DEFINEOBJECTS8);
+      /* TODO: implement test */
+      tr7.appendTcDetail("Not implemented.");
+      tr7.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests_SPEC2_26_IncludeJSPAction_defineObjects9 */
+      /* Details: "When included in the Action phase, the defineObjects tag   */
+      /* defines the variable PortletConfig portletConfig"                    */
+      TestResult tr8 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS_SPEC2_26_INCLUDEJSPACTION_DEFINEOBJECTS9);
+      /* TODO: implement test */
+      tr8.appendTcDetail("Not implemented.");
+      tr8.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests_SPEC2_26_IncludeJSPAction_defineObjects10 */
+      /* Details: "When included in the Action phase, the defineObjects tag   */
+      /* defines the variable PortletSession portletSession, providing        */
+      /* access to the portletSession, does not create a new session, only    */
+      /* returns an existing session or null if no session exists."           */
+      TestResult tr9 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS_SPEC2_26_INCLUDEJSPACTION_DEFINEOBJECTS10);
+      /* TODO: implement test */
+      tr9.appendTcDetail("Not implemented.");
+      tr9.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests_SPEC2_26_IncludeJSPAction_defineObjects11 */
+      /* Details: "When included in the Action phase, the defineObjects tag   */
+      /* defines the variable Map<String, Object> portletSessionScope,        */
+      /* providing access to the portletSession attributes as a Map           */
+      /* equivalent to the PortletSession.getAttributeMap() call, does not    */
+      /* create a new session, only returns an existing session. If no        */
+      /* session attributes exist this method returns an empty Map."          */
+      TestResult tr10 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS_SPEC2_26_INCLUDEJSPACTION_DEFINEOBJECTS11);
+      /* TODO: implement test */
+      tr10.appendTcDetail("Not implemented.");
+      tr10.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests_SPEC2_26_IncludeJSPAction_defineObjects12 */
+      /* Details: "When included in the Action phase, the defineObjects tag   */
+      /* defines the variable PortletPreferences portletPreferences,          */
+      /* providing access to the portlet preferences."                        */
+      TestResult tr11 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS_SPEC2_26_INCLUDEJSPACTION_DEFINEOBJECTS12);
+      /* TODO: implement test */
+      tr11.appendTcDetail("Not implemented.");
+      tr11.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests_SPEC2_26_IncludeJSPAction_defineObjects13 */
+      /* Details: "When included in the Action phase, the defineObjects tag   */
+      /* defines the variable Map<String, String[]>                           */
+      /* portletPreferencesValues, providing access to the portlet            */
+      /* preferences as a Map, equivalent to the                              */
+      /* PortletPreferences.getMap() call. If no portlet preferences exist,   */
+      /* the Map is empty."                                                   */
+      TestResult tr12 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS_SPEC2_26_INCLUDEJSPACTION_DEFINEOBJECTS13);
+      /* TODO: implement test */
+      tr12.appendTcDetail("Not implemented.");
+      tr12.writeTo(writer);
+
+      request.getSession().setAttribute(
+                   Constants.RESULT_ATTR_PREFIX + "PortletTagLibraryTests_SPEC2_26_IncludeJSPAction",
+                   writer.toString());
+%>

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/23a1c547/portlet-tck_3.0/V2PortletTagLibraryTests/src/main/webapp/WEB-INF/jsp/PortletTagLibraryTests_SPEC2_26_IncludeJSPEvent.jsp
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2PortletTagLibraryTests/src/main/webapp/WEB-INF/jsp/PortletTagLibraryTests_SPEC2_26_IncludeJSPEvent.jsp b/portlet-tck_3.0/V2PortletTagLibraryTests/src/main/webapp/WEB-INF/jsp/PortletTagLibraryTests_SPEC2_26_IncludeJSPEvent.jsp
new file mode 100644
index 0000000..09ec423
--- /dev/null
+++ b/portlet-tck_3.0/V2PortletTagLibraryTests/src/main/webapp/WEB-INF/jsp/PortletTagLibraryTests_SPEC2_26_IncludeJSPEvent.jsp
@@ -0,0 +1,152 @@
+<%@ page session="false" %>
+<%@ taglib uri="http://java.sun.com/portlet_2_0"  prefix="portlet" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ page import="java.io.*,java.util.*,java.util.logging.*" %>
+<%@ page import="static java.util.logging.Logger.*" %>
+<%@ page import="javax.portlet.*,javax.portlet.filter.*" %>
+<%@ page import="javax.servlet.http.*,javax.servlet.*" %>
+<%@ page import="javax.portlet.tck.beans.*,javax.portlet.tck.constants.*" %>
+<%@ page import="static javax.portlet.tck.constants.Constants.*" %>
+<%@ page import="static javax.portlet.tck.beans.JSR286SpecTestCaseDetails.*" %>
+
+<%
+
+      PortletRequest portletReq = (PortletRequest) request.getAttribute("javax.portlet.request");
+      PortletResponse portletResp = (PortletResponse) request.getAttribute("javax.portlet.response");
+      PortletConfig portletConfig = (PortletConfig) request.getAttribute("javax.portlet.config");
+      long svtTid = Thread.currentThread().getId();
+      long reqTid = (Long) portletReq.getAttribute(THREADID_ATTR);
+
+      StringWriter writer = new StringWriter();
+
+      JSR286SpecTestCaseDetails tcd = new JSR286SpecTestCaseDetails();
+
+      // Create result objects for the tests
+
+      /* TestCase: V2PortletTagLibraryTests_SPEC2_26_IncludeJSPEvent_defineObjects1 */
+      /* Details: "When included in the Event phase, the defineObjects tag    */
+      /* defines the variable RenderRequest renderRequest to be null or       */
+      /* undefined"                                                           */
+      TestResult tr0 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS_SPEC2_26_INCLUDEJSPEVENT_DEFINEOBJECTS1);
+      /* TODO: implement test */
+      tr0.appendTcDetail("Not implemented.");
+      tr0.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests_SPEC2_26_IncludeJSPEvent_defineObjects2 */
+      /* Details: "When included in the Event phase, the defineObjects tag    */
+      /* defines the variable ResourceRequest resourceRequest to be null or   */
+      /* undefined"                                                           */
+      TestResult tr1 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS_SPEC2_26_INCLUDEJSPEVENT_DEFINEOBJECTS2);
+      /* TODO: implement test */
+      tr1.appendTcDetail("Not implemented.");
+      tr1.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests_SPEC2_26_IncludeJSPEvent_defineObjects3 */
+      /* Details: "When included in the Event phase, the defineObjects tag    */
+      /* defines the variable ActionRequest actionRequest to be null or       */
+      /* undefined"                                                           */
+      TestResult tr2 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS_SPEC2_26_INCLUDEJSPEVENT_DEFINEOBJECTS3);
+      /* TODO: implement test */
+      tr2.appendTcDetail("Not implemented.");
+      tr2.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests_SPEC2_26_IncludeJSPEvent_defineObjects4 */
+      /* Details: "When included in the Event phase, the defineObjects tag    */
+      /* defines the variable EventRequest eventRequest to the                */
+      /* corresponding object"                                                */
+      TestResult tr3 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS_SPEC2_26_INCLUDEJSPEVENT_DEFINEOBJECTS4);
+      /* TODO: implement test */
+      tr3.appendTcDetail("Not implemented.");
+      tr3.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests_SPEC2_26_IncludeJSPEvent_defineObjects5 */
+      /* Details: "When included in the Event phase, the defineObjects tag    */
+      /* defines the variable RenderResponse renderResponse to be null or     */
+      /* undefined"                                                           */
+      TestResult tr4 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS_SPEC2_26_INCLUDEJSPEVENT_DEFINEOBJECTS5);
+      /* TODO: implement test */
+      tr4.appendTcDetail("Not implemented.");
+      tr4.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests_SPEC2_26_IncludeJSPEvent_defineObjects6 */
+      /* Details: "When included in the Event phase, the defineObjects tag    */
+      /* defines the variable ResourceResponse resourceResponse to be null    */
+      /* or undefined"                                                        */
+      TestResult tr5 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS_SPEC2_26_INCLUDEJSPEVENT_DEFINEOBJECTS6);
+      /* TODO: implement test */
+      tr5.appendTcDetail("Not implemented.");
+      tr5.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests_SPEC2_26_IncludeJSPEvent_defineObjects7 */
+      /* Details: "When included in the Event phase, the defineObjects tag    */
+      /* defines the variable ActionResponse actionResponse to be null or     */
+      /* undefined"                                                           */
+      TestResult tr6 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS_SPEC2_26_INCLUDEJSPEVENT_DEFINEOBJECTS7);
+      /* TODO: implement test */
+      tr6.appendTcDetail("Not implemented.");
+      tr6.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests_SPEC2_26_IncludeJSPEvent_defineObjects8 */
+      /* Details: "When included in the Event phase, the defineObjects tag    */
+      /* defines the variable EventResponse eventResponse to the              */
+      /* corresponding object"                                                */
+      TestResult tr7 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS_SPEC2_26_INCLUDEJSPEVENT_DEFINEOBJECTS8);
+      /* TODO: implement test */
+      tr7.appendTcDetail("Not implemented.");
+      tr7.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests_SPEC2_26_IncludeJSPEvent_defineObjects9 */
+      /* Details: "When included in the Event phase, the defineObjects tag    */
+      /* defines the variable PortletConfig portletConfig"                    */
+      TestResult tr8 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS_SPEC2_26_INCLUDEJSPEVENT_DEFINEOBJECTS9);
+      /* TODO: implement test */
+      tr8.appendTcDetail("Not implemented.");
+      tr8.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests_SPEC2_26_IncludeJSPEvent_defineObjects10 */
+      /* Details: "When included in the Event phase, the defineObjects tag    */
+      /* defines the variable PortletSession portletSession, providing        */
+      /* access to the portletSession, does not create a new session, only    */
+      /* returns an existing session or null if no session exists."           */
+      TestResult tr9 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS_SPEC2_26_INCLUDEJSPEVENT_DEFINEOBJECTS10);
+      /* TODO: implement test */
+      tr9.appendTcDetail("Not implemented.");
+      tr9.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests_SPEC2_26_IncludeJSPEvent_defineObjects11 */
+      /* Details: "When included in the Event phase, the defineObjects tag    */
+      /* defines the variable Map<String, Object> portletSessionScope,        */
+      /* providing access to the portletSession attributes as a Map           */
+      /* equivalent to the PortletSession.getAttributeMap() call, does not    */
+      /* create a new session, only returns an existing session. If no        */
+      /* session attributes exist this method returns an empty Map."          */
+      TestResult tr10 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS_SPEC2_26_INCLUDEJSPEVENT_DEFINEOBJECTS11);
+      /* TODO: implement test */
+      tr10.appendTcDetail("Not implemented.");
+      tr10.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests_SPEC2_26_IncludeJSPEvent_defineObjects12 */
+      /* Details: "When included in the Event phase, the defineObjects tag    */
+      /* defines the variable PortletPreferences portletPreferences,          */
+      /* providing access to the portlet preferences."                        */
+      TestResult tr11 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS_SPEC2_26_INCLUDEJSPEVENT_DEFINEOBJECTS12);
+      /* TODO: implement test */
+      tr11.appendTcDetail("Not implemented.");
+      tr11.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests_SPEC2_26_IncludeJSPEvent_defineObjects13 */
+      /* Details: "When included in the Event phase, the defineObjects tag    */
+      /* defines the variable Map<String, String[]>                           */
+      /* portletPreferencesValues, providing access to the portlet            */
+      /* preferences as a Map, equivalent to the                              */
+      /* PortletPreferences.getMap() call. If no portlet preferences exist,   */
+      /* the Map is empty."                                                   */
+      TestResult tr12 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS_SPEC2_26_INCLUDEJSPEVENT_DEFINEOBJECTS13);
+      /* TODO: implement test */
+      tr12.appendTcDetail("Not implemented.");
+      tr12.writeTo(writer);
+
+      request.getSession().setAttribute(
+                   Constants.RESULT_ATTR_PREFIX + "PortletTagLibraryTests_SPEC2_26_IncludeJSPEvent",
+                   writer.toString());
+%>

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/23a1c547/portlet-tck_3.0/V2PortletTagLibraryTests/src/main/webapp/WEB-INF/jsp/PortletTagLibraryTests_SPEC2_26_IncludeJSPGeneral.jsp
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2PortletTagLibraryTests/src/main/webapp/WEB-INF/jsp/PortletTagLibraryTests_SPEC2_26_IncludeJSPGeneral.jsp b/portlet-tck_3.0/V2PortletTagLibraryTests/src/main/webapp/WEB-INF/jsp/PortletTagLibraryTests_SPEC2_26_IncludeJSPGeneral.jsp
new file mode 100644
index 0000000..d0aebe1
--- /dev/null
+++ b/portlet-tck_3.0/V2PortletTagLibraryTests/src/main/webapp/WEB-INF/jsp/PortletTagLibraryTests_SPEC2_26_IncludeJSPGeneral.jsp
@@ -0,0 +1,84 @@
+<%@ page session="false" %>
+<%@ taglib uri="http://java.sun.com/portlet_2_0"  prefix="portlet" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ page import="java.io.*,java.util.*,java.util.logging.*" %>
+<%@ page import="static java.util.logging.Logger.*" %>
+<%@ page import="javax.portlet.*,javax.portlet.filter.*" %>
+<%@ page import="javax.servlet.http.*,javax.servlet.*" %>
+<%@ page import="javax.portlet.tck.beans.*,javax.portlet.tck.constants.*" %>
+<%@ page import="static javax.portlet.tck.constants.Constants.*" %>
+<%@ page import="static javax.portlet.tck.beans.JSR286SpecTestCaseDetails.*" %>
+
+<%
+
+      PortletRequest portletReq = (PortletRequest) request.getAttribute("javax.portlet.request");
+      PortletResponse portletResp = (PortletResponse) request.getAttribute("javax.portlet.response");
+      PortletConfig portletConfig = (PortletConfig) request.getAttribute("javax.portlet.config");
+      long svtTid = Thread.currentThread().getId();
+      long reqTid = (Long) portletReq.getAttribute(THREADID_ATTR);
+
+      PrintWriter writer = ((MimeResponse)portletResp).getWriter();
+
+      JSR286SpecTestCaseDetails tcd = new JSR286SpecTestCaseDetails();
+
+      // Create result objects for the tests
+
+      /* TestCase: V2PortletTagLibraryTests_SPEC2_26_IncludeJSPGeneral_defineObjects3 */
+      /* Details: "The version 1.0 tag library may be referenced using <%@    */
+      /* taglib uri=\"http://java.sun.com/portlet\" prefix=\"portlet\" %>"    */
+      TestResult tr0 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS_SPEC2_26_INCLUDEJSPGENERAL_DEFINEOBJECTS3);
+      /* TODO: implement test */
+      tr0.appendTcDetail("Not implemented.");
+      tr0.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests_SPEC2_26_IncludeJSPGeneral_defineObjects1 */
+      /* Details: "The portlet-container must provide an implementation of    */
+      /* the Tag Lib"                                                         */
+      TestResult tr1 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS_SPEC2_26_INCLUDEJSPGENERAL_DEFINEOBJECTS1);
+      /* TODO: implement test */
+      tr1.appendTcDetail("Not implemented.");
+      tr1.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests_SPEC2_26_IncludeJSPGeneral_defineObjects2 */
+      /* Details: "In order to obtain version 2 support, the tag library      */
+      /* must be specified as <%@ taglib                                      */
+      /* uri=\"http://java.sun.com/portlet_2_0\" prefix=\"portlet\" %>"       */
+      TestResult tr2 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS_SPEC2_26_INCLUDEJSPGENERAL_DEFINEOBJECTS2);
+      /* TODO: implement test */
+      tr2.appendTcDetail("Not implemented.");
+      tr2.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests_SPEC2_26_IncludeJSPGeneral_defineObjects4 */
+      /* Details: "The defineObjects tag must not define any attribute and    */
+      /* it must not contain any body content"                                */
+      TestResult tr3 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS_SPEC2_26_INCLUDEJSPGENERAL_DEFINEOBJECTS4);
+      /* TODO: implement test */
+      tr3.appendTcDetail("Not implemented.");
+      tr3.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests_SPEC2_26_IncludeJSPGeneral_namespace */
+      /* Details: "The namespace tag produces a unique string value for the   */
+      /* current portlet equal to the value returned by the                   */
+      /* PortletResponse.getNamespace method"                                 */
+      TestResult tr4 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS_SPEC2_26_INCLUDEJSPGENERAL_NAMESPACE);
+      /* TODO: implement test */
+      tr4.appendTcDetail("Not implemented.");
+      tr4.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests_SPEC2_26_IncludeJSPGeneral_escapeXML1 */
+      /* Details: "The container runtime option \"javax.portlet.escapeXml\"   */
+      /* can be used to set the default escapeXML setting to true"            */
+      TestResult tr5 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS_SPEC2_26_INCLUDEJSPGENERAL_ESCAPEXML1);
+      /* TODO: implement test */
+      tr5.appendTcDetail("Not implemented.");
+      tr5.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests_SPEC2_26_IncludeJSPGeneral_escapeXML2 */
+      /* Details: "The container runtime option \"javax.portlet.escapeXml\"   */
+      /* can be used to set the default escapeXML setting to false"           */
+      TestResult tr6 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS_SPEC2_26_INCLUDEJSPGENERAL_ESCAPEXML2);
+      /* TODO: implement test */
+      tr6.appendTcDetail("Not implemented.");
+      tr6.writeTo(writer);
+
+%>

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/23a1c547/portlet-tck_3.0/V2PortletTagLibraryTests/src/main/webapp/WEB-INF/portlet.xml
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2PortletTagLibraryTests/src/main/webapp/WEB-INF/portlet.xml b/portlet-tck_3.0/V2PortletTagLibraryTests/src/main/webapp/WEB-INF/portlet.xml
index a568595..3b2f294 100644
--- a/portlet-tck_3.0/V2PortletTagLibraryTests/src/main/webapp/WEB-INF/portlet.xml
+++ b/portlet-tck_3.0/V2PortletTagLibraryTests/src/main/webapp/WEB-INF/portlet.xml
@@ -20,162 +20,118 @@
 <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-PortletTagLibraryTests">
-
-   <portlet>
-      <portlet-name>PortletTagLibraryTests_SPEC2_26_TagLibV1</portlet-name>
-      <portlet-class>javax.portlet.tck.portlets.PortletTagLibraryTests_SPEC2_26_TagLibV1</portlet-class>
-
-      <init-param>
-         <name>TestParameter</name>
-         <value>TestValue</value>
-      </init-param>
-
-      <expiration-cache>0</expiration-cache>
-
-      <supports>
-         <mime-type>text/html</mime-type>
-      </supports>
-
-      <supported-locale>en_US</supported-locale>
-
-      <portlet-info>
-         <title>PortletTagLibraryTests_SPEC2_26_TagLibV1</title>
-      </portlet-info>
-   </portlet>
-
-   <portlet>
-      <portlet-name>PortletTagLibraryTests_SPEC2_26_TagLibAction</portlet-name>
-      <portlet-class>javax.portlet.tck.portlets.PortletTagLibraryTests_SPEC2_26_TagLibAction</portlet-class>
-
-      <init-param>
-         <name>TestParameter</name>
-         <value>TestValue</value>
-      </init-param>
-
-      <expiration-cache>0</expiration-cache>
-
-      <supports>
-         <mime-type>text/html</mime-type>
-      </supports>
-
-      <supported-locale>en_US</supported-locale>
-
-      <portlet-info>
-         <title>PortletTagLibraryTests_SPEC2_26_TagLibAction</title>
-      </portlet-info>
-   </portlet>
-
-   <portlet>
-      <portlet-name>PortletTagLibraryTests_SPEC2_26_TagLibRender</portlet-name>
-      <portlet-class>javax.portlet.tck.portlets.PortletTagLibraryTests_SPEC2_26_TagLibRender</portlet-class>
-
-      <init-param>
-         <name>TestParameter</name>
-         <value>TestValue</value>
-      </init-param>
-
-      <expiration-cache>0</expiration-cache>
-
-      <supports>
-         <mime-type>text/html</mime-type>
-      </supports>
-
-      <supported-locale>en_US</supported-locale>
-
-      <portlet-info>
-         <title>PortletTagLibraryTests_SPEC2_26_TagLibRender</title>
-      </portlet-info>
-   </portlet>
-
+   xmlns:tck="http://www.apache.org/portals/pluto/portlet-tck_3.0"
+   version="2.0" id="V2PortletTagLibraryTests">
    <portlet>
-      <portlet-name>PortletTagLibraryTests_SPEC2_26_TagLibResource</portlet-name>
-      <portlet-class>javax.portlet.tck.portlets.PortletTagLibraryTests_SPEC2_26_TagLibResource</portlet-class>
-
-      <init-param>
-         <name>TestParameter</name>
-         <value>TestValue</value>
-      </init-param>
-
+      <portlet-name>PortletTagLibraryTests_SPEC2_26_IncludeJSPGeneral</portlet-name>
+      <portlet-class>javax.portlet.tck.portlets.PortletTagLibraryTests_SPEC2_26_IncludeJSPGeneral</portlet-class>
       <expiration-cache>0</expiration-cache>
-
       <supports>
          <mime-type>text/html</mime-type>
       </supports>
-
       <supported-locale>en_US</supported-locale>
-
       <portlet-info>
-         <title>PortletTagLibraryTests_SPEC2_26_TagLibResource</title>
+         <title>PortletTagLibraryTests_SPEC2_26_IncludeJSPGeneral</title>
       </portlet-info>
    </portlet>
 
    <portlet>
-      <portlet-name>PortletTagLibraryTests_SPEC2_26_TagLibParam</portlet-name>
-      <portlet-class>javax.portlet.tck.portlets.PortletTagLibraryTests_SPEC2_26_TagLibParam</portlet-class>
-
-      <init-param>
-         <name>TestParameter</name>
-         <value>TestValue</value>
-      </init-param>
-
+      <portlet-name>PortletTagLibraryTests_SPEC2_26_IncludeJSPAction</portlet-name>
+      <portlet-class>javax.portlet.tck.portlets.PortletTagLibraryTests_SPEC2_26_IncludeJSPAction</portlet-class>
       <expiration-cache>0</expiration-cache>
-
       <supports>
          <mime-type>text/html</mime-type>
       </supports>
-
       <supported-locale>en_US</supported-locale>
-
       <portlet-info>
-         <title>PortletTagLibraryTests_SPEC2_26_TagLibParam</title>
+         <title>PortletTagLibraryTests_SPEC2_26_IncludeJSPAction</title>
       </portlet-info>
    </portlet>
 
    <portlet>
-      <portlet-name>PortletTagLibraryTests_SPEC2_26_TagLibProperty</portlet-name>
-      <portlet-class>javax.portlet.tck.portlets.PortletTagLibraryTests_SPEC2_26_TagLibProperty</portlet-class>
-
-      <init-param>
-         <name>TestParameter</name>
-         <value>TestValue</value>
-      </init-param>
-
+      <portlet-name>PortletTagLibraryTests_SPEC2_26_IncludeJSPEvent</portlet-name>
+      <portlet-class>javax.portlet.tck.portlets.PortletTagLibraryTests_SPEC2_26_IncludeJSPEvent</portlet-class>
       <expiration-cache>0</expiration-cache>
-
       <supports>
          <mime-type>text/html</mime-type>
       </supports>
-
       <supported-locale>en_US</supported-locale>
-
       <portlet-info>
-         <title>PortletTagLibraryTests_SPEC2_26_TagLibProperty</title>
+         <title>PortletTagLibraryTests_SPEC2_26_IncludeJSPEvent</title>
       </portlet-info>
+      <supported-publishing-event>
+         <qname>tck:PortletTagLibraryTests_SPEC2_26_IncludeJSPEvent</qname>
+      </supported-publishing-event>
    </portlet>
 
    <portlet>
-      <portlet-name>PortletTagLibraryTests_SPEC2_26_TagLib</portlet-name>
-      <portlet-class>javax.portlet.tck.portlets.PortletTagLibraryTests_SPEC2_26_TagLib</portlet-class>
-
-      <init-param>
-         <name>TestParameter</name>
-         <value>TestValue</value>
-      </init-param>
-
+      <portlet-name>PortletTagLibraryTests_SPEC2_26_IncludeJSPEvent_event</portlet-name>
+      <portlet-class>javax.portlet.tck.portlets.PortletTagLibraryTests_SPEC2_26_IncludeJSPEvent_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>PortletTagLibraryTests_SPEC2_26_TagLib</title>
+         <title>PortletTagLibraryTests_SPEC2_26_IncludeJSPEvent_event</title>
       </portlet-info>
+      <supported-processing-event>
+         <qname>tck:PortletTagLibraryTests_SPEC2_26_IncludeJSPEvent</qname>
+      </supported-processing-event>
    </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>
+
+   <event-definition>
+      <qname>tck:PortletTagLibraryTests_SPEC2_26_IncludeJSPEvent</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/V2PortletTagLibraryTests/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2PortletTagLibraryTests/src/main/webapp/WEB-INF/web.xml b/portlet-tck_3.0/V2PortletTagLibraryTests/src/main/webapp/WEB-INF/web.xml
index 185ef3e..07fc414 100644
--- a/portlet-tck_3.0/V2PortletTagLibraryTests/src/main/webapp/WEB-INF/web.xml
+++ b/portlet-tck_3.0/V2PortletTagLibraryTests/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-PortletTagLibraryTests</display-name>
-</web-app>
+   <display-name>javax.portlet-tck-PortletTagLibraryTests</display-name>
 
+</web-app>

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/23a1c547/portlet-tck_3.0/V2PortletTagLibraryTests2/pom.xml
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2PortletTagLibraryTests2/pom.xml b/portlet-tck_3.0/V2PortletTagLibraryTests2/pom.xml
new file mode 100644
index 0000000..107206d
--- /dev/null
+++ b/portlet-tck_3.0/V2PortletTagLibraryTests2/pom.xml
@@ -0,0 +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-V2PortletTagLibraryTests2</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>


[15/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.

Posted by ms...@apache.org.
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_15_ActionEventHandling.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_15_ActionEventHandling.java b/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_15_ActionEventHandling.java
new file mode 100644
index 0000000..0e838ca
--- /dev/null
+++ b/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_15_ActionEventHandling.java
@@ -0,0 +1,289 @@
+/*  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 AddlPortletTests_SPEC2_15_ActionEventHandling_event
+ *
+ */
+public class AddlPortletTests_SPEC2_15_ActionEventHandling implements Portlet, ResourceServingPortlet {
+   private static final String LOG_CLASS = 
+         AddlPortletTests_SPEC2_15_ActionEventHandling.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();
+
+      JSR286SpecTestCaseDetails tcd = new JSR286SpecTestCaseDetails();
+
+      // Create result objects for the tests
+
+      /* TestCase: V2AddlPortletTests_SPEC2_15_ActionEventHandling_eventProcessAction1 */
+      /* Details: "The portlet can publish an event via the setEvent method   */
+      /* in the processAction method"                                         */
+      TestResult tr0 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_15_ACTIONEVENTHANDLING_EVENTPROCESSACTION1);
+      /* TODO: implement test */
+      tr0.appendTcDetail("Not implemented.");
+      tr0.writeTo(writer);
+
+      /* TestCase: V2AddlPortletTests_SPEC2_15_ActionEventHandling_eventProcessAction2 */
+      /* Details: "The portlet can publish an event with its full Qname via   */
+      /* the setEvent method in the processAction method"                     */
+      TestResult tr1 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_15_ACTIONEVENTHANDLING_EVENTPROCESSACTION2);
+      /* TODO: implement test */
+      tr1.appendTcDetail("Not implemented.");
+      tr1.writeTo(writer);
+
+      /* TestCase: V2AddlPortletTests_SPEC2_15_ActionEventHandling_eventProcessAction3 */
+      /* Details: "The portlet can publish an event with only the local       */
+      /* part of the Qname via the setEvent method in the processAction       */
+      /* method"                                                              */
+      TestResult tr2 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_15_ACTIONEVENTHANDLING_EVENTPROCESSACTION3);
+      /* TODO: implement test */
+      tr2.appendTcDetail("Not implemented.");
+      tr2.writeTo(writer);
+
+      /* TestCase: V2AddlPortletTests_SPEC2_15_ActionEventHandling_eventProcessAction4 */
+      /* Details: "If an event is published with only the local part of the   */
+      /* Qname, the namespace must be the default namespace defined in the    */
+      /* deployment descriptor"                                               */
+      TestResult tr3 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_15_ACTIONEVENTHANDLING_EVENTPROCESSACTION4);
+      /* TODO: implement test */
+      tr3.appendTcDetail("Not implemented.");
+      tr3.writeTo(writer);
+
+      /* TestCase: V2AddlPortletTests_SPEC2_15_ActionEventHandling_eventProcessAction5 */
+      /* Details: "If an event is published with only the local part of the   */
+      /* Qname and no default namespace is defined in the deployment          */
+      /* descriptor, the value javax.xml.XMLConstants.NULL_NS_URI must be     */
+      /* used as the Qname namespace"                                         */
+      TestResult tr4 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_15_ACTIONEVENTHANDLING_EVENTPROCESSACTION5);
+      /* TODO: implement test */
+      tr4.appendTcDetail("Not implemented.");
+      tr4.writeTo(writer);
+
+      /* TestCase: V2AddlPortletTests_SPEC2_15_ActionEventHandling_eventProcessAction6 */
+      /* Details: "If an object is serializeable and has a valid JAXB         */
+      /* binding or is a Java primitive type, it can be used as an event      */
+      /* value"                                                               */
+      TestResult tr5 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_15_ACTIONEVENTHANDLING_EVENTPROCESSACTION6);
+      /* TODO: implement test */
+      tr5.appendTcDetail("Not implemented.");
+      tr5.writeTo(writer);
+
+      /* TestCase: V2AddlPortletTests_SPEC2_15_ActionEventHandling_eventProcessAction7 */
+      /* Details: "If a value is not serializeable, the setEvent method       */
+      /* must throw an IllegalArgumentException"                              */
+      TestResult tr6 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_15_ACTIONEVENTHANDLING_EVENTPROCESSACTION7);
+      /* TODO: implement test */
+      tr6.appendTcDetail("Not implemented.");
+      tr6.writeTo(writer);
+
+      /* TestCase: V2AddlPortletTests_SPEC2_15_ActionEventHandling_eventProcessAction8 */
+      /* Details: "If a value does not have a valid JAXB binding and is not   */
+      /* a Java primitve type, the setEvent method must throw an              */
+      /* IllegalArgumentException"                                            */
+      TestResult tr7 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_15_ACTIONEVENTHANDLING_EVENTPROCESSACTION8);
+      /* TODO: implement test */
+      tr7.appendTcDetail("Not implemented.");
+      tr7.writeTo(writer);
+
+      /* TestCase: V2AddlPortletTests_SPEC2_15_ActionEventHandling_eventProcessAction9 */
+      /* Details: "The portlet can publish multiple events via the setEvent   */
+      /* method in the processAction method"                                  */
+      TestResult tr8 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_15_ACTIONEVENTHANDLING_EVENTPROCESSACTION9);
+      /* TODO: implement test */
+      tr8.appendTcDetail("Not implemented.");
+      tr8.writeTo(writer);
+
+      portletReq.getPortletSession().setAttribute(
+                   Constants.RESULT_ATTR_PREFIX + "AddlPortletTests_SPEC2_15_ActionEventHandling",
+                   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();
+
+   }
+
+   @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();
+
+      PortletSession ps = portletReq.getPortletSession();
+      String msg = (String) ps.getAttribute(RESULT_ATTR_PREFIX + "AddlPortletTests_SPEC2_15_ActionEventHandling", APPLICATION_SCOPE);
+      if (msg != null) {
+         writer.write("<p>" + msg + "</p><br/>\n");
+         ps.removeAttribute(RESULT_ATTR_PREFIX + "AddlPortletTests_SPEC2_15_ActionEventHandling", APPLICATION_SCOPE);
+      }
+
+      /* TestCase: V2AddlPortletTests_SPEC2_15_ActionEventHandling_eventProcessAction1 */
+      /* Details: "The portlet can publish an event via the setEvent method   */
+      /* in the processAction method"                                         */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2AddlPortletTests_SPEC2_15_ActionEventHandling_eventProcessAction1", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2AddlPortletTests_SPEC2_15_ActionEventHandling_eventProcessAction2 */
+      /* Details: "The portlet can publish an event with its full Qname via   */
+      /* the setEvent method in the processAction method"                     */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2AddlPortletTests_SPEC2_15_ActionEventHandling_eventProcessAction2", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2AddlPortletTests_SPEC2_15_ActionEventHandling_eventProcessAction3 */
+      /* Details: "The portlet can publish an event with only the local       */
+      /* part of the Qname via the setEvent method in the processAction       */
+      /* method"                                                              */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2AddlPortletTests_SPEC2_15_ActionEventHandling_eventProcessAction3", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2AddlPortletTests_SPEC2_15_ActionEventHandling_eventProcessAction4 */
+      /* Details: "If an event is published with only the local part of the   */
+      /* Qname, the namespace must be the default namespace defined in the    */
+      /* deployment descriptor"                                               */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2AddlPortletTests_SPEC2_15_ActionEventHandling_eventProcessAction4", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2AddlPortletTests_SPEC2_15_ActionEventHandling_eventProcessAction5 */
+      /* Details: "If an event is published with only the local part of the   */
+      /* Qname and no default namespace is defined in the deployment          */
+      /* descriptor, the value javax.xml.XMLConstants.NULL_NS_URI must be     */
+      /* used as the Qname namespace"                                         */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2AddlPortletTests_SPEC2_15_ActionEventHandling_eventProcessAction5", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2AddlPortletTests_SPEC2_15_ActionEventHandling_eventProcessAction6 */
+      /* Details: "If an object is serializeable and has a valid JAXB         */
+      /* binding or is a Java primitive type, it can be used as an event      */
+      /* value"                                                               */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2AddlPortletTests_SPEC2_15_ActionEventHandling_eventProcessAction6", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2AddlPortletTests_SPEC2_15_ActionEventHandling_eventProcessAction7 */
+      /* Details: "If a value is not serializeable, the setEvent method       */
+      /* must throw an IllegalArgumentException"                              */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2AddlPortletTests_SPEC2_15_ActionEventHandling_eventProcessAction7", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2AddlPortletTests_SPEC2_15_ActionEventHandling_eventProcessAction8 */
+      /* Details: "If a value does not have a valid JAXB binding and is not   */
+      /* a Java primitve type, the setEvent method must throw an              */
+      /* IllegalArgumentException"                                            */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2AddlPortletTests_SPEC2_15_ActionEventHandling_eventProcessAction8", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2AddlPortletTests_SPEC2_15_ActionEventHandling_eventProcessAction9 */
+      /* Details: "The portlet can publish multiple events via the setEvent   */
+      /* method in the processAction method"                                  */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2AddlPortletTests_SPEC2_15_ActionEventHandling_eventProcessAction9", aurl);
+         tb.writeTo(writer);
+      }
+
+   }
+
+}

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_15_Event.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_15_Event.java b/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_15_Event.java
index 2d638f5..4344943 100644
--- a/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_15_Event.java
+++ b/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_15_Event.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_15_Event_event
+ *
  */
-public class AddlPortletTests_SPEC2_15_Event implements Portlet {
+public class AddlPortletTests_SPEC2_15_Event implements Portlet, ResourceServingPortlet {
    private static final String LOG_CLASS = 
          AddlPortletTests_SPEC2_15_Event.class.getName();
    private final Logger LOGGER = Logger.getLogger(LOG_CLASS);
@@ -57,287 +62,52 @@ public class AddlPortletTests_SPEC2_15_Event implements Portlet {
    }
 
    @Override
-   public void processAction(ActionRequest actionRequest, ActionResponse actionResponse)
+   public void processAction(ActionRequest portletReq, ActionResponse portletResp)
          throws PortletException, IOException {
-   }
-
-   @Override
-   public void render(RenderRequest renderRequest, RenderResponse renderResponse)
-         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
-
-      /* TestCase: SPEC2_15_Event_event1                                      */
-      /* Details: "Event names are defined in the deployment descriptor"      */
-      TestResult tr0 = tcd.getTestResultFailed(SPEC2_15_EVENT_EVENT1);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_15_Event_event2                                      */
-      /* Details: "Event value types are defined in the deployment            */
-      /* descriptor"                                                          */
-      TestResult tr1 = tcd.getTestResultFailed(SPEC2_15_EVENT_EVENT2);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_15_Event_event3                                      */
-      /* Details: "The supported publishing events for the portlet are        */
-      /* defined in the deployment descriptor"                                */
-      TestResult tr2 = tcd.getTestResultFailed(SPEC2_15_EVENT_EVENT3);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_15_Event_event4                                      */
-      /* Details: "The supported processing events for the portlet are        */
-      /* defined in the deployment descriptor"                                */
-      TestResult tr3 = tcd.getTestResultFailed(SPEC2_15_EVENT_EVENT4);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_15_Event_event5                                      */
-      /* Details: "The portlet can use the EventRequest.getEvent method to    */
-      /* obtain an Event object encapsulating the event name and value"       */
-      TestResult tr4 = tcd.getTestResultFailed(SPEC2_15_EVENT_EVENT5);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_15_Event_event6                                      */
-      /* Details: "The Event object must always have a name"                  */
-      TestResult tr5 = tcd.getTestResultFailed(SPEC2_15_EVENT_EVENT6);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_15_Event_event7                                      */
-      /* Details: "If the Event object has a value set when the event is      */
-      /* published, the value must be based on the value defined in the       */
-      /* deployment descriptor"                                               */
-      TestResult tr6 = tcd.getTestResultFailed(SPEC2_15_EVENT_EVENT7);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_15_Event_event8                                      */
-      /* Details: "If the Event object has a value set when the event is      */
-      /* published, the value must be available from the Event object in      */
-      /* the processEvent method"                                             */
-      TestResult tr7 = tcd.getTestResultFailed(SPEC2_15_EVENT_EVENT8);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_15_Event_event9                                      */
-      /* Details: "If the Event object does not have a value set when the     */
-      /* event is published, the Event object available in the processEvent   */
-      /* method must not have a value"                                        */
-      TestResult tr8 = tcd.getTestResultFailed(SPEC2_15_EVENT_EVENT9);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_15_Event_event10                                     */
-      /* Details: "The Event Qname object representing the name can be        */
-      /* retrieved through the Event getQname method"                         */
-      TestResult tr9 = tcd.getTestResultFailed(SPEC2_15_EVENT_EVENT10);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_15_Event_event11                                     */
-      /* Details: "The local part of the Event Qname object representing      */
-      /* the name can be retrieved through the Event getName method"          */
-      TestResult tr10 = tcd.getTestResultFailed(SPEC2_15_EVENT_EVENT11);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_15_Event_event12                                     */
-      /* Details: "Events are valid only in the current client request and    */
-      /* the portlet container must therefore deliver all events within the   */
-      /* current client request"                                              */
-      TestResult tr11 = tcd.getTestResultFailed(SPEC2_15_EVENT_EVENT12);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_15_Event_event13                                     */
-      /* Details: "Event distribution must be serialized for a specific       */
-      /* portlet window per client request so that at any given time a        */
-      /* portlet window is only processing one event in the processEvent      */
-      /* method for the current client request"                               */
-      TestResult tr12 = tcd.getTestResultFailed(SPEC2_15_EVENT_EVENT13);
-      /* TODO: implement test */
+      LOGGER.entering(LOG_CLASS, "main portlet processAction entry");
 
-      /* TestCase: SPEC2_15_Event_event14                                     */
-      /* Details: "Portlet event processing may occur after the processing    */
-      /* of the action, if the portlet was target of an action URL, and       */
-      /* must be finished before the render phase"                            */
-      TestResult tr13 = tcd.getTestResultFailed(SPEC2_15_EVENT_EVENT14);
-      /* TODO: implement test */
+      portletResp.setRenderParameters(portletReq.getParameterMap());
+      long tid = Thread.currentThread().getId();
+      portletReq.setAttribute(THREADID_ATTR, tid);
 
-      /* TestCase: SPEC2_15_Event_event15                                     */
-      /* Details: "If a portlet throws an exception in the processEvent       */
-      /* method, all operations on the EventResponse must be ignored"         */
-      TestResult tr14 = tcd.getTestResultFailed(SPEC2_15_EVENT_EVENT15);
-      /* TODO: implement test */
+      StringWriter writer = new StringWriter();
 
-      /* TestCase: SPEC2_15_Event_event16                                     */
-      /* Details: "If a portlet throws a permanent UnavailableException,      */
-      /* the portlet container must remove the portlet from service           */
-      /* immediately, call the portlet's destroy method, and release the      */
-      /* portlet object"                                                      */
-      TestResult tr15 = tcd.getTestResultFailed(SPEC2_15_EVENT_EVENT16);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_15_Event_eventProcessAction1                         */
-      /* Details: "The portlet can publish an event via the setEvent method   */
-      /* in the processAction method"                                         */
-      TestResult tr16 = tcd.getTestResultFailed(SPEC2_15_EVENT_EVENTPROCESSACTION1);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_15_Event_eventProcessAction2                         */
-      /* Details: "The portlet can publish an event with its full Qname via   */
-      /* the setEvent method in the processAction method"                     */
-      TestResult tr17 = tcd.getTestResultFailed(SPEC2_15_EVENT_EVENTPROCESSACTION2);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_15_Event_eventProcessAction3                         */
-      /* Details: "The portlet can publish an event with only the local       */
-      /* part of the Qname via the setEvent method in the processAction       */
-      /* method"                                                              */
-      TestResult tr18 = tcd.getTestResultFailed(SPEC2_15_EVENT_EVENTPROCESSACTION3);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_15_Event_eventProcessAction4                         */
-      /* Details: "If an event is published with only the local part of the   */
-      /* Qname, the namespace must be the default namespace defined in the    */
-      /* deployment descriptor"                                               */
-      TestResult tr19 = tcd.getTestResultFailed(SPEC2_15_EVENT_EVENTPROCESSACTION4);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_15_Event_eventProcessAction5                         */
-      /* Details: "If an event is published with only the local part of the   */
-      /* Qname and no default namespace is defined in the deployment          */
-      /* descriptor, the value javax.xml.XMLConstants.NULL_NS_URI must be     */
-      /* used as the Qname namespace"                                         */
-      TestResult tr20 = tcd.getTestResultFailed(SPEC2_15_EVENT_EVENTPROCESSACTION5);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_15_Event_eventProcessAction6                         */
-      /* Details: "If an object is serializeable and has a valid JAXB         */
-      /* binding or is a Java primitive type, it can be used as an event      */
-      /* value"                                                               */
-      TestResult tr21 = tcd.getTestResultFailed(SPEC2_15_EVENT_EVENTPROCESSACTION6);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_15_Event_eventProcessAction7                         */
-      /* Details: "If a value is not serializeable, the setEvent method       */
-      /* must throw an IllegalArgumentException"                              */
-      TestResult tr22 = tcd.getTestResultFailed(SPEC2_15_EVENT_EVENTPROCESSACTION7);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_15_Event_eventProcessAction8                         */
-      /* Details: "If a value does not have a valid JAXB binding and is not   */
-      /* a Java primitve type, the setEvent method must throw an              */
-      /* IllegalArgumentException"                                            */
-      TestResult tr23 = tcd.getTestResultFailed(SPEC2_15_EVENT_EVENTPROCESSACTION8);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_15_Event_eventProcessAction9                         */
-      /* Details: "The portlet can publish multiple events via the setEvent   */
-      /* method in the processAction method"                                  */
-      TestResult tr24 = tcd.getTestResultFailed(SPEC2_15_EVENT_EVENTPROCESSACTION9);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_15_Event_eventProcessEvent1                          */
-      /* Details: "The portlet can publish an event via the setEvent method   */
-      /* in the processEvent method"                                          */
-      TestResult tr25 = tcd.getTestResultFailed(SPEC2_15_EVENT_EVENTPROCESSEVENT1);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_15_Event_eventProcessEvent2                          */
-      /* Details: "The portlet can publish an event with its full Qname via   */
-      /* the setEvent method in the processAction method"                     */
-      TestResult tr26 = tcd.getTestResultFailed(SPEC2_15_EVENT_EVENTPROCESSEVENT2);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_15_Event_eventProcessEvent3                          */
-      /* Details: "The portlet can publish an event with only the local       */
-      /* part of the Qname via the setEvent method in the processAction       */
-      /* method"                                                              */
-      TestResult tr27 = tcd.getTestResultFailed(SPEC2_15_EVENT_EVENTPROCESSEVENT3);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_15_Event_eventProcessEvent4                          */
-      /* Details: "If an event is published with only the local part of the   */
-      /* Qname, the namespace must be the default namespace defined in the    */
-      /* deployment descriptor"                                               */
-      TestResult tr28 = tcd.getTestResultFailed(SPEC2_15_EVENT_EVENTPROCESSEVENT4);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_15_Event_eventProcessEvent5                          */
-      /* Details: "If an event is published with only the local part of the   */
-      /* Qname and no default namespace is defined in the deployment          */
-      /* descriptor, the value javax.xml.XMLConstants.NULL_NS_URI must be     */
-      /* used as the Qname namespace"                                         */
-      TestResult tr29 = tcd.getTestResultFailed(SPEC2_15_EVENT_EVENTPROCESSEVENT5);
-      /* TODO: implement test */
-
-      /* TestCase: SPEC2_15_Event_eventProcessEvent6                          */
-      /* Details: "If an object is serializeable and has a valid JAXB         */
-      /* binding or is a Java primitive type, it can be used as an event      */
-      /* value"                                                               */
-      TestResult tr30 = tcd.getTestResultFailed(SPEC2_15_EVENT_EVENTPROCESSEVENT6);
-      /* TODO: implement test */
+      QName eventQName = new QName(TCKNAMESPACE,
+             "AddlPortletTests_SPEC2_15_Event");
+      portletResp.setEvent(eventQName, "Hi!");
+   }
 
-      /* TestCase: SPEC2_15_Event_eventProcessEvent7                          */
-      /* Details: "If a value is not serializeable, the setEvent method       */
-      /* must throw an IllegalArgumentException"                              */
-      TestResult tr31 = tcd.getTestResultFailed(SPEC2_15_EVENT_EVENTPROCESSEVENT7);
-      /* TODO: implement test */
+   @Override
+   public void serveResource(ResourceRequest portletReq, ResourceResponse portletResp)
+         throws PortletException, IOException {
+      LOGGER.entering(LOG_CLASS, "main portlet serveResource entry");
 
-      /* TestCase: SPEC2_15_Event_eventProcessEvent8                          */
-      /* Details: "If a value does not have a valid JAXB binding and is not   */
-      /* a Java primitve type, the setEvent method must throw an              */
-      /* IllegalArgumentException"                                            */
-      TestResult tr32 = tcd.getTestResultFailed(SPEC2_15_EVENT_EVENTPROCESSEVENT8);
-      /* TODO: implement test */
+      long tid = Thread.currentThread().getId();
+      portletReq.setAttribute(THREADID_ATTR, tid);
 
-      /* TestCase: SPEC2_15_Event_eventProcessEvent9                          */
-      /* Details: "The portlet can publish multiple events via the setEvent   */
-      /* method in the processEvent method"                                   */
-      TestResult tr33 = tcd.getTestResultFailed(SPEC2_15_EVENT_EVENTPROCESSEVENT9);
-      /* TODO: implement test */
+      PrintWriter writer = portletResp.getWriter();
 
+   }
 
+   @Override
+   public void render(RenderRequest portletReq, RenderResponse portletResp)
+         throws PortletException, IOException {
+      LOGGER.entering(LOG_CLASS, "main portlet render entry");
 
-      // Write the results to the output stream
+      long tid = Thread.currentThread().getId();
+      portletReq.setAttribute(THREADID_ATTR, tid);
 
-      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.writeTo(writer);
-      tr30.writeTo(writer);
-      tr31.writeTo(writer);
-      tr32.writeTo(writer);
-      tr33.writeTo(writer);
+      PrintWriter writer = portletResp.getWriter();
 
+      /* TestCase: V2AddlPortletTests_SPEC2_15_Event_event1                   */
+      /* Details: "Event names are defined in the deployment descriptor"      */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2AddlPortletTests_SPEC2_15_Event_event1", aurl);
+         tb.writeTo(writer);
+      }
 
    }
 
 }
-

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_15_EventEventHandling.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_15_EventEventHandling.java b/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_15_EventEventHandling.java
new file mode 100644
index 0000000..56e5017
--- /dev/null
+++ b/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_15_EventEventHandling.java
@@ -0,0 +1,294 @@
+/*  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 AddlPortletTests_SPEC2_15_EventEventHandling_event
+ *
+ */
+public class AddlPortletTests_SPEC2_15_EventEventHandling implements Portlet, ResourceServingPortlet {
+   private static final String LOG_CLASS = 
+         AddlPortletTests_SPEC2_15_EventEventHandling.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();
+
+      QName eventQName = new QName(TCKNAMESPACE,
+             "AddlPortletTests_SPEC2_15_EventEventHandling");
+      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: V2AddlPortletTests_SPEC2_15_EventEventHandling_event5      */
+      /* Details: "The portlet can use the EventRequest.getEvent method to    */
+      /* obtain an Event object encapsulating the event name and value"       */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2AddlPortletTests_SPEC2_15_EventEventHandling_event5", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2AddlPortletTests_SPEC2_15_EventEventHandling_event6      */
+      /* Details: "The Event object must always have the name field set"      */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2AddlPortletTests_SPEC2_15_EventEventHandling_event6", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2AddlPortletTests_SPEC2_15_EventEventHandling_event7      */
+      /* Details: "If the Event object has a value set when the event is      */
+      /* published, the value must be based on the value defined in the       */
+      /* deployment descriptor"                                               */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2AddlPortletTests_SPEC2_15_EventEventHandling_event7", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2AddlPortletTests_SPEC2_15_EventEventHandling_event8      */
+      /* Details: "If the Event object has a value set when the event is      */
+      /* published, the value must be available from the Event object in      */
+      /* the processEvent method"                                             */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2AddlPortletTests_SPEC2_15_EventEventHandling_event8", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2AddlPortletTests_SPEC2_15_EventEventHandling_event9      */
+      /* Details: "If the Event object does not have a value set when the     */
+      /* event is published, the Event object available in the processEvent   */
+      /* method must not have a value"                                        */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2AddlPortletTests_SPEC2_15_EventEventHandling_event9", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2AddlPortletTests_SPEC2_15_EventEventHandling_event10     */
+      /* Details: "The Event Qname object representing the name can be        */
+      /* retrieved through the Event getQname method"                         */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2AddlPortletTests_SPEC2_15_EventEventHandling_event10", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2AddlPortletTests_SPEC2_15_EventEventHandling_event11     */
+      /* Details: "The local part of the Event Qname object representing      */
+      /* the name can be retrieved through the Event getName method"          */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2AddlPortletTests_SPEC2_15_EventEventHandling_event11", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2AddlPortletTests_SPEC2_15_EventEventHandling_event15     */
+      /* Details: "If a portlet throws an exception in the processEvent       */
+      /* method, all operations on the EventResponse must be ignored"         */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2AddlPortletTests_SPEC2_15_EventEventHandling_event15", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2AddlPortletTests_SPEC2_15_EventEventHandling_event16     */
+      /* Details: "If a portlet throws a permanent UnavailableException       */
+      /* during event processing, the portlet container must remove the       */
+      /* portlet from service immediately, call the portlet's destroy         */
+      /* method, and release the portlet object"                              */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2AddlPortletTests_SPEC2_15_EventEventHandling_event16", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2AddlPortletTests_SPEC2_15_EventEventHandling_eventProcessEvent1 */
+      /* Details: "The portlet can publish an event via the setEvent method   */
+      /* in the processEvent method"                                          */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2AddlPortletTests_SPEC2_15_EventEventHandling_eventProcessEvent1", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2AddlPortletTests_SPEC2_15_EventEventHandling_eventProcessEvent2 */
+      /* Details: "The portlet can publish an event with its full Qname via   */
+      /* the setEvent method in the processAction method"                     */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2AddlPortletTests_SPEC2_15_EventEventHandling_eventProcessEvent2", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2AddlPortletTests_SPEC2_15_EventEventHandling_eventProcessEvent3 */
+      /* Details: "The portlet can publish an event with only the local       */
+      /* part of the Qname via the setEvent method in the processAction       */
+      /* method"                                                              */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2AddlPortletTests_SPEC2_15_EventEventHandling_eventProcessEvent3", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2AddlPortletTests_SPEC2_15_EventEventHandling_eventProcessEvent4 */
+      /* Details: "If an event is published with only the local part of the   */
+      /* Qname, the namespace must be the default namespace defined in the    */
+      /* deployment descriptor"                                               */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2AddlPortletTests_SPEC2_15_EventEventHandling_eventProcessEvent4", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2AddlPortletTests_SPEC2_15_EventEventHandling_eventProcessEvent5 */
+      /* Details: "If an event is published with only the local part of the   */
+      /* Qname and no default namespace is defined in the deployment          */
+      /* descriptor, the value javax.xml.XMLConstants.NULL_NS_URI must be     */
+      /* used as the Qname namespace"                                         */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2AddlPortletTests_SPEC2_15_EventEventHandling_eventProcessEvent5", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2AddlPortletTests_SPEC2_15_EventEventHandling_eventProcessEvent6 */
+      /* Details: "If an object is serializeable and has a valid JAXB         */
+      /* binding or is a Java primitive type, it can be used as an event      */
+      /* value"                                                               */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2AddlPortletTests_SPEC2_15_EventEventHandling_eventProcessEvent6", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2AddlPortletTests_SPEC2_15_EventEventHandling_eventProcessEvent7 */
+      /* Details: "If a value is not serializeable, the setEvent method       */
+      /* must throw an IllegalArgumentException"                              */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2AddlPortletTests_SPEC2_15_EventEventHandling_eventProcessEvent7", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2AddlPortletTests_SPEC2_15_EventEventHandling_eventProcessEvent8 */
+      /* Details: "If a value does not have a valid JAXB binding and is not   */
+      /* a Java primitve type, the setEvent method must throw an              */
+      /* IllegalArgumentException"                                            */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2AddlPortletTests_SPEC2_15_EventEventHandling_eventProcessEvent8", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2AddlPortletTests_SPEC2_15_EventEventHandling_eventProcessEvent9 */
+      /* Details: "The portlet can publish multiple events via the setEvent   */
+      /* method in the processEvent method"                                   */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2AddlPortletTests_SPEC2_15_EventEventHandling_eventProcessEvent9", aurl);
+         tb.writeTo(writer);
+      }
+
+   }
+
+}

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_15_EventEventHandling_event.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_15_EventEventHandling_event.java b/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_15_EventEventHandling_event.java
new file mode 100644
index 0000000..5288b44
--- /dev/null
+++ b/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_15_EventEventHandling_event.java
@@ -0,0 +1,263 @@
+/*  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.constants.Constants.*;
+import static javax.portlet.tck.beans.JSR286SpecTestCaseDetails.*;
+import static javax.portlet.PortletSession.*;
+
+/**
+ * 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 AddlPortletTests_SPEC2_15_EventEventHandling_event implements Portlet, EventPortlet, ResourceServingPortlet {
+   private static final String LOG_CLASS = 
+         AddlPortletTests_SPEC2_15_EventEventHandling_event.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, "event companion processAction - ERROR!!");
+   }
+
+   @Override
+   public void serveResource(ResourceRequest portletReq, ResourceResponse portletResp)
+         throws PortletException, IOException {
+      LOGGER.entering(LOG_CLASS, "event companion serveResource - ERROR!!");
+   }
+
+   @Override
+   public void processEvent(EventRequest portletReq, EventResponse portletResp)
+         throws PortletException, IOException {
+      LOGGER.entering(LOG_CLASS, "event companion processEvent");
+
+
+      portletResp.setRenderParameters(portletReq);
+
+      long tid = Thread.currentThread().getId();
+      portletReq.setAttribute(THREADID_ATTR, tid);
+
+      StringWriter writer = new StringWriter();
+
+      JSR286SpecTestCaseDetails tcd = new JSR286SpecTestCaseDetails();
+
+      // Create result objects for the tests
+
+      /* TestCase: V2AddlPortletTests_SPEC2_15_EventEventHandling_event5      */
+      /* Details: "The portlet can use the EventRequest.getEvent method to    */
+      /* obtain an Event object encapsulating the event name and value"       */
+      TestResult tr0 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_15_EVENTEVENTHANDLING_EVENT5);
+      /* TODO: implement test */
+      tr0.appendTcDetail("Not implemented.");
+      tr0.writeTo(writer);
+
+      /* TestCase: V2AddlPortletTests_SPEC2_15_EventEventHandling_event6      */
+      /* Details: "The Event object must always have the name field set"      */
+      TestResult tr1 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_15_EVENTEVENTHANDLING_EVENT6);
+      /* TODO: implement test */
+      tr1.appendTcDetail("Not implemented.");
+      tr1.writeTo(writer);
+
+      /* TestCase: V2AddlPortletTests_SPEC2_15_EventEventHandling_event7      */
+      /* Details: "If the Event object has a value set when the event is      */
+      /* published, the value must be based on the value defined in the       */
+      /* deployment descriptor"                                               */
+      TestResult tr2 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_15_EVENTEVENTHANDLING_EVENT7);
+      /* TODO: implement test */
+      tr2.appendTcDetail("Not implemented.");
+      tr2.writeTo(writer);
+
+      /* TestCase: V2AddlPortletTests_SPEC2_15_EventEventHandling_event8      */
+      /* Details: "If the Event object has a value set when the event is      */
+      /* published, the value must be available from the Event object in      */
+      /* the processEvent method"                                             */
+      TestResult tr3 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_15_EVENTEVENTHANDLING_EVENT8);
+      /* TODO: implement test */
+      tr3.appendTcDetail("Not implemented.");
+      tr3.writeTo(writer);
+
+      /* TestCase: V2AddlPortletTests_SPEC2_15_EventEventHandling_event9      */
+      /* Details: "If the Event object does not have a value set when the     */
+      /* event is published, the Event object available in the processEvent   */
+      /* method must not have a value"                                        */
+      TestResult tr4 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_15_EVENTEVENTHANDLING_EVENT9);
+      /* TODO: implement test */
+      tr4.appendTcDetail("Not implemented.");
+      tr4.writeTo(writer);
+
+      /* TestCase: V2AddlPortletTests_SPEC2_15_EventEventHandling_event10     */
+      /* Details: "The Event Qname object representing the name can be        */
+      /* retrieved through the Event getQname method"                         */
+      TestResult tr5 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_15_EVENTEVENTHANDLING_EVENT10);
+      /* TODO: implement test */
+      tr5.appendTcDetail("Not implemented.");
+      tr5.writeTo(writer);
+
+      /* TestCase: V2AddlPortletTests_SPEC2_15_EventEventHandling_event11     */
+      /* Details: "The local part of the Event Qname object representing      */
+      /* the name can be retrieved through the Event getName method"          */
+      TestResult tr6 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_15_EVENTEVENTHANDLING_EVENT11);
+      /* TODO: implement test */
+      tr6.appendTcDetail("Not implemented.");
+      tr6.writeTo(writer);
+
+      /* TestCase: V2AddlPortletTests_SPEC2_15_EventEventHandling_event15     */
+      /* Details: "If a portlet throws an exception in the processEvent       */
+      /* method, all operations on the EventResponse must be ignored"         */
+      TestResult tr7 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_15_EVENTEVENTHANDLING_EVENT15);
+      /* TODO: implement test */
+      tr7.appendTcDetail("Not implemented.");
+      tr7.writeTo(writer);
+
+      /* TestCase: V2AddlPortletTests_SPEC2_15_EventEventHandling_event16     */
+      /* Details: "If a portlet throws a permanent UnavailableException       */
+      /* during event processing, the portlet container must remove the       */
+      /* portlet from service immediately, call the portlet's destroy         */
+      /* method, and release the portlet object"                              */
+      TestResult tr8 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_15_EVENTEVENTHANDLING_EVENT16);
+      /* TODO: implement test */
+      tr8.appendTcDetail("Not implemented.");
+      tr8.writeTo(writer);
+
+      /* TestCase: V2AddlPortletTests_SPEC2_15_EventEventHandling_eventProcessEvent1 */
+      /* Details: "The portlet can publish an event via the setEvent method   */
+      /* in the processEvent method"                                          */
+      TestResult tr9 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_15_EVENTEVENTHANDLING_EVENTPROCESSEVENT1);
+      /* TODO: implement test */
+      tr9.appendTcDetail("Not implemented.");
+      tr9.writeTo(writer);
+
+      /* TestCase: V2AddlPortletTests_SPEC2_15_EventEventHandling_eventProcessEvent2 */
+      /* Details: "The portlet can publish an event with its full Qname via   */
+      /* the setEvent method in the processAction method"                     */
+      TestResult tr10 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_15_EVENTEVENTHANDLING_EVENTPROCESSEVENT2);
+      /* TODO: implement test */
+      tr10.appendTcDetail("Not implemented.");
+      tr10.writeTo(writer);
+
+      /* TestCase: V2AddlPortletTests_SPEC2_15_EventEventHandling_eventProcessEvent3 */
+      /* Details: "The portlet can publish an event with only the local       */
+      /* part of the Qname via the setEvent method in the processAction       */
+      /* method"                                                              */
+      TestResult tr11 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_15_EVENTEVENTHANDLING_EVENTPROCESSEVENT3);
+      /* TODO: implement test */
+      tr11.appendTcDetail("Not implemented.");
+      tr11.writeTo(writer);
+
+      /* TestCase: V2AddlPortletTests_SPEC2_15_EventEventHandling_eventProcessEvent4 */
+      /* Details: "If an event is published with only the local part of the   */
+      /* Qname, the namespace must be the default namespace defined in the    */
+      /* deployment descriptor"                                               */
+      TestResult tr12 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_15_EVENTEVENTHANDLING_EVENTPROCESSEVENT4);
+      /* TODO: implement test */
+      tr12.appendTcDetail("Not implemented.");
+      tr12.writeTo(writer);
+
+      /* TestCase: V2AddlPortletTests_SPEC2_15_EventEventHandling_eventProcessEvent5 */
+      /* Details: "If an event is published with only the local part of the   */
+      /* Qname and no default namespace is defined in the deployment          */
+      /* descriptor, the value javax.xml.XMLConstants.NULL_NS_URI must be     */
+      /* used as the Qname namespace"                                         */
+      TestResult tr13 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_15_EVENTEVENTHANDLING_EVENTPROCESSEVENT5);
+      /* TODO: implement test */
+      tr13.appendTcDetail("Not implemented.");
+      tr13.writeTo(writer);
+
+      /* TestCase: V2AddlPortletTests_SPEC2_15_EventEventHandling_eventProcessEvent6 */
+      /* Details: "If an object is serializeable and has a valid JAXB         */
+      /* binding or is a Java primitive type, it can be used as an event      */
+      /* value"                                                               */
+      TestResult tr14 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_15_EVENTEVENTHANDLING_EVENTPROCESSEVENT6);
+      /* TODO: implement test */
+      tr14.appendTcDetail("Not implemented.");
+      tr14.writeTo(writer);
+
+      /* TestCase: V2AddlPortletTests_SPEC2_15_EventEventHandling_eventProcessEvent7 */
+      /* Details: "If a value is not serializeable, the setEvent method       */
+      /* must throw an IllegalArgumentException"                              */
+      TestResult tr15 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_15_EVENTEVENTHANDLING_EVENTPROCESSEVENT7);
+      /* TODO: implement test */
+      tr15.appendTcDetail("Not implemented.");
+      tr15.writeTo(writer);
+
+      /* TestCase: V2AddlPortletTests_SPEC2_15_EventEventHandling_eventProcessEvent8 */
+      /* Details: "If a value does not have a valid JAXB binding and is not   */
+      /* a Java primitve type, the setEvent method must throw an              */
+      /* IllegalArgumentException"                                            */
+      TestResult tr16 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_15_EVENTEVENTHANDLING_EVENTPROCESSEVENT8);
+      /* TODO: implement test */
+      tr16.appendTcDetail("Not implemented.");
+      tr16.writeTo(writer);
+
+      /* TestCase: V2AddlPortletTests_SPEC2_15_EventEventHandling_eventProcessEvent9 */
+      /* Details: "The portlet can publish multiple events via the setEvent   */
+      /* method in the processEvent method"                                   */
+      TestResult tr17 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_15_EVENTEVENTHANDLING_EVENTPROCESSEVENT9);
+      /* TODO: implement test */
+      tr17.appendTcDetail("Not implemented.");
+      tr17.writeTo(writer);
+
+      portletReq.getPortletSession().setAttribute(
+                   Constants.RESULT_ATTR_PREFIX + "AddlPortletTests_SPEC2_15_EventEventHandling",
+                   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>AddlPortletTests_SPEC2_15_EventEventHandling_event</p>\n");
+
+      String msg = (String) portletReq.getPortletSession()
+            .getAttribute(RESULT_ATTR_PREFIX + "AddlPortletTests_SPEC2_15_EventEventHandling", APPLICATION_SCOPE);
+      msg = (msg==null) ? "Not ready. click test case link." : msg;
+      writer.write("<p>" + msg + "</p>\n");
+
+   }
+
+}

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/23a1c547/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_15_Event_event.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_15_Event_event.java b/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_15_Event_event.java
new file mode 100644
index 0000000..b71670b
--- /dev/null
+++ b/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_15_Event_event.java
@@ -0,0 +1,116 @@
+/*  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.constants.Constants.*;
+import static javax.portlet.tck.beans.JSR286SpecTestCaseDetails.*;
+import static javax.portlet.PortletSession.*;
+
+/**
+ * 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 AddlPortletTests_SPEC2_15_Event_event implements Portlet, EventPortlet, ResourceServingPortlet {
+   private static final String LOG_CLASS = 
+         AddlPortletTests_SPEC2_15_Event_event.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, "event companion processAction - ERROR!!");
+   }
+
+   @Override
+   public void serveResource(ResourceRequest portletReq, ResourceResponse portletResp)
+         throws PortletException, IOException {
+      LOGGER.entering(LOG_CLASS, "event companion serveResource - ERROR!!");
+   }
+
+   @Override
+   public void processEvent(EventRequest portletReq, EventResponse portletResp)
+         throws PortletException, IOException {
+      LOGGER.entering(LOG_CLASS, "event companion processEvent");
+
+
+      portletResp.setRenderParameters(portletReq);
+
+      long tid = Thread.currentThread().getId();
+      portletReq.setAttribute(THREADID_ATTR, tid);
+
+      StringWriter writer = new StringWriter();
+
+      JSR286SpecTestCaseDetails tcd = new JSR286SpecTestCaseDetails();
+
+      // Create result objects for the tests
+
+      /* TestCase: V2AddlPortletTests_SPEC2_15_Event_event1                   */
+      /* Details: "Event names are defined in the deployment descriptor"      */
+      TestResult tr0 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_15_EVENT_EVENT1);
+      /* TODO: implement test */
+      tr0.appendTcDetail("Not implemented.");
+      tr0.writeTo(writer);
+
+      portletReq.getPortletSession().setAttribute(
+                   Constants.RESULT_ATTR_PREFIX + "AddlPortletTests_SPEC2_15_Event",
+                   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>AddlPortletTests_SPEC2_15_Event_event</p>\n");
+
+      String msg = (String) portletReq.getPortletSession()
+            .getAttribute(RESULT_ATTR_PREFIX + "AddlPortletTests_SPEC2_15_Event", APPLICATION_SCOPE);
+      msg = (msg==null) ? "Not ready. click test case link." : msg;
+      writer.write("<p>" + msg + "</p>\n");
+
+   }
+
+}

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/23a1c547/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_15_RenderEventHandling.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_15_RenderEventHandling.java b/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_15_RenderEventHandling.java
new file mode 100644
index 0000000..dd159e1
--- /dev/null
+++ b/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_15_RenderEventHandling.java
@@ -0,0 +1,129 @@
+/*  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 AddlPortletTests_SPEC2_15_RenderEventHandling_event
+ *
+ */
+public class AddlPortletTests_SPEC2_15_RenderEventHandling implements Portlet, ResourceServingPortlet {
+   private static final String LOG_CLASS = 
+         AddlPortletTests_SPEC2_15_RenderEventHandling.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();
+
+   }
+
+   @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();
+
+      JSR286SpecTestCaseDetails tcd = new JSR286SpecTestCaseDetails();
+
+      // Create result objects for the tests
+
+      /* TestCase: V2AddlPortletTests_SPEC2_15_RenderEventHandling_event2     */
+      /* Details: "Event value types are defined in the deployment            */
+      /* descriptor"                                                          */
+      TestResult tr0 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_15_RENDEREVENTHANDLING_EVENT2);
+      /* TODO: implement test */
+      tr0.appendTcDetail("Not implemented.");
+      tr0.writeTo(writer);
+
+      /* TestCase: V2AddlPortletTests_SPEC2_15_RenderEventHandling_event3     */
+      /* Details: "The supported publishing events for the portlet are        */
+      /* defined in the deployment descriptor"                                */
+      TestResult tr1 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_15_RENDEREVENTHANDLING_EVENT3);
+      /* TODO: implement test */
+      tr1.appendTcDetail("Not implemented.");
+      tr1.writeTo(writer);
+
+      /* TestCase: V2AddlPortletTests_SPEC2_15_RenderEventHandling_event4     */
+      /* Details: "The supported processing events for the portlet are        */
+      /* defined in the deployment descriptor"                                */
+      TestResult tr2 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_15_RENDEREVENTHANDLING_EVENT4);
+      /* TODO: implement test */
+      tr2.appendTcDetail("Not implemented.");
+      tr2.writeTo(writer);
+
+   }
+
+}

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_2_Compatibility.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_2_Compatibility.java b/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_2_Compatibility.java
index 106e69f..d650fbf 100644
--- a/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_2_Compatibility.java
+++ b/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_2_Compatibility.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_2_Compatibility_event
+ *
  */
-public class AddlPortletTests_SPEC2_2_Compatibility implements Portlet {
+public class AddlPortletTests_SPEC2_2_Compatibility implements Portlet, ResourceServingPortlet {
    private static final String LOG_CLASS = 
          AddlPortletTests_SPEC2_2_Compatibility.class.getName();
    private final Logger LOGGER = Logger.getLogger(LOG_CLASS);
@@ -57,44 +62,60 @@ public class AddlPortletTests_SPEC2_2_Compatibility 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 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 renderRequest, RenderResponse renderResponse)
+   public void render(RenderRequest portletReq, RenderResponse portletResp)
          throws PortletException, IOException {
-      
-      if (LOGGER.isLoggable(Level.FINE)) {
-         LOGGER.logp(Level.FINE, LOG_CLASS, "render", "Entry");
-      }
+      LOGGER.entering(LOG_CLASS, "main portlet render 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_2_Compatibility_deployJSR168_1                       */
+      /* TestCase: V2AddlPortletTests_SPEC2_2_Compatibility_deployJSR168_1    */
       /* Details: "A portlet with the JSR 168 deployment descriptor can be    */
       /* deployed"                                                            */
-      TestResult tr0 = tcd.getTestResultFailed(SPEC2_2_COMPATIBILITY_DEPLOYJSR168_1);
+      TestResult tr0 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_2_COMPATIBILITY_DEPLOYJSR168_1);
       /* TODO: implement test */
+      tr0.appendTcDetail("Not implemented.");
+      tr0.writeTo(writer);
 
-      /* TestCase: SPEC2_2_Compatibility_deployJSR168_2                       */
+      /* TestCase: V2AddlPortletTests_SPEC2_2_Compatibility_deployJSR168_2    */
       /* Details: "A portlet implementing only the JSR 168 API can be         */
       /* deployed"                                                            */
-      TestResult tr1 = tcd.getTestResultFailed(SPEC2_2_COMPATIBILITY_DEPLOYJSR168_2);
+      TestResult tr1 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_2_COMPATIBILITY_DEPLOYJSR168_2);
       /* TODO: implement test */
-
-
-
-      // Write the results to the output stream
-
-      tr0.writeTo(writer);
+      tr1.appendTcDetail("Not implemented.");
       tr1.writeTo(writer);
 
-
    }
 
 }
-


[20/22] Corrected implmentation of some dispatcher tests. Completed restructure of the spec tests (module names contain the string "Addl"). Completed restructuring the portlet tag library tests.

Posted by ms...@apache.org.
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/8bf37be8/portlet-tck_3.0/common/src/main/java/javax/portlet/tck/beans/JSR286SpecTestCaseDetails.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/common/src/main/java/javax/portlet/tck/beans/JSR286SpecTestCaseDetails.java b/portlet-tck_3.0/common/src/main/java/javax/portlet/tck/beans/JSR286SpecTestCaseDetails.java
index 9fc6cab..ea0b0cd 100644
--- a/portlet-tck_3.0/common/src/main/java/javax/portlet/tck/beans/JSR286SpecTestCaseDetails.java
+++ b/portlet-tck_3.0/common/src/main/java/javax/portlet/tck/beans/JSR286SpecTestCaseDetails.java
@@ -757,36 +757,36 @@ public class JSR286SpecTestCaseDetails extends TestCaseDetails {
       tcd.put(V2ADDLPORTLETTESTS_SPEC2_5_EVENTHANDLING_EXCEPTION4, "If the portlet throws an PortletException in processEvent, all operations on the EventResponse, including set events, must be ignored");
       tcd.put(V2ADDLPORTLETTESTS_SPEC2_5_EVENTHANDLING_EXCEPTION5, "If the portlet throws a RuntimeException in processEvent, all operations on the EventResponse, including set events, must be ignored");
       tcd.put(V2ADDLPORTLETTESTS_SPEC2_5_RENDERGENERICPORTLET_ACTIONDISPATCHING2, "If the ActionRequest.ACTION_NAME parameter is not set on the action URL, the GenericPortlet processAction method will throw a PortletException");
-      tcd.put(V2ADDLPORTLETTESTS_SPEC2_5_RENDERGENERICPORTLET_EVENTDISPATCHING1, "The GenericPortlet processEvent method will dispatch the request to a subclass method annotated with the tag @ProcessEvent(qname=<eventname>), where <eventname> must be in the format provided by Qname.toString()");
-      tcd.put(V2ADDLPORTLETTESTS_SPEC2_5_RENDERGENERICPORTLET_EVENTDISPATCHING2, "The GenericPortlet processEvent method will dispatch the request to a subclass method annotated with the tag @ProcessEvent(name=<event_name_local_part>)");
+      tcd.put(V2ADDLPORTLETTESTS_SPEC2_5_RENDERGENERICPORTLET_EVENTDISPATCHING1, "The GenericPortlet processEvent method will dispatch the request to a subclass method annotated with the tag @ProcessEvent(qname=&lt;eventname&gt;), where &lt;eventname&gt; must be in the format provided by Qname.toString()");
+      tcd.put(V2ADDLPORTLETTESTS_SPEC2_5_RENDERGENERICPORTLET_EVENTDISPATCHING2, "The GenericPortlet processEvent method will dispatch the request to a subclass method annotated with the tag @ProcessEvent(name=&lt;event_name_local_part&gt;)");
       tcd.put(V2ADDLPORTLETTESTS_SPEC2_5_RENDERGENERICPORTLET_RENDERDISPATCHING8, "getTitle - If a ResourceBundle containing the title string is defined in the deployment descriptor, that title string will be used");
-      tcd.put(V2ADDLPORTLETTESTS_SPEC2_5_RENDERGENERICPORTLET_RENDERDISPATCHING9, "getTitle - If a ResourceBundle containing the title string is not defined in the deployment descriptor, the title defined in the portlet descriptor <title> element is used");
-      tcd.put(V2ADDLPORTLETTESTS_SPEC2_6_RENDERCONFIG_GETRESOURCEBUNDLE1, "The resource bundle defined in the deployment descriptor <resource-bundle> element can be obtained through the PortletConfig object");
+      tcd.put(V2ADDLPORTLETTESTS_SPEC2_5_RENDERGENERICPORTLET_RENDERDISPATCHING9, "getTitle - If a ResourceBundle containing the title string is not defined in the deployment descriptor, the title defined in the portlet descriptor &lt;title&gt; element is used");
+      tcd.put(V2ADDLPORTLETTESTS_SPEC2_6_RENDERCONFIG_GETRESOURCEBUNDLE1, "The resource bundle defined in the deployment descriptor &lt;resource-bundle&gt; element can be obtained through the PortletConfig object");
       tcd.put(V2ADDLPORTLETTESTS_SPEC2_6_RENDERCONFIG_GETRESOURCEBUNDLE2, "If the resource bundle contains a \"javax.portlet.title\" property, the value defined in the bundle is returned by the corresponding getString method call");
       tcd.put(V2ADDLPORTLETTESTS_SPEC2_6_RENDERCONFIG_GETRESOURCEBUNDLE3, "If the resource bundle contains a \"javax.portlet.short-title\" property, the value defined in the bundle is returned by the corresponding getString method call");
       tcd.put(V2ADDLPORTLETTESTS_SPEC2_6_RENDERCONFIG_GETRESOURCEBUNDLE4, "If the resource bundle contains a \"javax.portlet.keywords\" property, the value defined in the bundle is returned by the corresponding getString method call");
-      tcd.put(V2ADDLPORTLETTESTS_SPEC2_6_RENDERCONFIG_GETPUBLISHINGEVENTQNAMES3, "getPublishingEventQnames - If the event was defined using the <name> element rather than the <qname> element, default namespace defined with the <default-namespace> element must be added as the event namespace");
-      tcd.put(V2ADDLPORTLETTESTS_SPEC2_6_RENDERCONFIG_GETPUBLISHINGEVENTQNAMES4, "getPublishingEventQnames - If the event was defined using the <name> element rather than the <qname> element and there is no default namespace defined, the value XMLConstants.NULL_NS_URI must be added as the event namespace");
-      tcd.put(V2ADDLPORTLETTESTS_SPEC2_6_RENDERCONFIG_GETPROCESSINGEVENTQNAMES3, "getProcessingEventQnames - If the event was defined using the <name> element rather than the <qname> element, default namespace defined with the <default-namespace> element must be added as the event namespace");
-      tcd.put(V2ADDLPORTLETTESTS_SPEC2_6_RENDERCONFIG_GETPROCESSINGEVENTQNAMES4, "getProcessingEventQnames - If the event was defined using the <name> element rather than the <qname> element and there is no default namespace defined, the value XMLConstants.NULL_NS_URI must be added as the event namespace");
-      tcd.put(V2ADDLPORTLETTESTS_SPEC2_6_RENDERCONFIG_GETCONTAINERRUNTIMEOPTIONS6, "The returned Map contains values defined in the deployment descriptor <container-runtime-option> elements at the portlet application level");
-      tcd.put(V2ADDLPORTLETTESTS_SPEC2_6_RENDERCONFIG_GETCONTAINERRUNTIMEOPTIONS7, "The returned Map contains values defined in the deployment descriptor <container-runtime-option> elements at the portlet level");
-      tcd.put(V2ADDLPORTLETTESTS_SPEC2_6_RENDERCONFIG_GETCONTAINERRUNTIMEOPTIONS8, "If the deployment descriptor contains <container-runtime-option> elements defined at both the portlet and the portlet application levels, the returned Map contains a merger of all values");
-      tcd.put(V2ADDLPORTLETTESTS_SPEC2_6_RENDERCONFIG_GETCONTAINERRUNTIMEOPTIONS9, "If the deployment descriptor contains <container-runtime-option> elements of the same name defined at both the portlet and the portlet application levels, the returned Map contains a the value defined at the portlet level");
-      tcd.put(V2ADDLPORTLETTESTS_SPEC2_6_RENDERCONFIG2_GETRESOURCEBUNDLE8, "If no resource bundle is defined, the value defined in the deployment descriptor <title> element is returned by the corresponding getString method call");
-      tcd.put(V2ADDLPORTLETTESTS_SPEC2_6_RENDERCONFIG2_GETRESOURCEBUNDLE9, "If no resource bundle is defined, the value defined in the deployment descriptor <short-title> element is returned by the corresponding getString method call");
-      tcd.put(V2ADDLPORTLETTESTS_SPEC2_6_RENDERCONFIG2_GETRESOURCEBUNDLE10, "If no resource bundle is defined, the value defined in the deployment descriptor <keywords> element is returned by the corresponding getString method call");
-      tcd.put(V2ADDLPORTLETTESTS_SPEC2_6_RENDERCONFIG3_GETRESOURCEBUNDLE5, "If the resource bundle does not contain a \"javax.portlet.title\" property, the value defined in the deployment descriptor <title> element is returned by the corresponding getString method call");
-      tcd.put(V2ADDLPORTLETTESTS_SPEC2_6_RENDERCONFIG3_GETRESOURCEBUNDLE6, "If the resource bundle does not contain a \"javax.portlet.short-title\" property, the value defined in the deployment descriptor <short-title> element is returned by the corresponding getString method call");
-      tcd.put(V2ADDLPORTLETTESTS_SPEC2_6_RENDERCONFIG3_GETRESOURCEBUNDLE7, "If the resource bundle does not contain a \"javax.portlet.keywords\" property, the value defined in the deployment descriptor <keywords> element is returned by the corresponding getString method call");
+      tcd.put(V2ADDLPORTLETTESTS_SPEC2_6_RENDERCONFIG_GETPUBLISHINGEVENTQNAMES3, "getPublishingEventQnames - If the event was defined using the &lt;name&gt; element rather than the &lt;qname&gt; element, default namespace defined with the &lt;default-namespace&gt; element must be added as the event namespace");
+      tcd.put(V2ADDLPORTLETTESTS_SPEC2_6_RENDERCONFIG_GETPUBLISHINGEVENTQNAMES4, "getPublishingEventQnames - If the event was defined using the &lt;name&gt; element rather than the &lt;qname&gt; element and there is no default namespace defined, the value XMLConstants.NULL_NS_URI must be added as the event namespace");
+      tcd.put(V2ADDLPORTLETTESTS_SPEC2_6_RENDERCONFIG_GETPROCESSINGEVENTQNAMES3, "getProcessingEventQnames - If the event was defined using the &lt;name&gt; element rather than the &lt;qname&gt; element, default namespace defined with the &lt;default-namespace&gt; element must be added as the event namespace");
+      tcd.put(V2ADDLPORTLETTESTS_SPEC2_6_RENDERCONFIG_GETPROCESSINGEVENTQNAMES4, "getProcessingEventQnames - If the event was defined using the &lt;name&gt; element rather than the &lt;qname&gt; element and there is no default namespace defined, the value XMLConstants.NULL_NS_URI must be added as the event namespace");
+      tcd.put(V2ADDLPORTLETTESTS_SPEC2_6_RENDERCONFIG_GETCONTAINERRUNTIMEOPTIONS6, "The returned Map contains values defined in the deployment descriptor &lt;container-runtime-option&gt; elements at the portlet application level");
+      tcd.put(V2ADDLPORTLETTESTS_SPEC2_6_RENDERCONFIG_GETCONTAINERRUNTIMEOPTIONS7, "The returned Map contains values defined in the deployment descriptor &lt;container-runtime-option&gt; elements at the portlet level");
+      tcd.put(V2ADDLPORTLETTESTS_SPEC2_6_RENDERCONFIG_GETCONTAINERRUNTIMEOPTIONS8, "If the deployment descriptor contains &lt;container-runtime-option&gt; elements defined at both the portlet and the portlet application levels, the returned Map contains a merger of all values");
+      tcd.put(V2ADDLPORTLETTESTS_SPEC2_6_RENDERCONFIG_GETCONTAINERRUNTIMEOPTIONS9, "If the deployment descriptor contains &lt;container-runtime-option&gt; elements of the same name defined at both the portlet and the portlet application levels, the returned Map contains a the value defined at the portlet level");
+      tcd.put(V2ADDLPORTLETTESTS_SPEC2_6_RENDERCONFIG2_GETRESOURCEBUNDLE8, "If no resource bundle is defined, the value defined in the deployment descriptor &lt;title&gt; element is returned by the corresponding getString method call");
+      tcd.put(V2ADDLPORTLETTESTS_SPEC2_6_RENDERCONFIG2_GETRESOURCEBUNDLE9, "If no resource bundle is defined, the value defined in the deployment descriptor &lt;short-title&gt; element is returned by the corresponding getString method call");
+      tcd.put(V2ADDLPORTLETTESTS_SPEC2_6_RENDERCONFIG2_GETRESOURCEBUNDLE10, "If no resource bundle is defined, the value defined in the deployment descriptor &lt;keywords&gt; element is returned by the corresponding getString method call");
+      tcd.put(V2ADDLPORTLETTESTS_SPEC2_6_RENDERCONFIG3_GETRESOURCEBUNDLE5, "If the resource bundle does not contain a \"javax.portlet.title\" property, the value defined in the deployment descriptor &lt;title&gt; element is returned by the corresponding getString method call");
+      tcd.put(V2ADDLPORTLETTESTS_SPEC2_6_RENDERCONFIG3_GETRESOURCEBUNDLE6, "If the resource bundle does not contain a \"javax.portlet.short-title\" property, the value defined in the deployment descriptor &lt;short-title&gt; element is returned by the corresponding getString method call");
+      tcd.put(V2ADDLPORTLETTESTS_SPEC2_6_RENDERCONFIG3_GETRESOURCEBUNDLE7, "If the resource bundle does not contain a \"javax.portlet.keywords\" property, the value defined in the deployment descriptor &lt;keywords&gt; element is returned by the corresponding getString method call");
       tcd.put(V2ADDLPORTLETTESTS_SPEC2_8_PORTLETMODES_DECLARINGPORTLETMODES1, "Support for the VIEW mode does not need to be declared in the deployment descriptor");
       tcd.put(V2ADDLPORTLETTESTS_SPEC2_8_PORTLETMODES_DECLARINGPORTLETMODES2, "Support for the HELP mode must be declared in the deployment descriptor");
       tcd.put(V2ADDLPORTLETTESTS_SPEC2_8_PORTLETMODES_DECLARINGPORTLETMODES3, "A custom portlet mode may be declared in the deployment descriptor");
-      tcd.put(V2ADDLPORTLETTESTS_SPEC2_8_PORTLETMODES_DECLARINGPORTLETMODES4, "A custom portlet mode with <portal-managed>false</portal-managed> may be declared in the deployment descriptor");
-      tcd.put(V2ADDLPORTLETTESTS_SPEC2_8_PORTLETMODES_DECLARINGPORTLETMODES5, "The PortletRequest.isPortletModeAllowed method must return FALSE for a custom portlet mode with <portal-managed>true</portal-managed> that is not supported by the portlet container");
-      tcd.put(V2ADDLPORTLETTESTS_SPEC2_8_PORTLETMODES_DECLARINGPORTLETMODES6, "The portlet container must ignore all custom portlet modes in the deployment descriptor with <portal-managed>true</portal-managed> that is not supported by the portlet container");
-      tcd.put(V2ADDLPORTLETTESTS_SPEC2_8_PORTLETMODES_DECLARINGPORTLETMODES7, "A custom portlet mode with <portal-managed>false</portal-managed> corresponds to the VIEW mode from the portal point of view");
-      tcd.put(V2ADDLPORTLETTESTS_SPEC2_8_PORTLETMODES_DECLARINGPORTLETMODES8, "A custom portlet mode can have a localized decoration name in the resource bundle with the name of javax.portlet.app.custom-portlet-mode.<name>.decoration-name");
+      tcd.put(V2ADDLPORTLETTESTS_SPEC2_8_PORTLETMODES_DECLARINGPORTLETMODES4, "A custom portlet mode with &lt;portal-managed&gt;false&lt;/portal-managed&gt; may be declared in the deployment descriptor");
+      tcd.put(V2ADDLPORTLETTESTS_SPEC2_8_PORTLETMODES_DECLARINGPORTLETMODES5, "The PortletRequest.isPortletModeAllowed method must return FALSE for a custom portlet mode with &lt;portal-managed&gt;true&lt;/portal-managed&gt; that is not supported by the portlet container");
+      tcd.put(V2ADDLPORTLETTESTS_SPEC2_8_PORTLETMODES_DECLARINGPORTLETMODES6, "The portlet container must ignore all custom portlet modes in the deployment descriptor with &lt;portal-managed&gt;true&lt;/portal-managed&gt; that is not supported by the portlet container");
+      tcd.put(V2ADDLPORTLETTESTS_SPEC2_8_PORTLETMODES_DECLARINGPORTLETMODES7, "A custom portlet mode with &lt;portal-managed&gt;false&lt;/portal-managed&gt; corresponds to the VIEW mode from the portal point of view");
+      tcd.put(V2ADDLPORTLETTESTS_SPEC2_8_PORTLETMODES_DECLARINGPORTLETMODES8, "A custom portlet mode can have a localized decoration name in the resource bundle with the name of javax.portlet.app.custom-portlet-mode.&lt;name&gt;.decoration-name");
       tcd.put(V2ADDLPORTLETTESTS_SPEC2_8_PORTLETMODES_DECLARINGPORTLETMODES9, "The portlet must not be invoked in a mode that has not been declared to be supported for a given markup type");
       tcd.put(V2ADDLPORTLETTESTS_SPEC2_9_WINDOWSTATES_DECLARINGWINDOWSTATES1, "Support for the NORMAL window state does not need to be declared in the deployment descriptor");
       tcd.put(V2ADDLPORTLETTESTS_SPEC2_9_WINDOWSTATES_DECLARINGWINDOWSTATES2, "Support for the MINIMIZED window state does not need to be declared in the deployment descriptor");
@@ -868,10 +868,10 @@ public class JSR286SpecTestCaseDetails extends TestCaseDetails {
       tcd.put(V2ADDLURLTESTS_SPEC2_7_URLRENDER_RENDERURL3, "When render parameters are set on a render URL, those parameters must become render parameters of the request resulting from triggering the renderURL");
       tcd.put(V2ADDLURLTESTS_SPEC2_7_URLRENDER_RENDERURL4, "Private render parameters can be set on the render URL through the setParameter(String, String) method");
       tcd.put(V2ADDLURLTESTS_SPEC2_7_URLRENDER_RENDERURL5, "Private render parameters can be set on the render URL through the setParameter(String, String[]) method");
-      tcd.put(V2ADDLURLTESTS_SPEC2_7_URLRENDER_RENDERURL6, "Private render parameters can be set on the render URL through the setParameterMap(Map<String, String[]>) method");
+      tcd.put(V2ADDLURLTESTS_SPEC2_7_URLRENDER_RENDERURL6, "Private render parameters can be set on the render URL through the setParameterMap(Map&lt;String, String[]&gt;) method");
       tcd.put(V2ADDLURLTESTS_SPEC2_7_URLRENDER_RENDERURL7, "Public render parameters can be set on the render URL through the setParameter(String, String) method");
       tcd.put(V2ADDLURLTESTS_SPEC2_7_URLRENDER_RENDERURL8, "Public render parameters can be set on the render URL through the setParameter(String, String[]) method");
-      tcd.put(V2ADDLURLTESTS_SPEC2_7_URLRENDER_RENDERURL9, "Public render parameters can be set on the render URL through the setParameterMap(Map<String, String[]>) method");
+      tcd.put(V2ADDLURLTESTS_SPEC2_7_URLRENDER_RENDERURL9, "Public render parameters can be set on the render URL through the setParameterMap(Map&lt;String, String[]&gt;) method");
       tcd.put(V2ADDLURLTESTS_SPEC2_7_URLRENDER_RENDERURL10, "If a parameter with an existing name is set through one of the setParameter methods, the existing value is repalced with the new value");
       tcd.put(V2ADDLURLTESTS_SPEC2_7_URLRENDER_RENDERURL11, "When a render URL is created, render parameters from the current request are not automatically copied to the new render URL");
       tcd.put(V2ADDLURLTESTS_SPEC2_7_URLRENDER_PORTLETMODE1, "The portlet may not set a portlet mode that is not defined as supported in the deployment descriptor on a portlet URL");
@@ -887,7 +887,7 @@ public class JSR286SpecTestCaseDetails extends TestCaseDetails {
       tcd.put(V2ADDLURLTESTS_SPEC2_7_URLACTION_ACTIONURL3, "When action parameters are set on a action URL, those parameters must become action parameters of the request resulting from triggering the actionURL");
       tcd.put(V2ADDLURLTESTS_SPEC2_7_URLACTION_ACTIONURL4, "Action parameters can be set on the action URL through the setParameter(String, String) method");
       tcd.put(V2ADDLURLTESTS_SPEC2_7_URLACTION_ACTIONURL5, "Action parameters can be set on the action URL through the setParameter(String, String[]) method");
-      tcd.put(V2ADDLURLTESTS_SPEC2_7_URLACTION_ACTIONURL6, "Action parameters can be set on the action URL through the setParameterMap(Map<String, String[]>) method");
+      tcd.put(V2ADDLURLTESTS_SPEC2_7_URLACTION_ACTIONURL6, "Action parameters can be set on the action URL through the setParameterMap(Map&lt;String, String[]&gt;) method");
       tcd.put(V2ADDLURLTESTS_SPEC2_7_URLACTION_ACTIONURL7, "If a parameter with an existing name is set through one of the setParameter methods, the existing value is repalced with the new value");
       tcd.put(V2ADDLURLTESTS_SPEC2_7_URLACTION_ACTIONURL8, "When an action URL is created, render parameters from the current request are not automatically copied to the new action URL");
       tcd.put(V2ADDLURLTESTS_SPEC2_7_URLRESOURCE_RESOURCEURL1, "When a resource URL is triggered, the serveResource method must be invoked");
@@ -895,7 +895,7 @@ public class JSR286SpecTestCaseDetails extends TestCaseDetails {
       tcd.put(V2ADDLURLTESTS_SPEC2_7_URLRESOURCE_RESOURCEURL3, "When resource parameters are set on a resource URL, those parameters must become resource parameters of the request resulting from triggering the resourceURL");
       tcd.put(V2ADDLURLTESTS_SPEC2_7_URLRESOURCE_RESOURCEURL4, "Resource parameters can be set on the resource URL through the setParameter(String, String) method");
       tcd.put(V2ADDLURLTESTS_SPEC2_7_URLRESOURCE_RESOURCEURL5, "Resource parameters can be set on the resource URL through the setParameter(String, String[]) method");
-      tcd.put(V2ADDLURLTESTS_SPEC2_7_URLRESOURCE_RESOURCEURL6, "Resource parameters can be set on the resource URL through the setParameterMap(Map<String, String[]>) method");
+      tcd.put(V2ADDLURLTESTS_SPEC2_7_URLRESOURCE_RESOURCEURL6, "Resource parameters can be set on the resource URL through the setParameterMap(Map&lt;String, String[]&gt;) method");
       tcd.put(V2ADDLURLTESTS_SPEC2_7_URLRESOURCE_RESOURCEURL7, "If a parameter with an existing name is set through one of the setParameter methods, the existing value is replaced with the new value");
       tcd.put(V2ADDLURLTESTS_SPEC2_7_URLRESOURCE_RESOURCEURL8, "When a resource URL is created, render parameters from the current request are automatically copied to the new resource URL");
       tcd.put(V2ADDLURLTESTS_SPEC2_7_URLRESOURCE_RESOURCEURL9, "When a resource URL is created, the automatically copied render parameters are hidden to the ResourceURL getParameter method");
@@ -960,7 +960,7 @@ public class JSR286SpecTestCaseDetails extends TestCaseDetails {
       tcd.put(V2ADDLENVIRONMENTTESTS_SPEC2_18_SESSIONS_SCOPE2, "The portlet container must not share the PortletSession object or the attributes stored in it among different portlet applications or among different user sessions");
       tcd.put(V2ADDLENVIRONMENTTESTS_SPEC2_18_SESSIONS_SCOPE3, "Any object stored in the session using the APPLICATION_SCOPE is available to any portlet that belongs to the same portlet application and that handles a request in the same session");
       tcd.put(V2ADDLENVIRONMENTTESTS_SPEC2_18_SESSIONS_SCOPE4, "Any Object stored in the session using the PORTLET_SCOPE must be available to the portlet during requests for the same portlet window that stored the object");
-      tcd.put(V2ADDLENVIRONMENTTESTS_SPEC2_18_SESSIONS_SCOPE5, "The PORTLET_SCOPE object must be stored in the APPLICATION_SCOPE with the attribute name 'javax.portlet.p.<ID>?<ATTRIBUTE_NAME>', where <ID> must be equal to the ID returned by the PortletRequest.getWindowID()");
+      tcd.put(V2ADDLENVIRONMENTTESTS_SPEC2_18_SESSIONS_SCOPE5, "The PORTLET_SCOPE object must be stored in the APPLICATION_SCOPE with the attribute name 'javax.portlet.p.&lt;ID&gt;?&lt;ATTRIBUTE_NAME&gt;', where &lt;ID&gt; must be equal to the ID returned by the PortletRequest.getWindowID()");
       tcd.put(V2ADDLENVIRONMENTTESTS_SPEC2_18_SESSIONS_SETATTRIBUTE1, "The setAttribute method can bind an object to the session in PORTLET_SCOPE");
       tcd.put(V2ADDLENVIRONMENTTESTS_SPEC2_18_SESSIONS_SETATTRIBUTE2, "The setAttribute method that does not take a scope parameter binds an object to the session in PORTLET_SCOPE");
       tcd.put(V2ADDLENVIRONMENTTESTS_SPEC2_18_SESSIONS_SETATTRIBUTE3, "The setAttribute method can bind an object to the session in APPLICATION_SCOPE");
@@ -970,9 +970,9 @@ public class JSR286SpecTestCaseDetails extends TestCaseDetails {
       tcd.put(V2ADDLENVIRONMENTTESTS_SPEC2_18_SESSIONS_REMOVEATTRIBUTE1, "The removeAttribute method is used to remove attributes stored in the session in PORTLET_SCOPE");
       tcd.put(V2ADDLENVIRONMENTTESTS_SPEC2_18_SESSIONS_REMOVEATTRIBUTE2, "The removeAttribute method that does not take a scope parameter remove attributes stored in the session in PORTLET_SCOPE");
       tcd.put(V2ADDLENVIRONMENTTESTS_SPEC2_18_SESSIONS_REMOVEATTRIBUTE3, "The removeAttribute method is used to remove attributes stored in the session in APPLICATION_SCOPE");
-      tcd.put(V2ADDLENVIRONMENTTESTS_SPEC2_18_SESSIONS_GETATTRIBUTENAMES1, "The getAttributeNames method can retrieve an Enumeration<String> of all attribute names stored in the session in PORTLET_SCOPE");
-      tcd.put(V2ADDLENVIRONMENTTESTS_SPEC2_18_SESSIONS_GETATTRIBUTENAMES2, "The getAttributeNames method that does not take a scope parameter retrieves an Enumeration<String> of all attribute names stored in the session in PORTLET_SCOPE");
-      tcd.put(V2ADDLENVIRONMENTTESTS_SPEC2_18_SESSIONS_GETATTRIBUTENAMES3, "The getAttributeNames method can retrieve an Enumeration<String> of all attribute names stored in the session in APPLICATION_SCOPE");
+      tcd.put(V2ADDLENVIRONMENTTESTS_SPEC2_18_SESSIONS_GETATTRIBUTENAMES1, "The getAttributeNames method can retrieve an Enumeration&lt;String&gt; of all attribute names stored in the session in PORTLET_SCOPE");
+      tcd.put(V2ADDLENVIRONMENTTESTS_SPEC2_18_SESSIONS_GETATTRIBUTENAMES2, "The getAttributeNames method that does not take a scope parameter retrieves an Enumeration&lt;String&gt; of all attribute names stored in the session in PORTLET_SCOPE");
+      tcd.put(V2ADDLENVIRONMENTTESTS_SPEC2_18_SESSIONS_GETATTRIBUTENAMES3, "The getAttributeNames method can retrieve an Enumeration&lt;String&gt; of all attribute names stored in the session in APPLICATION_SCOPE");
       tcd.put(V2ADDLENVIRONMENTTESTS_SPEC2_18_SESSIONS_DECODEATTRIBUTENAME1, "The PortletSessionUtil.decodeAttributeName method returns the attribute name without the prefix for an attribute name retrieved from the HttpSession");
       tcd.put(V2ADDLENVIRONMENTTESTS_SPEC2_18_SESSIONS_DECODEATTRIBUTENAME2, "The PortletSessionUtil.decodeAttributeName method returns the attribute name without the prefix for an attribute name retrieved from the PortletSession in APPLICATION_SCOPE");
       tcd.put(V2ADDLENVIRONMENTTESTS_SPEC2_18_SESSIONS_HTTPSESSION1, "Data stored in the HttpSession by a servlet in the same web application is accessible to portlets through the PortletSession in APPLICATION_SCOPE");
@@ -1110,64 +1110,64 @@ public class JSR286SpecTestCaseDetails extends TestCaseDetails {
       tcd.put(V2ADDLRESPONSETESTS_SPEC2_12_RESOURCE_CHARACTERENCODING3, "The character encoding can be set via the setContentType method if the given content type string provides a value for the charset attribute");
       tcd.put(V2ADDLRESPONSETESTS_SPEC2_12_RESOURCE_CHARACTERENCODING4, "If the portlet does not set the character encoding, the portlet container uses UTF-8 as the default character encoding");
       tcd.put(V2ADDLFILTERTESTS_SPEC2_20_ACTION_FILTER1, "A filter declaration can be configured in the deployment descriptor");
-      tcd.put(V2ADDLFILTERTESTS_SPEC2_20_ACTION_FILTER6, "A filter declaration can contain multiple <lifecycle> tags for a single filter class");
+      tcd.put(V2ADDLFILTERTESTS_SPEC2_20_ACTION_FILTER6, "A filter declaration can contain multiple &lt;lifecycle&gt; tags for a single filter class");
       tcd.put(V2ADDLFILTERTESTS_SPEC2_20_ACTION_FILTER7, "The filter declaration can contain initialization parameters which can be read by the filter through the FilterConfig object");
       tcd.put(V2ADDLFILTERTESTS_SPEC2_20_ACTION_FILTER8, "For each filter declaration, the filter instance must receive all initialization parameters defined in the filter declaration");
       tcd.put(V2ADDLFILTERTESTS_SPEC2_20_ACTION_FILTER9, "For each filter declaration, the filter instance must receive only initialization parameters defined in the filter declaration");
       tcd.put(V2ADDLFILTERTESTS_SPEC2_20_ACTION_FILTER10, "For multiple filter declarations for a single filter class, the filter instance must receive all initialization parameters defined in the filter declaration");
       tcd.put(V2ADDLFILTERTESTS_SPEC2_20_ACTION_FILTER11, "For multiple filter declarations for a single filter class, the filter instance must receive only initialization parameters defined in the filter declaration");
       tcd.put(V2ADDLFILTERTESTS_SPEC2_20_ACTION_FILTER12, "A filter class can appear in multiple filter declarations");
-      tcd.put(V2ADDLFILTERTESTS_SPEC2_20_ACTION_FILTER13, "A filter declaration can be mapped to a portlet through the deployment descriptor <filter-mapping> element");
+      tcd.put(V2ADDLFILTERTESTS_SPEC2_20_ACTION_FILTER13, "A filter declaration can be mapped to a portlet through the deployment descriptor &lt;filter-mapping&gt; element");
       tcd.put(V2ADDLFILTERTESTS_SPEC2_20_ACTION_FILTER14, "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");
-      tcd.put(V2ADDLFILTERTESTS_SPEC2_20_ACTION_FILTER15, "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");
+      tcd.put(V2ADDLFILTERTESTS_SPEC2_20_ACTION_FILTER15, "The order the container uses in building the chain of filters to be applied for a particular request is the order in which the &lt;portlet-name&gt; matching filter mappings appear in the deployment descriptor");
       tcd.put(V2ADDLFILTERTESTS_SPEC2_20_ACTION_FILTERWRAPPER1, "An ACTION_PHASE filter can wrap the ActionRequest object with a custom wrapper");
       tcd.put(V2ADDLFILTERTESTS_SPEC2_20_ACTION_FILTERWRAPPER2, "An ACTION_PHASE filter can wrap the ActionResponse object with a custom wrapper");
-      tcd.put(V2ADDLFILTERTESTS_SPEC2_20_ACTION_FILTER2, "If the filter declaration specifies the <lifecycle> tag value ACTION_PHASE, the ActionFilter.doFilter method is called");
+      tcd.put(V2ADDLFILTERTESTS_SPEC2_20_ACTION_FILTER2, "If the filter declaration specifies the &lt;lifecycle&gt; tag value ACTION_PHASE, the ActionFilter.doFilter method is called");
       tcd.put(V2ADDLFILTERTESTS_SPEC2_20_RENDER_FILTER1, "A filter declaration can be configured in the deployment descriptor");
-      tcd.put(V2ADDLFILTERTESTS_SPEC2_20_RENDER_FILTER6, "A filter declaration can contain multiple <lifecycle> tags for a single filter class");
+      tcd.put(V2ADDLFILTERTESTS_SPEC2_20_RENDER_FILTER6, "A filter declaration can contain multiple &lt;lifecycle&gt; tags for a single filter class");
       tcd.put(V2ADDLFILTERTESTS_SPEC2_20_RENDER_FILTER7, "The filter declaration can contain initialization parameters which can be read by the filter through the FilterConfig object");
       tcd.put(V2ADDLFILTERTESTS_SPEC2_20_RENDER_FILTER8, "For each filter declaration, the filter instance must receive all initialization parameters defined in the filter declaration");
       tcd.put(V2ADDLFILTERTESTS_SPEC2_20_RENDER_FILTER9, "For each filter declaration, the filter instance must receive only initialization parameters defined in the filter declaration");
       tcd.put(V2ADDLFILTERTESTS_SPEC2_20_RENDER_FILTER10, "For multiple filter declarations for a single filter class, the filter instance must receive all initialization parameters defined in the filter declaration");
       tcd.put(V2ADDLFILTERTESTS_SPEC2_20_RENDER_FILTER11, "For multiple filter declarations for a single filter class, the filter instance must receive only initialization parameters defined in the filter declaration");
       tcd.put(V2ADDLFILTERTESTS_SPEC2_20_RENDER_FILTER12, "A filter class can appear in multiple filter declarations");
-      tcd.put(V2ADDLFILTERTESTS_SPEC2_20_RENDER_FILTER13, "A filter declaration can be mapped to a portlet through the deployment descriptor <filter-mapping> element");
+      tcd.put(V2ADDLFILTERTESTS_SPEC2_20_RENDER_FILTER13, "A filter declaration can be mapped to a portlet through the deployment descriptor &lt;filter-mapping&gt; element");
       tcd.put(V2ADDLFILTERTESTS_SPEC2_20_RENDER_FILTER14, "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");
-      tcd.put(V2ADDLFILTERTESTS_SPEC2_20_RENDER_FILTER15, "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");
+      tcd.put(V2ADDLFILTERTESTS_SPEC2_20_RENDER_FILTER15, "The order the container uses in building the chain of filters to be applied for a particular request is the order in which the &lt;portlet-name&gt; matching filter mappings appear in the deployment descriptor");
       tcd.put(V2ADDLFILTERTESTS_SPEC2_20_RENDER_FILTERWRAPPER5, "An RENDER_PHASE filter can wrap the RenderRequest object with a custom wrapper");
       tcd.put(V2ADDLFILTERTESTS_SPEC2_20_RENDER_FILTERWRAPPER6, "An RENDER_PHASE filter can wrap the RenderResponse object with a custom wrapper");
-      tcd.put(V2ADDLFILTERTESTS_SPEC2_20_RENDER_FILTER3, "If the filter declaration specifies the <lifecycle> tag value RENDER_PHASE, the RenderFilter.doFilter method is called");
+      tcd.put(V2ADDLFILTERTESTS_SPEC2_20_RENDER_FILTER3, "If the filter declaration specifies the &lt;lifecycle&gt; tag value RENDER_PHASE, the RenderFilter.doFilter method is called");
       tcd.put(V2ADDLFILTERTESTS_SPEC2_20_EVENT_FILTER1, "A filter declaration can be configured in the deployment descriptor");
-      tcd.put(V2ADDLFILTERTESTS_SPEC2_20_EVENT_FILTER6, "A filter declaration can contain multiple <lifecycle> tags for a single filter class");
+      tcd.put(V2ADDLFILTERTESTS_SPEC2_20_EVENT_FILTER6, "A filter declaration can contain multiple &lt;lifecycle&gt; tags for a single filter class");
       tcd.put(V2ADDLFILTERTESTS_SPEC2_20_EVENT_FILTER7, "The filter declaration can contain initialization parameters which can be read by the filter through the FilterConfig object");
       tcd.put(V2ADDLFILTERTESTS_SPEC2_20_EVENT_FILTER8, "For each filter declaration, the filter instance must receive all initialization parameters defined in the filter declaration");
       tcd.put(V2ADDLFILTERTESTS_SPEC2_20_EVENT_FILTER9, "For each filter declaration, the filter instance must receive only initialization parameters defined in the filter declaration");
       tcd.put(V2ADDLFILTERTESTS_SPEC2_20_EVENT_FILTER10, "For multiple filter declarations for a single filter class, the filter instance must receive all initialization parameters defined in the filter declaration");
       tcd.put(V2ADDLFILTERTESTS_SPEC2_20_EVENT_FILTER11, "For multiple filter declarations for a single filter class, the filter instance must receive only initialization parameters defined in the filter declaration");
       tcd.put(V2ADDLFILTERTESTS_SPEC2_20_EVENT_FILTER12, "A filter class can appear in multiple filter declarations");
-      tcd.put(V2ADDLFILTERTESTS_SPEC2_20_EVENT_FILTER13, "A filter declaration can be mapped to a portlet through the deployment descriptor <filter-mapping> element");
+      tcd.put(V2ADDLFILTERTESTS_SPEC2_20_EVENT_FILTER13, "A filter declaration can be mapped to a portlet through the deployment descriptor &lt;filter-mapping&gt; element");
       tcd.put(V2ADDLFILTERTESTS_SPEC2_20_EVENT_FILTER14, "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");
-      tcd.put(V2ADDLFILTERTESTS_SPEC2_20_EVENT_FILTER15, "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");
+      tcd.put(V2ADDLFILTERTESTS_SPEC2_20_EVENT_FILTER15, "The order the container uses in building the chain of filters to be applied for a particular request is the order in which the &lt;portlet-name&gt; matching filter mappings appear in the deployment descriptor");
       tcd.put(V2ADDLFILTERTESTS_SPEC2_20_EVENT_FILTERWRAPPER3, "An EVENT_PHASE filter can wrap the EventRequest object with a custom wrapper");
       tcd.put(V2ADDLFILTERTESTS_SPEC2_20_EVENT_FILTERWRAPPER4, "An EVENT_PHASE filter can wrap the EventResponse object with a custom wrapper");
-      tcd.put(V2ADDLFILTERTESTS_SPEC2_20_EVENT_FILTER4, "If the filter declaration specifies the <lifecycle> tag value EVENT_PHASE, the EventFilter.doFilter method is called");
+      tcd.put(V2ADDLFILTERTESTS_SPEC2_20_EVENT_FILTER4, "If the filter declaration specifies the &lt;lifecycle&gt; tag value EVENT_PHASE, the EventFilter.doFilter method is called");
       tcd.put(V2ADDLFILTERTESTS_SPEC2_20_RESOURCE_FILTER1, "A filter declaration can be configured in the deployment descriptor");
-      tcd.put(V2ADDLFILTERTESTS_SPEC2_20_RESOURCE_FILTER6, "A filter declaration can contain multiple <lifecycle> tags for a single filter class");
+      tcd.put(V2ADDLFILTERTESTS_SPEC2_20_RESOURCE_FILTER6, "A filter declaration can contain multiple &lt;lifecycle&gt; tags for a single filter class");
       tcd.put(V2ADDLFILTERTESTS_SPEC2_20_RESOURCE_FILTER7, "The filter declaration can contain initialization parameters which can be read by the filter through the FilterConfig object");
       tcd.put(V2ADDLFILTERTESTS_SPEC2_20_RESOURCE_FILTER8, "For each filter declaration, the filter instance must receive all initialization parameters defined in the filter declaration");
       tcd.put(V2ADDLFILTERTESTS_SPEC2_20_RESOURCE_FILTER9, "For each filter declaration, the filter instance must receive only initialization parameters defined in the filter declaration");
       tcd.put(V2ADDLFILTERTESTS_SPEC2_20_RESOURCE_FILTER10, "For multiple filter declarations for a single filter class, the filter instance must receive all initialization parameters defined in the filter declaration");
       tcd.put(V2ADDLFILTERTESTS_SPEC2_20_RESOURCE_FILTER11, "For multiple filter declarations for a single filter class, the filter instance must receive only initialization parameters defined in the filter declaration");
       tcd.put(V2ADDLFILTERTESTS_SPEC2_20_RESOURCE_FILTER12, "A filter class can appear in multiple filter declarations");
-      tcd.put(V2ADDLFILTERTESTS_SPEC2_20_RESOURCE_FILTER13, "A filter declaration can be mapped to a portlet through the deployment descriptor <filter-mapping> element");
+      tcd.put(V2ADDLFILTERTESTS_SPEC2_20_RESOURCE_FILTER13, "A filter declaration can be mapped to a portlet through the deployment descriptor &lt;filter-mapping&gt; element");
       tcd.put(V2ADDLFILTERTESTS_SPEC2_20_RESOURCE_FILTER14, "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");
-      tcd.put(V2ADDLFILTERTESTS_SPEC2_20_RESOURCE_FILTER15, "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");
-      tcd.put(V2ADDLFILTERTESTS_SPEC2_20_RESOURCE_FILTER5, "If the filter declaration specifies the <lifecycle> tag value RESOURCE_PHASE, the ResourceFilter.doFilter method is called");
+      tcd.put(V2ADDLFILTERTESTS_SPEC2_20_RESOURCE_FILTER15, "The order the container uses in building the chain of filters to be applied for a particular request is the order in which the &lt;portlet-name&gt; matching filter mappings appear in the deployment descriptor");
+      tcd.put(V2ADDLFILTERTESTS_SPEC2_20_RESOURCE_FILTER5, "If the filter declaration specifies the &lt;lifecycle&gt; tag value RESOURCE_PHASE, the ResourceFilter.doFilter method is called");
       tcd.put(V2ADDLFILTERTESTS_SPEC2_20_RESOURCE_FILTERWRAPPER7, "An RESOURCE_PHASE filter can wrap the ResourceRequest object with a custom wrapper");
       tcd.put(V2ADDLFILTERTESTS_SPEC2_20_RESOURCE_FILTERWRAPPER8, "An RESOURCE_PHASE filter can wrap the ResourceResponse object with a custom wrapper");
-      tcd.put(V2PORTLETTAGLIBRARYTESTS_SPEC2_26_INCLUDEJSPGENERAL_DEFINEOBJECTS3, "The version 1.0 tag library may be referenced using <%@ taglib uri=\"http://java.sun.com/portlet\" prefix=\"portlet\" %>");
+      tcd.put(V2PORTLETTAGLIBRARYTESTS_SPEC2_26_INCLUDEJSPGENERAL_DEFINEOBJECTS3, "The version 1.0 tag library may be referenced using &lt;%@ taglib uri=\"http://java.sun.com/portlet\" prefix=\"portlet\" %&gt;");
       tcd.put(V2PORTLETTAGLIBRARYTESTS_SPEC2_26_INCLUDEJSPGENERAL_DEFINEOBJECTS1, "The portlet-container must provide an implementation of the Tag Lib");
-      tcd.put(V2PORTLETTAGLIBRARYTESTS_SPEC2_26_INCLUDEJSPGENERAL_DEFINEOBJECTS2, "In order to obtain version 2 support, the tag library must be specified as <%@ taglib uri=\"http://java.sun.com/portlet_2_0\" prefix=\"portlet\" %>");
+      tcd.put(V2PORTLETTAGLIBRARYTESTS_SPEC2_26_INCLUDEJSPGENERAL_DEFINEOBJECTS2, "In order to obtain version 2 support, the tag library must be specified as &lt;%@ taglib uri=\"http://java.sun.com/portlet_2_0\" prefix=\"portlet\" %&gt;");
       tcd.put(V2PORTLETTAGLIBRARYTESTS_SPEC2_26_INCLUDEJSPGENERAL_DEFINEOBJECTS4, "The defineObjects tag must not define any attribute and it must not contain any body content");
       tcd.put(V2PORTLETTAGLIBRARYTESTS_SPEC2_26_INCLUDEJSPGENERAL_NAMESPACE, "The namespace tag produces a unique string value for the current portlet equal to the value returned by the PortletResponse.getNamespace method");
       tcd.put(V2PORTLETTAGLIBRARYTESTS_SPEC2_26_INCLUDEJSPGENERAL_ESCAPEXML1, "The container runtime option \"javax.portlet.escapeXml\" can be used to set the default escapeXML setting to true");
@@ -1182,9 +1182,9 @@ public class JSR286SpecTestCaseDetails extends TestCaseDetails {
       tcd.put(V2PORTLETTAGLIBRARYTESTS_SPEC2_26_INCLUDEJSPACTION_DEFINEOBJECTS8, "When included in the Action phase, the defineObjects tag defines the variable EventResponse eventResponse to be null or undefined");
       tcd.put(V2PORTLETTAGLIBRARYTESTS_SPEC2_26_INCLUDEJSPACTION_DEFINEOBJECTS9, "When included in the Action phase, the defineObjects tag defines the variable PortletConfig portletConfig");
       tcd.put(V2PORTLETTAGLIBRARYTESTS_SPEC2_26_INCLUDEJSPACTION_DEFINEOBJECTS10, "When included in the Action phase, the defineObjects tag defines the variable PortletSession portletSession, providing access to the portletSession, does not create a new session, only returns an existing session or null if no session exists.");
-      tcd.put(V2PORTLETTAGLIBRARYTESTS_SPEC2_26_INCLUDEJSPACTION_DEFINEOBJECTS11, "When included in the Action phase, the defineObjects tag defines the variable Map<String, Object> portletSessionScope, providing access to the portletSession attributes as a Map equivalent to the PortletSession.getAttributeMap() call, does not create a new session, only returns an existing session. If no session attributes exist this method returns an empty Map.");
+      tcd.put(V2PORTLETTAGLIBRARYTESTS_SPEC2_26_INCLUDEJSPACTION_DEFINEOBJECTS11, "When included in the Action phase, the defineObjects tag defines the variable Map&lt;String, Object&gt; portletSessionScope, providing access to the portletSession attributes as a Map equivalent to the PortletSession.getAttributeMap() call, does not create a new session, only returns an existing session. If no session attributes exist this method returns an empty Map.");
       tcd.put(V2PORTLETTAGLIBRARYTESTS_SPEC2_26_INCLUDEJSPACTION_DEFINEOBJECTS12, "When included in the Action phase, the defineObjects tag defines the variable PortletPreferences portletPreferences, providing access to the portlet preferences.");
-      tcd.put(V2PORTLETTAGLIBRARYTESTS_SPEC2_26_INCLUDEJSPACTION_DEFINEOBJECTS13, "When included in the Action phase, the defineObjects tag defines the variable Map<String, String[]> portletPreferencesValues, providing access to the portlet preferences as a Map, equivalent to the PortletPreferences.getMap() call. If no portlet preferences exist, the Map is empty.");
+      tcd.put(V2PORTLETTAGLIBRARYTESTS_SPEC2_26_INCLUDEJSPACTION_DEFINEOBJECTS13, "When included in the Action phase, the defineObjects tag defines the variable Map&lt;String, String[]&gt; portletPreferencesValues, providing access to the portlet preferences as a Map, equivalent to the PortletPreferences.getMap() call. If no portlet preferences exist, the Map is empty.");
       tcd.put(V2PORTLETTAGLIBRARYTESTS_SPEC2_26_INCLUDEJSPEVENT_DEFINEOBJECTS1, "When included in the Event phase, the defineObjects tag defines the variable RenderRequest renderRequest to be null or undefined");
       tcd.put(V2PORTLETTAGLIBRARYTESTS_SPEC2_26_INCLUDEJSPEVENT_DEFINEOBJECTS2, "When included in the Event phase, the defineObjects tag defines the variable ResourceRequest resourceRequest to be null or undefined");
       tcd.put(V2PORTLETTAGLIBRARYTESTS_SPEC2_26_INCLUDEJSPEVENT_DEFINEOBJECTS3, "When included in the Event phase, the defineObjects tag defines the variable ActionRequest actionRequest to be null or undefined");
@@ -1195,9 +1195,9 @@ public class JSR286SpecTestCaseDetails extends TestCaseDetails {
       tcd.put(V2PORTLETTAGLIBRARYTESTS_SPEC2_26_INCLUDEJSPEVENT_DEFINEOBJECTS8, "When included in the Event phase, the defineObjects tag defines the variable EventResponse eventResponse to the corresponding object");
       tcd.put(V2PORTLETTAGLIBRARYTESTS_SPEC2_26_INCLUDEJSPEVENT_DEFINEOBJECTS9, "When included in the Event phase, the defineObjects tag defines the variable PortletConfig portletConfig");
       tcd.put(V2PORTLETTAGLIBRARYTESTS_SPEC2_26_INCLUDEJSPEVENT_DEFINEOBJECTS10, "When included in the Event phase, the defineObjects tag defines the variable PortletSession portletSession, providing access to the portletSession, does not create a new session, only returns an existing session or null if no session exists.");
-      tcd.put(V2PORTLETTAGLIBRARYTESTS_SPEC2_26_INCLUDEJSPEVENT_DEFINEOBJECTS11, "When included in the Event phase, the defineObjects tag defines the variable Map<String, Object> portletSessionScope, providing access to the portletSession attributes as a Map equivalent to the PortletSession.getAttributeMap() call, does not create a new session, only returns an existing session. If no session attributes exist this method returns an empty Map.");
+      tcd.put(V2PORTLETTAGLIBRARYTESTS_SPEC2_26_INCLUDEJSPEVENT_DEFINEOBJECTS11, "When included in the Event phase, the defineObjects tag defines the variable Map&lt;String, Object&gt; portletSessionScope, providing access to the portletSession attributes as a Map equivalent to the PortletSession.getAttributeMap() call, does not create a new session, only returns an existing session. If no session attributes exist this method returns an empty Map.");
       tcd.put(V2PORTLETTAGLIBRARYTESTS_SPEC2_26_INCLUDEJSPEVENT_DEFINEOBJECTS12, "When included in the Event phase, the defineObjects tag defines the variable PortletPreferences portletPreferences, providing access to the portlet preferences.");
-      tcd.put(V2PORTLETTAGLIBRARYTESTS_SPEC2_26_INCLUDEJSPEVENT_DEFINEOBJECTS13, "When included in the Event phase, the defineObjects tag defines the variable Map<String, String[]> portletPreferencesValues, providing access to the portlet preferences as a Map, equivalent to the PortletPreferences.getMap() call. If no portlet preferences exist, the Map is empty.");
+      tcd.put(V2PORTLETTAGLIBRARYTESTS_SPEC2_26_INCLUDEJSPEVENT_DEFINEOBJECTS13, "When included in the Event phase, the defineObjects tag defines the variable Map&lt;String, String[]&gt; portletPreferencesValues, providing access to the portlet preferences as a Map, equivalent to the PortletPreferences.getMap() call. If no portlet preferences exist, the Map is empty.");
       tcd.put(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_DEFINEOBJECTSRENDER1, "When included in the Render phase, the defineObjects tag defines the variable RenderRequest renderRequest to the corresponding object");
       tcd.put(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_DEFINEOBJECTSRENDER2, "When included in the Render phase, the defineObjects tag defines the variable ResourceRequest resourceRequest to be null or undefined");
       tcd.put(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_DEFINEOBJECTSRENDER3, "When included in the Render phase, the defineObjects tag defines the variable ActionRequest actionRequest to be null or undefined");
@@ -1208,9 +1208,9 @@ public class JSR286SpecTestCaseDetails extends TestCaseDetails {
       tcd.put(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_DEFINEOBJECTSRENDER8, "When included in the Render phase, the defineObjects tag defines the variable EventResponse eventResponse to be null or undefined");
       tcd.put(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_DEFINEOBJECTSRENDER9, "When included in the Render phase, the defineObjects tag defines the variable PortletConfig portletConfig");
       tcd.put(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_DEFINEOBJECTSRENDER10, "When included in the Render phase, the defineObjects tag defines the variable PortletSession portletSession, providing access to the portletSession, does not create a new session, only returns an existing session or null if no session exists.");
-      tcd.put(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_DEFINEOBJECTSRENDER11, "When included in the Render phase, the defineObjects tag defines the variable Map<String, Object> portletSessionScope, providing access to the portletSession attributes as a Map equivalent to the PortletSession.getAttributeMap() call, does not create a new session, only returns an existing session. If no session attributes exist this method returns an empty Map.");
+      tcd.put(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_DEFINEOBJECTSRENDER11, "When included in the Render phase, the defineObjects tag defines the variable Map&lt;String, Object&gt; portletSessionScope, providing access to the portletSession attributes as a Map equivalent to the PortletSession.getAttributeMap() call, does not create a new session, only returns an existing session. If no session attributes exist this method returns an empty Map.");
       tcd.put(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_DEFINEOBJECTSRENDER12, "When included in the Render phase, the defineObjects tag defines the variable PortletPreferences portletPreferences, providing access to the portlet preferences.");
-      tcd.put(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_DEFINEOBJECTSRENDER13, "When included in the Render phase, the defineObjects tag defines the variable Map<String, String[]> portletPreferencesValues, providing access to the portlet preferences as a Map, equivalent to the PortletPreferences.getMap() call. If no portlet preferences exist, the Map is empty.");
+      tcd.put(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_DEFINEOBJECTSRENDER13, "When included in the Render phase, the defineObjects tag defines the variable Map&lt;String, String[]&gt; portletPreferencesValues, providing access to the portlet preferences as a Map, equivalent to the PortletPreferences.getMap() call. If no portlet preferences exist, the Map is empty.");
       tcd.put(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_ACTIONURL1, "The portlet actionURL tag creates a URL that must point to the current portlet and must trigger an action request with the supplied parameters");
       tcd.put(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_ACTIONURL2, "Parameters may be added to the URL by including the param tag between the actionURL start and end tags");
       tcd.put(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_ACTIONURL3, "The optional actionURL \"windowState\" attribute can specify the desired window state after the URL is triggered");
@@ -1228,12 +1228,12 @@ public class JSR286SpecTestCaseDetails extends TestCaseDetails {
       tcd.put(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_ACTIONURL15, "If the optional actionURL \"secure\" attribute is set to false, the resulting URL does not need to require a secure connection");
       tcd.put(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_ACTIONURL17, "The \"secure\" attribute is not specified, the security setting is retained");
       tcd.put(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_ACTIONURL18, "If the optional actionURL \"copyCurrentRenderParameters\" attribute is set to true, the current private render parameters are attached to the URL");
-      tcd.put(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_ACTIONURL19, "If the optional actionURL \"copyCurrentRenderParameters\" attribute is set to true, additional parameters specified with the <portlet:param> element are merged with the render parameters");
-      tcd.put(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_ACTIONURL20, "If the optional actionURL \"copyCurrentRenderParameters\" attribute is set to true, additional parameters specified with the <portlet:param> element appear in the values array before the render parameter values if there is a name conflict");
+      tcd.put(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_ACTIONURL19, "If the optional actionURL \"copyCurrentRenderParameters\" attribute is set to true, additional parameters specified with the &lt;portlet:param&gt; element are merged with the render parameters");
+      tcd.put(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_ACTIONURL20, "If the optional actionURL \"copyCurrentRenderParameters\" attribute is set to true, additional parameters specified with the &lt;portlet:param&gt; element appear in the values array before the render parameter values if there is a name conflict");
       tcd.put(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_ACTIONURL21, "If the optional actionURL \"copyCurrentRenderParameters\" attribute is set to false, the current render parameters are not attached to the URL");
       tcd.put(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_ACTIONURL22, "If the \"copyCurrentRenderParameters\" attribute specifies an invalid value, a JspException is thrown");
       tcd.put(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_ACTIONURL23, "The \"copyCurrentRenderParameters\" attribute is not specified, the security setting is retained");
-      tcd.put(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_ACTIONURL25, "If the optional actionURL \"escapeXML\" attribute is set to false, the characters \"<>&'\\\"\" are not converted to their entity codes");
+      tcd.put(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_ACTIONURL25, "If the optional actionURL \"escapeXML\" attribute is set to false, the characters \"&lt;&gt;&'\\\"\" are not converted to their entity codes");
       tcd.put(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_ACTIONURL26, "The \"escapeXML\" attribute default value is true");
       tcd.put(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_ACTIONURL27, "If the optional actionURL \"name\" attribute is set, the provided name string is used by GenericPortlet to dispatch the request to the coresponding annotated method");
       tcd.put(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_ACTIONURL28, "Setting the \"name\" attribute will add a parameter to the action URL with the name of \"javax.portlet.action\"");
@@ -1256,17 +1256,17 @@ public class JSR286SpecTestCaseDetails extends TestCaseDetails {
       tcd.put(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_RENDERURL15, "If the optional renderURL \"secure\" attribute is set to false, the resulting URL does not need to require a secure connection");
       tcd.put(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_RENDERURL17, "The \"secure\" attribute is not specified, the security setting is retained");
       tcd.put(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_RENDERURL18, "If the optional renderURL \"copyCurrentRenderParameters\" attribute is set to true, the current private render parameters are attached to the URL");
-      tcd.put(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_RENDERURL19, "If the optional renderURL \"copyCurrentRenderParameters\" attribute is set to true, additional parameters specified with the <portlet:param> element are merged with the render parameters");
-      tcd.put(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_RENDERURL20, "If the optional renderURL \"copyCurrentRenderParameters\" attribute is set to true, additional parameters specified with the <portlet:param> element appear in the values array before the render parameter values if there is a name conflict");
+      tcd.put(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_RENDERURL19, "If the optional renderURL \"copyCurrentRenderParameters\" attribute is set to true, additional parameters specified with the &lt;portlet:param&gt; element are merged with the render parameters");
+      tcd.put(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_RENDERURL20, "If the optional renderURL \"copyCurrentRenderParameters\" attribute is set to true, additional parameters specified with the &lt;portlet:param&gt; element appear in the values array before the render parameter values if there is a name conflict");
       tcd.put(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_RENDERURL21, "If the optional renderURL \"copyCurrentRenderParameters\" attribute is set to false, the current render parameters are not attached to the URL");
       tcd.put(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_RENDERURL22, "If the \"copyCurrentRenderParameters\" attribute specifies an invalid value, a JspException is thrown");
       tcd.put(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_RENDERURL23, "The \"copyCurrentRenderParameters\" attribute is not specified, the security setting is retained");
-      tcd.put(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_RENDERURL25, "If the optional renderURL \"escapeXML\" attribute is set to false, the characters \"<>&'\\\"\" are not converted to their entity codes");
+      tcd.put(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_RENDERURL25, "If the optional renderURL \"escapeXML\" attribute is set to false, the characters \"&lt;&gt;&'\\\"\" are not converted to their entity codes");
       tcd.put(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_RENDERURL26, "The \"escapeXML\" attribute default value is true");
       tcd.put(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_RESOURCEURL1, "The portlet resourceURL tag creates a URL that must point to the current portlet and must trigger an resource request with the supplied parameters");
       tcd.put(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_RESOURCEURL2, "The resourceURL must preserve the current portlet mode, window state and render parameters");
       tcd.put(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_RESOURCEURL3, "Resource parameters may be added to the URL by including the param tag between the resourceURL start and end tags");
-      tcd.put(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_RESOURCEURL4, "The resource parameters specified with the <portlet:param> element appear in the values array before the render parameter values if there is a name conflict");
+      tcd.put(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_RESOURCEURL4, "The resource parameters specified with the &lt;portlet:param&gt; element appear in the values array before the render parameter values if there is a name conflict");
       tcd.put(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_RESOURCEURL5, "The optional resourceURL \"var\" attribute can specify a scoped variable for exporting the action URL");
       tcd.put(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_RESOURCEURL6, "If the resourceURL \"var\" attribute is specified, the URL is not written to the JspWriter");
       tcd.put(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_RESOURCEURL7, "If the resourceURL \"var\" attribute is not specified, the URL is written to the JspWriter");
@@ -1274,12 +1274,12 @@ public class JSR286SpecTestCaseDetails extends TestCaseDetails {
       tcd.put(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_RESOURCEURL9, "If the optional resourceURL \"secure\" attribute is set to false, the resulting URL does not need to require a secure connection");
       tcd.put(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_RESOURCEURL11, "The \"secure\" attribute is not specified, the security setting is retained");
       tcd.put(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_RESOURCEURL12, "If the optional resourceURL \"copyCurrentRenderParameters\" attribute is set to true, the current private render parameters are attached to the URL");
-      tcd.put(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_RESOURCEURL13, "If the optional resourceURL \"copyCurrentRenderParameters\" attribute is set to true, additional parameters specified with the <portlet:param> element are merged with the render parameters");
-      tcd.put(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_RESOURCEURL14, "If the optional resourceURL \"copyCurrentRenderParameters\" attribute is set to true, additional parameters specified with the <portlet:param> element appear in the values array before the render parameter values if there is a name conflict");
+      tcd.put(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_RESOURCEURL13, "If the optional resourceURL \"copyCurrentRenderParameters\" attribute is set to true, additional parameters specified with the &lt;portlet:param&gt; element are merged with the render parameters");
+      tcd.put(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_RESOURCEURL14, "If the optional resourceURL \"copyCurrentRenderParameters\" attribute is set to true, additional parameters specified with the &lt;portlet:param&gt; element appear in the values array before the render parameter values if there is a name conflict");
       tcd.put(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_RESOURCEURL15, "If the optional resourceURL \"copyCurrentRenderParameters\" attribute is set to false, the current render parameters are not attached to the URL");
       tcd.put(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_RESOURCEURL16, "If the \"copyCurrentRenderParameters\" attribute specifies an invalid value, a JspException is thrown");
       tcd.put(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_RESOURCEURL17, "The \"copyCurrentRenderParameters\" attribute is not specified, the security setting is retained");
-      tcd.put(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_RESOURCEURL19, "If the optional resourceURL \"escapeXML\" attribute is set to false, the characters \"<>&'\\\"\" are not converted to their entity codes");
+      tcd.put(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_RESOURCEURL19, "If the optional resourceURL \"escapeXML\" attribute is set to false, the characters \"&lt;&gt;&'\\\"\" are not converted to their entity codes");
       tcd.put(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_RESOURCEURL20, "The \"escapeXML\" attribute default value is true");
       tcd.put(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_RESOURCEURL21, "If the optional resourceURL \"id\" attribute is set, the provided id string is used by GenericPortlet to dispatch the request to the coresponding annotated method");
       tcd.put(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_RESOURCEURL22, "Setting the \"id\" attribute will add a parameter to the action URL with the id of \"javax.portlet.action\"");
@@ -1334,9 +1334,9 @@ public class JSR286SpecTestCaseDetails extends TestCaseDetails {
       tcd.put(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_DEFINEOBJECTSRESOURCE8, "When included in the Resource phase, the defineObjects tag defines the variable EventResponse eventResponse to be null or undefined");
       tcd.put(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_DEFINEOBJECTSRESOURCE9, "When included in the Resource phase, the defineObjects tag defines the variable PortletConfig portletConfig");
       tcd.put(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_DEFINEOBJECTSRESOURCE10, "When included in the Resource phase, the defineObjects tag defines the variable PortletSession portletSession, providing access to the portletSession, does not create a new session, only returns an existing session or null if no session exists.");
-      tcd.put(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_DEFINEOBJECTSRESOURCE11, "When included in the Resource phase, the defineObjects tag defines the variable Map<String, Object> portletSessionScope, providing access to the portletSession attributes as a Map equivalent to the PortletSession.getAttributeMap() call, does not create a new session, only returns an existing session. If no session attributes exist this method returns an empty Map.");
+      tcd.put(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_DEFINEOBJECTSRESOURCE11, "When included in the Resource phase, the defineObjects tag defines the variable Map&lt;String, Object&gt; portletSessionScope, providing access to the portletSession attributes as a Map equivalent to the PortletSession.getAttributeMap() call, does not create a new session, only returns an existing session. If no session attributes exist this method returns an empty Map.");
       tcd.put(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_DEFINEOBJECTSRESOURCE12, "When included in the Resource phase, the defineObjects tag defines the variable PortletPreferences portletPreferences, providing access to the portlet preferences.");
-      tcd.put(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_DEFINEOBJECTSRESOURCE13, "When included in the Resource phase, the defineObjects tag defines the variable Map<String, String[]> portletPreferencesValues, providing access to the portlet preferences as a Map, equivalent to the PortletPreferences.getMap() call. If no portlet preferences exist, the Map is empty.");
+      tcd.put(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_DEFINEOBJECTSRESOURCE13, "When included in the Resource phase, the defineObjects tag defines the variable Map&lt;String, String[]&gt; portletPreferencesValues, providing access to the portlet preferences as a Map, equivalent to the PortletPreferences.getMap() call. If no portlet preferences exist, the Map is empty.");
       tcd.put(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_ACTIONURL1, "The portlet actionURL tag creates a URL that must point to the current portlet and must trigger an action request with the supplied parameters");
       tcd.put(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_ACTIONURL2, "Parameters may be added to the URL by including the param tag between the actionURL start and end tags");
       tcd.put(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_ACTIONURL3, "The optional actionURL \"windowState\" attribute can specify the desired window state after the URL is triggered");
@@ -1354,12 +1354,12 @@ public class JSR286SpecTestCaseDetails extends TestCaseDetails {
       tcd.put(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_ACTIONURL15, "If the optional actionURL \"secure\" attribute is set to false, the resulting URL does not need to require a secure connection");
       tcd.put(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_ACTIONURL17, "The \"secure\" attribute is not specified, the security setting is retained");
       tcd.put(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_ACTIONURL18, "If the optional actionURL \"copyCurrentRenderParameters\" attribute is set to true, the current private render parameters are attached to the URL");
-      tcd.put(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_ACTIONURL19, "If the optional actionURL \"copyCurrentRenderParameters\" attribute is set to true, additional parameters specified with the <portlet:param> element are merged with the render parameters");
-      tcd.put(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_ACTIONURL20, "If the optional actionURL \"copyCurrentRenderParameters\" attribute is set to true, additional parameters specified with the <portlet:param> element appear in the values array before the render parameter values if there is a name conflict");
+      tcd.put(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_ACTIONURL19, "If the optional actionURL \"copyCurrentRenderParameters\" attribute is set to true, additional parameters specified with the &lt;portlet:param&gt; element are merged with the render parameters");
+      tcd.put(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_ACTIONURL20, "If the optional actionURL \"copyCurrentRenderParameters\" attribute is set to true, additional parameters specified with the &lt;portlet:param&gt; element appear in the values array before the render parameter values if there is a name conflict");
       tcd.put(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_ACTIONURL21, "If the optional actionURL \"copyCurrentRenderParameters\" attribute is set to false, the current render parameters are not attached to the URL");
       tcd.put(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_ACTIONURL22, "If the \"copyCurrentRenderParameters\" attribute specifies an invalid value, a JspException is thrown");
       tcd.put(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_ACTIONURL23, "The \"copyCurrentRenderParameters\" attribute is not specified, the security setting is retained");
-      tcd.put(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_ACTIONURL25, "If the optional actionURL \"escapeXML\" attribute is set to false, the characters \"<>&'\\\"\" are not converted to their entity codes");
+      tcd.put(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_ACTIONURL25, "If the optional actionURL \"escapeXML\" attribute is set to false, the characters \"&lt;&gt;&'\\\"\" are not converted to their entity codes");
       tcd.put(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_ACTIONURL26, "The \"escapeXML\" attribute default value is true");
       tcd.put(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_ACTIONURL27, "If the optional actionURL \"name\" attribute is set, the provided name string is used by GenericPortlet to dispatch the request to the coresponding annotated method");
       tcd.put(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_ACTIONURL28, "Setting the \"name\" attribute will add a parameter to the action URL with the name of \"javax.portlet.action\"");
@@ -1382,17 +1382,17 @@ public class JSR286SpecTestCaseDetails extends TestCaseDetails {
       tcd.put(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_RENDERURL15, "If the optional renderURL \"secure\" attribute is set to false, the resulting URL does not need to require a secure connection");
       tcd.put(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_RENDERURL17, "The \"secure\" attribute is not specified, the security setting is retained");
       tcd.put(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_RENDERURL18, "If the optional renderURL \"copyCurrentRenderParameters\" attribute is set to true, the current private render parameters are attached to the URL");
-      tcd.put(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_RENDERURL19, "If the optional renderURL \"copyCurrentRenderParameters\" attribute is set to true, additional parameters specified with the <portlet:param> element are merged with the render parameters");
-      tcd.put(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_RENDERURL20, "If the optional renderURL \"copyCurrentRenderParameters\" attribute is set to true, additional parameters specified with the <portlet:param> element appear in the values array before the render parameter values if there is a name conflict");
+      tcd.put(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_RENDERURL19, "If the optional renderURL \"copyCurrentRenderParameters\" attribute is set to true, additional parameters specified with the &lt;portlet:param&gt; element are merged with the render parameters");
+      tcd.put(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_RENDERURL20, "If the optional renderURL \"copyCurrentRenderParameters\" attribute is set to true, additional parameters specified with the &lt;portlet:param&gt; element appear in the values array before the render parameter values if there is a name conflict");
       tcd.put(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_RENDERURL21, "If the optional renderURL \"copyCurrentRenderParameters\" attribute is set to false, the current render parameters are not attached to the URL");
       tcd.put(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_RENDERURL22, "If the \"copyCurrentRenderParameters\" attribute specifies an invalid value, a JspException is thrown");
       tcd.put(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_RENDERURL23, "The \"copyCurrentRenderParameters\" attribute is not specified, the security setting is retained");
-      tcd.put(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_RENDERURL25, "If the optional renderURL \"escapeXML\" attribute is set to false, the characters \"<>&'\\\"\" are not converted to their entity codes");
+      tcd.put(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_RENDERURL25, "If the optional renderURL \"escapeXML\" attribute is set to false, the characters \"&lt;&gt;&'\\\"\" are not converted to their entity codes");
       tcd.put(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_RENDERURL26, "The \"escapeXML\" attribute default value is true");
       tcd.put(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_RESOURCEURL1, "The portlet resourceURL tag creates a URL that must point to the current portlet and must trigger an resource request with the supplied parameters");
       tcd.put(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_RESOURCEURL2, "The resourceURL must preserve the current portlet mode, window state and render parameters");
       tcd.put(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_RESOURCEURL3, "Resource parameters may be added to the URL by including the param tag between the resourceURL start and end tags");
-      tcd.put(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_RESOURCEURL4, "The resource parameters specified with the <portlet:param> element appear in the values array before the render parameter values if there is a name conflict");
+      tcd.put(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_RESOURCEURL4, "The resource parameters specified with the &lt;portlet:param&gt; element appear in the values array before the render parameter values if there is a name conflict");
       tcd.put(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_RESOURCEURL5, "The optional resourceURL \"var\" attribute can specify a scoped variable for exporting the action URL");
       tcd.put(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_RESOURCEURL6, "If the resourceURL \"var\" attribute is specified, the URL is not written to the JspWriter");
       tcd.put(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_RESOURCEURL7, "If the resourceURL \"var\" attribute is not specified, the URL is written to the JspWriter");
@@ -1400,12 +1400,12 @@ public class JSR286SpecTestCaseDetails extends TestCaseDetails {
       tcd.put(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_RESOURCEURL9, "If the optional resourceURL \"secure\" attribute is set to false, the resulting URL does not need to require a secure connection");
       tcd.put(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_RESOURCEURL11, "The \"secure\" attribute is not specified, the security setting is retained");
       tcd.put(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_RESOURCEURL12, "If the optional resourceURL \"copyCurrentRenderParameters\" attribute is set to true, the current private render parameters are attached to the URL");
-      tcd.put(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_RESOURCEURL13, "If the optional resourceURL \"copyCurrentRenderParameters\" attribute is set to true, additional parameters specified with the <portlet:param> element are merged with the render parameters");
-      tcd.put(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_RESOURCEURL14, "If the optional resourceURL \"copyCurrentRenderParameters\" attribute is set to true, additional parameters specified with the <portlet:param> element appear in the values array before the render parameter values if there is a name conflict");
+      tcd.put(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_RESOURCEURL13, "If the optional resourceURL \"copyCurrentRenderParameters\" attribute is set to true, additional parameters specified with the &lt;portlet:param&gt; element are merged with the render parameters");
+      tcd.put(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_RESOURCEURL14, "If the optional resourceURL \"copyCurrentRenderParameters\" attribute is set to true, additional parameters specified with the &lt;portlet:param&gt; element appear in the values array before the render parameter values if there is a name conflict");
       tcd.put(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_RESOURCEURL15, "If the optional resourceURL \"copyCurrentRenderParameters\" attribute is set to false, the current render parameters are not attached to the URL");
       tcd.put(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_RESOURCEURL16, "If the \"copyCurrentRenderParameters\" attribute specifies an invalid value, a JspException is thrown");
       tcd.put(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_RESOURCEURL17, "The \"copyCurrentRenderParameters\" attribute is not specified, the security setting is retained");
-      tcd.put(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_RESOURCEURL19, "If the optional resourceURL \"escapeXML\" attribute is set to false, the characters \"<>&'\\\"\" are not converted to their entity codes");
+      tcd.put(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_RESOURCEURL19, "If the optional resourceURL \"escapeXML\" attribute is set to false, the characters \"&lt;&gt;&'\\\"\" are not converted to their entity codes");
       tcd.put(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_RESOURCEURL20, "The \"escapeXML\" attribute default value is true");
       tcd.put(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_RESOURCEURL21, "If the optional resourceURL \"id\" attribute is set, the provided id string is used by GenericPortlet to dispatch the request to the coresponding annotated method");
       tcd.put(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_RESOURCEURL22, "Setting the \"id\" attribute will add a parameter to the action URL with the id of \"javax.portlet.action\"");


[21/22] Corrected implmentation of some dispatcher tests. Completed restructure of the spec tests (module names contain the string "Addl"). Completed restructuring the portlet tag library tests.

Posted by ms...@apache.org.
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/8bf37be8/portlet-tck_3.0/V2PortletTagLibraryTests/src/main/java/javax/portlet/tck/portlets/PortletTagLibraryTests_SPEC2_26_IncludeJSPAction.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2PortletTagLibraryTests/src/main/java/javax/portlet/tck/portlets/PortletTagLibraryTests_SPEC2_26_IncludeJSPAction.java b/portlet-tck_3.0/V2PortletTagLibraryTests/src/main/java/javax/portlet/tck/portlets/PortletTagLibraryTests_SPEC2_26_IncludeJSPAction.java
index 6b7da44..d1050eb 100644
--- a/portlet-tck_3.0/V2PortletTagLibraryTests/src/main/java/javax/portlet/tck/portlets/PortletTagLibraryTests_SPEC2_26_IncludeJSPAction.java
+++ b/portlet-tck_3.0/V2PortletTagLibraryTests/src/main/java/javax/portlet/tck/portlets/PortletTagLibraryTests_SPEC2_26_IncludeJSPAction.java
@@ -220,11 +220,12 @@ public class PortletTagLibraryTests_SPEC2_26_IncludeJSPAction implements Portlet
 
       /* TestCase: V2PortletTagLibraryTests_SPEC2_26_IncludeJSPAction_defineObjects11 */
       /* Details: "When included in the Action phase, the defineObjects tag   */
-      /* defines the variable Map<String, Object> portletSessionScope,        */
-      /* providing access to the portletSession attributes as a Map           */
-      /* equivalent to the PortletSession.getAttributeMap() call, does not    */
-      /* create a new session, only returns an existing session. If no        */
-      /* session attributes exist this method returns an empty Map."          */
+      /* defines the variable Map&lt;String, Object&gt;                       */
+      /* portletSessionScope, providing access to the portletSession          */
+      /* attributes as a Map equivalent to the                                */
+      /* PortletSession.getAttributeMap() call, does not create a new         */
+      /* session, only returns an existing session. If no session             */
+      /* attributes exist this method returns an empty Map."                  */
       {
          PortletURL aurl = portletResp.createActionURL();
          aurl.setParameters(portletReq.getPrivateParameterMap());
@@ -245,7 +246,7 @@ public class PortletTagLibraryTests_SPEC2_26_IncludeJSPAction implements Portlet
 
       /* TestCase: V2PortletTagLibraryTests_SPEC2_26_IncludeJSPAction_defineObjects13 */
       /* Details: "When included in the Action phase, the defineObjects tag   */
-      /* defines the variable Map<String, String[]>                           */
+      /* defines the variable Map&lt;String, String[]&gt;                     */
       /* portletPreferencesValues, providing access to the portlet            */
       /* preferences as a Map, equivalent to the                              */
       /* PortletPreferences.getMap() call. If no portlet preferences exist,   */

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/8bf37be8/portlet-tck_3.0/V2PortletTagLibraryTests/src/main/java/javax/portlet/tck/portlets/PortletTagLibraryTests_SPEC2_26_IncludeJSPEvent.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2PortletTagLibraryTests/src/main/java/javax/portlet/tck/portlets/PortletTagLibraryTests_SPEC2_26_IncludeJSPEvent.java b/portlet-tck_3.0/V2PortletTagLibraryTests/src/main/java/javax/portlet/tck/portlets/PortletTagLibraryTests_SPEC2_26_IncludeJSPEvent.java
index 4a6c1f9..735ad00 100644
--- a/portlet-tck_3.0/V2PortletTagLibraryTests/src/main/java/javax/portlet/tck/portlets/PortletTagLibraryTests_SPEC2_26_IncludeJSPEvent.java
+++ b/portlet-tck_3.0/V2PortletTagLibraryTests/src/main/java/javax/portlet/tck/portlets/PortletTagLibraryTests_SPEC2_26_IncludeJSPEvent.java
@@ -211,11 +211,12 @@ public class PortletTagLibraryTests_SPEC2_26_IncludeJSPEvent implements Portlet,
 
       /* TestCase: V2PortletTagLibraryTests_SPEC2_26_IncludeJSPEvent_defineObjects11 */
       /* Details: "When included in the Event phase, the defineObjects tag    */
-      /* defines the variable Map<String, Object> portletSessionScope,        */
-      /* providing access to the portletSession attributes as a Map           */
-      /* equivalent to the PortletSession.getAttributeMap() call, does not    */
-      /* create a new session, only returns an existing session. If no        */
-      /* session attributes exist this method returns an empty Map."          */
+      /* defines the variable Map&lt;String, Object&gt;                       */
+      /* portletSessionScope, providing access to the portletSession          */
+      /* attributes as a Map equivalent to the                                */
+      /* PortletSession.getAttributeMap() call, does not create a new         */
+      /* session, only returns an existing session. If no session             */
+      /* attributes exist this method returns an empty Map."                  */
       {
          PortletURL aurl = portletResp.createActionURL();
          aurl.setParameters(portletReq.getPrivateParameterMap());
@@ -236,7 +237,7 @@ public class PortletTagLibraryTests_SPEC2_26_IncludeJSPEvent implements Portlet,
 
       /* TestCase: V2PortletTagLibraryTests_SPEC2_26_IncludeJSPEvent_defineObjects13 */
       /* Details: "When included in the Event phase, the defineObjects tag    */
-      /* defines the variable Map<String, String[]>                           */
+      /* defines the variable Map&lt;String, String[]&gt;                     */
       /* portletPreferencesValues, providing access to the portlet            */
       /* preferences as a Map, equivalent to the                              */
       /* PortletPreferences.getMap() call. If no portlet preferences exist,   */

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/8bf37be8/portlet-tck_3.0/V2PortletTagLibraryTests/src/main/webapp/WEB-INF/jsp/PortletTagLibraryTests_SPEC2_26_IncludeJSPAction.jsp
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2PortletTagLibraryTests/src/main/webapp/WEB-INF/jsp/PortletTagLibraryTests_SPEC2_26_IncludeJSPAction.jsp b/portlet-tck_3.0/V2PortletTagLibraryTests/src/main/webapp/WEB-INF/jsp/PortletTagLibraryTests_SPEC2_26_IncludeJSPAction.jsp
index bb8d954..ca1590e 100644
--- a/portlet-tck_3.0/V2PortletTagLibraryTests/src/main/webapp/WEB-INF/jsp/PortletTagLibraryTests_SPEC2_26_IncludeJSPAction.jsp
+++ b/portlet-tck_3.0/V2PortletTagLibraryTests/src/main/webapp/WEB-INF/jsp/PortletTagLibraryTests_SPEC2_26_IncludeJSPAction.jsp
@@ -8,7 +8,6 @@
 <%@ page import="javax.portlet.tck.beans.*,javax.portlet.tck.constants.*" %>
 <%@ page import="static javax.portlet.tck.constants.Constants.*" %>
 <%@ page import="static javax.portlet.tck.beans.JSR286SpecTestCaseDetails.*" %>
-
 <%
 
       PortletRequest portletReq = (PortletRequest) request.getAttribute("javax.portlet.request");
@@ -115,11 +114,12 @@
 
       /* TestCase: V2PortletTagLibraryTests_SPEC2_26_IncludeJSPAction_defineObjects11 */
       /* Details: "When included in the Action phase, the defineObjects tag   */
-      /* defines the variable Map<String, Object> portletSessionScope,        */
-      /* providing access to the portletSession attributes as a Map           */
-      /* equivalent to the PortletSession.getAttributeMap() call, does not    */
-      /* create a new session, only returns an existing session. If no        */
-      /* session attributes exist this method returns an empty Map."          */
+      /* defines the variable Map&lt;String, Object&gt;                       */
+      /* portletSessionScope, providing access to the portletSession          */
+      /* attributes as a Map equivalent to the                                */
+      /* PortletSession.getAttributeMap() call, does not create a new         */
+      /* session, only returns an existing session. If no session             */
+      /* attributes exist this method returns an empty Map."                  */
       TestResult tr10 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS_SPEC2_26_INCLUDEJSPACTION_DEFINEOBJECTS11);
       /* TODO: implement test */
       tr10.appendTcDetail("Not implemented.");
@@ -136,7 +136,7 @@
 
       /* TestCase: V2PortletTagLibraryTests_SPEC2_26_IncludeJSPAction_defineObjects13 */
       /* Details: "When included in the Action phase, the defineObjects tag   */
-      /* defines the variable Map<String, String[]>                           */
+      /* defines the variable Map&lt;String, String[]&gt;                     */
       /* portletPreferencesValues, providing access to the portlet            */
       /* preferences as a Map, equivalent to the                              */
       /* PortletPreferences.getMap() call. If no portlet preferences exist,   */

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/8bf37be8/portlet-tck_3.0/V2PortletTagLibraryTests/src/main/webapp/WEB-INF/jsp/PortletTagLibraryTests_SPEC2_26_IncludeJSPEvent.jsp
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2PortletTagLibraryTests/src/main/webapp/WEB-INF/jsp/PortletTagLibraryTests_SPEC2_26_IncludeJSPEvent.jsp b/portlet-tck_3.0/V2PortletTagLibraryTests/src/main/webapp/WEB-INF/jsp/PortletTagLibraryTests_SPEC2_26_IncludeJSPEvent.jsp
index 09ec423..f8a92e2 100644
--- a/portlet-tck_3.0/V2PortletTagLibraryTests/src/main/webapp/WEB-INF/jsp/PortletTagLibraryTests_SPEC2_26_IncludeJSPEvent.jsp
+++ b/portlet-tck_3.0/V2PortletTagLibraryTests/src/main/webapp/WEB-INF/jsp/PortletTagLibraryTests_SPEC2_26_IncludeJSPEvent.jsp
@@ -8,7 +8,6 @@
 <%@ page import="javax.portlet.tck.beans.*,javax.portlet.tck.constants.*" %>
 <%@ page import="static javax.portlet.tck.constants.Constants.*" %>
 <%@ page import="static javax.portlet.tck.beans.JSR286SpecTestCaseDetails.*" %>
-
 <%
 
       PortletRequest portletReq = (PortletRequest) request.getAttribute("javax.portlet.request");
@@ -115,11 +114,12 @@
 
       /* TestCase: V2PortletTagLibraryTests_SPEC2_26_IncludeJSPEvent_defineObjects11 */
       /* Details: "When included in the Event phase, the defineObjects tag    */
-      /* defines the variable Map<String, Object> portletSessionScope,        */
-      /* providing access to the portletSession attributes as a Map           */
-      /* equivalent to the PortletSession.getAttributeMap() call, does not    */
-      /* create a new session, only returns an existing session. If no        */
-      /* session attributes exist this method returns an empty Map."          */
+      /* defines the variable Map&lt;String, Object&gt;                       */
+      /* portletSessionScope, providing access to the portletSession          */
+      /* attributes as a Map equivalent to the                                */
+      /* PortletSession.getAttributeMap() call, does not create a new         */
+      /* session, only returns an existing session. If no session             */
+      /* attributes exist this method returns an empty Map."                  */
       TestResult tr10 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS_SPEC2_26_INCLUDEJSPEVENT_DEFINEOBJECTS11);
       /* TODO: implement test */
       tr10.appendTcDetail("Not implemented.");
@@ -136,7 +136,7 @@
 
       /* TestCase: V2PortletTagLibraryTests_SPEC2_26_IncludeJSPEvent_defineObjects13 */
       /* Details: "When included in the Event phase, the defineObjects tag    */
-      /* defines the variable Map<String, String[]>                           */
+      /* defines the variable Map&lt;String, String[]&gt;                     */
       /* portletPreferencesValues, providing access to the portlet            */
       /* preferences as a Map, equivalent to the                              */
       /* PortletPreferences.getMap() call. If no portlet preferences exist,   */

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/8bf37be8/portlet-tck_3.0/V2PortletTagLibraryTests/src/main/webapp/WEB-INF/jsp/PortletTagLibraryTests_SPEC2_26_IncludeJSPGeneral.jsp
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2PortletTagLibraryTests/src/main/webapp/WEB-INF/jsp/PortletTagLibraryTests_SPEC2_26_IncludeJSPGeneral.jsp b/portlet-tck_3.0/V2PortletTagLibraryTests/src/main/webapp/WEB-INF/jsp/PortletTagLibraryTests_SPEC2_26_IncludeJSPGeneral.jsp
index d0aebe1..cafd35e 100644
--- a/portlet-tck_3.0/V2PortletTagLibraryTests/src/main/webapp/WEB-INF/jsp/PortletTagLibraryTests_SPEC2_26_IncludeJSPGeneral.jsp
+++ b/portlet-tck_3.0/V2PortletTagLibraryTests/src/main/webapp/WEB-INF/jsp/PortletTagLibraryTests_SPEC2_26_IncludeJSPGeneral.jsp
@@ -8,7 +8,6 @@
 <%@ page import="javax.portlet.tck.beans.*,javax.portlet.tck.constants.*" %>
 <%@ page import="static javax.portlet.tck.constants.Constants.*" %>
 <%@ page import="static javax.portlet.tck.beans.JSR286SpecTestCaseDetails.*" %>
-
 <%
 
       PortletRequest portletReq = (PortletRequest) request.getAttribute("javax.portlet.request");
@@ -24,8 +23,9 @@
       // Create result objects for the tests
 
       /* TestCase: V2PortletTagLibraryTests_SPEC2_26_IncludeJSPGeneral_defineObjects3 */
-      /* Details: "The version 1.0 tag library may be referenced using <%@    */
-      /* taglib uri=\"http://java.sun.com/portlet\" prefix=\"portlet\" %>"    */
+      /* Details: "The version 1.0 tag library may be referenced using        */
+      /* &lt;%@ taglib uri=\"http://java.sun.com/portlet\"                    */
+      /* prefix=\"portlet\" %&gt;"                                            */
       TestResult tr0 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS_SPEC2_26_INCLUDEJSPGENERAL_DEFINEOBJECTS3);
       /* TODO: implement test */
       tr0.appendTcDetail("Not implemented.");
@@ -41,8 +41,8 @@
 
       /* TestCase: V2PortletTagLibraryTests_SPEC2_26_IncludeJSPGeneral_defineObjects2 */
       /* Details: "In order to obtain version 2 support, the tag library      */
-      /* must be specified as <%@ taglib                                      */
-      /* uri=\"http://java.sun.com/portlet_2_0\" prefix=\"portlet\" %>"       */
+      /* must be specified as &lt;%@ taglib                                   */
+      /* uri=\"http://java.sun.com/portlet_2_0\" prefix=\"portlet\" %&gt;"    */
       TestResult tr2 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS_SPEC2_26_INCLUDEJSPGENERAL_DEFINEOBJECTS2);
       /* TODO: implement test */
       tr2.appendTcDetail("Not implemented.");

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/8bf37be8/portlet-tck_3.0/V2PortletTagLibraryTests2/src/main/webapp/WEB-INF/jsp/PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender.jsp
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2PortletTagLibraryTests2/src/main/webapp/WEB-INF/jsp/PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender.jsp b/portlet-tck_3.0/V2PortletTagLibraryTests2/src/main/webapp/WEB-INF/jsp/PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender.jsp
index 7f58c3a..a4690bc 100644
--- a/portlet-tck_3.0/V2PortletTagLibraryTests2/src/main/webapp/WEB-INF/jsp/PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender.jsp
+++ b/portlet-tck_3.0/V2PortletTagLibraryTests2/src/main/webapp/WEB-INF/jsp/PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender.jsp
@@ -8,7 +8,6 @@
 <%@ page import="javax.portlet.tck.beans.*,javax.portlet.tck.constants.*" %>
 <%@ page import="static javax.portlet.tck.constants.Constants.*" %>
 <%@ page import="static javax.portlet.tck.beans.JSR286SpecTestCaseDetails.*" %>
-
 <%
 
       PortletRequest portletReq = (PortletRequest) request.getAttribute("javax.portlet.request");
@@ -115,11 +114,12 @@
 
       /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_defineObjectsRender11 */
       /* Details: "When included in the Render phase, the defineObjects tag   */
-      /* defines the variable Map<String, Object> portletSessionScope,        */
-      /* providing access to the portletSession attributes as a Map           */
-      /* equivalent to the PortletSession.getAttributeMap() call, does not    */
-      /* create a new session, only returns an existing session. If no        */
-      /* session attributes exist this method returns an empty Map."          */
+      /* defines the variable Map&lt;String, Object&gt;                       */
+      /* portletSessionScope, providing access to the portletSession          */
+      /* attributes as a Map equivalent to the                                */
+      /* PortletSession.getAttributeMap() call, does not create a new         */
+      /* session, only returns an existing session. If no session             */
+      /* attributes exist this method returns an empty Map."                  */
       TestResult tr10 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_DEFINEOBJECTSRENDER11);
       /* TODO: implement test */
       tr10.appendTcDetail("Not implemented.");
@@ -136,7 +136,7 @@
 
       /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_defineObjectsRender13 */
       /* Details: "When included in the Render phase, the defineObjects tag   */
-      /* defines the variable Map<String, String[]>                           */
+      /* defines the variable Map&lt;String, String[]&gt;                     */
       /* portletPreferencesValues, providing access to the portlet            */
       /* preferences as a Map, equivalent to the                              */
       /* PortletPreferences.getMap() call. If no portlet preferences exist,   */
@@ -288,8 +288,8 @@
       /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_actionURL19 */
       /* Details: "If the optional actionURL                                  */
       /* \"copyCurrentRenderParameters\" attribute is set to true,            */
-      /* additional parameters specified with the <portlet:param> element     */
-      /* are merged with the render parameters"                               */
+      /* additional parameters specified with the &lt;portlet:param&gt;       */
+      /* element are merged with the render parameters"                       */
       TestResult tr30 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_ACTIONURL19);
       /* TODO: implement test */
       tr30.appendTcDetail("Not implemented.");
@@ -298,9 +298,9 @@
       /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_actionURL20 */
       /* Details: "If the optional actionURL                                  */
       /* \"copyCurrentRenderParameters\" attribute is set to true,            */
-      /* additional parameters specified with the <portlet:param> element     */
-      /* appear in the values array before the render parameter values if     */
-      /* there is a name conflict"                                            */
+      /* additional parameters specified with the &lt;portlet:param&gt;       */
+      /* element appear in the values array before the render parameter       */
+      /* values if there is a name conflict"                                  */
       TestResult tr31 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_ACTIONURL20);
       /* TODO: implement test */
       tr31.appendTcDetail("Not implemented.");
@@ -333,8 +333,8 @@
 
       /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_actionURL25 */
       /* Details: "If the optional actionURL \"escapeXML\" attribute is set   */
-      /* to false, the characters \"<>&'\\\"\" are not converted to their     */
-      /* entity codes"                                                        */
+      /* to false, the characters \"&lt;&gt;&'\\\"\" are not converted to     */
+      /* their entity codes"                                                  */
       TestResult tr35 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_ACTIONURL25);
       /* TODO: implement test */
       tr35.appendTcDetail("Not implemented.");
@@ -526,8 +526,8 @@
       /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_renderURL19 */
       /* Details: "If the optional renderURL                                  */
       /* \"copyCurrentRenderParameters\" attribute is set to true,            */
-      /* additional parameters specified with the <portlet:param> element     */
-      /* are merged with the render parameters"                               */
+      /* additional parameters specified with the &lt;portlet:param&gt;       */
+      /* element are merged with the render parameters"                       */
       TestResult tr58 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_RENDERURL19);
       /* TODO: implement test */
       tr58.appendTcDetail("Not implemented.");
@@ -536,9 +536,9 @@
       /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_renderURL20 */
       /* Details: "If the optional renderURL                                  */
       /* \"copyCurrentRenderParameters\" attribute is set to true,            */
-      /* additional parameters specified with the <portlet:param> element     */
-      /* appear in the values array before the render parameter values if     */
-      /* there is a name conflict"                                            */
+      /* additional parameters specified with the &lt;portlet:param&gt;       */
+      /* element appear in the values array before the render parameter       */
+      /* values if there is a name conflict"                                  */
       TestResult tr59 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_RENDERURL20);
       /* TODO: implement test */
       tr59.appendTcDetail("Not implemented.");
@@ -571,8 +571,8 @@
 
       /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_renderURL25 */
       /* Details: "If the optional renderURL \"escapeXML\" attribute is set   */
-      /* to false, the characters \"<>&'\\\"\" are not converted to their     */
-      /* entity codes"                                                        */
+      /* to false, the characters \"&lt;&gt;&'\\\"\" are not converted to     */
+      /* their entity codes"                                                  */
       TestResult tr63 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_RENDERURL25);
       /* TODO: implement test */
       tr63.appendTcDetail("Not implemented.");
@@ -612,8 +612,8 @@
 
       /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_resourceURL4 */
       /* Details: "The resource parameters specified with the                 */
-      /* <portlet:param> element appear in the values array before the        */
-      /* render parameter values if there is a name conflict"                 */
+      /* &lt;portlet:param&gt; element appear in the values array before      */
+      /* the render parameter values if there is a name conflict"             */
       TestResult tr68 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_RESOURCEURL4);
       /* TODO: implement test */
       tr68.appendTcDetail("Not implemented.");
@@ -680,8 +680,8 @@
       /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_resourceURL13 */
       /* Details: "If the optional resourceURL                                */
       /* \"copyCurrentRenderParameters\" attribute is set to true,            */
-      /* additional parameters specified with the <portlet:param> element     */
-      /* are merged with the render parameters"                               */
+      /* additional parameters specified with the &lt;portlet:param&gt;       */
+      /* element are merged with the render parameters"                       */
       TestResult tr76 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_RESOURCEURL13);
       /* TODO: implement test */
       tr76.appendTcDetail("Not implemented.");
@@ -690,9 +690,9 @@
       /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_resourceURL14 */
       /* Details: "If the optional resourceURL                                */
       /* \"copyCurrentRenderParameters\" attribute is set to true,            */
-      /* additional parameters specified with the <portlet:param> element     */
-      /* appear in the values array before the render parameter values if     */
-      /* there is a name conflict"                                            */
+      /* additional parameters specified with the &lt;portlet:param&gt;       */
+      /* element appear in the values array before the render parameter       */
+      /* values if there is a name conflict"                                  */
       TestResult tr77 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_RESOURCEURL14);
       /* TODO: implement test */
       tr77.appendTcDetail("Not implemented.");
@@ -725,8 +725,8 @@
 
       /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_resourceURL19 */
       /* Details: "If the optional resourceURL \"escapeXML\" attribute is     */
-      /* set to false, the characters \"<>&'\\\"\" are not converted to       */
-      /* their entity codes"                                                  */
+      /* set to false, the characters \"&lt;&gt;&'\\\"\" are not converted    */
+      /* to their entity codes"                                               */
       TestResult tr81 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_RESOURCEURL19);
       /* TODO: implement test */
       tr81.appendTcDetail("Not implemented.");

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/8bf37be8/portlet-tck_3.0/V2PortletTagLibraryTests3/src/main/webapp/WEB-INF/jsp/PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource.jsp
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2PortletTagLibraryTests3/src/main/webapp/WEB-INF/jsp/PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource.jsp b/portlet-tck_3.0/V2PortletTagLibraryTests3/src/main/webapp/WEB-INF/jsp/PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource.jsp
index c9f2c9e..c264b50 100644
--- a/portlet-tck_3.0/V2PortletTagLibraryTests3/src/main/webapp/WEB-INF/jsp/PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource.jsp
+++ b/portlet-tck_3.0/V2PortletTagLibraryTests3/src/main/webapp/WEB-INF/jsp/PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource.jsp
@@ -8,7 +8,6 @@
 <%@ page import="javax.portlet.tck.beans.*,javax.portlet.tck.constants.*" %>
 <%@ page import="static javax.portlet.tck.constants.Constants.*" %>
 <%@ page import="static javax.portlet.tck.beans.JSR286SpecTestCaseDetails.*" %>
-
 <%
 
       PortletRequest portletReq = (PortletRequest) request.getAttribute("javax.portlet.request");
@@ -115,11 +114,12 @@
 
       /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_defineObjectsResource11 */
       /* Details: "When included in the Resource phase, the defineObjects     */
-      /* tag defines the variable Map<String, Object> portletSessionScope,    */
-      /* providing access to the portletSession attributes as a Map           */
-      /* equivalent to the PortletSession.getAttributeMap() call, does not    */
-      /* create a new session, only returns an existing session. If no        */
-      /* session attributes exist this method returns an empty Map."          */
+      /* tag defines the variable Map&lt;String, Object&gt;                   */
+      /* portletSessionScope, providing access to the portletSession          */
+      /* attributes as a Map equivalent to the                                */
+      /* PortletSession.getAttributeMap() call, does not create a new         */
+      /* session, only returns an existing session. If no session             */
+      /* attributes exist this method returns an empty Map."                  */
       TestResult tr10 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_DEFINEOBJECTSRESOURCE11);
       /* TODO: implement test */
       tr10.appendTcDetail("Not implemented.");
@@ -136,7 +136,7 @@
 
       /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_defineObjectsResource13 */
       /* Details: "When included in the Resource phase, the defineObjects     */
-      /* tag defines the variable Map<String, String[]>                       */
+      /* tag defines the variable Map&lt;String, String[]&gt;                 */
       /* portletPreferencesValues, providing access to the portlet            */
       /* preferences as a Map, equivalent to the                              */
       /* PortletPreferences.getMap() call. If no portlet preferences exist,   */
@@ -288,8 +288,8 @@
       /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_actionURL19 */
       /* Details: "If the optional actionURL                                  */
       /* \"copyCurrentRenderParameters\" attribute is set to true,            */
-      /* additional parameters specified with the <portlet:param> element     */
-      /* are merged with the render parameters"                               */
+      /* additional parameters specified with the &lt;portlet:param&gt;       */
+      /* element are merged with the render parameters"                       */
       TestResult tr30 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_ACTIONURL19);
       /* TODO: implement test */
       tr30.appendTcDetail("Not implemented.");
@@ -298,9 +298,9 @@
       /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_actionURL20 */
       /* Details: "If the optional actionURL                                  */
       /* \"copyCurrentRenderParameters\" attribute is set to true,            */
-      /* additional parameters specified with the <portlet:param> element     */
-      /* appear in the values array before the render parameter values if     */
-      /* there is a name conflict"                                            */
+      /* additional parameters specified with the &lt;portlet:param&gt;       */
+      /* element appear in the values array before the render parameter       */
+      /* values if there is a name conflict"                                  */
       TestResult tr31 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_ACTIONURL20);
       /* TODO: implement test */
       tr31.appendTcDetail("Not implemented.");
@@ -333,8 +333,8 @@
 
       /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_actionURL25 */
       /* Details: "If the optional actionURL \"escapeXML\" attribute is set   */
-      /* to false, the characters \"<>&'\\\"\" are not converted to their     */
-      /* entity codes"                                                        */
+      /* to false, the characters \"&lt;&gt;&'\\\"\" are not converted to     */
+      /* their entity codes"                                                  */
       TestResult tr35 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_ACTIONURL25);
       /* TODO: implement test */
       tr35.appendTcDetail("Not implemented.");
@@ -526,8 +526,8 @@
       /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_renderURL19 */
       /* Details: "If the optional renderURL                                  */
       /* \"copyCurrentRenderParameters\" attribute is set to true,            */
-      /* additional parameters specified with the <portlet:param> element     */
-      /* are merged with the render parameters"                               */
+      /* additional parameters specified with the &lt;portlet:param&gt;       */
+      /* element are merged with the render parameters"                       */
       TestResult tr58 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_RENDERURL19);
       /* TODO: implement test */
       tr58.appendTcDetail("Not implemented.");
@@ -536,9 +536,9 @@
       /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_renderURL20 */
       /* Details: "If the optional renderURL                                  */
       /* \"copyCurrentRenderParameters\" attribute is set to true,            */
-      /* additional parameters specified with the <portlet:param> element     */
-      /* appear in the values array before the render parameter values if     */
-      /* there is a name conflict"                                            */
+      /* additional parameters specified with the &lt;portlet:param&gt;       */
+      /* element appear in the values array before the render parameter       */
+      /* values if there is a name conflict"                                  */
       TestResult tr59 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_RENDERURL20);
       /* TODO: implement test */
       tr59.appendTcDetail("Not implemented.");
@@ -571,8 +571,8 @@
 
       /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_renderURL25 */
       /* Details: "If the optional renderURL \"escapeXML\" attribute is set   */
-      /* to false, the characters \"<>&'\\\"\" are not converted to their     */
-      /* entity codes"                                                        */
+      /* to false, the characters \"&lt;&gt;&'\\\"\" are not converted to     */
+      /* their entity codes"                                                  */
       TestResult tr63 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_RENDERURL25);
       /* TODO: implement test */
       tr63.appendTcDetail("Not implemented.");
@@ -612,8 +612,8 @@
 
       /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_resourceURL4 */
       /* Details: "The resource parameters specified with the                 */
-      /* <portlet:param> element appear in the values array before the        */
-      /* render parameter values if there is a name conflict"                 */
+      /* &lt;portlet:param&gt; element appear in the values array before      */
+      /* the render parameter values if there is a name conflict"             */
       TestResult tr68 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_RESOURCEURL4);
       /* TODO: implement test */
       tr68.appendTcDetail("Not implemented.");
@@ -680,8 +680,8 @@
       /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_resourceURL13 */
       /* Details: "If the optional resourceURL                                */
       /* \"copyCurrentRenderParameters\" attribute is set to true,            */
-      /* additional parameters specified with the <portlet:param> element     */
-      /* are merged with the render parameters"                               */
+      /* additional parameters specified with the &lt;portlet:param&gt;       */
+      /* element are merged with the render parameters"                       */
       TestResult tr76 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_RESOURCEURL13);
       /* TODO: implement test */
       tr76.appendTcDetail("Not implemented.");
@@ -690,9 +690,9 @@
       /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_resourceURL14 */
       /* Details: "If the optional resourceURL                                */
       /* \"copyCurrentRenderParameters\" attribute is set to true,            */
-      /* additional parameters specified with the <portlet:param> element     */
-      /* appear in the values array before the render parameter values if     */
-      /* there is a name conflict"                                            */
+      /* additional parameters specified with the &lt;portlet:param&gt;       */
+      /* element appear in the values array before the render parameter       */
+      /* values if there is a name conflict"                                  */
       TestResult tr77 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_RESOURCEURL14);
       /* TODO: implement test */
       tr77.appendTcDetail("Not implemented.");
@@ -725,8 +725,8 @@
 
       /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_resourceURL19 */
       /* Details: "If the optional resourceURL \"escapeXML\" attribute is     */
-      /* set to false, the characters \"<>&'\\\"\" are not converted to       */
-      /* their entity codes"                                                  */
+      /* set to false, the characters \"&lt;&gt;&'\\\"\" are not converted    */
+      /* to their entity codes"                                               */
       TestResult tr81 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_RESOURCEURL19);
       /* TODO: implement test */
       tr81.appendTcDetail("Not implemented.");


[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.

Posted by ms...@apache.org.
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");
    }
 
 }
-


[05/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.

Posted by ms...@apache.org.
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/23a1c547/portlet-tck_3.0/V2PortletTagLibraryTests2/src/main/java/javax/portlet/tck/portlets/PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2PortletTagLibraryTests2/src/main/java/javax/portlet/tck/portlets/PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender.java b/portlet-tck_3.0/V2PortletTagLibraryTests2/src/main/java/javax/portlet/tck/portlets/PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender.java
new file mode 100644
index 0000000..2acb466
--- /dev/null
+++ b/portlet-tck_3.0/V2PortletTagLibraryTests2/src/main/java/javax/portlet/tck/portlets/PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender.java
@@ -0,0 +1,106 @@
+/*  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 PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_event
+ *
+ */
+public class PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender implements Portlet, ResourceServingPortlet {
+   private static final String LOG_CLASS = 
+         PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender.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();
+
+   }
+
+   @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();
+
+      // Now do the actual dispatch
+      String target = JSP_PREFIX + "PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender" + JSP_SUFFIX + "?" + QUERY_STRING;
+      PortletRequestDispatcher rd = portletConfig.getPortletContext()
+            .getRequestDispatcher(target);
+      rd.include(portletReq, portletResp);
+   }
+
+}

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/23a1c547/portlet-tck_3.0/V2PortletTagLibraryTests2/src/main/resources/xml-resources/additionalTCs.xml
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2PortletTagLibraryTests2/src/main/resources/xml-resources/additionalTCs.xml b/portlet-tck_3.0/V2PortletTagLibraryTests2/src/main/resources/xml-resources/additionalTCs.xml
new file mode 100644
index 0000000..c6b6fc7
--- /dev/null
+++ b/portlet-tck_3.0/V2PortletTagLibraryTests2/src/main/resources/xml-resources/additionalTCs.xml
@@ -0,0 +1,149 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    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.     
+-->
+<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
+<properties>
+<!-- JSR 286 API PortletTagLibraryTests2 test case names and page mappings -->
+<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_defineObjectsRender1">V2PortletTagLibraryTests2</entry>
+<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_defineObjectsRender2">V2PortletTagLibraryTests2</entry>
+<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_defineObjectsRender3">V2PortletTagLibraryTests2</entry>
+<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_defineObjectsRender4">V2PortletTagLibraryTests2</entry>
+<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_defineObjectsRender5">V2PortletTagLibraryTests2</entry>
+<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_defineObjectsRender6">V2PortletTagLibraryTests2</entry>
+<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_defineObjectsRender7">V2PortletTagLibraryTests2</entry>
+<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_defineObjectsRender8">V2PortletTagLibraryTests2</entry>
+<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_defineObjectsRender9">V2PortletTagLibraryTests2</entry>
+<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_defineObjectsRender10">V2PortletTagLibraryTests2</entry>
+<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_defineObjectsRender11">V2PortletTagLibraryTests2</entry>
+<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_defineObjectsRender12">V2PortletTagLibraryTests2</entry>
+<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_defineObjectsRender13">V2PortletTagLibraryTests2</entry>
+<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_actionURL1">V2PortletTagLibraryTests2</entry>
+<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_actionURL2">V2PortletTagLibraryTests2</entry>
+<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_actionURL3">V2PortletTagLibraryTests2</entry>
+<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_actionURL4">V2PortletTagLibraryTests2</entry>
+<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_actionURL5">V2PortletTagLibraryTests2</entry>
+<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_actionURL6">V2PortletTagLibraryTests2</entry>
+<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_actionURL7">V2PortletTagLibraryTests2</entry>
+<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_actionURL8">V2PortletTagLibraryTests2</entry>
+<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_actionURL9">V2PortletTagLibraryTests2</entry>
+<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_actionURL10">V2PortletTagLibraryTests2</entry>
+<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_actionURL11">V2PortletTagLibraryTests2</entry>
+<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_actionURL12">V2PortletTagLibraryTests2</entry>
+<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_actionURL13">V2PortletTagLibraryTests2</entry>
+<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_actionURL14">V2PortletTagLibraryTests2</entry>
+<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_actionURL15">V2PortletTagLibraryTests2</entry>
+<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_actionURL17">V2PortletTagLibraryTests2</entry>
+<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_actionURL18">V2PortletTagLibraryTests2</entry>
+<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_actionURL19">V2PortletTagLibraryTests2</entry>
+<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_actionURL20">V2PortletTagLibraryTests2</entry>
+<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_actionURL21">V2PortletTagLibraryTests2</entry>
+<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_actionURL22">V2PortletTagLibraryTests2</entry>
+<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_actionURL23">V2PortletTagLibraryTests2</entry>
+<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_actionURL25">V2PortletTagLibraryTests2</entry>
+<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_actionURL26">V2PortletTagLibraryTests2</entry>
+<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_actionURL27">V2PortletTagLibraryTests2</entry>
+<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_actionURL28">V2PortletTagLibraryTests2</entry>
+<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_actionURL29">V2PortletTagLibraryTests2</entry>
+<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_actionURL30">V2PortletTagLibraryTests2</entry>
+<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_renderURL1">V2PortletTagLibraryTests2</entry>
+<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_renderURL2">V2PortletTagLibraryTests2</entry>
+<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_renderURL3">V2PortletTagLibraryTests2</entry>
+<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_renderURL4">V2PortletTagLibraryTests2</entry>
+<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_renderURL5">V2PortletTagLibraryTests2</entry>
+<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_renderURL6">V2PortletTagLibraryTests2</entry>
+<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_renderURL7">V2PortletTagLibraryTests2</entry>
+<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_renderURL8">V2PortletTagLibraryTests2</entry>
+<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_renderURL9">V2PortletTagLibraryTests2</entry>
+<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_renderURL10">V2PortletTagLibraryTests2</entry>
+<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_renderURL11">V2PortletTagLibraryTests2</entry>
+<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_renderURL12">V2PortletTagLibraryTests2</entry>
+<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_renderURL13">V2PortletTagLibraryTests2</entry>
+<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_renderURL14">V2PortletTagLibraryTests2</entry>
+<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_renderURL15">V2PortletTagLibraryTests2</entry>
+<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_renderURL17">V2PortletTagLibraryTests2</entry>
+<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_renderURL18">V2PortletTagLibraryTests2</entry>
+<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_renderURL19">V2PortletTagLibraryTests2</entry>
+<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_renderURL20">V2PortletTagLibraryTests2</entry>
+<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_renderURL21">V2PortletTagLibraryTests2</entry>
+<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_renderURL22">V2PortletTagLibraryTests2</entry>
+<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_renderURL23">V2PortletTagLibraryTests2</entry>
+<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_renderURL25">V2PortletTagLibraryTests2</entry>
+<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_renderURL26">V2PortletTagLibraryTests2</entry>
+<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_resourceURL1">V2PortletTagLibraryTests2</entry>
+<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_resourceURL2">V2PortletTagLibraryTests2</entry>
+<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_resourceURL3">V2PortletTagLibraryTests2</entry>
+<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_resourceURL4">V2PortletTagLibraryTests2</entry>
+<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_resourceURL5">V2PortletTagLibraryTests2</entry>
+<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_resourceURL6">V2PortletTagLibraryTests2</entry>
+<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_resourceURL7">V2PortletTagLibraryTests2</entry>
+<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_resourceURL8">V2PortletTagLibraryTests2</entry>
+<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_resourceURL9">V2PortletTagLibraryTests2</entry>
+<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_resourceURL11">V2PortletTagLibraryTests2</entry>
+<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_resourceURL12">V2PortletTagLibraryTests2</entry>
+<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_resourceURL13">V2PortletTagLibraryTests2</entry>
+<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_resourceURL14">V2PortletTagLibraryTests2</entry>
+<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_resourceURL15">V2PortletTagLibraryTests2</entry>
+<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_resourceURL16">V2PortletTagLibraryTests2</entry>
+<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_resourceURL17">V2PortletTagLibraryTests2</entry>
+<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_resourceURL19">V2PortletTagLibraryTests2</entry>
+<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_resourceURL20">V2PortletTagLibraryTests2</entry>
+<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_resourceURL21">V2PortletTagLibraryTests2</entry>
+<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_resourceURL22">V2PortletTagLibraryTests2</entry>
+<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_resourceURL23">V2PortletTagLibraryTests2</entry>
+<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_resourceURL24">V2PortletTagLibraryTests2</entry>
+<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_resourceURL25">V2PortletTagLibraryTests2</entry>
+<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_resourceURL26">V2PortletTagLibraryTests2</entry>
+<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_resourceURL27">V2PortletTagLibraryTests2</entry>
+<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_paramAction1">V2PortletTagLibraryTests2</entry>
+<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_paramAction2">V2PortletTagLibraryTests2</entry>
+<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_paramAction3">V2PortletTagLibraryTests2</entry>
+<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_paramAction4">V2PortletTagLibraryTests2</entry>
+<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_paramAction5">V2PortletTagLibraryTests2</entry>
+<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_paramAction6">V2PortletTagLibraryTests2</entry>
+<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_paramRender1">V2PortletTagLibraryTests2</entry>
+<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_paramRender2">V2PortletTagLibraryTests2</entry>
+<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_paramRender3">V2PortletTagLibraryTests2</entry>
+<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_paramRender4">V2PortletTagLibraryTests2</entry>
+<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_paramRender5">V2PortletTagLibraryTests2</entry>
+<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_paramRender6">V2PortletTagLibraryTests2</entry>
+<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_paramResource1">V2PortletTagLibraryTests2</entry>
+<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_paramResource2">V2PortletTagLibraryTests2</entry>
+<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_paramResource3">V2PortletTagLibraryTests2</entry>
+<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_paramResource4">V2PortletTagLibraryTests2</entry>
+<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_paramResource5">V2PortletTagLibraryTests2</entry>
+<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_paramResource6">V2PortletTagLibraryTests2</entry>
+<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_propertyAction1">V2PortletTagLibraryTests2</entry>
+<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_propertyAction2">V2PortletTagLibraryTests2</entry>
+<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_propertyAction3">V2PortletTagLibraryTests2</entry>
+<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_propertyAction4">V2PortletTagLibraryTests2</entry>
+<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_propertyAction5">V2PortletTagLibraryTests2</entry>
+<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_propertyAction6">V2PortletTagLibraryTests2</entry>
+<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_propertyRender1">V2PortletTagLibraryTests2</entry>
+<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_propertyRender2">V2PortletTagLibraryTests2</entry>
+<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_propertyRender3">V2PortletTagLibraryTests2</entry>
+<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_propertyRender4">V2PortletTagLibraryTests2</entry>
+<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_propertyRender5">V2PortletTagLibraryTests2</entry>
+<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_propertyRender6">V2PortletTagLibraryTests2</entry>
+<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_propertyResource1">V2PortletTagLibraryTests2</entry>
+<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_propertyResource2">V2PortletTagLibraryTests2</entry>
+<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_propertyResource3">V2PortletTagLibraryTests2</entry>
+<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_propertyResource4">V2PortletTagLibraryTests2</entry>
+<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_propertyResource5">V2PortletTagLibraryTests2</entry>
+<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_propertyResource6">V2PortletTagLibraryTests2</entry>
+</properties>

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/23a1c547/portlet-tck_3.0/V2PortletTagLibraryTests2/src/main/webapp/WEB-INF/jsp/PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender.jsp
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2PortletTagLibraryTests2/src/main/webapp/WEB-INF/jsp/PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender.jsp b/portlet-tck_3.0/V2PortletTagLibraryTests2/src/main/webapp/WEB-INF/jsp/PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender.jsp
new file mode 100644
index 0000000..7f58c3a
--- /dev/null
+++ b/portlet-tck_3.0/V2PortletTagLibraryTests2/src/main/webapp/WEB-INF/jsp/PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender.jsp
@@ -0,0 +1,1096 @@
+<%@ page session="false" %>
+<%@ taglib uri="http://java.sun.com/portlet_2_0"  prefix="portlet" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ page import="java.io.*,java.util.*,java.util.logging.*" %>
+<%@ page import="static java.util.logging.Logger.*" %>
+<%@ page import="javax.portlet.*,javax.portlet.filter.*" %>
+<%@ page import="javax.servlet.http.*,javax.servlet.*" %>
+<%@ page import="javax.portlet.tck.beans.*,javax.portlet.tck.constants.*" %>
+<%@ page import="static javax.portlet.tck.constants.Constants.*" %>
+<%@ page import="static javax.portlet.tck.beans.JSR286SpecTestCaseDetails.*" %>
+
+<%
+
+      PortletRequest portletReq = (PortletRequest) request.getAttribute("javax.portlet.request");
+      PortletResponse portletResp = (PortletResponse) request.getAttribute("javax.portlet.response");
+      PortletConfig portletConfig = (PortletConfig) request.getAttribute("javax.portlet.config");
+      long svtTid = Thread.currentThread().getId();
+      long reqTid = (Long) portletReq.getAttribute(THREADID_ATTR);
+
+      PrintWriter writer = ((MimeResponse)portletResp).getWriter();
+
+      JSR286SpecTestCaseDetails tcd = new JSR286SpecTestCaseDetails();
+
+      // Create result objects for the tests
+
+      /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_defineObjectsRender1 */
+      /* Details: "When included in the Render phase, the defineObjects tag   */
+      /* defines the variable RenderRequest renderRequest to the              */
+      /* corresponding object"                                                */
+      TestResult tr0 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_DEFINEOBJECTSRENDER1);
+      /* TODO: implement test */
+      tr0.appendTcDetail("Not implemented.");
+      tr0.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_defineObjectsRender2 */
+      /* Details: "When included in the Render phase, the defineObjects tag   */
+      /* defines the variable ResourceRequest resourceRequest to be null or   */
+      /* undefined"                                                           */
+      TestResult tr1 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_DEFINEOBJECTSRENDER2);
+      /* TODO: implement test */
+      tr1.appendTcDetail("Not implemented.");
+      tr1.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_defineObjectsRender3 */
+      /* Details: "When included in the Render phase, the defineObjects tag   */
+      /* defines the variable ActionRequest actionRequest to be null or       */
+      /* undefined"                                                           */
+      TestResult tr2 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_DEFINEOBJECTSRENDER3);
+      /* TODO: implement test */
+      tr2.appendTcDetail("Not implemented.");
+      tr2.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_defineObjectsRender4 */
+      /* Details: "When included in the Render phase, the defineObjects tag   */
+      /* defines the variable EventRequest eventRequest to be null or         */
+      /* undefined"                                                           */
+      TestResult tr3 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_DEFINEOBJECTSRENDER4);
+      /* TODO: implement test */
+      tr3.appendTcDetail("Not implemented.");
+      tr3.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_defineObjectsRender5 */
+      /* Details: "When included in the Render phase, the defineObjects tag   */
+      /* defines the variable RenderResponse renderResponse to the            */
+      /* corresponding object"                                                */
+      TestResult tr4 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_DEFINEOBJECTSRENDER5);
+      /* TODO: implement test */
+      tr4.appendTcDetail("Not implemented.");
+      tr4.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_defineObjectsRender6 */
+      /* Details: "When included in the Render phase, the defineObjects tag   */
+      /* defines the variable ResourceResponse resourceResponse to be null    */
+      /* or undefined"                                                        */
+      TestResult tr5 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_DEFINEOBJECTSRENDER6);
+      /* TODO: implement test */
+      tr5.appendTcDetail("Not implemented.");
+      tr5.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_defineObjectsRender7 */
+      /* Details: "When included in the Render phase, the defineObjects tag   */
+      /* defines the variable ActionResponse actionResponse to be null or     */
+      /* undefined"                                                           */
+      TestResult tr6 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_DEFINEOBJECTSRENDER7);
+      /* TODO: implement test */
+      tr6.appendTcDetail("Not implemented.");
+      tr6.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_defineObjectsRender8 */
+      /* Details: "When included in the Render phase, the defineObjects tag   */
+      /* defines the variable EventResponse eventResponse to be null or       */
+      /* undefined"                                                           */
+      TestResult tr7 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_DEFINEOBJECTSRENDER8);
+      /* TODO: implement test */
+      tr7.appendTcDetail("Not implemented.");
+      tr7.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_defineObjectsRender9 */
+      /* Details: "When included in the Render phase, the defineObjects tag   */
+      /* defines the variable PortletConfig portletConfig"                    */
+      TestResult tr8 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_DEFINEOBJECTSRENDER9);
+      /* TODO: implement test */
+      tr8.appendTcDetail("Not implemented.");
+      tr8.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_defineObjectsRender10 */
+      /* Details: "When included in the Render phase, the defineObjects tag   */
+      /* defines the variable PortletSession portletSession, providing        */
+      /* access to the portletSession, does not create a new session, only    */
+      /* returns an existing session or null if no session exists."           */
+      TestResult tr9 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_DEFINEOBJECTSRENDER10);
+      /* TODO: implement test */
+      tr9.appendTcDetail("Not implemented.");
+      tr9.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_defineObjectsRender11 */
+      /* Details: "When included in the Render phase, the defineObjects tag   */
+      /* defines the variable Map<String, Object> portletSessionScope,        */
+      /* providing access to the portletSession attributes as a Map           */
+      /* equivalent to the PortletSession.getAttributeMap() call, does not    */
+      /* create a new session, only returns an existing session. If no        */
+      /* session attributes exist this method returns an empty Map."          */
+      TestResult tr10 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_DEFINEOBJECTSRENDER11);
+      /* TODO: implement test */
+      tr10.appendTcDetail("Not implemented.");
+      tr10.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_defineObjectsRender12 */
+      /* Details: "When included in the Render phase, the defineObjects tag   */
+      /* defines the variable PortletPreferences portletPreferences,          */
+      /* providing access to the portlet preferences."                        */
+      TestResult tr11 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_DEFINEOBJECTSRENDER12);
+      /* TODO: implement test */
+      tr11.appendTcDetail("Not implemented.");
+      tr11.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_defineObjectsRender13 */
+      /* Details: "When included in the Render phase, the defineObjects tag   */
+      /* defines the variable Map<String, String[]>                           */
+      /* portletPreferencesValues, providing access to the portlet            */
+      /* preferences as a Map, equivalent to the                              */
+      /* PortletPreferences.getMap() call. If no portlet preferences exist,   */
+      /* the Map is empty."                                                   */
+      TestResult tr12 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_DEFINEOBJECTSRENDER13);
+      /* TODO: implement test */
+      tr12.appendTcDetail("Not implemented.");
+      tr12.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_actionURL1 */
+      /* Details: "The portlet actionURL tag creates a URL that must point    */
+      /* to the current portlet and must trigger an action request with the   */
+      /* supplied parameters"                                                 */
+      TestResult tr13 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_ACTIONURL1);
+      /* TODO: implement test */
+      tr13.appendTcDetail("Not implemented.");
+      tr13.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_actionURL2 */
+      /* Details: "Parameters may be added to the URL by including the        */
+      /* param tag between the actionURL start and end tags"                  */
+      TestResult tr14 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_ACTIONURL2);
+      /* TODO: implement test */
+      tr14.appendTcDetail("Not implemented.");
+      tr14.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_actionURL3 */
+      /* Details: "The optional actionURL \"windowState\" attribute can       */
+      /* specify the desired window state after the URL is triggered"         */
+      TestResult tr15 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_ACTIONURL3);
+      /* TODO: implement test */
+      tr15.appendTcDetail("Not implemented.");
+      tr15.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_actionURL4 */
+      /* Details: "If the \"windowState\" attribute specifies an invalid      */
+      /* value, a JspException with the PortletException that caused this     */
+      /* error as root cause is thrown"                                       */
+      TestResult tr16 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_ACTIONURL4);
+      /* TODO: implement test */
+      tr16.appendTcDetail("Not implemented.");
+      tr16.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_actionURL5 */
+      /* Details: "The \"windowState\" attribute is not case sensitive"       */
+      TestResult tr17 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_ACTIONURL5);
+      /* TODO: implement test */
+      tr17.appendTcDetail("Not implemented.");
+      tr17.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_actionURL6 */
+      /* Details: "The \"windowState\" attribute is not specified, the        */
+      /* current window state is retained when the URL is triggered"          */
+      TestResult tr18 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_ACTIONURL6);
+      /* TODO: implement test */
+      tr18.appendTcDetail("Not implemented.");
+      tr18.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_actionURL7 */
+      /* Details: "The optional actionURL \"portletMode\" attribute can       */
+      /* specify the desired portlet mode after the URL is triggered"         */
+      TestResult tr19 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_ACTIONURL7);
+      /* TODO: implement test */
+      tr19.appendTcDetail("Not implemented.");
+      tr19.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_actionURL8 */
+      /* Details: "If the \"portletMode\" attribute specifies an invalid      */
+      /* value, a JspException with the PortletException that caused this     */
+      /* error as root cause is thrown"                                       */
+      TestResult tr20 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_ACTIONURL8);
+      /* TODO: implement test */
+      tr20.appendTcDetail("Not implemented.");
+      tr20.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_actionURL9 */
+      /* Details: "The \"portletMode\" attribute is not case sensitive"       */
+      TestResult tr21 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_ACTIONURL9);
+      /* TODO: implement test */
+      tr21.appendTcDetail("Not implemented.");
+      tr21.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_actionURL10 */
+      /* Details: "The \"portletMode\" attribute is not specified, the        */
+      /* current portlet mode is retained when the URL is triggered"          */
+      TestResult tr22 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_ACTIONURL10);
+      /* TODO: implement test */
+      tr22.appendTcDetail("Not implemented.");
+      tr22.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_actionURL11 */
+      /* Details: "The optional actionURL \"var\" attribute can specify a     */
+      /* scoped variable for exporting the action URL"                        */
+      TestResult tr23 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_ACTIONURL11);
+      /* TODO: implement test */
+      tr23.appendTcDetail("Not implemented.");
+      tr23.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_actionURL12 */
+      /* Details: "If the actionURL \"var\" attribute is specified, the URL   */
+      /* is not written to the JspWriter"                                     */
+      TestResult tr24 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_ACTIONURL12);
+      /* TODO: implement test */
+      tr24.appendTcDetail("Not implemented.");
+      tr24.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_actionURL13 */
+      /* Details: "If the actionURL \"var\" attribute is not specified, the   */
+      /* URL is written to the JspWriter"                                     */
+      TestResult tr25 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_ACTIONURL13);
+      /* TODO: implement test */
+      tr25.appendTcDetail("Not implemented.");
+      tr25.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_actionURL14 */
+      /* Details: "If the optional actionURL \"secure\" attribute is set to   */
+      /* true, the resulting URL should require a secure connection"          */
+      TestResult tr26 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_ACTIONURL14);
+      /* TODO: implement test */
+      tr26.appendTcDetail("Not implemented.");
+      tr26.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_actionURL15 */
+      /* Details: "If the optional actionURL \"secure\" attribute is set to   */
+      /* false, the resulting URL does not need to require a secure           */
+      /* connection"                                                          */
+      TestResult tr27 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_ACTIONURL15);
+      /* TODO: implement test */
+      tr27.appendTcDetail("Not implemented.");
+      tr27.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_actionURL17 */
+      /* Details: "The \"secure\" attribute is not specified, the security    */
+      /* setting is retained"                                                 */
+      TestResult tr28 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_ACTIONURL17);
+      /* TODO: implement test */
+      tr28.appendTcDetail("Not implemented.");
+      tr28.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_actionURL18 */
+      /* Details: "If the optional actionURL                                  */
+      /* \"copyCurrentRenderParameters\" attribute is set to true, the        */
+      /* current private render parameters are attached to the URL"           */
+      TestResult tr29 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_ACTIONURL18);
+      /* TODO: implement test */
+      tr29.appendTcDetail("Not implemented.");
+      tr29.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_actionURL19 */
+      /* Details: "If the optional actionURL                                  */
+      /* \"copyCurrentRenderParameters\" attribute is set to true,            */
+      /* additional parameters specified with the <portlet:param> element     */
+      /* are merged with the render parameters"                               */
+      TestResult tr30 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_ACTIONURL19);
+      /* TODO: implement test */
+      tr30.appendTcDetail("Not implemented.");
+      tr30.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_actionURL20 */
+      /* Details: "If the optional actionURL                                  */
+      /* \"copyCurrentRenderParameters\" attribute is set to true,            */
+      /* additional parameters specified with the <portlet:param> element     */
+      /* appear in the values array before the render parameter values if     */
+      /* there is a name conflict"                                            */
+      TestResult tr31 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_ACTIONURL20);
+      /* TODO: implement test */
+      tr31.appendTcDetail("Not implemented.");
+      tr31.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_actionURL21 */
+      /* Details: "If the optional actionURL                                  */
+      /* \"copyCurrentRenderParameters\" attribute is set to false, the       */
+      /* current render parameters are not attached to the URL"               */
+      TestResult tr32 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_ACTIONURL21);
+      /* TODO: implement test */
+      tr32.appendTcDetail("Not implemented.");
+      tr32.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_actionURL22 */
+      /* Details: "If the \"copyCurrentRenderParameters\" attribute           */
+      /* specifies an invalid value, a JspException is thrown"                */
+      TestResult tr33 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_ACTIONURL22);
+      /* TODO: implement test */
+      tr33.appendTcDetail("Not implemented.");
+      tr33.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_actionURL23 */
+      /* Details: "The \"copyCurrentRenderParameters\" attribute is not       */
+      /* specified, the security setting is retained"                         */
+      TestResult tr34 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_ACTIONURL23);
+      /* TODO: implement test */
+      tr34.appendTcDetail("Not implemented.");
+      tr34.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_actionURL25 */
+      /* Details: "If the optional actionURL \"escapeXML\" attribute is set   */
+      /* to false, the characters \"<>&'\\\"\" are not converted to their     */
+      /* entity codes"                                                        */
+      TestResult tr35 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_ACTIONURL25);
+      /* TODO: implement test */
+      tr35.appendTcDetail("Not implemented.");
+      tr35.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_actionURL26 */
+      /* Details: "The \"escapeXML\" attribute default value is true"         */
+      TestResult tr36 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_ACTIONURL26);
+      /* TODO: implement test */
+      tr36.appendTcDetail("Not implemented.");
+      tr36.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_actionURL27 */
+      /* Details: "If the optional actionURL \"name\" attribute is set, the   */
+      /* provided name string is used by GenericPortlet to dispatch the       */
+      /* request to the coresponding annotated method"                        */
+      TestResult tr37 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_ACTIONURL27);
+      /* TODO: implement test */
+      tr37.appendTcDetail("Not implemented.");
+      tr37.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_actionURL28 */
+      /* Details: "Setting the \"name\" attribute will add a parameter to     */
+      /* the action URL with the name of \"javax.portlet.action\""            */
+      TestResult tr38 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_ACTIONURL28);
+      /* TODO: implement test */
+      tr38.appendTcDetail("Not implemented.");
+      tr38.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_actionURL29 */
+      /* Details: "If this tag is used in markup provided by a                */
+      /* serveResource call that was directly or indirectly triggered via a   */
+      /* resource URL of type FULL, a JspException with the                   */
+      /* IllegalStateException that caused this error is thrown"              */
+      TestResult tr39 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_ACTIONURL29);
+      /* TODO: implement test */
+      tr39.appendTcDetail("Not implemented.");
+      tr39.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_actionURL30 */
+      /* Details: "If this tag is used in markup provided by a                */
+      /* serveResource call that was directly or indirectly triggered via a   */
+      /* resource URL of type PORTLET, a JspException with the                */
+      /* IllegalStateException that caused this error is thrown"              */
+      TestResult tr40 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_ACTIONURL30);
+      /* TODO: implement test */
+      tr40.appendTcDetail("Not implemented.");
+      tr40.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_renderURL1 */
+      /* Details: "The portlet renderURL tag creates a URL that must point    */
+      /* to the current portlet and must trigger an render request with the   */
+      /* supplied parameters"                                                 */
+      TestResult tr41 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_RENDERURL1);
+      /* TODO: implement test */
+      tr41.appendTcDetail("Not implemented.");
+      tr41.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_renderURL2 */
+      /* Details: "Parameters may be added to the URL by including the        */
+      /* param tag between the renderURL start and end tags"                  */
+      TestResult tr42 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_RENDERURL2);
+      /* TODO: implement test */
+      tr42.appendTcDetail("Not implemented.");
+      tr42.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_renderURL3 */
+      /* Details: "The optional renderURL \"windowState\" attribute can       */
+      /* specify the desired window state after the URL is triggered"         */
+      TestResult tr43 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_RENDERURL3);
+      /* TODO: implement test */
+      tr43.appendTcDetail("Not implemented.");
+      tr43.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_renderURL4 */
+      /* Details: "If the \"windowState\" attribute specifies an invalid      */
+      /* value, a JspException with the PortletException that caused this     */
+      /* error as root cause is thrown"                                       */
+      TestResult tr44 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_RENDERURL4);
+      /* TODO: implement test */
+      tr44.appendTcDetail("Not implemented.");
+      tr44.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_renderURL5 */
+      /* Details: "The \"windowState\" attribute is not case sensitive"       */
+      TestResult tr45 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_RENDERURL5);
+      /* TODO: implement test */
+      tr45.appendTcDetail("Not implemented.");
+      tr45.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_renderURL6 */
+      /* Details: "The \"windowState\" attribute is not specified, the        */
+      /* current window state is retained when the URL is triggered"          */
+      TestResult tr46 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_RENDERURL6);
+      /* TODO: implement test */
+      tr46.appendTcDetail("Not implemented.");
+      tr46.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_renderURL7 */
+      /* Details: "The optional renderURL \"portletMode\" attribute can       */
+      /* specify the desired portlet mode after the URL is triggered"         */
+      TestResult tr47 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_RENDERURL7);
+      /* TODO: implement test */
+      tr47.appendTcDetail("Not implemented.");
+      tr47.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_renderURL8 */
+      /* Details: "If the \"portletMode\" attribute specifies an invalid      */
+      /* value, a JspException with the PortletException that caused this     */
+      /* error as root cause is thrown"                                       */
+      TestResult tr48 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_RENDERURL8);
+      /* TODO: implement test */
+      tr48.appendTcDetail("Not implemented.");
+      tr48.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_renderURL9 */
+      /* Details: "The \"portletMode\" attribute is not case sensitive"       */
+      TestResult tr49 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_RENDERURL9);
+      /* TODO: implement test */
+      tr49.appendTcDetail("Not implemented.");
+      tr49.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_renderURL10 */
+      /* Details: "The \"portletMode\" attribute is not specified, the        */
+      /* current portlet mode is retained when the URL is triggered"          */
+      TestResult tr50 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_RENDERURL10);
+      /* TODO: implement test */
+      tr50.appendTcDetail("Not implemented.");
+      tr50.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_renderURL11 */
+      /* Details: "The optional renderURL \"var\" attribute can specify a     */
+      /* scoped variable for exporting the action URL"                        */
+      TestResult tr51 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_RENDERURL11);
+      /* TODO: implement test */
+      tr51.appendTcDetail("Not implemented.");
+      tr51.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_renderURL12 */
+      /* Details: "If the renderURL \"var\" attribute is specified, the URL   */
+      /* is not written to the JspWriter"                                     */
+      TestResult tr52 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_RENDERURL12);
+      /* TODO: implement test */
+      tr52.appendTcDetail("Not implemented.");
+      tr52.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_renderURL13 */
+      /* Details: "If the renderURL \"var\" attribute is not specified, the   */
+      /* URL is written to the JspWriter"                                     */
+      TestResult tr53 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_RENDERURL13);
+      /* TODO: implement test */
+      tr53.appendTcDetail("Not implemented.");
+      tr53.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_renderURL14 */
+      /* Details: "If the optional renderURL \"secure\" attribute is set to   */
+      /* true, the resulting URL should require a secure connection"          */
+      TestResult tr54 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_RENDERURL14);
+      /* TODO: implement test */
+      tr54.appendTcDetail("Not implemented.");
+      tr54.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_renderURL15 */
+      /* Details: "If the optional renderURL \"secure\" attribute is set to   */
+      /* false, the resulting URL does not need to require a secure           */
+      /* connection"                                                          */
+      TestResult tr55 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_RENDERURL15);
+      /* TODO: implement test */
+      tr55.appendTcDetail("Not implemented.");
+      tr55.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_renderURL17 */
+      /* Details: "The \"secure\" attribute is not specified, the security    */
+      /* setting is retained"                                                 */
+      TestResult tr56 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_RENDERURL17);
+      /* TODO: implement test */
+      tr56.appendTcDetail("Not implemented.");
+      tr56.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_renderURL18 */
+      /* Details: "If the optional renderURL                                  */
+      /* \"copyCurrentRenderParameters\" attribute is set to true, the        */
+      /* current private render parameters are attached to the URL"           */
+      TestResult tr57 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_RENDERURL18);
+      /* TODO: implement test */
+      tr57.appendTcDetail("Not implemented.");
+      tr57.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_renderURL19 */
+      /* Details: "If the optional renderURL                                  */
+      /* \"copyCurrentRenderParameters\" attribute is set to true,            */
+      /* additional parameters specified with the <portlet:param> element     */
+      /* are merged with the render parameters"                               */
+      TestResult tr58 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_RENDERURL19);
+      /* TODO: implement test */
+      tr58.appendTcDetail("Not implemented.");
+      tr58.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_renderURL20 */
+      /* Details: "If the optional renderURL                                  */
+      /* \"copyCurrentRenderParameters\" attribute is set to true,            */
+      /* additional parameters specified with the <portlet:param> element     */
+      /* appear in the values array before the render parameter values if     */
+      /* there is a name conflict"                                            */
+      TestResult tr59 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_RENDERURL20);
+      /* TODO: implement test */
+      tr59.appendTcDetail("Not implemented.");
+      tr59.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_renderURL21 */
+      /* Details: "If the optional renderURL                                  */
+      /* \"copyCurrentRenderParameters\" attribute is set to false, the       */
+      /* current render parameters are not attached to the URL"               */
+      TestResult tr60 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_RENDERURL21);
+      /* TODO: implement test */
+      tr60.appendTcDetail("Not implemented.");
+      tr60.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_renderURL22 */
+      /* Details: "If the \"copyCurrentRenderParameters\" attribute           */
+      /* specifies an invalid value, a JspException is thrown"                */
+      TestResult tr61 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_RENDERURL22);
+      /* TODO: implement test */
+      tr61.appendTcDetail("Not implemented.");
+      tr61.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_renderURL23 */
+      /* Details: "The \"copyCurrentRenderParameters\" attribute is not       */
+      /* specified, the security setting is retained"                         */
+      TestResult tr62 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_RENDERURL23);
+      /* TODO: implement test */
+      tr62.appendTcDetail("Not implemented.");
+      tr62.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_renderURL25 */
+      /* Details: "If the optional renderURL \"escapeXML\" attribute is set   */
+      /* to false, the characters \"<>&'\\\"\" are not converted to their     */
+      /* entity codes"                                                        */
+      TestResult tr63 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_RENDERURL25);
+      /* TODO: implement test */
+      tr63.appendTcDetail("Not implemented.");
+      tr63.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_renderURL26 */
+      /* Details: "The \"escapeXML\" attribute default value is true"         */
+      TestResult tr64 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_RENDERURL26);
+      /* TODO: implement test */
+      tr64.appendTcDetail("Not implemented.");
+      tr64.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_resourceURL1 */
+      /* Details: "The portlet resourceURL tag creates a URL that must        */
+      /* point to the current portlet and must trigger an resource request    */
+      /* with the supplied parameters"                                        */
+      TestResult tr65 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_RESOURCEURL1);
+      /* TODO: implement test */
+      tr65.appendTcDetail("Not implemented.");
+      tr65.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_resourceURL2 */
+      /* Details: "The resourceURL must preserve the current portlet mode,    */
+      /* window state and render parameters"                                  */
+      TestResult tr66 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_RESOURCEURL2);
+      /* TODO: implement test */
+      tr66.appendTcDetail("Not implemented.");
+      tr66.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_resourceURL3 */
+      /* Details: "Resource parameters may be added to the URL by including   */
+      /* the param tag between the resourceURL start and end tags"            */
+      TestResult tr67 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_RESOURCEURL3);
+      /* TODO: implement test */
+      tr67.appendTcDetail("Not implemented.");
+      tr67.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_resourceURL4 */
+      /* Details: "The resource parameters specified with the                 */
+      /* <portlet:param> element appear in the values array before the        */
+      /* render parameter values if there is a name conflict"                 */
+      TestResult tr68 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_RESOURCEURL4);
+      /* TODO: implement test */
+      tr68.appendTcDetail("Not implemented.");
+      tr68.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_resourceURL5 */
+      /* Details: "The optional resourceURL \"var\" attribute can specify a   */
+      /* scoped variable for exporting the action URL"                        */
+      TestResult tr69 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_RESOURCEURL5);
+      /* TODO: implement test */
+      tr69.appendTcDetail("Not implemented.");
+      tr69.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_resourceURL6 */
+      /* Details: "If the resourceURL \"var\" attribute is specified, the     */
+      /* URL is not written to the JspWriter"                                 */
+      TestResult tr70 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_RESOURCEURL6);
+      /* TODO: implement test */
+      tr70.appendTcDetail("Not implemented.");
+      tr70.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_resourceURL7 */
+      /* Details: "If the resourceURL \"var\" attribute is not specified,     */
+      /* the URL is written to the JspWriter"                                 */
+      TestResult tr71 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_RESOURCEURL7);
+      /* TODO: implement test */
+      tr71.appendTcDetail("Not implemented.");
+      tr71.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_resourceURL8 */
+      /* Details: "If the optional resourceURL \"secure\" attribute is set    */
+      /* to true, the resulting URL should require a secure connection"       */
+      TestResult tr72 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_RESOURCEURL8);
+      /* TODO: implement test */
+      tr72.appendTcDetail("Not implemented.");
+      tr72.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_resourceURL9 */
+      /* Details: "If the optional resourceURL \"secure\" attribute is set    */
+      /* to false, the resulting URL does not need to require a secure        */
+      /* connection"                                                          */
+      TestResult tr73 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_RESOURCEURL9);
+      /* TODO: implement test */
+      tr73.appendTcDetail("Not implemented.");
+      tr73.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_resourceURL11 */
+      /* Details: "The \"secure\" attribute is not specified, the security    */
+      /* setting is retained"                                                 */
+      TestResult tr74 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_RESOURCEURL11);
+      /* TODO: implement test */
+      tr74.appendTcDetail("Not implemented.");
+      tr74.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_resourceURL12 */
+      /* Details: "If the optional resourceURL                                */
+      /* \"copyCurrentRenderParameters\" attribute is set to true, the        */
+      /* current private render parameters are attached to the URL"           */
+      TestResult tr75 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_RESOURCEURL12);
+      /* TODO: implement test */
+      tr75.appendTcDetail("Not implemented.");
+      tr75.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_resourceURL13 */
+      /* Details: "If the optional resourceURL                                */
+      /* \"copyCurrentRenderParameters\" attribute is set to true,            */
+      /* additional parameters specified with the <portlet:param> element     */
+      /* are merged with the render parameters"                               */
+      TestResult tr76 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_RESOURCEURL13);
+      /* TODO: implement test */
+      tr76.appendTcDetail("Not implemented.");
+      tr76.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_resourceURL14 */
+      /* Details: "If the optional resourceURL                                */
+      /* \"copyCurrentRenderParameters\" attribute is set to true,            */
+      /* additional parameters specified with the <portlet:param> element     */
+      /* appear in the values array before the render parameter values if     */
+      /* there is a name conflict"                                            */
+      TestResult tr77 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_RESOURCEURL14);
+      /* TODO: implement test */
+      tr77.appendTcDetail("Not implemented.");
+      tr77.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_resourceURL15 */
+      /* Details: "If the optional resourceURL                                */
+      /* \"copyCurrentRenderParameters\" attribute is set to false, the       */
+      /* current render parameters are not attached to the URL"               */
+      TestResult tr78 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_RESOURCEURL15);
+      /* TODO: implement test */
+      tr78.appendTcDetail("Not implemented.");
+      tr78.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_resourceURL16 */
+      /* Details: "If the \"copyCurrentRenderParameters\" attribute           */
+      /* specifies an invalid value, a JspException is thrown"                */
+      TestResult tr79 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_RESOURCEURL16);
+      /* TODO: implement test */
+      tr79.appendTcDetail("Not implemented.");
+      tr79.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_resourceURL17 */
+      /* Details: "The \"copyCurrentRenderParameters\" attribute is not       */
+      /* specified, the security setting is retained"                         */
+      TestResult tr80 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_RESOURCEURL17);
+      /* TODO: implement test */
+      tr80.appendTcDetail("Not implemented.");
+      tr80.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_resourceURL19 */
+      /* Details: "If the optional resourceURL \"escapeXML\" attribute is     */
+      /* set to false, the characters \"<>&'\\\"\" are not converted to       */
+      /* their entity codes"                                                  */
+      TestResult tr81 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_RESOURCEURL19);
+      /* TODO: implement test */
+      tr81.appendTcDetail("Not implemented.");
+      tr81.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_resourceURL20 */
+      /* Details: "The \"escapeXML\" attribute default value is true"         */
+      TestResult tr82 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_RESOURCEURL20);
+      /* TODO: implement test */
+      tr82.appendTcDetail("Not implemented.");
+      tr82.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_resourceURL21 */
+      /* Details: "If the optional resourceURL \"id\" attribute is set, the   */
+      /* provided id string is used by GenericPortlet to dispatch the         */
+      /* request to the coresponding annotated method"                        */
+      TestResult tr83 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_RESOURCEURL21);
+      /* TODO: implement test */
+      tr83.appendTcDetail("Not implemented.");
+      tr83.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_resourceURL22 */
+      /* Details: "Setting the \"id\" attribute will add a parameter to the   */
+      /* action URL with the id of \"javax.portlet.action\""                  */
+      TestResult tr84 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_RESOURCEURL22);
+      /* TODO: implement test */
+      tr84.appendTcDetail("Not implemented.");
+      tr84.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_resourceURL23 */
+      /* Details: "If the optional resourceURL \"cacheability\" attribute     */
+      /* is set, the cacheability is set accordingly"                         */
+      TestResult tr85 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_RESOURCEURL23);
+      /* TODO: implement test */
+      tr85.appendTcDetail("Not implemented.");
+      tr85.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_resourceURL24 */
+      /* Details: "If the optional resourceURL \"cacheability\" attribute     */
+      /* is not set, the current cacheability setting is retained"            */
+      TestResult tr86 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_RESOURCEURL24);
+      /* TODO: implement test */
+      tr86.appendTcDetail("Not implemented.");
+      tr86.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_resourceURL25 */
+      /* Details: "If the cacheability is set to PAGE in a Resource phase     */
+      /* include with cacheability = FULL, a JspException with the            */
+      /* IllegalStateException that caused this error is thrown"              */
+      TestResult tr87 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_RESOURCEURL25);
+      /* TODO: implement test */
+      tr87.appendTcDetail("Not implemented.");
+      tr87.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_resourceURL26 */
+      /* Details: "If the cacheability is set to PORTLET in a Resource        */
+      /* phase include with cacheability = FULL, a JspException with the      */
+      /* IllegalStateException that caused this error is thrown"              */
+      TestResult tr88 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_RESOURCEURL26);
+      /* TODO: implement test */
+      tr88.appendTcDetail("Not implemented.");
+      tr88.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_resourceURL27 */
+      /* Details: "If the cacheability is set to PAGE in a Resource phase     */
+      /* include with cacheability = PORTLET, a JspException with the         */
+      /* IllegalStateException that caused this error is thrown"              */
+      TestResult tr89 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_RESOURCEURL27);
+      /* TODO: implement test */
+      tr89.appendTcDetail("Not implemented.");
+      tr89.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_paramAction1 */
+      /* Details: "The param tag can be used within the actionURL tag to      */
+      /* add a parameter"                                                     */
+      TestResult tr90 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_PARAMACTION1);
+      /* TODO: implement test */
+      tr90.appendTcDetail("Not implemented.");
+      tr90.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_paramAction2 */
+      /* Details: "The param tag required attribute \"name\" defines the      */
+      /* parameter name"                                                      */
+      TestResult tr91 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_PARAMACTION2);
+      /* TODO: implement test */
+      tr91.appendTcDetail("Not implemented.");
+      tr91.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_paramAction3 */
+      /* Details: "If more than one tags appear in the actionURL tag, the     */
+      /* values must be stored as a multivalued array in order of             */
+      /* appearance within the actionURL tag"                                 */
+      TestResult tr92 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_PARAMACTION3);
+      /* TODO: implement test */
+      tr92.appendTcDetail("Not implemented.");
+      tr92.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_paramAction4 */
+      /* Details: "If the \"name\" attribute is null or empty, no action is   */
+      /* performed"                                                           */
+      TestResult tr93 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_PARAMACTION4);
+      /* TODO: implement test */
+      tr93.appendTcDetail("Not implemented.");
+      tr93.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_paramAction5 */
+      /* Details: "The param tag required attribute \"value\" defines the     */
+      /* parameter value"                                                     */
+      TestResult tr94 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_PARAMACTION5);
+      /* TODO: implement test */
+      tr94.appendTcDetail("Not implemented.");
+      tr94.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_paramAction6 */
+      /* Details: "If the \"value\" attribute is null or empty, the           */
+      /* parameter is removed"                                                */
+      TestResult tr95 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_PARAMACTION6);
+      /* TODO: implement test */
+      tr95.appendTcDetail("Not implemented.");
+      tr95.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_paramRender1 */
+      /* Details: "The param tag can be used within the renderURL tag to      */
+      /* add a parameter"                                                     */
+      TestResult tr96 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_PARAMRENDER1);
+      /* TODO: implement test */
+      tr96.appendTcDetail("Not implemented.");
+      tr96.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_paramRender2 */
+      /* Details: "The param tag required attribute \"name\" defines the      */
+      /* parameter name"                                                      */
+      TestResult tr97 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_PARAMRENDER2);
+      /* TODO: implement test */
+      tr97.appendTcDetail("Not implemented.");
+      tr97.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_paramRender3 */
+      /* Details: "If more than one tags appear in the renderURL tag, the     */
+      /* values must be stored as a multivalued array in order of             */
+      /* appearance within the renderURL tag"                                 */
+      TestResult tr98 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_PARAMRENDER3);
+      /* TODO: implement test */
+      tr98.appendTcDetail("Not implemented.");
+      tr98.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_paramRender4 */
+      /* Details: "If the \"name\" attribute is null or empty, no action is   */
+      /* performed"                                                           */
+      TestResult tr99 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_PARAMRENDER4);
+      /* TODO: implement test */
+      tr99.appendTcDetail("Not implemented.");
+      tr99.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_paramRender5 */
+      /* Details: "The param tag required attribute \"value\" defines the     */
+      /* parameter value"                                                     */
+      TestResult tr100 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_PARAMRENDER5);
+      /* TODO: implement test */
+      tr100.appendTcDetail("Not implemented.");
+      tr100.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_paramRender6 */
+      /* Details: "If the \"value\" attribute is null or empty, the           */
+      /* parameter is removed"                                                */
+      TestResult tr101 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_PARAMRENDER6);
+      /* TODO: implement test */
+      tr101.appendTcDetail("Not implemented.");
+      tr101.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_paramResource1 */
+      /* Details: "The param tag can be used within the resourceURL tag to    */
+      /* add a parameter"                                                     */
+      TestResult tr102 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_PARAMRESOURCE1);
+      /* TODO: implement test */
+      tr102.appendTcDetail("Not implemented.");
+      tr102.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_paramResource2 */
+      /* Details: "The param tag required attribute \"name\" defines the      */
+      /* parameter name"                                                      */
+      TestResult tr103 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_PARAMRESOURCE2);
+      /* TODO: implement test */
+      tr103.appendTcDetail("Not implemented.");
+      tr103.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_paramResource3 */
+      /* Details: "If more than one tags appear in the resourceURL tag, the   */
+      /* values must be stored as a multivalued array in order of             */
+      /* appearance within the resourceURL tag"                               */
+      TestResult tr104 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_PARAMRESOURCE3);
+      /* TODO: implement test */
+      tr104.appendTcDetail("Not implemented.");
+      tr104.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_paramResource4 */
+      /* Details: "If the \"name\" attribute is null or empty, no action is   */
+      /* performed"                                                           */
+      TestResult tr105 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_PARAMRESOURCE4);
+      /* TODO: implement test */
+      tr105.appendTcDetail("Not implemented.");
+      tr105.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_paramResource5 */
+      /* Details: "The param tag required attribute \"value\" defines the     */
+      /* parameter value"                                                     */
+      TestResult tr106 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_PARAMRESOURCE5);
+      /* TODO: implement test */
+      tr106.appendTcDetail("Not implemented.");
+      tr106.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_paramResource6 */
+      /* Details: "If the \"value\" attribute is null or empty, no action     */
+      /* is performed"                                                        */
+      TestResult tr107 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_PARAMRESOURCE6);
+      /* TODO: implement test */
+      tr107.appendTcDetail("Not implemented.");
+      tr107.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_propertyAction1 */
+      /* Details: "The property tag can be used within the actionURL tag to   */
+      /* add a property"                                                      */
+      TestResult tr108 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_PROPERTYACTION1);
+      /* TODO: implement test */
+      tr108.appendTcDetail("Not implemented.");
+      tr108.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_propertyAction2 */
+      /* Details: "The property tag required attribute \"name\" defines the   */
+      /* property name"                                                       */
+      TestResult tr109 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_PROPERTYACTION2);
+      /* TODO: implement test */
+      tr109.appendTcDetail("Not implemented.");
+      tr109.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_propertyAction3 */
+      /* Details: "If more than one tags appear in the actionURL tag, the     */
+      /* values must be stored as a multivalued array in order of             */
+      /* appearance within the actionURL tag"                                 */
+      TestResult tr110 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_PROPERTYACTION3);
+      /* TODO: implement test */
+      tr110.appendTcDetail("Not implemented.");
+      tr110.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_propertyAction4 */
+      /* Details: "If the \"name\" attribute is null or empty, no action is   */
+      /* performed"                                                           */
+      TestResult tr111 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_PROPERTYACTION4);
+      /* TODO: implement test */
+      tr111.appendTcDetail("Not implemented.");
+      tr111.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_propertyAction5 */
+      /* Details: "The property tag required attribute \"value\" defines      */
+      /* the property value"                                                  */
+      TestResult tr112 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_PROPERTYACTION5);
+      /* TODO: implement test */
+      tr112.appendTcDetail("Not implemented.");
+      tr112.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_propertyAction6 */
+      /* Details: "If the \"value\" attribute is null or empty,  the          */
+      /* property value is set to null"                                       */
+      TestResult tr113 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_PROPERTYACTION6);
+      /* TODO: implement test */
+      tr113.appendTcDetail("Not implemented.");
+      tr113.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_propertyRender1 */
+      /* Details: "The property tag can be used within the renderURL tag to   */
+      /* add a property"                                                      */
+      TestResult tr114 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_PROPERTYRENDER1);
+      /* TODO: implement test */
+      tr114.appendTcDetail("Not implemented.");
+      tr114.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_propertyRender2 */
+      /* Details: "The property tag required attribute \"name\" defines the   */
+      /* property name"                                                       */
+      TestResult tr115 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_PROPERTYRENDER2);
+      /* TODO: implement test */
+      tr115.appendTcDetail("Not implemented.");
+      tr115.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_propertyRender3 */
+      /* Details: "If more than one tags appear in the renderURL tag, the     */
+      /* values must be stored as a multivalued array in order of             */
+      /* appearance within the renderURL tag"                                 */
+      TestResult tr116 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_PROPERTYRENDER3);
+      /* TODO: implement test */
+      tr116.appendTcDetail("Not implemented.");
+      tr116.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_propertyRender4 */
+      /* Details: "If the \"name\" attribute is null or empty, no action is   */
+      /* performed"                                                           */
+      TestResult tr117 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_PROPERTYRENDER4);
+      /* TODO: implement test */
+      tr117.appendTcDetail("Not implemented.");
+      tr117.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_propertyRender5 */
+      /* Details: "The property tag required attribute \"value\" defines      */
+      /* the property value"                                                  */
+      TestResult tr118 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_PROPERTYRENDER5);
+      /* TODO: implement test */
+      tr118.appendTcDetail("Not implemented.");
+      tr118.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_propertyRender6 */
+      /* Details: "If the \"value\" attribute is null or empty,  the          */
+      /* property value is set to null"                                       */
+      TestResult tr119 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_PROPERTYRENDER6);
+      /* TODO: implement test */
+      tr119.appendTcDetail("Not implemented.");
+      tr119.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_propertyResource1 */
+      /* Details: "The property tag can be used within the resourceURL tag    */
+      /* to add a property"                                                   */
+      TestResult tr120 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_PROPERTYRESOURCE1);
+      /* TODO: implement test */
+      tr120.appendTcDetail("Not implemented.");
+      tr120.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_propertyResource2 */
+      /* Details: "The property tag required attribute \"name\" defines the   */
+      /* property name"                                                       */
+      TestResult tr121 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_PROPERTYRESOURCE2);
+      /* TODO: implement test */
+      tr121.appendTcDetail("Not implemented.");
+      tr121.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_propertyResource3 */
+      /* Details: "If more than one tags appear in the resourceURL tag, the   */
+      /* values must be stored as a multivalued array in order of             */
+      /* appearance within the resourceURL tag"                               */
+      TestResult tr122 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_PROPERTYRESOURCE3);
+      /* TODO: implement test */
+      tr122.appendTcDetail("Not implemented.");
+      tr122.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_propertyResource4 */
+      /* Details: "If the \"name\" attribute is null or empty, no action is   */
+      /* performed"                                                           */
+      TestResult tr123 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_PROPERTYRESOURCE4);
+      /* TODO: implement test */
+      tr123.appendTcDetail("Not implemented.");
+      tr123.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_propertyResource5 */
+      /* Details: "The property tag required attribute \"value\" defines      */
+      /* the property value"                                                  */
+      TestResult tr124 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_PROPERTYRESOURCE5);
+      /* TODO: implement test */
+      tr124.appendTcDetail("Not implemented.");
+      tr124.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_propertyResource6 */
+      /* Details: "If the \"value\" attribute is null or empty, the           */
+      /* property value is set to null"                                       */
+      TestResult tr125 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_PROPERTYRESOURCE6);
+      /* TODO: implement test */
+      tr125.appendTcDetail("Not implemented.");
+      tr125.writeTo(writer);
+
+%>


[03/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.

Posted by ms...@apache.org.
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/23a1c547/portlet-tck_3.0/V2PortletTagLibraryTests3/src/main/webapp/WEB-INF/jsp/PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource.jsp
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2PortletTagLibraryTests3/src/main/webapp/WEB-INF/jsp/PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource.jsp b/portlet-tck_3.0/V2PortletTagLibraryTests3/src/main/webapp/WEB-INF/jsp/PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource.jsp
new file mode 100644
index 0000000..c9f2c9e
--- /dev/null
+++ b/portlet-tck_3.0/V2PortletTagLibraryTests3/src/main/webapp/WEB-INF/jsp/PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource.jsp
@@ -0,0 +1,1096 @@
+<%@ page session="false" %>
+<%@ taglib uri="http://java.sun.com/portlet_2_0"  prefix="portlet" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ page import="java.io.*,java.util.*,java.util.logging.*" %>
+<%@ page import="static java.util.logging.Logger.*" %>
+<%@ page import="javax.portlet.*,javax.portlet.filter.*" %>
+<%@ page import="javax.servlet.http.*,javax.servlet.*" %>
+<%@ page import="javax.portlet.tck.beans.*,javax.portlet.tck.constants.*" %>
+<%@ page import="static javax.portlet.tck.constants.Constants.*" %>
+<%@ page import="static javax.portlet.tck.beans.JSR286SpecTestCaseDetails.*" %>
+
+<%
+
+      PortletRequest portletReq = (PortletRequest) request.getAttribute("javax.portlet.request");
+      PortletResponse portletResp = (PortletResponse) request.getAttribute("javax.portlet.response");
+      PortletConfig portletConfig = (PortletConfig) request.getAttribute("javax.portlet.config");
+      long svtTid = Thread.currentThread().getId();
+      long reqTid = (Long) portletReq.getAttribute(THREADID_ATTR);
+
+      PrintWriter writer = ((MimeResponse)portletResp).getWriter();
+
+      JSR286SpecTestCaseDetails tcd = new JSR286SpecTestCaseDetails();
+
+      // Create result objects for the tests
+
+      /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_defineObjectsResource1 */
+      /* Details: "When included in the Resource phase, the defineObjects     */
+      /* tag defines the variable RenderRequest renderRequest to be null or   */
+      /* undefined"                                                           */
+      TestResult tr0 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_DEFINEOBJECTSRESOURCE1);
+      /* TODO: implement test */
+      tr0.appendTcDetail("Not implemented.");
+      tr0.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_defineObjectsResource2 */
+      /* Details: "When included in the Resource phase, the defineObjects     */
+      /* tag defines the variable ResourceRequest resourceRequest to the      */
+      /* corresponding object"                                                */
+      TestResult tr1 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_DEFINEOBJECTSRESOURCE2);
+      /* TODO: implement test */
+      tr1.appendTcDetail("Not implemented.");
+      tr1.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_defineObjectsResource3 */
+      /* Details: "When included in the Resource phase, the defineObjects     */
+      /* tag defines the variable ActionRequest actionRequest to be null or   */
+      /* undefined"                                                           */
+      TestResult tr2 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_DEFINEOBJECTSRESOURCE3);
+      /* TODO: implement test */
+      tr2.appendTcDetail("Not implemented.");
+      tr2.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_defineObjectsResource4 */
+      /* Details: "When included in the Resource phase, the defineObjects     */
+      /* tag defines the variable EventRequest eventRequest to be null or     */
+      /* undefined"                                                           */
+      TestResult tr3 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_DEFINEOBJECTSRESOURCE4);
+      /* TODO: implement test */
+      tr3.appendTcDetail("Not implemented.");
+      tr3.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_defineObjectsResource5 */
+      /* Details: "When included in the Resource phase, the defineObjects     */
+      /* tag defines the variable RenderResponse renderResponse to be null    */
+      /* or undefined"                                                        */
+      TestResult tr4 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_DEFINEOBJECTSRESOURCE5);
+      /* TODO: implement test */
+      tr4.appendTcDetail("Not implemented.");
+      tr4.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_defineObjectsResource6 */
+      /* Details: "When included in the Resource phase, the defineObjects     */
+      /* tag defines the variable ResourceResponse resourceResponse to the    */
+      /* corresponding object"                                                */
+      TestResult tr5 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_DEFINEOBJECTSRESOURCE6);
+      /* TODO: implement test */
+      tr5.appendTcDetail("Not implemented.");
+      tr5.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_defineObjectsResource7 */
+      /* Details: "When included in the Resource phase, the defineObjects     */
+      /* tag defines the variable ActionResponse actionResponse to be null    */
+      /* or undefined"                                                        */
+      TestResult tr6 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_DEFINEOBJECTSRESOURCE7);
+      /* TODO: implement test */
+      tr6.appendTcDetail("Not implemented.");
+      tr6.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_defineObjectsResource8 */
+      /* Details: "When included in the Resource phase, the defineObjects     */
+      /* tag defines the variable EventResponse eventResponse to be null or   */
+      /* undefined"                                                           */
+      TestResult tr7 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_DEFINEOBJECTSRESOURCE8);
+      /* TODO: implement test */
+      tr7.appendTcDetail("Not implemented.");
+      tr7.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_defineObjectsResource9 */
+      /* Details: "When included in the Resource phase, the defineObjects     */
+      /* tag defines the variable PortletConfig portletConfig"                */
+      TestResult tr8 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_DEFINEOBJECTSRESOURCE9);
+      /* TODO: implement test */
+      tr8.appendTcDetail("Not implemented.");
+      tr8.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_defineObjectsResource10 */
+      /* Details: "When included in the Resource phase, the defineObjects     */
+      /* tag defines the variable PortletSession portletSession, providing    */
+      /* access to the portletSession, does not create a new session, only    */
+      /* returns an existing session or null if no session exists."           */
+      TestResult tr9 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_DEFINEOBJECTSRESOURCE10);
+      /* TODO: implement test */
+      tr9.appendTcDetail("Not implemented.");
+      tr9.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_defineObjectsResource11 */
+      /* Details: "When included in the Resource phase, the defineObjects     */
+      /* tag defines the variable Map<String, Object> portletSessionScope,    */
+      /* providing access to the portletSession attributes as a Map           */
+      /* equivalent to the PortletSession.getAttributeMap() call, does not    */
+      /* create a new session, only returns an existing session. If no        */
+      /* session attributes exist this method returns an empty Map."          */
+      TestResult tr10 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_DEFINEOBJECTSRESOURCE11);
+      /* TODO: implement test */
+      tr10.appendTcDetail("Not implemented.");
+      tr10.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_defineObjectsResource12 */
+      /* Details: "When included in the Resource phase, the defineObjects     */
+      /* tag defines the variable PortletPreferences portletPreferences,      */
+      /* providing access to the portlet preferences."                        */
+      TestResult tr11 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_DEFINEOBJECTSRESOURCE12);
+      /* TODO: implement test */
+      tr11.appendTcDetail("Not implemented.");
+      tr11.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_defineObjectsResource13 */
+      /* Details: "When included in the Resource phase, the defineObjects     */
+      /* tag defines the variable Map<String, String[]>                       */
+      /* portletPreferencesValues, providing access to the portlet            */
+      /* preferences as a Map, equivalent to the                              */
+      /* PortletPreferences.getMap() call. If no portlet preferences exist,   */
+      /* the Map is empty."                                                   */
+      TestResult tr12 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_DEFINEOBJECTSRESOURCE13);
+      /* TODO: implement test */
+      tr12.appendTcDetail("Not implemented.");
+      tr12.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_actionURL1 */
+      /* Details: "The portlet actionURL tag creates a URL that must point    */
+      /* to the current portlet and must trigger an action request with the   */
+      /* supplied parameters"                                                 */
+      TestResult tr13 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_ACTIONURL1);
+      /* TODO: implement test */
+      tr13.appendTcDetail("Not implemented.");
+      tr13.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_actionURL2 */
+      /* Details: "Parameters may be added to the URL by including the        */
+      /* param tag between the actionURL start and end tags"                  */
+      TestResult tr14 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_ACTIONURL2);
+      /* TODO: implement test */
+      tr14.appendTcDetail("Not implemented.");
+      tr14.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_actionURL3 */
+      /* Details: "The optional actionURL \"windowState\" attribute can       */
+      /* specify the desired window state after the URL is triggered"         */
+      TestResult tr15 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_ACTIONURL3);
+      /* TODO: implement test */
+      tr15.appendTcDetail("Not implemented.");
+      tr15.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_actionURL4 */
+      /* Details: "If the \"windowState\" attribute specifies an invalid      */
+      /* value, a JspException with the PortletException that caused this     */
+      /* error as root cause is thrown"                                       */
+      TestResult tr16 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_ACTIONURL4);
+      /* TODO: implement test */
+      tr16.appendTcDetail("Not implemented.");
+      tr16.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_actionURL5 */
+      /* Details: "The \"windowState\" attribute is not case sensitive"       */
+      TestResult tr17 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_ACTIONURL5);
+      /* TODO: implement test */
+      tr17.appendTcDetail("Not implemented.");
+      tr17.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_actionURL6 */
+      /* Details: "The \"windowState\" attribute is not specified, the        */
+      /* current window state is retained when the URL is triggered"          */
+      TestResult tr18 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_ACTIONURL6);
+      /* TODO: implement test */
+      tr18.appendTcDetail("Not implemented.");
+      tr18.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_actionURL7 */
+      /* Details: "The optional actionURL \"portletMode\" attribute can       */
+      /* specify the desired portlet mode after the URL is triggered"         */
+      TestResult tr19 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_ACTIONURL7);
+      /* TODO: implement test */
+      tr19.appendTcDetail("Not implemented.");
+      tr19.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_actionURL8 */
+      /* Details: "If the \"portletMode\" attribute specifies an invalid      */
+      /* value, a JspException with the PortletException that caused this     */
+      /* error as root cause is thrown"                                       */
+      TestResult tr20 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_ACTIONURL8);
+      /* TODO: implement test */
+      tr20.appendTcDetail("Not implemented.");
+      tr20.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_actionURL9 */
+      /* Details: "The \"portletMode\" attribute is not case sensitive"       */
+      TestResult tr21 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_ACTIONURL9);
+      /* TODO: implement test */
+      tr21.appendTcDetail("Not implemented.");
+      tr21.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_actionURL10 */
+      /* Details: "The \"portletMode\" attribute is not specified, the        */
+      /* current portlet mode is retained when the URL is triggered"          */
+      TestResult tr22 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_ACTIONURL10);
+      /* TODO: implement test */
+      tr22.appendTcDetail("Not implemented.");
+      tr22.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_actionURL11 */
+      /* Details: "The optional actionURL \"var\" attribute can specify a     */
+      /* scoped variable for exporting the action URL"                        */
+      TestResult tr23 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_ACTIONURL11);
+      /* TODO: implement test */
+      tr23.appendTcDetail("Not implemented.");
+      tr23.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_actionURL12 */
+      /* Details: "If the actionURL \"var\" attribute is specified, the URL   */
+      /* is not written to the JspWriter"                                     */
+      TestResult tr24 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_ACTIONURL12);
+      /* TODO: implement test */
+      tr24.appendTcDetail("Not implemented.");
+      tr24.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_actionURL13 */
+      /* Details: "If the actionURL \"var\" attribute is not specified, the   */
+      /* URL is written to the JspWriter"                                     */
+      TestResult tr25 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_ACTIONURL13);
+      /* TODO: implement test */
+      tr25.appendTcDetail("Not implemented.");
+      tr25.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_actionURL14 */
+      /* Details: "If the optional actionURL \"secure\" attribute is set to   */
+      /* true, the resulting URL should require a secure connection"          */
+      TestResult tr26 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_ACTIONURL14);
+      /* TODO: implement test */
+      tr26.appendTcDetail("Not implemented.");
+      tr26.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_actionURL15 */
+      /* Details: "If the optional actionURL \"secure\" attribute is set to   */
+      /* false, the resulting URL does not need to require a secure           */
+      /* connection"                                                          */
+      TestResult tr27 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_ACTIONURL15);
+      /* TODO: implement test */
+      tr27.appendTcDetail("Not implemented.");
+      tr27.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_actionURL17 */
+      /* Details: "The \"secure\" attribute is not specified, the security    */
+      /* setting is retained"                                                 */
+      TestResult tr28 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_ACTIONURL17);
+      /* TODO: implement test */
+      tr28.appendTcDetail("Not implemented.");
+      tr28.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_actionURL18 */
+      /* Details: "If the optional actionURL                                  */
+      /* \"copyCurrentRenderParameters\" attribute is set to true, the        */
+      /* current private render parameters are attached to the URL"           */
+      TestResult tr29 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_ACTIONURL18);
+      /* TODO: implement test */
+      tr29.appendTcDetail("Not implemented.");
+      tr29.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_actionURL19 */
+      /* Details: "If the optional actionURL                                  */
+      /* \"copyCurrentRenderParameters\" attribute is set to true,            */
+      /* additional parameters specified with the <portlet:param> element     */
+      /* are merged with the render parameters"                               */
+      TestResult tr30 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_ACTIONURL19);
+      /* TODO: implement test */
+      tr30.appendTcDetail("Not implemented.");
+      tr30.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_actionURL20 */
+      /* Details: "If the optional actionURL                                  */
+      /* \"copyCurrentRenderParameters\" attribute is set to true,            */
+      /* additional parameters specified with the <portlet:param> element     */
+      /* appear in the values array before the render parameter values if     */
+      /* there is a name conflict"                                            */
+      TestResult tr31 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_ACTIONURL20);
+      /* TODO: implement test */
+      tr31.appendTcDetail("Not implemented.");
+      tr31.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_actionURL21 */
+      /* Details: "If the optional actionURL                                  */
+      /* \"copyCurrentRenderParameters\" attribute is set to false, the       */
+      /* current render parameters are not attached to the URL"               */
+      TestResult tr32 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_ACTIONURL21);
+      /* TODO: implement test */
+      tr32.appendTcDetail("Not implemented.");
+      tr32.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_actionURL22 */
+      /* Details: "If the \"copyCurrentRenderParameters\" attribute           */
+      /* specifies an invalid value, a JspException is thrown"                */
+      TestResult tr33 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_ACTIONURL22);
+      /* TODO: implement test */
+      tr33.appendTcDetail("Not implemented.");
+      tr33.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_actionURL23 */
+      /* Details: "The \"copyCurrentRenderParameters\" attribute is not       */
+      /* specified, the security setting is retained"                         */
+      TestResult tr34 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_ACTIONURL23);
+      /* TODO: implement test */
+      tr34.appendTcDetail("Not implemented.");
+      tr34.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_actionURL25 */
+      /* Details: "If the optional actionURL \"escapeXML\" attribute is set   */
+      /* to false, the characters \"<>&'\\\"\" are not converted to their     */
+      /* entity codes"                                                        */
+      TestResult tr35 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_ACTIONURL25);
+      /* TODO: implement test */
+      tr35.appendTcDetail("Not implemented.");
+      tr35.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_actionURL26 */
+      /* Details: "The \"escapeXML\" attribute default value is true"         */
+      TestResult tr36 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_ACTIONURL26);
+      /* TODO: implement test */
+      tr36.appendTcDetail("Not implemented.");
+      tr36.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_actionURL27 */
+      /* Details: "If the optional actionURL \"name\" attribute is set, the   */
+      /* provided name string is used by GenericPortlet to dispatch the       */
+      /* request to the coresponding annotated method"                        */
+      TestResult tr37 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_ACTIONURL27);
+      /* TODO: implement test */
+      tr37.appendTcDetail("Not implemented.");
+      tr37.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_actionURL28 */
+      /* Details: "Setting the \"name\" attribute will add a parameter to     */
+      /* the action URL with the name of \"javax.portlet.action\""            */
+      TestResult tr38 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_ACTIONURL28);
+      /* TODO: implement test */
+      tr38.appendTcDetail("Not implemented.");
+      tr38.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_actionURL29 */
+      /* Details: "If this tag is used in markup provided by a                */
+      /* serveResource call that was directly or indirectly triggered via a   */
+      /* resource URL of type FULL, a JspException with the                   */
+      /* IllegalStateException that caused this error is thrown"              */
+      TestResult tr39 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_ACTIONURL29);
+      /* TODO: implement test */
+      tr39.appendTcDetail("Not implemented.");
+      tr39.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_actionURL30 */
+      /* Details: "If this tag is used in markup provided by a                */
+      /* serveResource call that was directly or indirectly triggered via a   */
+      /* resource URL of type PORTLET, a JspException with the                */
+      /* IllegalStateException that caused this error is thrown"              */
+      TestResult tr40 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_ACTIONURL30);
+      /* TODO: implement test */
+      tr40.appendTcDetail("Not implemented.");
+      tr40.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_renderURL1 */
+      /* Details: "The portlet renderURL tag creates a URL that must point    */
+      /* to the current portlet and must trigger an render request with the   */
+      /* supplied parameters"                                                 */
+      TestResult tr41 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_RENDERURL1);
+      /* TODO: implement test */
+      tr41.appendTcDetail("Not implemented.");
+      tr41.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_renderURL2 */
+      /* Details: "Parameters may be added to the URL by including the        */
+      /* param tag between the renderURL start and end tags"                  */
+      TestResult tr42 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_RENDERURL2);
+      /* TODO: implement test */
+      tr42.appendTcDetail("Not implemented.");
+      tr42.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_renderURL3 */
+      /* Details: "The optional renderURL \"windowState\" attribute can       */
+      /* specify the desired window state after the URL is triggered"         */
+      TestResult tr43 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_RENDERURL3);
+      /* TODO: implement test */
+      tr43.appendTcDetail("Not implemented.");
+      tr43.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_renderURL4 */
+      /* Details: "If the \"windowState\" attribute specifies an invalid      */
+      /* value, a JspException with the PortletException that caused this     */
+      /* error as root cause is thrown"                                       */
+      TestResult tr44 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_RENDERURL4);
+      /* TODO: implement test */
+      tr44.appendTcDetail("Not implemented.");
+      tr44.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_renderURL5 */
+      /* Details: "The \"windowState\" attribute is not case sensitive"       */
+      TestResult tr45 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_RENDERURL5);
+      /* TODO: implement test */
+      tr45.appendTcDetail("Not implemented.");
+      tr45.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_renderURL6 */
+      /* Details: "The \"windowState\" attribute is not specified, the        */
+      /* current window state is retained when the URL is triggered"          */
+      TestResult tr46 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_RENDERURL6);
+      /* TODO: implement test */
+      tr46.appendTcDetail("Not implemented.");
+      tr46.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_renderURL7 */
+      /* Details: "The optional renderURL \"portletMode\" attribute can       */
+      /* specify the desired portlet mode after the URL is triggered"         */
+      TestResult tr47 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_RENDERURL7);
+      /* TODO: implement test */
+      tr47.appendTcDetail("Not implemented.");
+      tr47.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_renderURL8 */
+      /* Details: "If the \"portletMode\" attribute specifies an invalid      */
+      /* value, a JspException with the PortletException that caused this     */
+      /* error as root cause is thrown"                                       */
+      TestResult tr48 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_RENDERURL8);
+      /* TODO: implement test */
+      tr48.appendTcDetail("Not implemented.");
+      tr48.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_renderURL9 */
+      /* Details: "The \"portletMode\" attribute is not case sensitive"       */
+      TestResult tr49 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_RENDERURL9);
+      /* TODO: implement test */
+      tr49.appendTcDetail("Not implemented.");
+      tr49.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_renderURL10 */
+      /* Details: "The \"portletMode\" attribute is not specified, the        */
+      /* current portlet mode is retained when the URL is triggered"          */
+      TestResult tr50 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_RENDERURL10);
+      /* TODO: implement test */
+      tr50.appendTcDetail("Not implemented.");
+      tr50.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_renderURL11 */
+      /* Details: "The optional renderURL \"var\" attribute can specify a     */
+      /* scoped variable for exporting the action URL"                        */
+      TestResult tr51 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_RENDERURL11);
+      /* TODO: implement test */
+      tr51.appendTcDetail("Not implemented.");
+      tr51.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_renderURL12 */
+      /* Details: "If the renderURL \"var\" attribute is specified, the URL   */
+      /* is not written to the JspWriter"                                     */
+      TestResult tr52 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_RENDERURL12);
+      /* TODO: implement test */
+      tr52.appendTcDetail("Not implemented.");
+      tr52.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_renderURL13 */
+      /* Details: "If the renderURL \"var\" attribute is not specified, the   */
+      /* URL is written to the JspWriter"                                     */
+      TestResult tr53 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_RENDERURL13);
+      /* TODO: implement test */
+      tr53.appendTcDetail("Not implemented.");
+      tr53.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_renderURL14 */
+      /* Details: "If the optional renderURL \"secure\" attribute is set to   */
+      /* true, the resulting URL should require a secure connection"          */
+      TestResult tr54 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_RENDERURL14);
+      /* TODO: implement test */
+      tr54.appendTcDetail("Not implemented.");
+      tr54.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_renderURL15 */
+      /* Details: "If the optional renderURL \"secure\" attribute is set to   */
+      /* false, the resulting URL does not need to require a secure           */
+      /* connection"                                                          */
+      TestResult tr55 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_RENDERURL15);
+      /* TODO: implement test */
+      tr55.appendTcDetail("Not implemented.");
+      tr55.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_renderURL17 */
+      /* Details: "The \"secure\" attribute is not specified, the security    */
+      /* setting is retained"                                                 */
+      TestResult tr56 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_RENDERURL17);
+      /* TODO: implement test */
+      tr56.appendTcDetail("Not implemented.");
+      tr56.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_renderURL18 */
+      /* Details: "If the optional renderURL                                  */
+      /* \"copyCurrentRenderParameters\" attribute is set to true, the        */
+      /* current private render parameters are attached to the URL"           */
+      TestResult tr57 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_RENDERURL18);
+      /* TODO: implement test */
+      tr57.appendTcDetail("Not implemented.");
+      tr57.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_renderURL19 */
+      /* Details: "If the optional renderURL                                  */
+      /* \"copyCurrentRenderParameters\" attribute is set to true,            */
+      /* additional parameters specified with the <portlet:param> element     */
+      /* are merged with the render parameters"                               */
+      TestResult tr58 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_RENDERURL19);
+      /* TODO: implement test */
+      tr58.appendTcDetail("Not implemented.");
+      tr58.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_renderURL20 */
+      /* Details: "If the optional renderURL                                  */
+      /* \"copyCurrentRenderParameters\" attribute is set to true,            */
+      /* additional parameters specified with the <portlet:param> element     */
+      /* appear in the values array before the render parameter values if     */
+      /* there is a name conflict"                                            */
+      TestResult tr59 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_RENDERURL20);
+      /* TODO: implement test */
+      tr59.appendTcDetail("Not implemented.");
+      tr59.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_renderURL21 */
+      /* Details: "If the optional renderURL                                  */
+      /* \"copyCurrentRenderParameters\" attribute is set to false, the       */
+      /* current render parameters are not attached to the URL"               */
+      TestResult tr60 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_RENDERURL21);
+      /* TODO: implement test */
+      tr60.appendTcDetail("Not implemented.");
+      tr60.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_renderURL22 */
+      /* Details: "If the \"copyCurrentRenderParameters\" attribute           */
+      /* specifies an invalid value, a JspException is thrown"                */
+      TestResult tr61 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_RENDERURL22);
+      /* TODO: implement test */
+      tr61.appendTcDetail("Not implemented.");
+      tr61.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_renderURL23 */
+      /* Details: "The \"copyCurrentRenderParameters\" attribute is not       */
+      /* specified, the security setting is retained"                         */
+      TestResult tr62 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_RENDERURL23);
+      /* TODO: implement test */
+      tr62.appendTcDetail("Not implemented.");
+      tr62.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_renderURL25 */
+      /* Details: "If the optional renderURL \"escapeXML\" attribute is set   */
+      /* to false, the characters \"<>&'\\\"\" are not converted to their     */
+      /* entity codes"                                                        */
+      TestResult tr63 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_RENDERURL25);
+      /* TODO: implement test */
+      tr63.appendTcDetail("Not implemented.");
+      tr63.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_renderURL26 */
+      /* Details: "The \"escapeXML\" attribute default value is true"         */
+      TestResult tr64 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_RENDERURL26);
+      /* TODO: implement test */
+      tr64.appendTcDetail("Not implemented.");
+      tr64.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_resourceURL1 */
+      /* Details: "The portlet resourceURL tag creates a URL that must        */
+      /* point to the current portlet and must trigger an resource request    */
+      /* with the supplied parameters"                                        */
+      TestResult tr65 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_RESOURCEURL1);
+      /* TODO: implement test */
+      tr65.appendTcDetail("Not implemented.");
+      tr65.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_resourceURL2 */
+      /* Details: "The resourceURL must preserve the current portlet mode,    */
+      /* window state and render parameters"                                  */
+      TestResult tr66 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_RESOURCEURL2);
+      /* TODO: implement test */
+      tr66.appendTcDetail("Not implemented.");
+      tr66.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_resourceURL3 */
+      /* Details: "Resource parameters may be added to the URL by including   */
+      /* the param tag between the resourceURL start and end tags"            */
+      TestResult tr67 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_RESOURCEURL3);
+      /* TODO: implement test */
+      tr67.appendTcDetail("Not implemented.");
+      tr67.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_resourceURL4 */
+      /* Details: "The resource parameters specified with the                 */
+      /* <portlet:param> element appear in the values array before the        */
+      /* render parameter values if there is a name conflict"                 */
+      TestResult tr68 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_RESOURCEURL4);
+      /* TODO: implement test */
+      tr68.appendTcDetail("Not implemented.");
+      tr68.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_resourceURL5 */
+      /* Details: "The optional resourceURL \"var\" attribute can specify a   */
+      /* scoped variable for exporting the action URL"                        */
+      TestResult tr69 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_RESOURCEURL5);
+      /* TODO: implement test */
+      tr69.appendTcDetail("Not implemented.");
+      tr69.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_resourceURL6 */
+      /* Details: "If the resourceURL \"var\" attribute is specified, the     */
+      /* URL is not written to the JspWriter"                                 */
+      TestResult tr70 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_RESOURCEURL6);
+      /* TODO: implement test */
+      tr70.appendTcDetail("Not implemented.");
+      tr70.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_resourceURL7 */
+      /* Details: "If the resourceURL \"var\" attribute is not specified,     */
+      /* the URL is written to the JspWriter"                                 */
+      TestResult tr71 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_RESOURCEURL7);
+      /* TODO: implement test */
+      tr71.appendTcDetail("Not implemented.");
+      tr71.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_resourceURL8 */
+      /* Details: "If the optional resourceURL \"secure\" attribute is set    */
+      /* to true, the resulting URL should require a secure connection"       */
+      TestResult tr72 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_RESOURCEURL8);
+      /* TODO: implement test */
+      tr72.appendTcDetail("Not implemented.");
+      tr72.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_resourceURL9 */
+      /* Details: "If the optional resourceURL \"secure\" attribute is set    */
+      /* to false, the resulting URL does not need to require a secure        */
+      /* connection"                                                          */
+      TestResult tr73 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_RESOURCEURL9);
+      /* TODO: implement test */
+      tr73.appendTcDetail("Not implemented.");
+      tr73.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_resourceURL11 */
+      /* Details: "The \"secure\" attribute is not specified, the security    */
+      /* setting is retained"                                                 */
+      TestResult tr74 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_RESOURCEURL11);
+      /* TODO: implement test */
+      tr74.appendTcDetail("Not implemented.");
+      tr74.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_resourceURL12 */
+      /* Details: "If the optional resourceURL                                */
+      /* \"copyCurrentRenderParameters\" attribute is set to true, the        */
+      /* current private render parameters are attached to the URL"           */
+      TestResult tr75 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_RESOURCEURL12);
+      /* TODO: implement test */
+      tr75.appendTcDetail("Not implemented.");
+      tr75.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_resourceURL13 */
+      /* Details: "If the optional resourceURL                                */
+      /* \"copyCurrentRenderParameters\" attribute is set to true,            */
+      /* additional parameters specified with the <portlet:param> element     */
+      /* are merged with the render parameters"                               */
+      TestResult tr76 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_RESOURCEURL13);
+      /* TODO: implement test */
+      tr76.appendTcDetail("Not implemented.");
+      tr76.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_resourceURL14 */
+      /* Details: "If the optional resourceURL                                */
+      /* \"copyCurrentRenderParameters\" attribute is set to true,            */
+      /* additional parameters specified with the <portlet:param> element     */
+      /* appear in the values array before the render parameter values if     */
+      /* there is a name conflict"                                            */
+      TestResult tr77 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_RESOURCEURL14);
+      /* TODO: implement test */
+      tr77.appendTcDetail("Not implemented.");
+      tr77.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_resourceURL15 */
+      /* Details: "If the optional resourceURL                                */
+      /* \"copyCurrentRenderParameters\" attribute is set to false, the       */
+      /* current render parameters are not attached to the URL"               */
+      TestResult tr78 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_RESOURCEURL15);
+      /* TODO: implement test */
+      tr78.appendTcDetail("Not implemented.");
+      tr78.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_resourceURL16 */
+      /* Details: "If the \"copyCurrentRenderParameters\" attribute           */
+      /* specifies an invalid value, a JspException is thrown"                */
+      TestResult tr79 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_RESOURCEURL16);
+      /* TODO: implement test */
+      tr79.appendTcDetail("Not implemented.");
+      tr79.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_resourceURL17 */
+      /* Details: "The \"copyCurrentRenderParameters\" attribute is not       */
+      /* specified, the security setting is retained"                         */
+      TestResult tr80 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_RESOURCEURL17);
+      /* TODO: implement test */
+      tr80.appendTcDetail("Not implemented.");
+      tr80.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_resourceURL19 */
+      /* Details: "If the optional resourceURL \"escapeXML\" attribute is     */
+      /* set to false, the characters \"<>&'\\\"\" are not converted to       */
+      /* their entity codes"                                                  */
+      TestResult tr81 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_RESOURCEURL19);
+      /* TODO: implement test */
+      tr81.appendTcDetail("Not implemented.");
+      tr81.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_resourceURL20 */
+      /* Details: "The \"escapeXML\" attribute default value is true"         */
+      TestResult tr82 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_RESOURCEURL20);
+      /* TODO: implement test */
+      tr82.appendTcDetail("Not implemented.");
+      tr82.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_resourceURL21 */
+      /* Details: "If the optional resourceURL \"id\" attribute is set, the   */
+      /* provided id string is used by GenericPortlet to dispatch the         */
+      /* request to the coresponding annotated method"                        */
+      TestResult tr83 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_RESOURCEURL21);
+      /* TODO: implement test */
+      tr83.appendTcDetail("Not implemented.");
+      tr83.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_resourceURL22 */
+      /* Details: "Setting the \"id\" attribute will add a parameter to the   */
+      /* action URL with the id of \"javax.portlet.action\""                  */
+      TestResult tr84 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_RESOURCEURL22);
+      /* TODO: implement test */
+      tr84.appendTcDetail("Not implemented.");
+      tr84.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_resourceURL23 */
+      /* Details: "If the optional resourceURL \"cacheability\" attribute     */
+      /* is set, the cacheability is set accordingly"                         */
+      TestResult tr85 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_RESOURCEURL23);
+      /* TODO: implement test */
+      tr85.appendTcDetail("Not implemented.");
+      tr85.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_resourceURL24 */
+      /* Details: "If the optional resourceURL \"cacheability\" attribute     */
+      /* is not set, the current cacheability setting is retained"            */
+      TestResult tr86 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_RESOURCEURL24);
+      /* TODO: implement test */
+      tr86.appendTcDetail("Not implemented.");
+      tr86.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_resourceURL25 */
+      /* Details: "If the cacheability is set to PAGE in a Resource phase     */
+      /* include with cacheability = FULL, a JspException with the            */
+      /* IllegalStateException that caused this error is thrown"              */
+      TestResult tr87 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_RESOURCEURL25);
+      /* TODO: implement test */
+      tr87.appendTcDetail("Not implemented.");
+      tr87.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_resourceURL26 */
+      /* Details: "If the cacheability is set to PORTLET in a Resource        */
+      /* phase include with cacheability = FULL, a JspException with the      */
+      /* IllegalStateException that caused this error is thrown"              */
+      TestResult tr88 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_RESOURCEURL26);
+      /* TODO: implement test */
+      tr88.appendTcDetail("Not implemented.");
+      tr88.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_resourceURL27 */
+      /* Details: "If the cacheability is set to PAGE in a Resource phase     */
+      /* include with cacheability = PORTLET, a JspException with the         */
+      /* IllegalStateException that caused this error is thrown"              */
+      TestResult tr89 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_RESOURCEURL27);
+      /* TODO: implement test */
+      tr89.appendTcDetail("Not implemented.");
+      tr89.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_paramAction1 */
+      /* Details: "The param tag can be used within the actionURL tag to      */
+      /* add a parameter"                                                     */
+      TestResult tr90 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_PARAMACTION1);
+      /* TODO: implement test */
+      tr90.appendTcDetail("Not implemented.");
+      tr90.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_paramAction2 */
+      /* Details: "The param tag required attribute \"name\" defines the      */
+      /* parameter name"                                                      */
+      TestResult tr91 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_PARAMACTION2);
+      /* TODO: implement test */
+      tr91.appendTcDetail("Not implemented.");
+      tr91.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_paramAction3 */
+      /* Details: "If more than one tags appear in the actionURL tag, the     */
+      /* values must be stored as a multivalued array in order of             */
+      /* appearance within the actionURL tag"                                 */
+      TestResult tr92 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_PARAMACTION3);
+      /* TODO: implement test */
+      tr92.appendTcDetail("Not implemented.");
+      tr92.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_paramAction4 */
+      /* Details: "If the \"name\" attribute is null or empty, no action is   */
+      /* performed"                                                           */
+      TestResult tr93 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_PARAMACTION4);
+      /* TODO: implement test */
+      tr93.appendTcDetail("Not implemented.");
+      tr93.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_paramAction5 */
+      /* Details: "The param tag required attribute \"value\" defines the     */
+      /* parameter value"                                                     */
+      TestResult tr94 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_PARAMACTION5);
+      /* TODO: implement test */
+      tr94.appendTcDetail("Not implemented.");
+      tr94.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_paramAction6 */
+      /* Details: "If the \"value\" attribute is null or empty, the           */
+      /* parameter is removed"                                                */
+      TestResult tr95 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_PARAMACTION6);
+      /* TODO: implement test */
+      tr95.appendTcDetail("Not implemented.");
+      tr95.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_paramRender1 */
+      /* Details: "The param tag can be used within the renderURL tag to      */
+      /* add a parameter"                                                     */
+      TestResult tr96 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_PARAMRENDER1);
+      /* TODO: implement test */
+      tr96.appendTcDetail("Not implemented.");
+      tr96.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_paramRender2 */
+      /* Details: "The param tag required attribute \"name\" defines the      */
+      /* parameter name"                                                      */
+      TestResult tr97 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_PARAMRENDER2);
+      /* TODO: implement test */
+      tr97.appendTcDetail("Not implemented.");
+      tr97.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_paramRender3 */
+      /* Details: "If more than one tags appear in the renderURL tag, the     */
+      /* values must be stored as a multivalued array in order of             */
+      /* appearance within the renderURL tag"                                 */
+      TestResult tr98 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_PARAMRENDER3);
+      /* TODO: implement test */
+      tr98.appendTcDetail("Not implemented.");
+      tr98.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_paramRender4 */
+      /* Details: "If the \"name\" attribute is null or empty, no action is   */
+      /* performed"                                                           */
+      TestResult tr99 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_PARAMRENDER4);
+      /* TODO: implement test */
+      tr99.appendTcDetail("Not implemented.");
+      tr99.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_paramRender5 */
+      /* Details: "The param tag required attribute \"value\" defines the     */
+      /* parameter value"                                                     */
+      TestResult tr100 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_PARAMRENDER5);
+      /* TODO: implement test */
+      tr100.appendTcDetail("Not implemented.");
+      tr100.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_paramRender6 */
+      /* Details: "If the \"value\" attribute is null or empty, the           */
+      /* parameter is removed"                                                */
+      TestResult tr101 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_PARAMRENDER6);
+      /* TODO: implement test */
+      tr101.appendTcDetail("Not implemented.");
+      tr101.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_paramResource1 */
+      /* Details: "The param tag can be used within the resourceURL tag to    */
+      /* add a parameter"                                                     */
+      TestResult tr102 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_PARAMRESOURCE1);
+      /* TODO: implement test */
+      tr102.appendTcDetail("Not implemented.");
+      tr102.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_paramResource2 */
+      /* Details: "The param tag required attribute \"name\" defines the      */
+      /* parameter name"                                                      */
+      TestResult tr103 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_PARAMRESOURCE2);
+      /* TODO: implement test */
+      tr103.appendTcDetail("Not implemented.");
+      tr103.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_paramResource3 */
+      /* Details: "If more than one tags appear in the resourceURL tag, the   */
+      /* values must be stored as a multivalued array in order of             */
+      /* appearance within the resourceURL tag"                               */
+      TestResult tr104 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_PARAMRESOURCE3);
+      /* TODO: implement test */
+      tr104.appendTcDetail("Not implemented.");
+      tr104.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_paramResource4 */
+      /* Details: "If the \"name\" attribute is null or empty, no action is   */
+      /* performed"                                                           */
+      TestResult tr105 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_PARAMRESOURCE4);
+      /* TODO: implement test */
+      tr105.appendTcDetail("Not implemented.");
+      tr105.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_paramResource5 */
+      /* Details: "The param tag required attribute \"value\" defines the     */
+      /* parameter value"                                                     */
+      TestResult tr106 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_PARAMRESOURCE5);
+      /* TODO: implement test */
+      tr106.appendTcDetail("Not implemented.");
+      tr106.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_paramResource6 */
+      /* Details: "If the \"value\" attribute is null or empty, no action     */
+      /* is performed"                                                        */
+      TestResult tr107 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_PARAMRESOURCE6);
+      /* TODO: implement test */
+      tr107.appendTcDetail("Not implemented.");
+      tr107.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_propertyAction1 */
+      /* Details: "The property tag can be used within the actionURL tag to   */
+      /* add a property"                                                      */
+      TestResult tr108 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_PROPERTYACTION1);
+      /* TODO: implement test */
+      tr108.appendTcDetail("Not implemented.");
+      tr108.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_propertyAction2 */
+      /* Details: "The property tag required attribute \"name\" defines the   */
+      /* property name"                                                       */
+      TestResult tr109 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_PROPERTYACTION2);
+      /* TODO: implement test */
+      tr109.appendTcDetail("Not implemented.");
+      tr109.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_propertyAction3 */
+      /* Details: "If more than one tags appear in the actionURL tag, the     */
+      /* values must be stored as a multivalued array in order of             */
+      /* appearance within the actionURL tag"                                 */
+      TestResult tr110 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_PROPERTYACTION3);
+      /* TODO: implement test */
+      tr110.appendTcDetail("Not implemented.");
+      tr110.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_propertyAction4 */
+      /* Details: "If the \"name\" attribute is null or empty, no action is   */
+      /* performed"                                                           */
+      TestResult tr111 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_PROPERTYACTION4);
+      /* TODO: implement test */
+      tr111.appendTcDetail("Not implemented.");
+      tr111.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_propertyAction5 */
+      /* Details: "The property tag required attribute \"value\" defines      */
+      /* the property value"                                                  */
+      TestResult tr112 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_PROPERTYACTION5);
+      /* TODO: implement test */
+      tr112.appendTcDetail("Not implemented.");
+      tr112.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_propertyAction6 */
+      /* Details: "If the \"value\" attribute is null or empty,  the          */
+      /* property value is set to null"                                       */
+      TestResult tr113 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_PROPERTYACTION6);
+      /* TODO: implement test */
+      tr113.appendTcDetail("Not implemented.");
+      tr113.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_propertyRender1 */
+      /* Details: "The property tag can be used within the renderURL tag to   */
+      /* add a property"                                                      */
+      TestResult tr114 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_PROPERTYRENDER1);
+      /* TODO: implement test */
+      tr114.appendTcDetail("Not implemented.");
+      tr114.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_propertyRender2 */
+      /* Details: "The property tag required attribute \"name\" defines the   */
+      /* property name"                                                       */
+      TestResult tr115 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_PROPERTYRENDER2);
+      /* TODO: implement test */
+      tr115.appendTcDetail("Not implemented.");
+      tr115.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_propertyRender3 */
+      /* Details: "If more than one tags appear in the renderURL tag, the     */
+      /* values must be stored as a multivalued array in order of             */
+      /* appearance within the renderURL tag"                                 */
+      TestResult tr116 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_PROPERTYRENDER3);
+      /* TODO: implement test */
+      tr116.appendTcDetail("Not implemented.");
+      tr116.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_propertyRender4 */
+      /* Details: "If the \"name\" attribute is null or empty, no action is   */
+      /* performed"                                                           */
+      TestResult tr117 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_PROPERTYRENDER4);
+      /* TODO: implement test */
+      tr117.appendTcDetail("Not implemented.");
+      tr117.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_propertyRender5 */
+      /* Details: "The property tag required attribute \"value\" defines      */
+      /* the property value"                                                  */
+      TestResult tr118 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_PROPERTYRENDER5);
+      /* TODO: implement test */
+      tr118.appendTcDetail("Not implemented.");
+      tr118.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_propertyRender6 */
+      /* Details: "If the \"value\" attribute is null or empty,  the          */
+      /* property value is set to null"                                       */
+      TestResult tr119 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_PROPERTYRENDER6);
+      /* TODO: implement test */
+      tr119.appendTcDetail("Not implemented.");
+      tr119.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_propertyResource1 */
+      /* Details: "The property tag can be used within the resourceURL tag    */
+      /* to add a property"                                                   */
+      TestResult tr120 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_PROPERTYRESOURCE1);
+      /* TODO: implement test */
+      tr120.appendTcDetail("Not implemented.");
+      tr120.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_propertyResource2 */
+      /* Details: "The property tag required attribute \"name\" defines the   */
+      /* property name"                                                       */
+      TestResult tr121 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_PROPERTYRESOURCE2);
+      /* TODO: implement test */
+      tr121.appendTcDetail("Not implemented.");
+      tr121.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_propertyResource3 */
+      /* Details: "If more than one tags appear in the resourceURL tag, the   */
+      /* values must be stored as a multivalued array in order of             */
+      /* appearance within the resourceURL tag"                               */
+      TestResult tr122 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_PROPERTYRESOURCE3);
+      /* TODO: implement test */
+      tr122.appendTcDetail("Not implemented.");
+      tr122.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_propertyResource4 */
+      /* Details: "If the \"name\" attribute is null or empty, no action is   */
+      /* performed"                                                           */
+      TestResult tr123 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_PROPERTYRESOURCE4);
+      /* TODO: implement test */
+      tr123.appendTcDetail("Not implemented.");
+      tr123.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_propertyResource5 */
+      /* Details: "The property tag required attribute \"value\" defines      */
+      /* the property value"                                                  */
+      TestResult tr124 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_PROPERTYRESOURCE5);
+      /* TODO: implement test */
+      tr124.appendTcDetail("Not implemented.");
+      tr124.writeTo(writer);
+
+      /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_propertyResource6 */
+      /* Details: "If the \"value\" attribute is null or empty, the           */
+      /* property value is set to null"                                       */
+      TestResult tr125 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_PROPERTYRESOURCE6);
+      /* TODO: implement test */
+      tr125.appendTcDetail("Not implemented.");
+      tr125.writeTo(writer);
+
+%>

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/23a1c547/portlet-tck_3.0/V2PortletTagLibraryTests3/src/main/webapp/WEB-INF/portlet.xml
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2PortletTagLibraryTests3/src/main/webapp/WEB-INF/portlet.xml b/portlet-tck_3.0/V2PortletTagLibraryTests3/src/main/webapp/WEB-INF/portlet.xml
new file mode 100644
index 0000000..f985aea
--- /dev/null
+++ b/portlet-tck_3.0/V2PortletTagLibraryTests3/src/main/webapp/WEB-INF/portlet.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    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.     
+-->
+<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"
+   xmlns:tck="http://www.apache.org/portals/pluto/portlet-tck_3.0"
+   version="2.0" id="V2PortletTagLibraryTests3">
+   <portlet>
+      <portlet-name>PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource</portlet-name>
+      <portlet-class>javax.portlet.tck.portlets.PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource</portlet-class>
+      <expiration-cache>0</expiration-cache>
+      <supports>
+         <mime-type>text/html</mime-type>
+      </supports>
+      <supported-locale>en_US</supported-locale>
+      <portlet-info>
+         <title>PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource</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>
+
+   <event-definition>
+      <qname>tck:PortletTagLibraryTests_SPEC2_26_IncludeJSPEvent</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/V2PortletTagLibraryTests3/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2PortletTagLibraryTests3/src/main/webapp/WEB-INF/web.xml b/portlet-tck_3.0/V2PortletTagLibraryTests3/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 0000000..209b655
--- /dev/null
+++ b/portlet-tck_3.0/V2PortletTagLibraryTests3/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    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.     
+-->
+<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-PortletTagLibraryTests3</display-name>
+
+</web-app>