portals-pluto-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From msnickl...@apache.org
Subject [1/2] portals-pluto git commit: Fixed some defects in content type handling. Fixes in the methods PortletRequest#getResponseContentType() and PortletRequest#getResponseContentTypes(). Set the pluto default theme to explicitly declare content type txt/htm
Date Fri, 05 Aug 2016 09:37:46 GMT
Repository: portals-pluto
Updated Branches:
  refs/heads/master d302586ac -> 53f9ea5f8


http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/53f9ea5f/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
index c327987..1b975c4 100644
--- 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
@@ -15,6 +15,14 @@
 
 package javax.portlet.tck.portlets;
 
+import static javax.portlet.tck.beans.JSR286SpecTestCaseDetails.V2ADDLREQUESTTESTS_SPEC2_11_EVENTREQ_CONTENTTYPE1;
+import static javax.portlet.tck.beans.JSR286SpecTestCaseDetails.V2ADDLREQUESTTESTS_SPEC2_11_EVENTREQ_CONTENTTYPE2;
+import static javax.portlet.tck.beans.JSR286SpecTestCaseDetails.V2ADDLREQUESTTESTS_SPEC2_11_EVENTREQ_CONTENTTYPE3;
+import static javax.portlet.tck.beans.JSR286SpecTestCaseDetails.V2ADDLREQUESTTESTS_SPEC2_11_EVENTREQ_CONTENTTYPE8;
+import static javax.portlet.tck.beans.JSR286SpecTestCaseDetails.V2ADDLREQUESTTESTS_SPEC2_11_EVENTREQ_WINDOWID4;
+import static javax.portlet.tck.constants.Constants.TCKNAMESPACE;
+import static javax.portlet.tck.constants.Constants.THREADID_ATTR;
+
 import java.io.IOException;
 import java.io.PrintWriter;
 
@@ -29,144 +37,101 @@ import javax.portlet.RenderResponse;
 import javax.portlet.tck.beans.TestButton;
 import javax.xml.namespace.QName;
 
