portals-pluto-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From msnickl...@apache.org
Subject [40/63] [abbrv] Moved filter test cases to proper filter method. Added keyword "Api" to test case names whose definitions were derived from the API documentation to allow targeted test runs for that group of tests.
Date Mon, 01 Sep 2014 13:29:48 GMT
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/db1071e7/portlet-tck_3.0/V2EnvironmentTests/src/main/java/javax/portlet/tck/portlets/EnvironmentTests_PortletSession_Render.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2EnvironmentTests/src/main/java/javax/portlet/tck/portlets/EnvironmentTests_PortletSession_Render.java b/portlet-tck_3.0/V2EnvironmentTests/src/main/java/javax/portlet/tck/portlets/EnvironmentTests_PortletSession_Render.java
deleted file mode 100644
index 6231afd..0000000
--- a/portlet-tck_3.0/V2EnvironmentTests/src/main/java/javax/portlet/tck/portlets/EnvironmentTests_PortletSession_Render.java
+++ /dev/null
@@ -1,565 +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.*;
-import java.util.*;
-import java.util.logging.*;
-import static java.util.logging.Logger.*;
-import javax.xml.namespace.QName;
-import javax.portlet.*;
-import javax.portlet.filter.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
-import javax.portlet.tck.beans.*;
-import javax.portlet.tck.constants.*;
-import static javax.portlet.tck.beans.JSR286ApiTestCaseDetails.*;
-import static javax.portlet.tck.constants.Constants.*;
-import static javax.portlet.PortletSession.*;
-import static javax.portlet.ResourceURL.*;
-
-/**
- * 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 EnvironmentTests_PortletSession_Render_event
- *
- */
-public class EnvironmentTests_PortletSession_Render implements Portlet, ResourceServingPortlet {
-   private static final String LOG_CLASS = 
-         EnvironmentTests_PortletSession_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();
-
-      JSR286ApiTestCaseDetails tcd = new JSR286ApiTestCaseDetails();
-
-      // Create result objects for the tests
-
-      /* TestCase: V2EnvironmentTests_PortletSession_Render_fieldAPPLICATION_SCOPE */
-      /* Details: "Has int field APPLICATION_SCOPE with value of 0x01 "       */
-      TestResult tr0 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_PORTLETSESSION_RENDER_FIELDAPPLICATION_SCOPE);
-      /* TODO: implement test */
-      tr0.appendTcDetail("Not implemented.");
-      tr0.writeTo(writer);
-
-      /* TestCase: V2EnvironmentTests_PortletSession_Render_fieldPORTLET_SCOPE */
-      /* Details: "Has int field PORTLET_SCOPE with value of 0x02 "           */
-      TestResult tr1 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_PORTLETSESSION_RENDER_FIELDPORTLET_SCOPE);
-      /* TODO: implement test */
-      tr1.appendTcDetail("Not implemented.");
-      tr1.writeTo(writer);
-
-      /* TestCase: V2EnvironmentTests_PortletSession_Render_getAttributeA1    */
-      /* Details: "Method getAttribute(String): Returns a java.lang.Object    */
-      /* for the specified attribute name in the PORTLET_SCOPE"               */
-      TestResult tr2 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_PORTLETSESSION_RENDER_GETATTRIBUTEA1);
-      /* TODO: implement test */
-      tr2.appendTcDetail("Not implemented.");
-      tr2.writeTo(writer);
-
-      /* TestCase: V2EnvironmentTests_PortletSession_Render_getAttributeA2    */
-      /* Details: "Method getAttribute(String): Returns null if no            */
-      /* attribute with the specified name exists in the PORTLET_SCOPE"       */
-      TestResult tr3 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_PORTLETSESSION_RENDER_GETATTRIBUTEA2);
-      /* TODO: implement test */
-      tr3.appendTcDetail("Not implemented.");
-      tr3.writeTo(writer);
-
-      /* TestCase: V2EnvironmentTests_PortletSession_Render_getAttributeA3    */
-      /* Details: "Method getAttribute(String): Throws                        */
-      /* IllegalArgumentException if the name is null"                        */
-      TestResult tr4 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_PORTLETSESSION_RENDER_GETATTRIBUTEA3);
-      /* TODO: implement test */
-      tr4.appendTcDetail("Not implemented.");
-      tr4.writeTo(writer);
-
-      /* TestCase: V2EnvironmentTests_PortletSession_Render_getAttributeA4    */
-      /* Details: "Method getAttribute(String): Throws                        */
-      /* IllegalStateException if the method is called on an invalidated      */
-      /* session"                                                             */
-      TestResult tr5 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_PORTLETSESSION_RENDER_GETATTRIBUTEA4);
-      /* TODO: implement test */
-      tr5.appendTcDetail("Not implemented.");
-      tr5.writeTo(writer);
-
-      /* TestCase: V2EnvironmentTests_PortletSession_Render_getAttributeB1    */
-      /* Details: "Method getAttribute(String): Returns a java.lang.Object    */
-      /* for the specified attribute name in the specified scope"             */
-      TestResult tr6 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_PORTLETSESSION_RENDER_GETATTRIBUTEB1);
-      /* TODO: implement test */
-      tr6.appendTcDetail("Not implemented.");
-      tr6.writeTo(writer);
-
-      /* TestCase: V2EnvironmentTests_PortletSession_Render_getAttributeB2    */
-      /* Details: "Method getAttribute(String): Returns null if no            */
-      /* attribute with the specified name exists in the specified scope"     */
-      TestResult tr7 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_PORTLETSESSION_RENDER_GETATTRIBUTEB2);
-      /* TODO: implement test */
-      tr7.appendTcDetail("Not implemented.");
-      tr7.writeTo(writer);
-
-      /* TestCase: V2EnvironmentTests_PortletSession_Render_getAttributeB3    */
-      /* Details: "Method getAttribute(String): Throws                        */
-      /* IllegalArgumentException if the name is null"                        */
-      TestResult tr8 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_PORTLETSESSION_RENDER_GETATTRIBUTEB3);
-      /* TODO: implement test */
-      tr8.appendTcDetail("Not implemented.");
-      tr8.writeTo(writer);
-
-      /* TestCase: V2EnvironmentTests_PortletSession_Render_getAttributeB4    */
-      /* Details: "Method getAttribute(String): Throws                        */
-      /* IllegalStateException if the method is called on an invalidated      */
-      /* session"                                                             */
-      TestResult tr9 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_PORTLETSESSION_RENDER_GETATTRIBUTEB4);
-      /* TODO: implement test */
-      tr9.appendTcDetail("Not implemented.");
-      tr9.writeTo(writer);
-
-      /* TestCase: V2EnvironmentTests_PortletSession_Render_getAttributeNamesA1 */
-      /* Details: "Method getAttributeNames(): Returns a                      */
-      /* java.util.Enumeration<java.lang.String> of the available       */
-      /* attribute names in the PORTLET_SCOPE"                                */
-      TestResult tr10 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_PORTLETSESSION_RENDER_GETATTRIBUTENAMESA1);
-      /* TODO: implement test */
-      tr10.appendTcDetail("Not implemented.");
-      tr10.writeTo(writer);
-
-      /* TestCase: V2EnvironmentTests_PortletSession_Render_getAttributeNamesA2 */
-      /* Details: "Method getAttributeNames(): Returns an empty Enumeration   */
-      /* if there are no attributes available in the PORTLET_SCOPE"           */
-      TestResult tr11 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_PORTLETSESSION_RENDER_GETATTRIBUTENAMESA2);
-      /* TODO: implement test */
-      tr11.appendTcDetail("Not implemented.");
-      tr11.writeTo(writer);
-
-      /* TestCase: V2EnvironmentTests_PortletSession_Render_getAttributeNamesB1 */
-      /* Details: "Method getAttributeNames(int): Returns a                   */
-      /* java.util.Enumeration<java.lang.String> of the available       */
-      /* attribute names in the specified scope"                              */
-      TestResult tr12 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_PORTLETSESSION_RENDER_GETATTRIBUTENAMESB1);
-      /* TODO: implement test */
-      tr12.appendTcDetail("Not implemented.");
-      tr12.writeTo(writer);
-
-      /* TestCase: V2EnvironmentTests_PortletSession_Render_getAttributeNamesB2 */
-      /* Details: "Method getAttributeNames(int): Returns an empty            */
-      /* Enumeration if there are no attributes available in the specified    */
-      /* scope"                                                               */
-      TestResult tr13 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_PORTLETSESSION_RENDER_GETATTRIBUTENAMESB2);
-      /* TODO: implement test */
-      tr13.appendTcDetail("Not implemented.");
-      tr13.writeTo(writer);
-
-      /* TestCase: V2EnvironmentTests_PortletSession_Render_getCreationTime1  */
-      /* Details: "Method getCreationTime(): Returns a long containing the    */
-      /* time the session was created in milliseconds since 1/1/1970  "       */
-      TestResult tr14 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_PORTLETSESSION_RENDER_GETCREATIONTIME1);
-      /* TODO: implement test */
-      tr14.appendTcDetail("Not implemented.");
-      tr14.writeTo(writer);
-
-      /* TestCase: V2EnvironmentTests_PortletSession_Render_getCreationTime2  */
-      /* Details: "Method getCreationTime(): Throws IllegalStateException     */
-      /* if this method is called on an invalidated session"                  */
-      TestResult tr15 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_PORTLETSESSION_RENDER_GETCREATIONTIME2);
-      /* TODO: implement test */
-      tr15.appendTcDetail("Not implemented.");
-      tr15.writeTo(writer);
-
-      /* TestCase: V2EnvironmentTests_PortletSession_Render_getId             */
-      /* Details: "Method getId(): Returns a String containing a unique       */
-      /* identifier for the session"                                          */
-      TestResult tr16 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_PORTLETSESSION_RENDER_GETID);
-      /* TODO: implement test */
-      tr16.appendTcDetail("Not implemented.");
-      tr16.writeTo(writer);
-
-      /* TestCase: V2EnvironmentTests_PortletSession_Render_getLastAccessedTime */
-      /* Details: "Method getLastAccessedTime(): Returns a long containing    */
-      /* the last time the session was accessed in milliseconds since         */
-      /* 1/1/1970"                                                            */
-      TestResult tr17 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_PORTLETSESSION_RENDER_GETLASTACCESSEDTIME);
-      /* TODO: implement test */
-      tr17.appendTcDetail("Not implemented.");
-      tr17.writeTo(writer);
-
-      /* TestCase: V2EnvironmentTests_PortletSession_Render_getMaxInactiveInterval */
-      /* Details: "Method getMaxInactiveInterval(): Returns the maximum       */
-      /* time interval, in seconds, for which the portlet container keeps     */
-      /* this session open between client accesses"                           */
-      TestResult tr18 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_PORTLETSESSION_RENDER_GETMAXINACTIVEINTERVAL);
-      /* TODO: implement test */
-      tr18.appendTcDetail("Not implemented.");
-      tr18.writeTo(writer);
-
-      /* TestCase: V2EnvironmentTests_PortletSession_Render_invalidate1       */
-      /* Details: "Method invalidate(): Invalidates this session (all         */
-      /* scopes): and unbinds any objects bound to it"                        */
-      TestResult tr19 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_PORTLETSESSION_RENDER_INVALIDATE1);
-      /* TODO: implement test */
-      tr19.appendTcDetail("Not implemented.");
-      tr19.writeTo(writer);
-
-      /* TestCase: V2EnvironmentTests_PortletSession_Render_invalidate2       */
-      /* Details: "Method invalidate(): The underlying HTTP session is also   */
-      /* invalidated"                                                         */
-      TestResult tr20 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_PORTLETSESSION_RENDER_INVALIDATE2);
-      /* TODO: implement test */
-      tr20.appendTcDetail("Not implemented.");
-      tr20.writeTo(writer);
-
-      /* TestCase: V2EnvironmentTests_PortletSession_Render_isNew1            */
-      /* Details: "Method isNew(): Returns true if the client has not yet     */
-      /* joined the session"                                                  */
-      TestResult tr21 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_PORTLETSESSION_RENDER_ISNEW1);
-      /* TODO: implement test */
-      tr21.appendTcDetail("Not implemented.");
-      tr21.writeTo(writer);
-
-      /* TestCase: V2EnvironmentTests_PortletSession_Render_isNew2            */
-      /* Details: "Method isNew(): Returns false if the client has joined     */
-      /* the session"                                                         */
-      TestResult tr22 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_PORTLETSESSION_RENDER_ISNEW2);
-      /* TODO: implement test */
-      tr22.appendTcDetail("Not implemented.");
-      tr22.writeTo(writer);
-
-      /* TestCase: V2EnvironmentTests_PortletSession_Render_removeAttributeA1 */
-      /* Details: "Method removeAttribute(String): Removes the attribute      */
-      /* specified by the name from the PORTLET_SCOPE"                        */
-      TestResult tr23 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_PORTLETSESSION_RENDER_REMOVEATTRIBUTEA1);
-      /* TODO: implement test */
-      tr23.appendTcDetail("Not implemented.");
-      tr23.writeTo(writer);
-
-      /* TestCase: V2EnvironmentTests_PortletSession_Render_removeAttributeA2 */
-      /* Details: "Method removeAttribute(String): If there is no attribute   */
-      /* by the specified name in the the PORTLET_SCOPE, this method does     */
-      /* nothing"                                                             */
-      TestResult tr24 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_PORTLETSESSION_RENDER_REMOVEATTRIBUTEA2);
-      /* TODO: implement test */
-      tr24.appendTcDetail("Not implemented.");
-      tr24.writeTo(writer);
-
-      /* TestCase: V2EnvironmentTests_PortletSession_Render_removeAttributeA3 */
-      /* Details: "Method removeAttribute(String): If an attribute was        */
-      /* removed, the HttpSessionAttributeListener.attributeRemoved method    */
-      /* is called on all HttpSessionAttributeListeners in the web            */
-      /* application"                                                         */
-      TestResult tr25 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_PORTLETSESSION_RENDER_REMOVEATTRIBUTEA3);
-      /* TODO: implement test */
-      tr25.appendTcDetail("Not implemented.");
-      tr25.writeTo(writer);
-
-      /* TestCase: V2EnvironmentTests_PortletSession_Render_removeAttributeA4 */
-      /* Details: "Method removeAttribute(String): Throws                     */
-      /* IllegalArgumentException if the name is null"                        */
-      TestResult tr26 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_PORTLETSESSION_RENDER_REMOVEATTRIBUTEA4);
-      /* TODO: implement test */
-      tr26.appendTcDetail("Not implemented.");
-      tr26.writeTo(writer);
-
-      /* TestCase: V2EnvironmentTests_PortletSession_Render_removeAttributeB1 */
-      /* Details: "Method removeAttribute(String, int): Removes the           */
-      /* attribute specified by the name from the specified scope"            */
-      TestResult tr27 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_PORTLETSESSION_RENDER_REMOVEATTRIBUTEB1);
-      /* TODO: implement test */
-      tr27.appendTcDetail("Not implemented.");
-      tr27.writeTo(writer);
-
-      /* TestCase: V2EnvironmentTests_PortletSession_Render_removeAttributeB2 */
-      /* Details: "Method removeAttribute(String, int): If there is no        */
-      /* attribute by the specified name in the specified scope, this         */
-      /* method does nothing"                                                 */
-      TestResult tr28 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_PORTLETSESSION_RENDER_REMOVEATTRIBUTEB2);
-      /* TODO: implement test */
-      tr28.appendTcDetail("Not implemented.");
-      tr28.writeTo(writer);
-
-      /* TestCase: V2EnvironmentTests_PortletSession_Render_removeAttributeB3 */
-      /* Details: "Method removeAttribute(String, int): If an attribute was   */
-      /* removed, the HttpSessionAttributeListener.attributeRemoved method    */
-      /* is called on all HttpSessionAttributeListeners in the web            */
-      /* application"                                                         */
-      TestResult tr29 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_PORTLETSESSION_RENDER_REMOVEATTRIBUTEB3);
-      /* TODO: implement test */
-      tr29.appendTcDetail("Not implemented.");
-      tr29.writeTo(writer);
-
-      /* TestCase: V2EnvironmentTests_PortletSession_Render_removeAttributeB4 */
-      /* Details: "Method removeAttribute(String, int): Throws                */
-      /* IllegalArgumentException if the name is null"                        */
-      TestResult tr30 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_PORTLETSESSION_RENDER_REMOVEATTRIBUTEB4);
-      /* TODO: implement test */
-      tr30.appendTcDetail("Not implemented.");
-      tr30.writeTo(writer);
-
-      /* TestCase: V2EnvironmentTests_PortletSession_Render_setAttributeA1    */
-      /* Details: "Method setAttribute(String, Object): Stores an attribute   */
-      /* object under the specified name in the PORTLET_SCOPE"                */
-      TestResult tr31 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_PORTLETSESSION_RENDER_SETATTRIBUTEA1);
-      /* TODO: implement test */
-      tr31.appendTcDetail("Not implemented.");
-      tr31.writeTo(writer);
-
-      /* TestCase: V2EnvironmentTests_PortletSession_Render_setAttributeA2    */
-      /* Details: "Method setAttribute(String, Object): Replaces the          */
-      /* attribute by the specified name if the attribute already exists"     */
-      TestResult tr32 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_PORTLETSESSION_RENDER_SETATTRIBUTEA2);
-      /* TODO: implement test */
-      tr32.appendTcDetail("Not implemented.");
-      tr32.writeTo(writer);
-
-      /* TestCase: V2EnvironmentTests_PortletSession_Render_setAttributeA3    */
-      /* Details: "Method setAttribute(String, Object): Removes the           */
-      /* attribute by the specified name if the object is null"               */
-      TestResult tr33 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_PORTLETSESSION_RENDER_SETATTRIBUTEA3);
-      /* TODO: implement test */
-      tr33.appendTcDetail("Not implemented.");
-      tr33.writeTo(writer);
-
-      /* TestCase: V2EnvironmentTests_PortletSession_Render_setAttributeA4    */
-      /* Details: "Method setAttribute(String, Object): If the attribute      */
-      /* object implements HttpSessionBindingListener, its                    */
-      /* HttpSessionBindingListener.valueBound method is called"              */
-      TestResult tr34 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_PORTLETSESSION_RENDER_SETATTRIBUTEA4);
-      /* TODO: implement test */
-      tr34.appendTcDetail("Not implemented.");
-      tr34.writeTo(writer);
-
-      /* TestCase: V2EnvironmentTests_PortletSession_Render_setAttributeA5    */
-      /* Details: "Method setAttribute(String, Object): If an existing        */
-      /* attribute object implements HttpSessionBindingListener and is        */
-      /* replaced, its HttpSessionBindingListener.valueUnbound method is      */
-      /* called"                                                              */
-      TestResult tr35 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_PORTLETSESSION_RENDER_SETATTRIBUTEA5);
-      /* TODO: implement test */
-      tr35.appendTcDetail("Not implemented.");
-      tr35.writeTo(writer);
-
-      /* TestCase: V2EnvironmentTests_PortletSession_Render_setAttributeA6    */
-      /* Details: "Method setAttribute(String, Object): If an attribute was   */
-      /* replaced, the HttpSessionAttributeListener.attributeReplaced         */
-      /* method is called on all HttpSessionAttributeListeners in the web     */
-      /* application"                                                         */
-      TestResult tr36 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_PORTLETSESSION_RENDER_SETATTRIBUTEA6);
-      /* TODO: implement test */
-      tr36.appendTcDetail("Not implemented.");
-      tr36.writeTo(writer);
-
-      /* TestCase: V2EnvironmentTests_PortletSession_Render_setAttributeA7    */
-      /* Details: "Method setAttribute(String, Object): If a new attribute    */
-      /* was added, the HttpSessionAttributeListener.attributeAdded method    */
-      /* is called on all HttpSessionAttributeListeners in the web            */
-      /* application"                                                         */
-      TestResult tr37 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_PORTLETSESSION_RENDER_SETATTRIBUTEA7);
-      /* TODO: implement test */
-      tr37.appendTcDetail("Not implemented.");
-      tr37.writeTo(writer);
-
-      /* TestCase: V2EnvironmentTests_PortletSession_Render_setAttributeA8    */
-      /* Details: "Method setAttribute(String, Object): Throws                */
-      /* IllegalArgumentException if the name is null"                        */
-      TestResult tr38 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_PORTLETSESSION_RENDER_SETATTRIBUTEA8);
-      /* TODO: implement test */
-      tr38.appendTcDetail("Not implemented.");
-      tr38.writeTo(writer);
-
-      /* TestCase: V2EnvironmentTests_PortletSession_Render_setAttributeB1    */
-      /* Details: "Method setAttribute(String, Object, int): Stores an        */
-      /* attribute object under the specified name in the specified scope"    */
-      TestResult tr39 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_PORTLETSESSION_RENDER_SETATTRIBUTEB1);
-      /* TODO: implement test */
-      tr39.appendTcDetail("Not implemented.");
-      tr39.writeTo(writer);
-
-      /* TestCase: V2EnvironmentTests_PortletSession_Render_setAttributeB2    */
-      /* Details: "Method setAttribute(String, Object, int): Replaces the     */
-      /* attribute by the specified name if the attribute already exists"     */
-      TestResult tr40 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_PORTLETSESSION_RENDER_SETATTRIBUTEB2);
-      /* TODO: implement test */
-      tr40.appendTcDetail("Not implemented.");
-      tr40.writeTo(writer);
-
-      /* TestCase: V2EnvironmentTests_PortletSession_Render_setAttributeB3    */
-      /* Details: "Method setAttribute(String, Object, int): Removes the      */
-      /* attribute by the specified name if the object is null"               */
-      TestResult tr41 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_PORTLETSESSION_RENDER_SETATTRIBUTEB3);
-      /* TODO: implement test */
-      tr41.appendTcDetail("Not implemented.");
-      tr41.writeTo(writer);
-
-      /* TestCase: V2EnvironmentTests_PortletSession_Render_setAttributeB4    */
-      /* Details: "Method setAttribute(String, Object, int): If the           */
-      /* attribute object implements HttpSessionBindingListener, its          */
-      /* HttpSessionBindingListener.valueBound method is called"              */
-      TestResult tr42 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_PORTLETSESSION_RENDER_SETATTRIBUTEB4);
-      /* TODO: implement test */
-      tr42.appendTcDetail("Not implemented.");
-      tr42.writeTo(writer);
-
-      /* TestCase: V2EnvironmentTests_PortletSession_Render_setAttributeB5    */
-      /* Details: "Method setAttribute(String, Object, int): If an existing   */
-      /* attribute object implements HttpSessionBindingListener and is        */
-      /* replaced, its HttpSessionBindingListener.valueUnbound method is      */
-      /* called"                                                              */
-      TestResult tr43 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_PORTLETSESSION_RENDER_SETATTRIBUTEB5);
-      /* TODO: implement test */
-      tr43.appendTcDetail("Not implemented.");
-      tr43.writeTo(writer);
-
-      /* TestCase: V2EnvironmentTests_PortletSession_Render_setAttributeB6    */
-      /* Details: "Method setAttribute(String, Object, int): If an            */
-      /* attribute was replaced, the                                          */
-      /* HttpSessionAttributeListener.attributeReplaced method is called on   */
-      /* all HttpSessionAttributeListeners in the web application"            */
-      TestResult tr44 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_PORTLETSESSION_RENDER_SETATTRIBUTEB6);
-      /* TODO: implement test */
-      tr44.appendTcDetail("Not implemented.");
-      tr44.writeTo(writer);
-
-      /* TestCase: V2EnvironmentTests_PortletSession_Render_setAttributeB7    */
-      /* Details: "Method setAttribute(String, Object, int): If a new         */
-      /* attribute was added, the                                             */
-      /* HttpSessionAttributeListener.attributeAdded method is called on      */
-      /* all HttpSessionAttributeListeners in the web application"            */
-      TestResult tr45 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_PORTLETSESSION_RENDER_SETATTRIBUTEB7);
-      /* TODO: implement test */
-      tr45.appendTcDetail("Not implemented.");
-      tr45.writeTo(writer);
-
-      /* TestCase: V2EnvironmentTests_PortletSession_Render_setAttributeB8    */
-      /* Details: "Method setAttribute(String, Object, int): Throws           */
-      /* IllegalArgumentException if the name is null"                        */
-      TestResult tr46 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_PORTLETSESSION_RENDER_SETATTRIBUTEB8);
-      /* TODO: implement test */
-      tr46.appendTcDetail("Not implemented.");
-      tr46.writeTo(writer);
-
-      /* TestCase: V2EnvironmentTests_PortletSession_Render_setMaxInactiveInterval1 */
-      /* Details: "Method setMaxInactiveInterval(int): Specifies the time     */
-      /* in seconds between client requests before the portlet contaner       */
-      /* invalidates the session"                                             */
-      TestResult tr47 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_PORTLETSESSION_RENDER_SETMAXINACTIVEINTERVAL1);
-      /* TODO: implement test */
-      tr47.appendTcDetail("Not implemented.");
-      tr47.writeTo(writer);
-
-      /* TestCase: V2EnvironmentTests_PortletSession_Render_setMaxInactiveInterval2 */
-      /* Details: "Method setMaxInactiveInterval(int): If the specified       */
-      /* time is negative, the session should never timeout"                  */
-      TestResult tr48 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_PORTLETSESSION_RENDER_SETMAXINACTIVEINTERVAL2);
-      /* TODO: implement test */
-      tr48.appendTcDetail("Not implemented.");
-      tr48.writeTo(writer);
-
-      /* TestCase: V2EnvironmentTests_PortletSession_Render_getPortletContext */
-      /* Details: "Method getPortletContext(): Returns the PortletContext     */
-      /* object for this session"                                             */
-      TestResult tr49 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_PORTLETSESSION_RENDER_GETPORTLETCONTEXT);
-      /* TODO: implement test */
-      tr49.appendTcDetail("Not implemented.");
-      tr49.writeTo(writer);
-
-      /* TestCase: V2EnvironmentTests_PortletSession_Render_getAttributeMapA1 */
-      /* Details: "Method getAttributeMap(): Returns an                       */
-      /* java.util.Map<java.lang.String,java.lang.Object> object for    */
-      /* the attributes available in the PORTLET_SCOPE"                       */
-      TestResult tr50 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_PORTLETSESSION_RENDER_GETATTRIBUTEMAPA1);
-      /* TODO: implement test */
-      tr50.appendTcDetail("Not implemented.");
-      tr50.writeTo(writer);
-
-      /* TestCase: V2EnvironmentTests_PortletSession_Render_getAttributeMapA2 */
-      /* Details: "Method getAttributeMap(): Returns an empty map if no       */
-      /* attributes exist in the PORTLET_SCOPE"                               */
-      TestResult tr51 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_PORTLETSESSION_RENDER_GETATTRIBUTEMAPA2);
-      /* TODO: implement test */
-      tr51.appendTcDetail("Not implemented.");
-      tr51.writeTo(writer);
-
-      /* TestCase: V2EnvironmentTests_PortletSession_Render_getAttributeMapB1 */
-      /* Details: "Method getAttributeMap(int): Returns an                    */
-      /* java.util.Map<java.lang.String,java.lang.Object> object for    */
-      /* the attributes available in the PORTLET_SCOPE"                       */
-      TestResult tr52 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_PORTLETSESSION_RENDER_GETATTRIBUTEMAPB1);
-      /* TODO: implement test */
-      tr52.appendTcDetail("Not implemented.");
-      tr52.writeTo(writer);
-
-      /* TestCase: V2EnvironmentTests_PortletSession_Render_getAttributeMapB2 */
-      /* Details: "Method getAttributeMap(int): Returns an empty map if no    */
-      /* attributes exist in the PORTLET_SCOPE"                               */
-      TestResult tr53 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_PORTLETSESSION_RENDER_GETATTRIBUTEMAPB2);
-      /* TODO: implement test */
-      tr53.appendTcDetail("Not implemented.");
-      tr53.writeTo(writer);
-
-   }
-
-}

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/db1071e7/portlet-tck_3.0/V2EnvironmentTests/src/main/java/javax/portlet/tck/portlets/EnvironmentTests_PreferencesValidator_Action.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2EnvironmentTests/src/main/java/javax/portlet/tck/portlets/EnvironmentTests_PreferencesValidator_Action.java b/portlet-tck_3.0/V2EnvironmentTests/src/main/java/javax/portlet/tck/portlets/EnvironmentTests_PreferencesValidator_Action.java
deleted file mode 100644
index 18b6363..0000000
--- a/portlet-tck_3.0/V2EnvironmentTests/src/main/java/javax/portlet/tck/portlets/EnvironmentTests_PreferencesValidator_Action.java
+++ /dev/null
@@ -1,171 +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.*;
-import java.util.*;
-import java.util.logging.*;
-import static java.util.logging.Logger.*;
-import javax.xml.namespace.QName;
-import javax.portlet.*;
-import javax.portlet.filter.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
-import javax.portlet.tck.beans.*;
-import javax.portlet.tck.constants.*;
-import static javax.portlet.tck.beans.JSR286ApiTestCaseDetails.*;
-import static javax.portlet.tck.constants.Constants.*;
-import static javax.portlet.PortletSession.*;
-import static javax.portlet.ResourceURL.*;
-
-/**
- * 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 EnvironmentTests_PreferencesValidator_Action_event
- *
- */
-public class EnvironmentTests_PreferencesValidator_Action implements Portlet, ResourceServingPortlet {
-   private static final String LOG_CLASS = 
-         EnvironmentTests_PreferencesValidator_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();
-
-      JSR286ApiTestCaseDetails tcd = new JSR286ApiTestCaseDetails();
-
-      // Create result objects for the tests
-
-      /* TestCase: V2EnvironmentTests_PreferencesValidator_Action_canBeConfigured */
-      /* Details: "A PreferencesValidator can be configured in the            */
-      /* deployment descriptor"                                               */
-      TestResult tr0 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_PREFERENCESVALIDATOR_ACTION_CANBECONFIGURED);
-      /* TODO: implement test */
-      tr0.appendTcDetail("Not implemented.");
-      tr0.writeTo(writer);
-
-      /* TestCase: V2EnvironmentTests_PreferencesValidator_Action_validate1   */
-      /* Details: "Method validate(PortletPreferences): The                   */
-      /* validate(PortletPreferences): method is called when the              */
-      /* preferences are stored "                                             */
-      TestResult tr1 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_PREFERENCESVALIDATOR_ACTION_VALIDATE1);
-      /* TODO: implement test */
-      tr1.appendTcDetail("Not implemented.");
-      tr1.writeTo(writer);
-
-      /* TestCase: V2EnvironmentTests_PreferencesValidator_Action_validate2   */
-      /* Details: "Method validate(PortletPreferences): If a                  */
-      /* ValidatorException is thrown, the preferences are not stored"        */
-      TestResult tr2 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_PREFERENCESVALIDATOR_ACTION_VALIDATE2);
-      /* TODO: implement test */
-      tr2.appendTcDetail("Not implemented.");
-      tr2.writeTo(writer);
-
-      portletReq.getPortletSession().setAttribute(
-                   Constants.RESULT_ATTR_PREFIX + "EnvironmentTests_PreferencesValidator_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 + "EnvironmentTests_PreferencesValidator_Action", APPLICATION_SCOPE);
-      if (msg != null) {
-         writer.write("<p>" + msg + "</p><br/>\n");
-         ps.removeAttribute(RESULT_ATTR_PREFIX + "EnvironmentTests_PreferencesValidator_Action", APPLICATION_SCOPE);
-      }
-
-      /* TestCase: V2EnvironmentTests_PreferencesValidator_Action_canBeConfigured */
-      /* Details: "A PreferencesValidator can be configured in the            */
-      /* deployment descriptor"                                               */
-      {
-         PortletURL aurl = portletResp.createActionURL();
-         aurl.setParameters(portletReq.getPrivateParameterMap());
-         TestButton tb = new TestButton("V2EnvironmentTests_PreferencesValidator_Action_canBeConfigured", aurl);
-         tb.writeTo(writer);
-      }
-
-      /* TestCase: V2EnvironmentTests_PreferencesValidator_Action_validate1   */
-      /* Details: "Method validate(PortletPreferences): The                   */
-      /* validate(PortletPreferences): method is called when the              */
-      /* preferences are stored "                                             */
-      {
-         PortletURL aurl = portletResp.createActionURL();
-         aurl.setParameters(portletReq.getPrivateParameterMap());
-         TestButton tb = new TestButton("V2EnvironmentTests_PreferencesValidator_Action_validate1", aurl);
-         tb.writeTo(writer);
-      }
-
-      /* TestCase: V2EnvironmentTests_PreferencesValidator_Action_validate2   */
-      /* Details: "Method validate(PortletPreferences): If a                  */
-      /* ValidatorException is thrown, the preferences are not stored"        */
-      {
-         PortletURL aurl = portletResp.createActionURL();
-         aurl.setParameters(portletReq.getPrivateParameterMap());
-         TestButton tb = new TestButton("V2EnvironmentTests_PreferencesValidator_Action_validate2", aurl);
-         tb.writeTo(writer);
-      }
-
-   }
-
-}

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/db1071e7/portlet-tck_3.0/V2EnvironmentTests/src/main/java/javax/portlet/tck/portlets/EnvironmentTests_PreferencesValidator_ApiAction.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2EnvironmentTests/src/main/java/javax/portlet/tck/portlets/EnvironmentTests_PreferencesValidator_ApiAction.java b/portlet-tck_3.0/V2EnvironmentTests/src/main/java/javax/portlet/tck/portlets/EnvironmentTests_PreferencesValidator_ApiAction.java
new file mode 100644
index 0000000..1aa12d4
--- /dev/null
+++ b/portlet-tck_3.0/V2EnvironmentTests/src/main/java/javax/portlet/tck/portlets/EnvironmentTests_PreferencesValidator_ApiAction.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.JSR286ApiTestCaseDetails.*;
+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 EnvironmentTests_PreferencesValidator_ApiAction_event
+ *
+ */
+public class EnvironmentTests_PreferencesValidator_ApiAction implements Portlet, ResourceServingPortlet {
+   private static final String LOG_CLASS = 
+         EnvironmentTests_PreferencesValidator_ApiAction.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();
+
+      JSR286ApiTestCaseDetails tcd = new JSR286ApiTestCaseDetails();
+
+      // Create result objects for the tests
+
+      /* TestCase: V2EnvironmentTests_PreferencesValidator_ApiAction_canBeConfigured */
+      /* Details: "A PreferencesValidator can be configured in the            */
+      /* deployment descriptor"                                               */
+      TestResult tr0 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_PREFERENCESVALIDATOR_APIACTION_CANBECONFIGURED);
+      /* TODO: implement test */
+      tr0.appendTcDetail("Not implemented.");
+      tr0.writeTo(writer);
+
+      /* TestCase: V2EnvironmentTests_PreferencesValidator_ApiAction_validate1 */
+      /* Details: "Method validate(PortletPreferences): The                   */
+      /* validate(PortletPreferences): method is called when the              */
+      /* preferences are stored "                                             */
+      TestResult tr1 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_PREFERENCESVALIDATOR_APIACTION_VALIDATE1);
+      /* TODO: implement test */
+      tr1.appendTcDetail("Not implemented.");
+      tr1.writeTo(writer);
+
+      /* TestCase: V2EnvironmentTests_PreferencesValidator_ApiAction_validate2 */
+      /* Details: "Method validate(PortletPreferences): If a                  */
+      /* ValidatorException is thrown, the preferences are not stored"        */
+      TestResult tr2 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_PREFERENCESVALIDATOR_APIACTION_VALIDATE2);
+      /* TODO: implement test */
+      tr2.appendTcDetail("Not implemented.");
+      tr2.writeTo(writer);
+
+      portletReq.getPortletSession().setAttribute(
+                   Constants.RESULT_ATTR_PREFIX + "EnvironmentTests_PreferencesValidator_ApiAction",
+                   writer.toString(), APPLICATION_SCOPE);
+   }
+
+   @Override
+   public void serveResource(ResourceRequest portletReq, ResourceResponse portletResp)
+         throws PortletException, IOException {
+      LOGGER.entering(LOG_CLASS, "main portlet serveResource entry");
+
+      long tid = Thread.currentThread().getId();
+      portletReq.setAttribute(THREADID_ATTR, tid);
+
+      PrintWriter writer = portletResp.getWriter();
+
+   }
+
+   @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 + "EnvironmentTests_PreferencesValidator_ApiAction", APPLICATION_SCOPE);
+      if (msg != null) {
+         writer.write("<p>" + msg + "</p><br/>\n");
+         ps.removeAttribute(RESULT_ATTR_PREFIX + "EnvironmentTests_PreferencesValidator_ApiAction", APPLICATION_SCOPE);
+      }
+
+      /* TestCase: V2EnvironmentTests_PreferencesValidator_ApiAction_canBeConfigured */
+      /* Details: "A PreferencesValidator can be configured in the            */
+      /* deployment descriptor"                                               */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2EnvironmentTests_PreferencesValidator_ApiAction_canBeConfigured", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2EnvironmentTests_PreferencesValidator_ApiAction_validate1 */
+      /* Details: "Method validate(PortletPreferences): The                   */
+      /* validate(PortletPreferences): method is called when the              */
+      /* preferences are stored "                                             */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2EnvironmentTests_PreferencesValidator_ApiAction_validate1", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2EnvironmentTests_PreferencesValidator_ApiAction_validate2 */
+      /* Details: "Method validate(PortletPreferences): If a                  */
+      /* ValidatorException is thrown, the preferences are not stored"        */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2EnvironmentTests_PreferencesValidator_ApiAction_validate2", aurl);
+         tb.writeTo(writer);
+      }
+
+   }
+
+}

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/db1071e7/portlet-tck_3.0/V2EnvironmentTests/src/main/java/javax/portlet/tck/portlets/EnvironmentTests_PreferencesValidator_ApiEvent.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2EnvironmentTests/src/main/java/javax/portlet/tck/portlets/EnvironmentTests_PreferencesValidator_ApiEvent.java b/portlet-tck_3.0/V2EnvironmentTests/src/main/java/javax/portlet/tck/portlets/EnvironmentTests_PreferencesValidator_ApiEvent.java
new file mode 100644
index 0000000..2f8b6de
--- /dev/null
+++ b/portlet-tck_3.0/V2EnvironmentTests/src/main/java/javax/portlet/tck/portlets/EnvironmentTests_PreferencesValidator_ApiEvent.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.JSR286ApiTestCaseDetails.*;
+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 EnvironmentTests_PreferencesValidator_ApiEvent_event
+ *
+ */
+public class EnvironmentTests_PreferencesValidator_ApiEvent implements Portlet, ResourceServingPortlet {
+   private static final String LOG_CLASS = 
+         EnvironmentTests_PreferencesValidator_ApiEvent.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,
+             "EnvironmentTests_PreferencesValidator_ApiEvent");
+      portletResp.setEvent(eventQName, "Hi!");
+   }
+
+   @Override
+   public void serveResource(ResourceRequest portletReq, ResourceResponse portletResp)
+         throws PortletException, IOException {
+      LOGGER.entering(LOG_CLASS, "main portlet serveResource entry");
+
+      long tid = Thread.currentThread().getId();
+      portletReq.setAttribute(THREADID_ATTR, tid);
+
+      PrintWriter writer = portletResp.getWriter();
+
+   }
+
+   @Override
+   public void render(RenderRequest portletReq, RenderResponse portletResp)
+         throws PortletException, IOException {
+      LOGGER.entering(LOG_CLASS, "main portlet render entry");
+
+      long tid = Thread.currentThread().getId();
+      portletReq.setAttribute(THREADID_ATTR, tid);
+
+      PrintWriter writer = portletResp.getWriter();
+
+      /* TestCase: V2EnvironmentTests_PreferencesValidator_ApiEvent_canBeConfigured */
+      /* Details: "A PreferencesValidator can be configured in the            */
+      /* deployment descriptor"                                               */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2EnvironmentTests_PreferencesValidator_ApiEvent_canBeConfigured", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2EnvironmentTests_PreferencesValidator_ApiEvent_validate1 */
+      /* Details: "Method validate(PortletPreferences): The                   */
+      /* validate(PortletPreferences): method is called when the              */
+      /* preferences are stored "                                             */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2EnvironmentTests_PreferencesValidator_ApiEvent_validate1", aurl);
+         tb.writeTo(writer);
+      }
+
+      /* TestCase: V2EnvironmentTests_PreferencesValidator_ApiEvent_validate2 */
+      /* Details: "Method validate(PortletPreferences): If a                  */
+      /* ValidatorException is thrown, the preferences are not stored"        */
+      {
+         PortletURL aurl = portletResp.createActionURL();
+         aurl.setParameters(portletReq.getPrivateParameterMap());
+         TestButton tb = new TestButton("V2EnvironmentTests_PreferencesValidator_ApiEvent_validate2", aurl);
+         tb.writeTo(writer);
+      }
+
+   }
+
+}

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/db1071e7/portlet-tck_3.0/V2EnvironmentTests/src/main/java/javax/portlet/tck/portlets/EnvironmentTests_PreferencesValidator_ApiEvent_event.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2EnvironmentTests/src/main/java/javax/portlet/tck/portlets/EnvironmentTests_PreferencesValidator_ApiEvent_event.java b/portlet-tck_3.0/V2EnvironmentTests/src/main/java/javax/portlet/tck/portlets/EnvironmentTests_PreferencesValidator_ApiEvent_event.java
new file mode 100644
index 0000000..93823bf
--- /dev/null
+++ b/portlet-tck_3.0/V2EnvironmentTests/src/main/java/javax/portlet/tck/portlets/EnvironmentTests_PreferencesValidator_ApiEvent_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.JSR286ApiTestCaseDetails.*;
+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 EnvironmentTests_PreferencesValidator_ApiEvent_event implements Portlet, EventPortlet, ResourceServingPortlet {
+   private static final String LOG_CLASS = 
+         EnvironmentTests_PreferencesValidator_ApiEvent_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();
+
+      JSR286ApiTestCaseDetails tcd = new JSR286ApiTestCaseDetails();
+
+      // Create result objects for the tests
+
+      /* TestCase: V2EnvironmentTests_PreferencesValidator_ApiEvent_canBeConfigured */
+      /* Details: "A PreferencesValidator can be configured in the            */
+      /* deployment descriptor"                                               */
+      TestResult tr0 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_PREFERENCESVALIDATOR_APIEVENT_CANBECONFIGURED);
+      /* TODO: implement test */
+      tr0.appendTcDetail("Not implemented.");
+      tr0.writeTo(writer);
+
+      /* TestCase: V2EnvironmentTests_PreferencesValidator_ApiEvent_validate1 */
+      /* Details: "Method validate(PortletPreferences): The                   */
+      /* validate(PortletPreferences): method is called when the              */
+      /* preferences are stored "                                             */
+      TestResult tr1 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_PREFERENCESVALIDATOR_APIEVENT_VALIDATE1);
+      /* TODO: implement test */
+      tr1.appendTcDetail("Not implemented.");
+      tr1.writeTo(writer);
+
+      /* TestCase: V2EnvironmentTests_PreferencesValidator_ApiEvent_validate2 */
+      /* Details: "Method validate(PortletPreferences): If a                  */
+      /* ValidatorException is thrown, the preferences are not stored"        */
+      TestResult tr2 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_PREFERENCESVALIDATOR_APIEVENT_VALIDATE2);
+      /* TODO: implement test */
+      tr2.appendTcDetail("Not implemented.");
+      tr2.writeTo(writer);
+
+      portletReq.getPortletSession().setAttribute(
+                   Constants.RESULT_ATTR_PREFIX + "EnvironmentTests_PreferencesValidator_ApiEvent",
+                   writer.toString(), APPLICATION_SCOPE);
+
+   }
+
+   @Override
+   public void render(RenderRequest portletReq, RenderResponse portletResp)
+         throws PortletException, IOException {
+      
+      LOGGER.entering(LOG_CLASS, "event companion render");
+
+      portletResp.setContentType("text/html");
+      PrintWriter writer = portletResp.getWriter();
+      writer.write("<h3>Event Companion Portlet </h3>\n");
+      writer.write("<p>EnvironmentTests_PreferencesValidator_ApiEvent_event</p>\n");
+
+      String msg = (String) portletReq.getPortletSession()
+            .getAttribute(RESULT_ATTR_PREFIX + "EnvironmentTests_PreferencesValidator_ApiEvent", 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/db1071e7/portlet-tck_3.0/V2EnvironmentTests/src/main/java/javax/portlet/tck/portlets/EnvironmentTests_PreferencesValidator_ApiResource.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2EnvironmentTests/src/main/java/javax/portlet/tck/portlets/EnvironmentTests_PreferencesValidator_ApiResource.java b/portlet-tck_3.0/V2EnvironmentTests/src/main/java/javax/portlet/tck/portlets/EnvironmentTests_PreferencesValidator_ApiResource.java
new file mode 100644
index 0000000..df41626
--- /dev/null
+++ b/portlet-tck_3.0/V2EnvironmentTests/src/main/java/javax/portlet/tck/portlets/EnvironmentTests_PreferencesValidator_ApiResource.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.JSR286ApiTestCaseDetails.*;
+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 EnvironmentTests_PreferencesValidator_ApiResource_event
+ *
+ */
+public class EnvironmentTests_PreferencesValidator_ApiResource implements Portlet, ResourceServingPortlet {
+   private static final String LOG_CLASS = 
+         EnvironmentTests_PreferencesValidator_ApiResource.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();
+
+      JSR286ApiTestCaseDetails tcd = new JSR286ApiTestCaseDetails();
+
+      // Create result objects for the tests
+
+      /* TestCase: V2EnvironmentTests_PreferencesValidator_ApiResource_canBeConfigured */
+      /* Details: "A PreferencesValidator can be configured in the            */
+      /* deployment descriptor"                                               */
+      TestResult tr0 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_PREFERENCESVALIDATOR_APIRESOURCE_CANBECONFIGURED);
+      /* TODO: implement test */
+      tr0.appendTcDetail("Not implemented.");
+      tr0.writeTo(writer);
+
+      /* TestCase: V2EnvironmentTests_PreferencesValidator_ApiResource_validate1 */
+      /* Details: "Method validate(PortletPreferences): The                   */
+      /* validate(PortletPreferences): method is called when the              */
+      /* preferences are stored "                                             */
+      TestResult tr1 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_PREFERENCESVALIDATOR_APIRESOURCE_VALIDATE1);
+      /* TODO: implement test */
+      tr1.appendTcDetail("Not implemented.");
+      tr1.writeTo(writer);
+
+      /* TestCase: V2EnvironmentTests_PreferencesValidator_ApiResource_validate2 */
+      /* Details: "Method validate(PortletPreferences): If a                  */
+      /* ValidatorException is thrown, the preferences are not stored"        */
+      TestResult tr2 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_PREFERENCESVALIDATOR_APIRESOURCE_VALIDATE2);
+      /* 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=\"EnvironmentTests_PreferencesValidator_ApiResource\">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(\"EnvironmentTests_PreferencesValidator_ApiResource\").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/db1071e7/portlet-tck_3.0/V2EnvironmentTests/src/main/java/javax/portlet/tck/portlets/EnvironmentTests_PreferencesValidator_Event.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2EnvironmentTests/src/main/java/javax/portlet/tck/portlets/EnvironmentTests_PreferencesValidator_Event.java b/portlet-tck_3.0/V2EnvironmentTests/src/main/java/javax/portlet/tck/portlets/EnvironmentTests_PreferencesValidator_Event.java
deleted file mode 100644
index e90c386..0000000
--- a/portlet-tck_3.0/V2EnvironmentTests/src/main/java/javax/portlet/tck/portlets/EnvironmentTests_PreferencesValidator_Event.java
+++ /dev/null
@@ -1,135 +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.*;
-import java.util.*;
-import java.util.logging.*;
-import static java.util.logging.Logger.*;
-import javax.xml.namespace.QName;
-import javax.portlet.*;
-import javax.portlet.filter.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
-import javax.portlet.tck.beans.*;
-import javax.portlet.tck.constants.*;
-import static javax.portlet.tck.beans.JSR286ApiTestCaseDetails.*;
-import static javax.portlet.tck.constants.Constants.*;
-import static javax.portlet.PortletSession.*;
-import static javax.portlet.ResourceURL.*;
-
-/**
- * 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 EnvironmentTests_PreferencesValidator_Event_event
- *
- */
-public class EnvironmentTests_PreferencesValidator_Event implements Portlet, ResourceServingPortlet {
-   private static final String LOG_CLASS = 
-         EnvironmentTests_PreferencesValidator_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,
-             "EnvironmentTests_PreferencesValidator_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: V2EnvironmentTests_PreferencesValidator_Event_canBeConfigured */
-      /* Details: "A PreferencesValidator can be configured in the            */
-      /* deployment descriptor"                                               */
-      {
-         PortletURL aurl = portletResp.createActionURL();
-         aurl.setParameters(portletReq.getPrivateParameterMap());
-         TestButton tb = new TestButton("V2EnvironmentTests_PreferencesValidator_Event_canBeConfigured", aurl);
-         tb.writeTo(writer);
-      }
-
-      /* TestCase: V2EnvironmentTests_PreferencesValidator_Event_validate1    */
-      /* Details: "Method validate(PortletPreferences): The                   */
-      /* validate(PortletPreferences): method is called when the              */
-      /* preferences are stored "                                             */
-      {
-         PortletURL aurl = portletResp.createActionURL();
-         aurl.setParameters(portletReq.getPrivateParameterMap());
-         TestButton tb = new TestButton("V2EnvironmentTests_PreferencesValidator_Event_validate1", aurl);
-         tb.writeTo(writer);
-      }
-
-      /* TestCase: V2EnvironmentTests_PreferencesValidator_Event_validate2    */
-      /* Details: "Method validate(PortletPreferences): If a                  */
-      /* ValidatorException is thrown, the preferences are not stored"        */
-      {
-         PortletURL aurl = portletResp.createActionURL();
-         aurl.setParameters(portletReq.getPrivateParameterMap());
-         TestButton tb = new TestButton("V2EnvironmentTests_PreferencesValidator_Event_validate2", aurl);
-         tb.writeTo(writer);
-      }
-
-   }
-
-}

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/db1071e7/portlet-tck_3.0/V2EnvironmentTests/src/main/java/javax/portlet/tck/portlets/EnvironmentTests_PreferencesValidator_Event_event.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2EnvironmentTests/src/main/java/javax/portlet/tck/portlets/EnvironmentTests_PreferencesValidator_Event_event.java b/portlet-tck_3.0/V2EnvironmentTests/src/main/java/javax/portlet/tck/portlets/EnvironmentTests_PreferencesValidator_Event_event.java
deleted file mode 100644
index a5acc61..0000000
--- a/portlet-tck_3.0/V2EnvironmentTests/src/main/java/javax/portlet/tck/portlets/EnvironmentTests_PreferencesValidator_Event_event.java
+++ /dev/null
@@ -1,134 +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.*;
-import java.util.*;
-import java.util.logging.*;
-import static java.util.logging.Logger.*;
-import javax.xml.namespace.QName;
-import javax.portlet.*;
-import javax.portlet.filter.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
-import javax.portlet.tck.beans.*;
-import javax.portlet.tck.constants.*;
-import static javax.portlet.tck.constants.Constants.*;
-import static javax.portlet.tck.beans.JSR286ApiTestCaseDetails.*;
-import static javax.portlet.PortletSession.*;
-
-/**
- * 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 EnvironmentTests_PreferencesValidator_Event_event implements Portlet, EventPortlet, ResourceServingPortlet {
-   private static final String LOG_CLASS = 
-         EnvironmentTests_PreferencesValidator_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();
-
-      JSR286ApiTestCaseDetails tcd = new JSR286ApiTestCaseDetails();
-
-      // Create result objects for the tests
-
-      /* TestCase: V2EnvironmentTests_PreferencesValidator_Event_canBeConfigured */
-      /* Details: "A PreferencesValidator can be configured in the            */
-      /* deployment descriptor"                                               */
-      TestResult tr0 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_PREFERENCESVALIDATOR_EVENT_CANBECONFIGURED);
-      /* TODO: implement test */
-      tr0.appendTcDetail("Not implemented.");
-      tr0.writeTo(writer);
-
-      /* TestCase: V2EnvironmentTests_PreferencesValidator_Event_validate1    */
-      /* Details: "Method validate(PortletPreferences): The                   */
-      /* validate(PortletPreferences): method is called when the              */
-      /* preferences are stored "                                             */
-      TestResult tr1 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_PREFERENCESVALIDATOR_EVENT_VALIDATE1);
-      /* TODO: implement test */
-      tr1.appendTcDetail("Not implemented.");
-      tr1.writeTo(writer);
-
-      /* TestCase: V2EnvironmentTests_PreferencesValidator_Event_validate2    */
-      /* Details: "Method validate(PortletPreferences): If a                  */
-      /* ValidatorException is thrown, the preferences are not stored"        */
-      TestResult tr2 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_PREFERENCESVALIDATOR_EVENT_VALIDATE2);
-      /* TODO: implement test */
-      tr2.appendTcDetail("Not implemented.");
-      tr2.writeTo(writer);
-
-      portletReq.getPortletSession().setAttribute(
-                   Constants.RESULT_ATTR_PREFIX + "EnvironmentTests_PreferencesValidator_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>EnvironmentTests_PreferencesValidator_Event_event</p>\n");
-
-      String msg = (String) portletReq.getPortletSession()
-            .getAttribute(RESULT_ATTR_PREFIX + "EnvironmentTests_PreferencesValidator_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/db1071e7/portlet-tck_3.0/V2EnvironmentTests/src/main/java/javax/portlet/tck/portlets/EnvironmentTests_PreferencesValidator_Resource.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2EnvironmentTests/src/main/java/javax/portlet/tck/portlets/EnvironmentTests_PreferencesValidator_Resource.java b/portlet-tck_3.0/V2EnvironmentTests/src/main/java/javax/portlet/tck/portlets/EnvironmentTests_PreferencesValidator_Resource.java
deleted file mode 100644
index 7d03224..0000000
--- a/portlet-tck_3.0/V2EnvironmentTests/src/main/java/javax/portlet/tck/portlets/EnvironmentTests_PreferencesValidator_Resource.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.*;
-import java.util.*;
-import java.util.logging.*;
-import static java.util.logging.Logger.*;
-import javax.xml.namespace.QName;
-import javax.portlet.*;
-import javax.portlet.filter.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
-import javax.portlet.tck.beans.*;
-import javax.portlet.tck.constants.*;
-import static javax.portlet.tck.beans.JSR286ApiTestCaseDetails.*;
-import static javax.portlet.tck.constants.Constants.*;
-import static javax.portlet.PortletSession.*;
-import static javax.portlet.ResourceURL.*;
-
-/**
- * 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 EnvironmentTests_PreferencesValidator_Resource_event
- *
- */
-public class EnvironmentTests_PreferencesValidator_Resource implements Portlet, ResourceServingPortlet {
-   private static final String LOG_CLASS = 
-         EnvironmentTests_PreferencesValidator_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();
-
-      JSR286ApiTestCaseDetails tcd = new JSR286ApiTestCaseDetails();
-
-      // Create result objects for the tests
-
-      /* TestCase: V2EnvironmentTests_PreferencesValidator_Resource_canBeConfigured */
-      /* Details: "A PreferencesValidator can be configured in the            */
-      /* deployment descriptor"                                               */
-      TestResult tr0 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_PREFERENCESVALIDATOR_RESOURCE_CANBECONFIGURED);
-      /* TODO: implement test */
-      tr0.appendTcDetail("Not implemented.");
-      tr0.writeTo(writer);
-
-      /* TestCase: V2EnvironmentTests_PreferencesValidator_Resource_validate1 */
-      /* Details: "Method validate(PortletPreferences): The                   */
-      /* validate(PortletPreferences): method is called when the              */
-      /* preferences are stored "                                             */
-      TestResult tr1 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_PREFERENCESVALIDATOR_RESOURCE_VALIDATE1);
-      /* TODO: implement test */
-      tr1.appendTcDetail("Not implemented.");
-      tr1.writeTo(writer);
-
-      /* TestCase: V2EnvironmentTests_PreferencesValidator_Resource_validate2 */
-      /* Details: "Method validate(PortletPreferences): If a                  */
-      /* ValidatorException is thrown, the preferences are not stored"        */
-      TestResult tr2 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_PREFERENCESVALIDATOR_RESOURCE_VALIDATE2);
-      /* 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=\"EnvironmentTests_PreferencesValidator_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(\"EnvironmentTests_PreferencesValidator_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");
-   }
-
-}


Mime
View raw message