-import static javax.portlet.tck.beans.JSR286SpecTestCaseDetails.V2ADDLREQUESTTESTS_SPEC2_11_EVENTREQ_CONTENTTYPE1;
-import static javax.portlet.tck.beans.JSR286SpecTestCaseDetails.V2ADDLREQUESTTESTS_SPEC2_11_EVENTREQ_CONTENTTYPE2;
-import static javax.portlet.tck.beans.JSR286SpecTestCaseDetails.V2ADDLREQUESTTESTS_SPEC2_11_EVENTREQ_CONTENTTYPE3;
-import static javax.portlet.tck.beans.JSR286SpecTestCaseDetails.V2ADDLREQUESTTESTS_SPEC2_11_EVENTREQ_CONTENTTYPE4;
-import static javax.portlet.tck.beans.JSR286SpecTestCaseDetails.V2ADDLREQUESTTESTS_SPEC2_11_EVENTREQ_CONTENTTYPE5;
-import static javax.portlet.tck.beans.JSR286SpecTestCaseDetails.V2ADDLREQUESTTESTS_SPEC2_11_EVENTREQ_WINDOWID4;
-import static javax.portlet.tck.beans.JSR286SpecTestCaseDetails.V2ADDLREQUESTTESTS_SPEC2_11_EVENTREQ_CONTENTTYPE8;
-import static javax.portlet.tck.beans.JSR286SpecTestCaseDetails.V2ADDLREQUESTTESTS_SPEC2_11_EVENTREQ_CONTENTTYPE9;
-import static javax.portlet.tck.constants.Constants.THREADID_ATTR;
-import static javax.portlet.tck.constants.Constants.TCKNAMESPACE;
-
 /**
- * This portlet implements several test cases for the JSR 362 TCK. The test case names are defined
- * in the /src/main/resources/xml-resources/additionalTCs.xml file. The build process will integrate
- * the test case names defined in the additionalTCs.xml file into the complete list of test case
- * names for execution by the driver.
- *
- * This 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
+ * 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
  * 
  * @author ahmed
  */
 public class AddlRequestTests_SPEC2_11_EventReq implements Portlet {
 
-  @Override
-  public void init(PortletConfig config) throws PortletException {}
-
-  @Override
-  public void destroy() {}
-
-  @Override
-  public void processAction(ActionRequest portletReq, ActionResponse portletResp)
-      throws PortletException, IOException {
-
-    portletResp.setRenderParameters(portletReq.getParameterMap());
-    long tid = Thread.currentThread().getId();
-    portletReq.setAttribute(THREADID_ATTR, tid);
-
-    QName eventQName = new QName(TCKNAMESPACE, "AddlRequestTests_SPEC2_11_EventReq");
-    portletResp.setEvent(eventQName, "Hi!");
-  }
-
-  @Override
-  public void render(RenderRequest portletReq, RenderResponse portletResp)
-      throws PortletException, IOException {
-
-    long tid = Thread.currentThread().getId();
-    portletReq.setAttribute(THREADID_ATTR, tid);
-
-    PrintWriter writer = portletResp.getWriter();
-
-    /* TestCase: 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);
-    }
-
-  }
+   @Override
+   public void init(PortletConfig config) throws PortletException {
+   }
+
+   @Override
+   public void destroy() {
+   }
+
+   @SuppressWarnings("deprecation")
+   @Override
+   public void processAction(ActionRequest portletReq, ActionResponse portletResp) throws PortletException, IOException {
+
+      portletResp.setRenderParameters(portletReq.getParameterMap());
+      long tid = Thread.currentThread().getId();
+      portletReq.setAttribute(THREADID_ATTR, tid);
+
+      QName eventQName = new QName(TCKNAMESPACE, "AddlRequestTests_SPEC2_11_EventReq");
+      portletResp.setEvent(eventQName, "Hi!");
+   }
+
+   @SuppressWarnings("deprecation")
+   @Override
+   public void render(RenderRequest portletReq, RenderResponse portletResp) throws PortletException, IOException {
+
+      long tid = Thread.currentThread().getId();
+      portletReq.setAttribute(THREADID_ATTR, tid);
+
+      PrintWriter writer = portletResp.getWriter();
+
+      /* TestCase: 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_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);
+      }
+
+   }
 
 }

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/53f9ea5f/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
index dbfa432..19aacad 100644
--- 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
@@ -15,6 +15,16 @@
 
 package javax.portlet.tck.portlets;
 
+import static javax.portlet.PortletSession.APPLICATION_SCOPE;
+import static javax.portlet.PortletSession.PORTLET_SCOPE;
+import static javax.portlet.tck.beans.JSR286SpecTestCaseDetails.V2ADDLREQUESTTESTS_SPEC2_11_EVENTREQ_CONTENTTYPE1;
+import static javax.portlet.tck.beans.JSR286SpecTestCaseDetails.V2ADDLREQUESTTESTS_SPEC2_11_EVENTREQ_CONTENTTYPE2;
+import static javax.portlet.tck.beans.JSR286SpecTestCaseDetails.V2ADDLREQUESTTESTS_SPEC2_11_EVENTREQ_CONTENTTYPE3;
+import static javax.portlet.tck.beans.JSR286SpecTestCaseDetails.V2ADDLREQUESTTESTS_SPEC2_11_EVENTREQ_CONTENTTYPE8;
+import static javax.portlet.tck.beans.JSR286SpecTestCaseDetails.V2ADDLREQUESTTESTS_SPEC2_11_EVENTREQ_WINDOWID4;
+import static javax.portlet.tck.constants.Constants.RESULT_ATTR_PREFIX;
+import static javax.portlet.tck.constants.Constants.THREADID_ATTR;
+
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.io.StringWriter;
@@ -36,164 +46,110 @@ import javax.portlet.tck.beans.TestResult;
 
 import org.apache.commons.lang3.StringUtils;
 
-import static javax.portlet.tck.beans.JSR286SpecTestCaseDetails.V2ADDLREQUESTTESTS_SPEC2_11_EVENTREQ_CONTENTTYPE1;
-import static javax.portlet.tck.beans.JSR286SpecTestCaseDetails.V2ADDLREQUESTTESTS_SPEC2_11_EVENTREQ_CONTENTTYPE2;
-import static javax.portlet.tck.beans.JSR286SpecTestCaseDetails.V2ADDLREQUESTTESTS_SPEC2_11_EVENTREQ_CONTENTTYPE3;
-import static javax.portlet.tck.beans.JSR286SpecTestCaseDetails.V2ADDLREQUESTTESTS_SPEC2_11_EVENTREQ_CONTENTTYPE4;
-import static javax.portlet.tck.beans.JSR286SpecTestCaseDetails.V2ADDLREQUESTTESTS_SPEC2_11_EVENTREQ_CONTENTTYPE5;
-import static javax.portlet.tck.beans.JSR286SpecTestCaseDetails.V2ADDLREQUESTTESTS_SPEC2_11_EVENTREQ_WINDOWID4;
-import static javax.portlet.tck.beans.JSR286SpecTestCaseDetails.V2ADDLREQUESTTESTS_SPEC2_11_EVENTREQ_CONTENTTYPE8;
-import static javax.portlet.tck.beans.JSR286SpecTestCaseDetails.V2ADDLREQUESTTESTS_SPEC2_11_EVENTREQ_CONTENTTYPE9;
-import static javax.portlet.tck.constants.Constants.THREADID_ATTR;
-import static javax.portlet.tck.constants.Constants.RESULT_ATTR_PREFIX;
-import static javax.portlet.PortletSession.APPLICATION_SCOPE;
-import static javax.portlet.PortletSession.PORTLET_SCOPE;
-
 /**
- * This is the event processing portlet for the test cases. This portlet processes events, but does
- * not publish them. Events are published in the main portlet for the test cases.
+ * This is the event processing portlet for the test cases. This portlet processes events, but does not publish them.
+ * Events are published in the main portlet for the test cases.
  * 
  * @author ahmed
  */
 public class AddlRequestTests_SPEC2_11_EventReq_event implements Portlet, EventPortlet {
-  private static final String LOG_CLASS = AddlRequestTests_SPEC2_11_EventReq_event.class.getName();
-  private final Logger LOGGER = Logger.getLogger(LOG_CLASS);
-
-  @Override
-  public void init(PortletConfig config) throws PortletException {}
-
-  @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 processEvent(EventRequest portletReq, EventResponse portletResp)
-      throws PortletException, IOException {
-
-    portletResp.setRenderParameters(portletReq);
-
-    long tid = Thread.currentThread().getId();
-    portletReq.setAttribute(THREADID_ATTR, tid);
-
-    StringWriter writer = new StringWriter();
-
-    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);
-    if (portletReq.getResponseContentType() != null
-        && !portletReq.getResponseContentType().isEmpty())
-      tr0.setTcSuccess(true);
-    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);
-    Enumeration<String> contentTypesTr1 = portletReq.getResponseContentTypes();
-    if (contentTypesTr1 != null && contentTypesTr1.hasMoreElements()
-        && !contentTypesTr1.nextElement().isEmpty())
-      tr1.setTcSuccess(true);
-    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);
-    if (portletReq.getResponseContentTypes().nextElement()
-        .equals(portletReq.getResponseContentType()))
-      tr2.setTcSuccess(true);
-    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);
-    if (portletReq.getResponseContentType().equals("*/*")) {
-      tr3.setTcSuccess(true);
-    } else {
-      tr3.appendTcDetail("Content type is " + portletReq.getResponseContentType());
-    }
-    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);
-    if (portletReq.getResponseContentType().equals("*/*")) {
-      tr4.setTcSuccess(true);
-    } else {
-      tr4.appendTcDetail("Content type is " + portletReq.getResponseContentType());
-    }
-    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);
-    portletReq.getPortletSession().setAttribute("tr5", portletReq.getWindowID(), PORTLET_SCOPE);
-    String tr5SessionAttribute = (String) portletReq.getPortletSession()
-        .getAttribute("javax.portlet.p." + portletReq.getWindowID() + "?tr5", APPLICATION_SCOPE);
-    if (tr5SessionAttribute != null && tr5SessionAttribute.equals(portletReq.getWindowID())) {
-      tr5.setTcSuccess(true);
-    } else {
-      tr5.appendTcDetail(
-          "Couldn't find javax.portlet.p." + portletReq.getWindowID() + ".tr5 attribute");
-    }
-    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);
-    if (!StringUtils.containsIgnoreCase(portletReq.getResponseContentType(), "UTF-8"))
-      tr6.setTcSuccess(true);
-    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);
-    Enumeration<String> contentTypesTr7 = portletReq.getResponseContentTypes();
-    if (contentTypesTr7.nextElement().equals("*/*") && !contentTypesTr7.hasMoreElements())
-      tr7.setTcSuccess(true);
-    tr7.writeTo(writer);
-
-    portletReq.getPortletSession().setAttribute(
-        RESULT_ATTR_PREFIX + "AddlRequestTests_SPEC2_11_EventReq", writer.toString(),
-        APPLICATION_SCOPE);
-
-  }
-
-  @Override
-  public void render(RenderRequest portletReq, RenderResponse portletResp)
-      throws PortletException, IOException {
-
-    portletResp.setContentType("text/html");
-    PrintWriter writer = portletResp.getWriter();
-    writer.write("<h3>Event Companion Portlet </h3>\n");
-    writer.write("<p>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");
-
-  }
+   private static final String LOG_CLASS = AddlRequestTests_SPEC2_11_EventReq_event.class.getName();
+   private final Logger        LOGGER    = Logger.getLogger(LOG_CLASS);
+
+   @Override
+   public void init(PortletConfig config) throws PortletException {
+   }
+
+   @Override
+   public void destroy() {
+   }
+
+   @Override
+   public void processAction(ActionRequest portletReq, ActionResponse portletResp) throws PortletException, IOException {
+      LOGGER.entering(LOG_CLASS, "event companion processAction - ERROR!!");
+   }
+
+   @SuppressWarnings("deprecation")
+   @Override
+   public void processEvent(EventRequest portletReq, EventResponse portletResp) throws PortletException, IOException {
+
+      portletResp.setRenderParameters(portletReq);
+
+      long tid = Thread.currentThread().getId();
+      portletReq.setAttribute(THREADID_ATTR, tid);
+
+      StringWriter writer = new StringWriter();
+
+      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);
+      if (portletReq.getResponseContentType() != null && !portletReq.getResponseContentType().isEmpty())
+         tr0.setTcSuccess(true);
+      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);
+      Enumeration<String> contentTypesTr1 = portletReq.getResponseContentTypes();
+      if (contentTypesTr1 != null && contentTypesTr1.hasMoreElements() && !contentTypesTr1.nextElement().isEmpty())
+         tr1.setTcSuccess(true);
+      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);
+      if (portletReq.getResponseContentTypes().nextElement().equals(portletReq.getResponseContentType()))
+         tr2.setTcSuccess(true);
+      tr2.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);
+      portletReq.getPortletSession().setAttribute("tr5", portletReq.getWindowID(), PORTLET_SCOPE);
+      String tr5SessionAttribute = (String) portletReq.getPortletSession().getAttribute("javax.portlet.p." + portletReq.getWindowID() + "?tr5",
+            APPLICATION_SCOPE);
+      if (tr5SessionAttribute != null && tr5SessionAttribute.equals(portletReq.getWindowID())) {
+         tr5.setTcSuccess(true);
+      } else {
+         tr5.appendTcDetail("Couldn't find javax.portlet.p." + portletReq.getWindowID() + ".tr5 attribute");
+      }
+      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);
+      if (!StringUtils.containsIgnoreCase(portletReq.getResponseContentType(), "UTF-8"))
+         tr6.setTcSuccess(true);
+      tr6.writeTo(writer);
+
+      portletReq.getPortletSession().setAttribute(RESULT_ATTR_PREFIX + "AddlRequestTests_SPEC2_11_EventReq", writer.toString(), APPLICATION_SCOPE);
+
+   }
+
+   @Override
+   public void render(RenderRequest portletReq, RenderResponse portletResp) throws PortletException, IOException {
+
+      portletResp.setContentType("text/html");
+      PrintWriter writer = portletResp.getWriter();
+      writer.write("<h3>Event Companion Portlet </h3>\n");
+      writer.write("<p>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/53f9ea5f/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
index 6e5619b..7e1bfc0 100644
--- 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
@@ -29,6 +29,7 @@ import javax.portlet.RenderRequest;
 import javax.portlet.RenderResponse;
 import javax.portlet.tck.beans.JSR286SpecTestCaseDetails;
 import javax.portlet.tck.beans.TestButton;
+import javax.portlet.tck.beans.TestLink;
 import javax.portlet.tck.beans.TestResult;
 import javax.portlet.tck.beans.TestSetupLink;
 
@@ -63,7 +64,8 @@ public class AddlRequestTests_SPEC2_11_Render implements Portlet {
   @Override
   public void destroy() {}
 
-  @Override
+  @SuppressWarnings("deprecation")
+@Override
   public void processAction(ActionRequest portletReq, ActionResponse portletResp)
       throws PortletException, IOException {
 
@@ -92,7 +94,8 @@ public class AddlRequestTests_SPEC2_11_Render implements Portlet {
 
   }
 
-  @Override
+  @SuppressWarnings("deprecation")
+@Override
   public void render(RenderRequest portletReq, RenderResponse portletResp)
       throws PortletException, IOException {
 
@@ -321,5 +324,19 @@ public class AddlRequestTests_SPEC2_11_Render implements Portlet {
         tl.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" */
+    {
+       PortletURL rurl = portletResp.createRenderURL();
+       rurl.setParameters(portletReq.getPrivateParameterMap());
+       rurl.setParameter("tr1_ready", "true");
+       TestLink tb = new TestLink(V2ADDLREQUESTTESTS_SPEC2_11_RENDER_PARAMETERS11, rurl);
+       tb.writeTo(writer);
+    }
+    
   }
 }

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/53f9ea5f/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
index 0559293..10b7d22 100644
--- 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
@@ -15,6 +15,16 @@
 
 package javax.portlet.tck.portlets;
 
+import static javax.portlet.PortletSession.APPLICATION_SCOPE;
+import static javax.portlet.PortletSession.PORTLET_SCOPE;
+import static javax.portlet.tck.beans.JSR286SpecTestCaseDetails.V2ADDLREQUESTTESTS_SPEC2_11_RENDERREQ_CONTENTTYPE1;
+import static javax.portlet.tck.beans.JSR286SpecTestCaseDetails.V2ADDLREQUESTTESTS_SPEC2_11_RENDERREQ_CONTENTTYPE10;
+import static javax.portlet.tck.beans.JSR286SpecTestCaseDetails.V2ADDLREQUESTTESTS_SPEC2_11_RENDERREQ_CONTENTTYPE13;
+import static javax.portlet.tck.beans.JSR286SpecTestCaseDetails.V2ADDLREQUESTTESTS_SPEC2_11_RENDERREQ_CONTENTTYPE2;
+import static javax.portlet.tck.beans.JSR286SpecTestCaseDetails.V2ADDLREQUESTTESTS_SPEC2_11_RENDERREQ_CONTENTTYPE3;
+import static javax.portlet.tck.beans.JSR286SpecTestCaseDetails.V2ADDLREQUESTTESTS_SPEC2_11_RENDERREQ_WINDOWID4;
+import static javax.portlet.tck.constants.Constants.THREADID_ATTR;
+
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.util.Enumeration;
@@ -31,162 +41,110 @@ import javax.portlet.tck.beans.TestResult;
 
 import org.apache.commons.lang3.StringUtils;
 
-import static javax.portlet.tck.beans.JSR286SpecTestCaseDetails.V2ADDLREQUESTTESTS_SPEC2_11_RENDERREQ_CONTENTTYPE1;
-import static javax.portlet.tck.beans.JSR286SpecTestCaseDetails.V2ADDLREQUESTTESTS_SPEC2_11_RENDERREQ_CONTENTTYPE2;
-import static javax.portlet.tck.beans.JSR286SpecTestCaseDetails.V2ADDLREQUESTTESTS_SPEC2_11_RENDERREQ_CONTENTTYPE3;
-import static javax.portlet.tck.beans.JSR286SpecTestCaseDetails.V2ADDLREQUESTTESTS_SPEC2_11_RENDERREQ_CONTENTTYPE4;
-import static javax.portlet.tck.beans.JSR286SpecTestCaseDetails.V2ADDLREQUESTTESTS_SPEC2_11_RENDERREQ_CONTENTTYPE5;
-import static javax.portlet.tck.beans.JSR286SpecTestCaseDetails.V2ADDLREQUESTTESTS_SPEC2_11_RENDERREQ_WINDOWID4;
-import static javax.portlet.tck.beans.JSR286SpecTestCaseDetails.V2ADDLREQUESTTESTS_SPEC2_11_RENDERREQ_CONTENTTYPE10;
-import static javax.portlet.tck.beans.JSR286SpecTestCaseDetails.V2ADDLREQUESTTESTS_SPEC2_11_RENDERREQ_CONTENTTYPE11;
-import static javax.portlet.tck.beans.JSR286SpecTestCaseDetails.V2ADDLREQUESTTESTS_SPEC2_11_RENDERREQ_CONTENTTYPE13;
-import static javax.portlet.tck.constants.Constants.THREADID_ATTR;
-import static javax.portlet.PortletSession.APPLICATION_SCOPE;
-import static javax.portlet.PortletSession.PORTLET_SCOPE;
-
 /**
- * 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
+ * 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
  * 
  * @author ahmed
  */
 public class AddlRequestTests_SPEC2_11_RenderReq implements Portlet {
 
-  @Override
-  public void init(PortletConfig config) throws PortletException {}
-
-  @Override
-  public void destroy() {}
-
-  @Override
-  public void processAction(ActionRequest portletReq, ActionResponse portletResp)
-      throws PortletException, IOException {
-
-    portletResp.setRenderParameters(portletReq.getParameterMap());
-    long tid = Thread.currentThread().getId();
-    portletReq.setAttribute(THREADID_ATTR, tid);
-
-  }
-
-  @Override
-  public void render(RenderRequest portletReq, RenderResponse portletResp)
-      throws PortletException, IOException {
-
-    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);
-    if (portletReq.getResponseContentType() != null
-        && !portletReq.getResponseContentType().isEmpty())
-      tr0.setTcSuccess(true);
-    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);
-    Enumeration<String> contentTypesTr1 = portletReq.getResponseContentTypes();
-    if (contentTypesTr1 != null && contentTypesTr1.hasMoreElements()
-        && !contentTypesTr1.nextElement().isEmpty())
-      tr1.setTcSuccess(true);
-    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);
-    if (portletReq.getResponseContentTypes().nextElement()
-        .equals(portletReq.getResponseContentType()))
-      tr2.setTcSuccess(true);
-    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);
-    if (portletReq.getResponseContentType().equals("*/*")) {
-      tr3.setTcSuccess(true);
-    } else {
-      tr3.appendTcDetail("Content type is " + portletReq.getResponseContentType());
-    }
-    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);
-    if (portletReq.getResponseContentType().equals("*/*")) {
-      tr4.setTcSuccess(true);
-    } else {
-      tr4.appendTcDetail("Content type is " + portletReq.getResponseContentType());
-    }
-    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);
-    portletReq.getPortletSession().setAttribute("tr5", portletReq.getWindowID(), PORTLET_SCOPE);
-    String tr5SessionAttribute = (String) portletReq.getPortletSession()
-        .getAttribute("javax.portlet.p." + portletReq.getWindowID() + "?tr5", APPLICATION_SCOPE);
-    if (tr5SessionAttribute != null && tr5SessionAttribute.equals(portletReq.getWindowID())) {
-      tr5.setTcSuccess(true);
-    } else {
-      tr5.appendTcDetail(
-          "Couldn't find javax.portlet.p." + portletReq.getWindowID() + ".tr5 attribute");
-    }
-    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);
-    if (!StringUtils.containsIgnoreCase(portletReq.getResponseContentType(),
-        portletResp.getCharacterEncoding()))
-      tr6.setTcSuccess(true);
-    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);
-    Enumeration<String> contentTypesTr7 = portletReq.getResponseContentTypes();
-    if (contentTypesTr7.nextElement().equals("*/*") && !contentTypesTr7.hasMoreElements())
-      tr7.setTcSuccess(true);
-    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);
-    if (portletResp.getCharacterEncoding() != null) {
-      tr8.setTcSuccess(true);
-    } else {
-      tr8.appendTcDetail("Character Encoding is null");
-    }
-    tr8.writeTo(writer);
-
-  }
+   @Override
+   public void init(PortletConfig config) throws PortletException {
+   }
+
+   @Override
+   public void destroy() {
+   }
+
+   @SuppressWarnings("deprecation")
+   @Override
+   public void processAction(ActionRequest portletReq, ActionResponse portletResp) throws PortletException, IOException {
+
+      portletResp.setRenderParameters(portletReq.getParameterMap());
+      long tid = Thread.currentThread().getId();
+      portletReq.setAttribute(THREADID_ATTR, tid);
+
+   }
+
+   @Override
+   public void render(RenderRequest portletReq, RenderResponse portletResp) throws PortletException, IOException {
+
+      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);
+      if (portletReq.getResponseContentType() != null && !portletReq.getResponseContentType().isEmpty())
+         tr0.setTcSuccess(true);
+      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);
+      Enumeration<String> contentTypesTr1 = portletReq.getResponseContentTypes();
+      if (contentTypesTr1 != null && contentTypesTr1.hasMoreElements() && !contentTypesTr1.nextElement().isEmpty())
+         tr1.setTcSuccess(true);
+      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);
+      if (portletReq.getResponseContentTypes().nextElement().equals(portletReq.getResponseContentType()))
+         tr2.setTcSuccess(true);
+      tr2.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);
+      portletReq.getPortletSession().setAttribute("tr5", portletReq.getWindowID(), PORTLET_SCOPE);
+      String tr5SessionAttribute = (String) portletReq.getPortletSession().getAttribute("javax.portlet.p." + portletReq.getWindowID() + "?tr5",
+            APPLICATION_SCOPE);
+      if (tr5SessionAttribute != null && tr5SessionAttribute.equals(portletReq.getWindowID())) {
+         tr5.setTcSuccess(true);
+      } else {
+         tr5.appendTcDetail("Couldn't find javax.portlet.p." + portletReq.getWindowID() + ".tr5 attribute");
+      }
+      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);
+      if (!StringUtils.containsIgnoreCase(portletReq.getResponseContentType(), portletResp.getCharacterEncoding()))
+         tr6.setTcSuccess(true);
+      tr6.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);
+      if (portletResp.getCharacterEncoding() != null) {
+         tr8.setTcSuccess(true);
+      } else {
+         tr8.appendTcDetail("Character Encoding is null");
+      }
+      tr8.writeTo(writer);
+
+   }
 
 }

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/53f9ea5f/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
index ee5a3cb..2cc3c32 100644
--- 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
@@ -38,8 +38,6 @@ import org.apache.commons.lang3.StringUtils;
 import static javax.portlet.tck.beans.JSR286SpecTestCaseDetails.V2ADDLREQUESTTESTS_SPEC2_11_RESOURCEREQ_CONTENTTYPE1;
 import static javax.portlet.tck.beans.JSR286SpecTestCaseDetails.V2ADDLREQUESTTESTS_SPEC2_11_RESOURCEREQ_CONTENTTYPE2;
 import static javax.portlet.tck.beans.JSR286SpecTestCaseDetails.V2ADDLREQUESTTESTS_SPEC2_11_RESOURCEREQ_CONTENTTYPE3;
-import static javax.portlet.tck.beans.JSR286SpecTestCaseDetails.V2ADDLREQUESTTESTS_SPEC2_11_RESOURCEREQ_CONTENTTYPE4;
-import static javax.portlet.tck.beans.JSR286SpecTestCaseDetails.V2ADDLREQUESTTESTS_SPEC2_11_RESOURCEREQ_CONTENTTYPE5;
 import static javax.portlet.tck.beans.JSR286SpecTestCaseDetails.V2ADDLREQUESTTESTS_SPEC2_11_RESOURCEREQ_WINDOWID4;
 import static javax.portlet.tck.beans.JSR286SpecTestCaseDetails.V2ADDLREQUESTTESTS_SPEC2_11_RESOURCEREQ_CONTENTTYPE12;
 import static javax.portlet.tck.beans.JSR286SpecTestCaseDetails.V2ADDLREQUESTTESTS_SPEC2_11_RESOURCEREQ_CONTENTTYPE13;
@@ -68,7 +66,8 @@ public class AddlRequestTests_SPEC2_11_ResourceReq implements Portlet, ResourceS
   @Override
   public void destroy() {}
 
-  @Override
+  @SuppressWarnings("deprecation")
+@Override
   public void processAction(ActionRequest portletReq, ActionResponse portletResp)
       throws PortletException, IOException {
 
@@ -121,24 +120,6 @@ public class AddlRequestTests_SPEC2_11_ResourceReq implements Portlet, ResourceS
       tr2.setTcSuccess(true);
     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.getTestResultSucceeded(V2ADDLREQUESTTESTS_SPEC2_11_RESOURCEREQ_CONTENTTYPE4);
-    tr3.appendTcDetail("Can't be tested, since the implementation defines the supported content types.");
-    tr3.appendTcDetail("Content type is " + portletReq.getResponseContentType());
-    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.getTestResultSucceeded(V2ADDLREQUESTTESTS_SPEC2_11_RESOURCEREQ_CONTENTTYPE5);
-    tr4.appendTcDetail("Can't be tested, since the implementation defines the supported content types.");
-    tr4.appendTcDetail("Content type is " + portletReq.getResponseContentType());
-    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" */

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/53f9ea5f/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 7e4449a..61811d1 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
@@ -68,33 +68,22 @@
 <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>

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/53f9ea5f/portlet-tck_3.0/V2ResponseTests/src/main/java/javax/portlet/tck/portlets/ResponseTests_MimeResponse_ApiRender.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2ResponseTests/src/main/java/javax/portlet/tck/portlets/ResponseTests_MimeResponse_ApiRender.java b/portlet-tck_3.0/V2ResponseTests/src/main/java/javax/portlet/tck/portlets/ResponseTests_MimeResponse_ApiRender.java
index 721b700..cf2258f 100644
--- a/portlet-tck_3.0/V2ResponseTests/src/main/java/javax/portlet/tck/portlets/ResponseTests_MimeResponse_ApiRender.java
+++ b/portlet-tck_3.0/V2ResponseTests/src/main/java/javax/portlet/tck/portlets/ResponseTests_MimeResponse_ApiRender.java
@@ -256,7 +256,7 @@ public class ResponseTests_MimeResponse_ApiRender implements Portlet {
             V2RESPONSETESTS_MIMERESPONSE_APIRENDER_SETCONTENTTYPE1);
       try {
          portletResp.setContentType("text/html");
-         String type = portletReq.getResponseContentType();
+         String type = portletResp.getContentType();
          if (type.equals("text/html")) {
             tr10.setTcSuccess(true);
          }

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/53f9ea5f/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 d3274a4..4c3de10 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
@@ -304,33 +304,22 @@ public class JSR286SpecTestCaseDetails extends TestCaseDetails {
    public final static String               V2ADDLREQUESTTESTS_SPEC2_11_ACTIONREQ_CONTENTTYPE1                             = "V2AddlRequestTests_SPEC2_11_ActionReq_contentType1";
    public final static String               V2ADDLREQUESTTESTS_SPEC2_11_ACTIONREQ_CONTENTTYPE2                             = "V2AddlRequestTests_SPEC2_11_ActionReq_contentType2";
    public final static String               V2ADDLREQUESTTESTS_SPEC2_11_ACTIONREQ_CONTENTTYPE3                             = "V2AddlRequestTests_SPEC2_11_ActionReq_contentType3";
-   public final static String               V2ADDLREQUESTTESTS_SPEC2_11_ACTIONREQ_CONTENTTYPE4                             = "V2AddlRequestTests_SPEC2_11_ActionReq_contentType4";
-   public final static String               V2ADDLREQUESTTESTS_SPEC2_11_ACTIONREQ_CONTENTTYPE5                             = "V2AddlRequestTests_SPEC2_11_ActionReq_contentType5";
    public final static String               V2ADDLREQUESTTESTS_SPEC2_11_ACTIONREQ_WINDOWID4                                = "V2AddlRequestTests_SPEC2_11_ActionReq_windowId4";
    public final static String               V2ADDLREQUESTTESTS_SPEC2_11_ACTIONREQ_CONTENTTYPE6                             = "V2AddlRequestTests_SPEC2_11_ActionReq_contentType6";
-   public final static String               V2ADDLREQUESTTESTS_SPEC2_11_ACTIONREQ_CONTENTTYPE7                             = "V2AddlRequestTests_SPEC2_11_ActionReq_contentType7";
    public final static String               V2ADDLREQUESTTESTS_SPEC2_11_EVENTREQ_CONTENTTYPE1                              = "V2AddlRequestTests_SPEC2_11_EventReq_contentType1";
    public final static String               V2ADDLREQUESTTESTS_SPEC2_11_EVENTREQ_CONTENTTYPE2                              = "V2AddlRequestTests_SPEC2_11_EventReq_contentType2";
    public final static String               V2ADDLREQUESTTESTS_SPEC2_11_EVENTREQ_CONTENTTYPE3                              = "V2AddlRequestTests_SPEC2_11_EventReq_contentType3";
-   public final static String               V2ADDLREQUESTTESTS_SPEC2_11_EVENTREQ_CONTENTTYPE4                              = "V2AddlRequestTests_SPEC2_11_EventReq_contentType4";
-   public final static String               V2ADDLREQUESTTESTS_SPEC2_11_EVENTREQ_CONTENTTYPE5                              = "V2AddlRequestTests_SPEC2_11_EventReq_contentType5";
    public final static String               V2ADDLREQUESTTESTS_SPEC2_11_EVENTREQ_WINDOWID4                                 = "V2AddlRequestTests_SPEC2_11_EventReq_windowId4";
    public final static String               V2ADDLREQUESTTESTS_SPEC2_11_EVENTREQ_CONTENTTYPE8                              = "V2AddlRequestTests_SPEC2_11_EventReq_contentType8";
-   public final static String               V2ADDLREQUESTTESTS_SPEC2_11_EVENTREQ_CONTENTTYPE9                              = "V2AddlRequestTests_SPEC2_11_EventReq_contentType9";
    public final static String               V2ADDLREQUESTTESTS_SPEC2_11_RENDERREQ_CONTENTTYPE1                             = "V2AddlRequestTests_SPEC2_11_RenderReq_contentType1";
    public final static String               V2ADDLREQUESTTESTS_SPEC2_11_RENDERREQ_CONTENTTYPE2                             = "V2AddlRequestTests_SPEC2_11_RenderReq_contentType2";
    public final static String               V2ADDLREQUESTTESTS_SPEC2_11_RENDERREQ_CONTENTTYPE3                             = "V2AddlRequestTests_SPEC2_11_RenderReq_contentType3";
-   public final static String               V2ADDLREQUESTTESTS_SPEC2_11_RENDERREQ_CONTENTTYPE4                             = "V2AddlRequestTests_SPEC2_11_RenderReq_contentType4";
-   public final static String               V2ADDLREQUESTTESTS_SPEC2_11_RENDERREQ_CONTENTTYPE5                             = "V2AddlRequestTests_SPEC2_11_RenderReq_contentType5";
    public final static String               V2ADDLREQUESTTESTS_SPEC2_11_RENDERREQ_WINDOWID4                                = "V2AddlRequestTests_SPEC2_11_RenderReq_windowId4";
    public final static String               V2ADDLREQUESTTESTS_SPEC2_11_RENDERREQ_CONTENTTYPE10                            = "V2AddlRequestTests_SPEC2_11_RenderReq_contentType10";
-   public final static String               V2ADDLREQUESTTESTS_SPEC2_11_RENDERREQ_CONTENTTYPE11                            = "V2AddlRequestTests_SPEC2_11_RenderReq_contentType11";
    public final static String               V2ADDLREQUESTTESTS_SPEC2_11_RENDERREQ_CONTENTTYPE13                            = "V2AddlRequestTests_SPEC2_11_RenderReq_contentType13";
    public final static String               V2ADDLREQUESTTESTS_SPEC2_11_RESOURCEREQ_CONTENTTYPE1                           = "V2AddlRequestTests_SPEC2_11_ResourceReq_contentType1";
    public final static String               V2ADDLREQUESTTESTS_SPEC2_11_RESOURCEREQ_CONTENTTYPE2                           = "V2AddlRequestTests_SPEC2_11_ResourceReq_contentType2";
    public final static String               V2ADDLREQUESTTESTS_SPEC2_11_RESOURCEREQ_CONTENTTYPE3                           = "V2AddlRequestTests_SPEC2_11_ResourceReq_contentType3";
-   public final static String               V2ADDLREQUESTTESTS_SPEC2_11_RESOURCEREQ_CONTENTTYPE4                           = "V2AddlRequestTests_SPEC2_11_ResourceReq_contentType4";
-   public final static String               V2ADDLREQUESTTESTS_SPEC2_11_RESOURCEREQ_CONTENTTYPE5                           = "V2AddlRequestTests_SPEC2_11_ResourceReq_contentType5";
    public final static String               V2ADDLREQUESTTESTS_SPEC2_11_RESOURCEREQ_WINDOWID4                              = "V2AddlRequestTests_SPEC2_11_ResourceReq_windowId4";
    public final static String               V2ADDLREQUESTTESTS_SPEC2_11_RESOURCEREQ_CONTENTTYPE12                          = "V2AddlRequestTests_SPEC2_11_ResourceReq_contentType12";
    public final static String               V2ADDLREQUESTTESTS_SPEC2_11_RESOURCEREQ_CONTENTTYPE13                          = "V2AddlRequestTests_SPEC2_11_ResourceReq_contentType13";
@@ -1411,20 +1400,11 @@ public class JSR286SpecTestCaseDetails extends TestCaseDetails {
       tcd.put(
             V2ADDLREQUESTTESTS_SPEC2_11_ACTIONREQ_CONTENTTYPE3,
             "The first element of the Enumeration returned by the getResponseContentTypes method must equal the value returned by the getResponseContentType method");
-      tcd.put(
-            V2ADDLREQUESTTESTS_SPEC2_11_ACTIONREQ_CONTENTTYPE4,
-            "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");
-      tcd.put(
-            V2ADDLREQUESTTESTS_SPEC2_11_ACTIONREQ_CONTENTTYPE5,
-            "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");
       tcd.put(V2ADDLREQUESTTESTS_SPEC2_11_ACTIONREQ_WINDOWID4,
             "The string returned by getWindowID method must be the same ID used for scoping portlet-scope session attributes");
       tcd.put(V2ADDLREQUESTTESTS_SPEC2_11_ACTIONREQ_CONTENTTYPE6,
             "Within the processAction method, the content type must include only the MIME type, not the character set");
       tcd.put(
-            V2ADDLREQUESTTESTS_SPEC2_11_ACTIONREQ_CONTENTTYPE7,
-            "Within the processAction method, the getResponseContentTypes method must return only the content types supported by the current portlet mode");
-      tcd.put(
             V2ADDLREQUESTTESTS_SPEC2_11_EVENTREQ_CONTENTTYPE1,
             "The getResponseContentType method returns a String representing the default content type the portlet container assumes for the output");
       tcd.put(
@@ -1433,20 +1413,11 @@ public class JSR286SpecTestCaseDetails extends TestCaseDetails {
       tcd.put(
             V2ADDLREQUESTTESTS_SPEC2_11_EVENTREQ_CONTENTTYPE3,
             "The first element of the Enumeration returned by the getResponseContentTypes method must equal the value returned by the getResponseContentType method");
-      tcd.put(
-            V2ADDLREQUESTTESTS_SPEC2_11_EVENTREQ_CONTENTTYPE4,
-            "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");
-      tcd.put(
-            V2ADDLREQUESTTESTS_SPEC2_11_EVENTREQ_CONTENTTYPE5,
-            "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");
       tcd.put(V2ADDLREQUESTTESTS_SPEC2_11_EVENTREQ_WINDOWID4,
             "The string returned by getWindowID method must be the same ID used for scoping portlet-scope session attributes");
       tcd.put(V2ADDLREQUESTTESTS_SPEC2_11_EVENTREQ_CONTENTTYPE8,
             "Within the processEvent method, the content type must include only the MIME type, not the character set");
       tcd.put(
-            V2ADDLREQUESTTESTS_SPEC2_11_EVENTREQ_CONTENTTYPE9,
-            "Within the processEvent method, the getResponseContentTypes method must return only the content types supported by the current portlet mode");
-      tcd.put(
             V2ADDLREQUESTTESTS_SPEC2_11_RENDERREQ_CONTENTTYPE1,
             "The getResponseContentType method returns a String representing the default content type the portlet container assumes for the output");
       tcd.put(
@@ -1455,19 +1426,10 @@ public class JSR286SpecTestCaseDetails extends TestCaseDetails {
       tcd.put(
             V2ADDLREQUESTTESTS_SPEC2_11_RENDERREQ_CONTENTTYPE3,
             "The first element of the Enumeration returned by the getResponseContentTypes method must equal the value returned by the getResponseContentType method");
-      tcd.put(
-            V2ADDLREQUESTTESTS_SPEC2_11_RENDERREQ_CONTENTTYPE4,
-            "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");
-      tcd.put(
-            V2ADDLREQUESTTESTS_SPEC2_11_RENDERREQ_CONTENTTYPE5,
-            "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");
       tcd.put(V2ADDLREQUESTTESTS_SPEC2_11_RENDERREQ_WINDOWID4,
             "The string returned by getWindowID method must be the same ID used for scoping portlet-scope session attributes");
       tcd.put(V2ADDLREQUESTTESTS_SPEC2_11_RENDERREQ_CONTENTTYPE10,
             "Within the render method, the content type must include only the MIME type, not the character set");
-      tcd.put(
-            V2ADDLREQUESTTESTS_SPEC2_11_RENDERREQ_CONTENTTYPE11,
-            "Within the render method, the getResponseContentTypes method must return only the content types supported by the current portlet mode");
       tcd.put(V2ADDLREQUESTTESTS_SPEC2_11_RENDERREQ_CONTENTTYPE13,
             "The character set of the response can be retrieved via the RenderResponse.getCharacterEncoding method");
       tcd.put(
@@ -1479,12 +1441,6 @@ public class JSR286SpecTestCaseDetails extends TestCaseDetails {
       tcd.put(
             V2ADDLREQUESTTESTS_SPEC2_11_RESOURCEREQ_CONTENTTYPE3,
             "The first element of the Enumeration returned by the getResponseContentTypes method must equal the value returned by the getResponseContentType method");
-      tcd.put(
-            V2ADDLREQUESTTESTS_SPEC2_11_RESOURCEREQ_CONTENTTYPE4,
-            "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");
-      tcd.put(
-            V2ADDLREQUESTTESTS_SPEC2_11_RESOURCEREQ_CONTENTTYPE5,
-            "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");
       tcd.put(V2ADDLREQUESTTESTS_SPEC2_11_RESOURCEREQ_WINDOWID4,
             "The string returned by getWindowID method must be the same ID used for scoping portlet-scope session attributes");
       tcd.put(V2ADDLREQUESTTESTS_SPEC2_11_RESOURCEREQ_CONTENTTYPE12,


Mime
View raw message