You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by mf...@apache.org on 2010/10/19 23:55:52 UTC

svn commit: r1024428 [1/4] - in /myfaces/portlet-bridge/tck/trunk_2.0.x: ./ portlet-bridge-tck-main/src/main/webapp/WEB-INF/ portlet-bridge-tck-main/src/main/webapp/tests/ portlet-bridge-tck-section6-2-configured-response-wrapper/ portlet-bridge-tck-se...

Author: mfreedman
Date: Tue Oct 19 21:55:51 2010
New Revision: 1024428

URL: http://svn.apache.org/viewvc?rev=1024428&view=rev
Log:
Added new chapter 6 tests.

Added:
    myfaces/portlet-bridge/tck/trunk_2.0.x/portlet-bridge-tck-main/src/main/webapp/tests/ImplementsBridgeWriteBehindResponseTest.jsp
    myfaces/portlet-bridge/tck/trunk_2.0.x/portlet-bridge-tck-main/src/main/webapp/tests/ResourceTrinidadResult.jsp
    myfaces/portlet-bridge/tck/trunk_2.0.x/portlet-bridge-tck-main/src/main/webapp/tests/TrinidadMultiRequest.jsp
    myfaces/portlet-bridge/tck/trunk_2.0.x/portlet-bridge-tck-main/src/main/webapp/tests/TrinidadMultiRequestTestResult.jsp
    myfaces/portlet-bridge/tck/trunk_2.0.x/portlet-bridge-tck-section6-2-configured-response-wrapper/
    myfaces/portlet-bridge/tck/trunk_2.0.x/portlet-bridge-tck-section6-2-configured-response-wrapper/pom.xml
    myfaces/portlet-bridge/tck/trunk_2.0.x/portlet-bridge-tck-section6-2-configured-response-wrapper/src/
    myfaces/portlet-bridge/tck/trunk_2.0.x/portlet-bridge-tck-section6-2-configured-response-wrapper/src/main/
    myfaces/portlet-bridge/tck/trunk_2.0.x/portlet-bridge-tck-section6-2-configured-response-wrapper/src/main/java/
    myfaces/portlet-bridge/tck/trunk_2.0.x/portlet-bridge-tck-section6-2-configured-response-wrapper/src/main/java/org/
    myfaces/portlet-bridge/tck/trunk_2.0.x/portlet-bridge-tck-section6-2-configured-response-wrapper/src/main/java/org/apache/
    myfaces/portlet-bridge/tck/trunk_2.0.x/portlet-bridge-tck-section6-2-configured-response-wrapper/src/main/java/org/apache/myfaces/
    myfaces/portlet-bridge/tck/trunk_2.0.x/portlet-bridge-tck-section6-2-configured-response-wrapper/src/main/java/org/apache/myfaces/portlet/
    myfaces/portlet-bridge/tck/trunk_2.0.x/portlet-bridge-tck-section6-2-configured-response-wrapper/src/main/java/org/apache/myfaces/portlet/faces/
    myfaces/portlet-bridge/tck/trunk_2.0.x/portlet-bridge-tck-section6-2-configured-response-wrapper/src/main/java/org/apache/myfaces/portlet/faces/tck/
    myfaces/portlet-bridge/tck/trunk_2.0.x/portlet-bridge-tck-section6-2-configured-response-wrapper/src/main/java/org/apache/myfaces/portlet/faces/tck/TCKRenderResponseWrapper.java
    myfaces/portlet-bridge/tck/trunk_2.0.x/portlet-bridge-tck-section6-2-configured-response-wrapper/src/main/java/org/apache/myfaces/portlet/faces/tck/TCKResourceResponseWrapper.java
    myfaces/portlet-bridge/tck/trunk_2.0.x/portlet-bridge-tck-section6-2-configured-response-wrapper/src/main/webapp/
    myfaces/portlet-bridge/tck/trunk_2.0.x/portlet-bridge-tck-section6-2-configured-response-wrapper/src/main/webapp/WEB-INF/
    myfaces/portlet-bridge/tck/trunk_2.0.x/portlet-bridge-tck-section6-2-configured-response-wrapper/src/main/webapp/WEB-INF/faces-config.xml
    myfaces/portlet-bridge/tck/trunk_2.0.x/portlet-bridge-tck-section6-2-configured-response-wrapper/src/main/webapp/WEB-INF/portlet.xml
    myfaces/portlet-bridge/tck/trunk_2.0.x/portlet-bridge-tck-section6-2-configured-response-wrapper/src/main/webapp/WEB-INF/web.xml
    myfaces/portlet-bridge/tck/trunk_2.0.x/portlet-bridge-tck-section6-2-configured-response-wrapper/src/main/webapp/tests/
    myfaces/portlet-bridge/tck/trunk_2.0.x/portlet-bridge-tck-section6-2-configured-response-wrapper/src/main/webapp/tests/ResourceRequestTest.jsp
    myfaces/portlet-bridge/tck/trunk_2.0.x/portlet-bridge-tck-section6-2-configured-response-wrapper/src/main/webapp/tests/UsesConfiguredRenderResponseWrapperTest.jsp
    myfaces/portlet-bridge/tck/trunk_2.0.x/portlet-bridge-tck-section6-2-configured-response-wrapper/src/main/webapp/tests/UsesConfiguredResourceResponseWrapperTest.jsp
    myfaces/portlet-bridge/tck/trunk_2.0.x/src/main/java/org/apache/myfaces/portlet/faces/testsuite/tests/chapter_6/section_6_1_3_1/TestEventHandler.java
    myfaces/portlet-bridge/tck/trunk_2.0.x/src/main/java/org/apache/myfaces/portlet/faces/testsuite/tests/chapter_6/section_6_9/
    myfaces/portlet-bridge/tck/trunk_2.0.x/src/main/java/org/apache/myfaces/portlet/faces/testsuite/tests/chapter_6/section_6_9/Tests.java
Modified:
    myfaces/portlet-bridge/tck/trunk_2.0.x/pom.xml
    myfaces/portlet-bridge/tck/trunk_2.0.x/portlet-bridge-tck-main/src/main/webapp/WEB-INF/faces-config.xml
    myfaces/portlet-bridge/tck/trunk_2.0.x/portlet-bridge-tck-main/src/main/webapp/WEB-INF/portlet.xml
    myfaces/portlet-bridge/tck/trunk_2.0.x/portlet-bridge-tck-main/src/main/webapp/tests/RedisplayResourceTrinidadResult.jsp
    myfaces/portlet-bridge/tck/trunk_2.0.x/portlet-bridge-tck-main/src/main/webapp/tests/chapter6_5.jsp
    myfaces/portlet-bridge/tck/trunk_2.0.x/src/main/java/org/apache/myfaces/portlet/faces/testsuite/tests/chapter_3/BridgeDestroyTestPortlet.java
    myfaces/portlet-bridge/tck/trunk_2.0.x/src/main/java/org/apache/myfaces/portlet/faces/testsuite/tests/chapter_5/section_5_2/Tests.java
    myfaces/portlet-bridge/tck/trunk_2.0.x/src/main/java/org/apache/myfaces/portlet/faces/testsuite/tests/chapter_5/section_5_3/Tests.java
    myfaces/portlet-bridge/tck/trunk_2.0.x/src/main/java/org/apache/myfaces/portlet/faces/testsuite/tests/chapter_6/section_6_1_3_1/Tests.java
    myfaces/portlet-bridge/tck/trunk_2.0.x/src/main/java/org/apache/myfaces/portlet/faces/testsuite/tests/chapter_6/section_6_2_1/Tests.java

Modified: myfaces/portlet-bridge/tck/trunk_2.0.x/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/tck/trunk_2.0.x/pom.xml?rev=1024428&r1=1024427&r2=1024428&view=diff
==============================================================================
--- myfaces/portlet-bridge/tck/trunk_2.0.x/pom.xml (original)
+++ myfaces/portlet-bridge/tck/trunk_2.0.x/pom.xml Tue Oct 19 21:55:51 2010
@@ -382,6 +382,7 @@
       <modules>
         <module>portlet-bridge-tck-main</module>
         <module>portlet-bridge-tck-section3-2-lifecycle-set</module>
+        <module>portlet-bridge-tck-section6-2-configured-response-wrapper</module>
 <!-- Render Policy tests are excluded because its mechanism relies on a Mojarra impl dependency (doesn't work on MyFaces)
      If you are testing with Mojarra uncomment these out to get the additional test apps built
 

Modified: myfaces/portlet-bridge/tck/trunk_2.0.x/portlet-bridge-tck-main/src/main/webapp/WEB-INF/faces-config.xml
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/tck/trunk_2.0.x/portlet-bridge-tck-main/src/main/webapp/WEB-INF/faces-config.xml?rev=1024428&r1=1024427&r2=1024428&view=diff
==============================================================================
--- myfaces/portlet-bridge/tck/trunk_2.0.x/portlet-bridge-tck-main/src/main/webapp/WEB-INF/faces-config.xml (original)
+++ myfaces/portlet-bridge/tck/trunk_2.0.x/portlet-bridge-tck-main/src/main/webapp/WEB-INF/faces-config.xml Tue Oct 19 21:55:51 2010
@@ -153,6 +153,11 @@
     <managed-bean-scope>request</managed-bean-scope>
   </managed-bean>
   <managed-bean>
+    <managed-bean-name>chapter6_9Tests</managed-bean-name>
+    <managed-bean-class>org.apache.myfaces.portlet.faces.testsuite.tests.chapter_6.section_6_9.Tests</managed-bean-class>
+    <managed-bean-scope>request</managed-bean-scope>
+  </managed-bean>  
+  <managed-bean>
     <managed-bean-name>predestroyBean1</managed-bean-name>
     <managed-bean-class>org.apache.myfaces.portlet.faces.testsuite.beans.PreDestroyBean1</managed-bean-class>
     <managed-bean-scope>request</managed-bean-scope>
@@ -281,6 +286,10 @@
       <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp?javax.portlet.faces.PortletMode=edit</to-view-id>
     </navigation-case>
     <navigation-case>
+      <from-outcome>eventPhaseListenerTest</from-outcome>
+      <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp</to-view-id>
+    </navigation-case>
+    <navigation-case>
       <from-outcome>eventScopeRestoredTest</from-outcome>
       <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp</to-view-id>
     </navigation-case>
@@ -393,6 +402,38 @@
       <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp?javax.portlet.faces.Secure=blue&amp;param1=testValue</to-view-id>
     </navigation-case>
     <navigation-case>
+      <from-outcome>encodeActionURLJSFViewEventTest</from-outcome>
+      <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp</to-view-id>
+    </navigation-case>
+    <navigation-case>
+      <from-outcome>encodeActionURLWithParamEventTest</from-outcome>
+      <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp?param1=testValue</to-view-id>
+    </navigation-case>
+    <navigation-case>
+      <from-outcome>encodeActionURLWithModeEventTest</from-outcome>
+      <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp?javax.portlet.faces.PortletMode=edit&amp;param1=testValue</to-view-id>
+    </navigation-case>
+    <navigation-case>
+      <from-outcome>encodeActionURLWithInvalidModeEventTest</from-outcome>
+      <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp?javax.portlet.faces.PortletMode=blue&amp;param1=testValue</to-view-id>
+    </navigation-case>
+    <navigation-case>
+      <from-outcome>encodeActionURLWithWindowStateEventTest</from-outcome>
+      <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp?javax.portlet.faces.WindowState=maximized&amp;param1=testValue</to-view-id>
+    </navigation-case>
+    <navigation-case>
+      <from-outcome>encodeActionURLWithInvalidWindowStateEventTest</from-outcome>
+      <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp?javax.portlet.faces.WindowState=blue&amp;param1=testValue</to-view-id>
+    </navigation-case>
+    <navigation-case>
+      <from-outcome>encodeActionURLWithSecurityEventTest</from-outcome>
+      <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp?javax.portlet.faces.Secure=true&amp;param1=testValue</to-view-id>
+    </navigation-case>
+    <navigation-case>
+      <from-outcome>encodeActionURLWithInvalidSecurityEventTest</from-outcome>
+      <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp?javax.portlet.faces.Secure=blue&amp;param1=testValue</to-view-id>
+    </navigation-case>    
+    <navigation-case>
       <from-outcome>encodeActionURLJSFViewRenderTest</from-outcome>
       <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp</to-view-id>
     </navigation-case>
@@ -423,7 +464,7 @@
     <navigation-case>
       <from-outcome>encodeActionURLWithInvalidSecurityRenderTest</from-outcome>
       <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp</to-view-id>
-    </navigation-case>
+    </navigation-case>   
     <navigation-case>
       <from-outcome>getSetRequestObjectTest</from-outcome>
       <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp</to-view-id>
@@ -437,10 +478,18 @@
       <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp?param1=testValue</to-view-id>
     </navigation-case>
     <navigation-case>
+      <from-outcome>getRequestHeaderMapEventTest</from-outcome>
+      <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp?param1=testValue</to-view-id>
+    </navigation-case>    
+    <navigation-case>
       <from-outcome>getRequestHeaderValuesMapActionTest</from-outcome>
       <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp?param1=testValue</to-view-id>
     </navigation-case>
     <navigation-case>
+      <from-outcome>getRequestHeaderValuesMapEventTest</from-outcome>
+      <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp?param1=testValue</to-view-id>
+    </navigation-case>     
+    <navigation-case>
       <from-outcome>requestMapRequestScopeTest</from-outcome>
       <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp?param1=testValue</to-view-id>
     </navigation-case>
@@ -453,22 +502,42 @@
       <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp</to-view-id>
     </navigation-case>
     <navigation-case>
+      <from-outcome>getRequestCharacterEncodingEventTest</from-outcome>
+      <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp?param1=testValue</to-view-id>
+    </navigation-case>      
+    <navigation-case>
       <from-outcome>getRequestContentTypeActionTest</from-outcome>
       <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp</to-view-id>
     </navigation-case>
     <navigation-case>
+      <from-outcome>getRequestContentTypeEventTest</from-outcome>
+      <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp?param1=testValue</to-view-id>
+    </navigation-case> 
+    <navigation-case>
       <from-outcome>getResponseCharacterEncodingActionTest</from-outcome>
       <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp</to-view-id>
     </navigation-case>
     <navigation-case>
+      <from-outcome>getResponseCharacterEncodingEventTest</from-outcome>
+      <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp?param1=testValue</to-view-id>
+    </navigation-case> 
+    <navigation-case>
       <from-outcome>getResponseContentTypeActionTest</from-outcome>
       <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp</to-view-id>
     </navigation-case>
     <navigation-case>
+      <from-outcome>getResponseContentTypeEventTest</from-outcome>
+      <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp?param1=testValue</to-view-id>
+    </navigation-case>     
+    <navigation-case>
       <from-outcome>redirectActionTest</from-outcome>
       <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp</to-view-id>
     </navigation-case>   
     <navigation-case>
+      <from-outcome>redirectEventTest</from-outcome>
+      <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp?param1=testValue</to-view-id>
+    </navigation-case>     
+    <navigation-case>
       <from-outcome>redirectRenderPRP1Test</from-outcome>
       <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp</to-view-id>
     </navigation-case> 
@@ -489,6 +558,14 @@
       <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp</to-view-id>
     </navigation-case>   
   </navigation-rule>
+  
+  <navigation-rule>
+    <from-view-id>/tests/TrinidadMultiRequest.jsp</from-view-id>
+    <navigation-case>
+      <from-outcome>usesConfiguredRenderKitTest</from-outcome>
+      <to-view-id>/tests/TrinidadMultiRequestTestResult.jsp</to-view-id>
+    </navigation-case>
+  </navigation-rule>
     
   <navigation-rule>
     <from-view-id>/tests/MultiRequestFormDataTest.jsp</from-view-id>

Modified: myfaces/portlet-bridge/tck/trunk_2.0.x/portlet-bridge-tck-main/src/main/webapp/WEB-INF/portlet.xml
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/tck/trunk_2.0.x/portlet-bridge-tck-main/src/main/webapp/WEB-INF/portlet.xml?rev=1024428&r1=1024427&r2=1024428&view=diff
==============================================================================
--- myfaces/portlet-bridge/tck/trunk_2.0.x/portlet-bridge-tck-main/src/main/webapp/WEB-INF/portlet.xml (original)
+++ myfaces/portlet-bridge/tck/trunk_2.0.x/portlet-bridge-tck-main/src/main/webapp/WEB-INF/portlet.xml Tue Oct 19 21:55:51 2010
@@ -1260,6 +1260,38 @@
     </portlet> 
     
     <portlet>
+      <portlet-name>chapter5_2Tests-eventPhaseListenerTest-portlet</portlet-name>
+      <portlet-class>org.apache.myfaces.portlet.faces.testsuite.common.portlet.GenericFacesTestSuitePortlet</portlet-class>
+      
+      <init-param>
+        <name>javax.portlet.faces.defaultViewId.view</name>
+        <value>/tests/MultiRequestTest.jsp</value>
+      </init-param>
+      
+      <init-param>
+        <name>javax.portlet.faces.bridgeEventHandler</name>
+        <value>org.apache.myfaces.portlet.faces.testsuite.tests.chapter_5.section_5_2.TestEventHandler</value>
+      </init-param>      
+           
+      <expiration-cache>0</expiration-cache>
+  
+     <supports>
+       <mime-type>text/html</mime-type>
+     </supports>
+     <portlet-info>
+              <title>chapter5_2Tests-eventPhaseListenerTest-portlet</title>
+      </portlet-info>
+      
+      <supported-publishing-event>
+        <qname xmlns:bridge="http://myfaces.apache.org/portlet-bridge/event_ns">bridge:myfaces.apache.org.tck.testEvent</qname>
+      </supported-publishing-event>
+      
+      <supported-processing-event>
+        <qname xmlns:bridge="http://myfaces.apache.org/portlet-bridge/event_ns">bridge:myfaces.apache.org.tck.testEvent</qname>
+      </supported-processing-event>
+    </portlet>     
+    
+    <portlet>
       <portlet-name>chapter5_2Tests-eventScopeRestoredTest-portlet</portlet-name>
       <portlet-class>org.apache.myfaces.portlet.faces.testsuite.common.portlet.GenericFacesTestSuitePortlet</portlet-class>
       
@@ -1959,6 +1991,25 @@
     </portlet>
     
     <portlet>
+        <portlet-name>chapter6_1_3_1Tests-encodeActionURLPortletResourceTest-portlet</portlet-name>
+        <portlet-class>org.apache.myfaces.portlet.faces.testsuite.common.portlet.GenericFacesTestSuitePortlet</portlet-class>
+        
+        <init-param>
+          <name>javax.portlet.faces.defaultViewId.view</name>
+          <value>/tests/SingleRequestTest.jsp</value>
+        </init-param>
+
+        <expiration-cache>0</expiration-cache>
+        
+       <supports>
+         <mime-type>text/html</mime-type>
+       </supports>
+        <portlet-info>
+                <title>chapter6_1_3_1Tests-encodeActionURLPortletResourceTest-portlet</title>
+        </portlet-info>
+    </portlet>    
+    
+    <portlet>
         <portlet-name>chapter6_1_3_1Tests-encodeActionURLJSFViewActionTest-portlet</portlet-name>
         <portlet-class>org.apache.myfaces.portlet.faces.testsuite.common.portlet.GenericFacesTestSuitePortlet</portlet-class>
         
@@ -2121,6 +2172,274 @@
     </portlet>
     
 -->
+
+    <portlet>
+        <portlet-name>chapter6_1_3_1Tests-encodeActionURLJSFViewEventTest-portlet</portlet-name>
+        <portlet-class>org.apache.myfaces.portlet.faces.testsuite.common.portlet.GenericFacesTestSuitePortlet</portlet-class>
+        
+        <init-param>
+          <name>javax.portlet.faces.defaultViewId.view</name>
+          <value>/tests/MultiRequestTest.jsp</value>
+        </init-param>
+        
+        <init-param>
+          <name>javax.portlet.faces.bridgeEventHandler</name>
+          <value>org.apache.myfaces.portlet.faces.testsuite.tests.chapter_6.section_6_1_3_1.TestEventHandler</value>
+        </init-param>
+
+        <expiration-cache>0</expiration-cache>
+        
+       <supports>
+         <mime-type>text/html</mime-type>
+       </supports>
+        <portlet-info>
+                <title>chapter6_1_3_1Tests-encodeActionURLJSFViewEventTest-portlet</title>
+        </portlet-info>
+        
+        <supported-publishing-event>
+          <qname xmlns:bridge="http://myfaces.apache.org/portlet-bridge/event_ns">bridge:myfaces.apache.org.tck.testEvent</qname>
+        </supported-publishing-event>
+        
+        <supported-processing-event>
+          <qname xmlns:bridge="http://myfaces.apache.org/portlet-bridge/event_ns">bridge:myfaces.apache.org.tck.testEvent</qname>
+        </supported-processing-event>
+    </portlet>
+    
+    <portlet>
+        <portlet-name>chapter6_1_3_1Tests-encodeActionURLWithParamEventTest-portlet</portlet-name>
+        <portlet-class>org.apache.myfaces.portlet.faces.testsuite.common.portlet.GenericFacesTestSuitePortlet</portlet-class>
+        
+        <init-param>
+          <name>javax.portlet.faces.defaultViewId.view</name>
+          <value>/tests/MultiRequestTest.jsp</value>
+        </init-param>
+
+        <init-param>
+          <name>javax.portlet.faces.bridgeEventHandler</name>
+          <value>org.apache.myfaces.portlet.faces.testsuite.tests.chapter_6.section_6_1_3_1.TestEventHandler</value>
+        </init-param>
+        
+        <expiration-cache>0</expiration-cache>
+        
+       <supports>
+         <mime-type>text/html</mime-type>
+       </supports>
+        <portlet-info>
+                <title>chapter6_1_3_1Tests-encodeActionURLWithParamEventTest-portlet</title>
+        </portlet-info>
+
+        <supported-publishing-event>
+          <qname xmlns:bridge="http://myfaces.apache.org/portlet-bridge/event_ns">bridge:myfaces.apache.org.tck.testEvent</qname>
+        </supported-publishing-event>
+        
+        <supported-processing-event>
+          <qname xmlns:bridge="http://myfaces.apache.org/portlet-bridge/event_ns">bridge:myfaces.apache.org.tck.testEvent</qname>
+        </supported-processing-event>
+    </portlet>
+    
+    <portlet>
+        <portlet-name>chapter6_1_3_1Tests-encodeActionURLWithModeEventTest-portlet</portlet-name>
+        <portlet-class>org.apache.myfaces.portlet.faces.testsuite.common.portlet.GenericFacesTestSuitePortlet</portlet-class>
+        
+        <init-param>
+          <name>javax.portlet.faces.defaultViewId.view</name>
+          <value>/tests/MultiRequestTest.jsp</value>
+        </init-param>
+        
+        <init-param>
+          <name>javax.portlet.faces.defaultViewId.edit</name>
+          <value>/tests/MultiRequestTestResultRenderCheck.jsp</value>
+        </init-param>
+        
+        <init-param>
+          <name>javax.portlet.faces.bridgeEventHandler</name>
+          <value>org.apache.myfaces.portlet.faces.testsuite.tests.chapter_6.section_6_1_3_1.TestEventHandler</value>
+        </init-param>
+
+        <expiration-cache>0</expiration-cache>
+        
+       <supports>
+         <mime-type>text/html</mime-type>
+         <portlet-mode>VIEW</portlet-mode>
+         <portlet-mode>EDIT</portlet-mode>
+       </supports>
+        <portlet-info>
+                <title>chapter6_1_3_1Tests-encodeActionURLWithModeEventTest-portlet</title>
+        </portlet-info>
+        
+        <supported-publishing-event>
+          <qname xmlns:bridge="http://myfaces.apache.org/portlet-bridge/event_ns">bridge:myfaces.apache.org.tck.testEvent</qname>
+        </supported-publishing-event>
+        
+        <supported-processing-event>
+          <qname xmlns:bridge="http://myfaces.apache.org/portlet-bridge/event_ns">bridge:myfaces.apache.org.tck.testEvent</qname>
+        </supported-processing-event>
+    </portlet>
+    
+    <portlet>
+        <portlet-name>chapter6_1_3_1Tests-encodeActionURLWithInvalidModeEventTest-portlet</portlet-name>
+        <portlet-class>org.apache.myfaces.portlet.faces.testsuite.common.portlet.GenericFacesTestSuitePortlet</portlet-class>
+        
+        <init-param>
+          <name>javax.portlet.faces.defaultViewId.view</name>
+          <value>/tests/MultiRequestTest.jsp</value>
+        </init-param>
+        
+        <init-param>
+          <name>javax.portlet.faces.bridgeEventHandler</name>
+          <value>org.apache.myfaces.portlet.faces.testsuite.tests.chapter_6.section_6_1_3_1.TestEventHandler</value>
+        </init-param>
+
+        <expiration-cache>0</expiration-cache>
+        
+       <supports>
+         <mime-type>text/html</mime-type>
+       </supports>
+        <portlet-info>
+                <title>chapter6_1_3_1Tests-encodeActionURLWithInvalidModeEventTest-portlet</title>
+        </portlet-info>
+        
+        <supported-publishing-event>
+          <qname xmlns:bridge="http://myfaces.apache.org/portlet-bridge/event_ns">bridge:myfaces.apache.org.tck.testEvent</qname>
+        </supported-publishing-event>
+        
+        <supported-processing-event>
+          <qname xmlns:bridge="http://myfaces.apache.org/portlet-bridge/event_ns">bridge:myfaces.apache.org.tck.testEvent</qname>
+        </supported-processing-event>
+    </portlet>
+    
+    <portlet>
+        <portlet-name>chapter6_1_3_1Tests-encodeActionURLWithWindowStateEventTest-portlet</portlet-name>
+        <portlet-class>org.apache.myfaces.portlet.faces.testsuite.common.portlet.GenericFacesTestSuitePortlet</portlet-class>
+        
+        <init-param>
+          <name>javax.portlet.faces.defaultViewId.view</name>
+          <value>/tests/MultiRequestTest.jsp</value>
+        </init-param>
+        
+        <init-param>
+          <name>javax.portlet.faces.bridgeEventHandler</name>
+          <value>org.apache.myfaces.portlet.faces.testsuite.tests.chapter_6.section_6_1_3_1.TestEventHandler</value>
+        </init-param>
+
+        <expiration-cache>0</expiration-cache>
+        
+       <supports>
+         <mime-type>text/html</mime-type>
+       </supports>
+        <portlet-info>
+                <title>chapter6_1_3_1Tests-encodeActionURLWithWindowStateEventTest-portlet</title>
+        </portlet-info>
+        
+        <supported-publishing-event>
+          <qname xmlns:bridge="http://myfaces.apache.org/portlet-bridge/event_ns">bridge:myfaces.apache.org.tck.testEvent</qname>
+        </supported-publishing-event>
+        
+        <supported-processing-event>
+          <qname xmlns:bridge="http://myfaces.apache.org/portlet-bridge/event_ns">bridge:myfaces.apache.org.tck.testEvent</qname>
+        </supported-processing-event>
+    </portlet>
+    
+    <portlet>
+        <portlet-name>chapter6_1_3_1Tests-encodeActionURLWithInvalidWindowStateEventTest-portlet</portlet-name>
+        <portlet-class>org.apache.myfaces.portlet.faces.testsuite.common.portlet.GenericFacesTestSuitePortlet</portlet-class>
+        
+        <init-param>
+          <name>javax.portlet.faces.defaultViewId.view</name>
+          <value>/tests/MultiRequestTest.jsp</value>
+        </init-param>
+        
+        <init-param>
+          <name>javax.portlet.faces.bridgeEventHandler</name>
+          <value>org.apache.myfaces.portlet.faces.testsuite.tests.chapter_6.section_6_1_3_1.TestEventHandler</value>
+        </init-param>
+        
+        <expiration-cache>0</expiration-cache>
+
+       <supports>
+         <mime-type>text/html</mime-type>
+       </supports>
+        <portlet-info>
+                <title>chapter6_1_3_1Tests-encodeActionURLWithInvalidWindowStateEventTest-portlet</title>
+        </portlet-info>
+        
+        <supported-publishing-event>
+          <qname xmlns:bridge="http://myfaces.apache.org/portlet-bridge/event_ns">bridge:myfaces.apache.org.tck.testEvent</qname>
+        </supported-publishing-event>
+        
+        <supported-processing-event>
+          <qname xmlns:bridge="http://myfaces.apache.org/portlet-bridge/event_ns">bridge:myfaces.apache.org.tck.testEvent</qname>
+        </supported-processing-event>
+    </portlet>
+
+<!--   This relies on a feature that isn't required in the portlet containers - if your container supports
+       uncomment to check to see if the bridge is behaving as expected.
+
+    <portlet>
+        <portlet-name>chapter6_1_3_1Tests-encodeActionURLWithSecurityEventTest-portlet</portlet-name>
+        <portlet-class>org.apache.myfaces.portlet.faces.testsuite.common.portlet.GenericFacesTestSuitePortlet</portlet-class>
+        
+        <init-param>
+          <name>javax.portlet.faces.defaultViewId.view</name>
+          <value>/tests/MultiRequestTest.jsp</value>
+        </init-param>
+        
+        <init-param>
+          <name>javax.portlet.faces.bridgeEventHandler</name>
+          <value>org.apache.myfaces.portlet.faces.testsuite.tests.chapter_6.section_6_1_3_1.TestEventHandler</value>
+        </init-param>
+
+        <expiration-cache>0</expiration-cache>
+        
+       <supports>
+         <mime-type>text/html</mime-type>
+       </supports>
+        <portlet-info>
+                <title>chapter6_1_3_1Tests-encodeActionURLWithSecurityEventTest-portlet</title>
+        </portlet-info>
+        
+        <supported-publishing-event>
+          <qname xmlns:bridge="http://myfaces.apache.org/portlet-bridge/event_ns">bridge:myfaces.apache.org.tck.testEvent</qname>
+        </supported-publishing-event>
+        
+        <supported-processing-event>
+          <qname xmlns:bridge="http://myfaces.apache.org/portlet-bridge/event_ns">bridge:myfaces.apache.org.tck.testEvent</qname>
+        </supported-processing-event>
+    </portlet>
+    
+    <portlet>
+        <portlet-name>chapter6_1_3_1Tests-encodeActionURLWithInvalidSecurityEventTest-portlet</portlet-name>
+        <portlet-class>org.apache.myfaces.portlet.faces.testsuite.common.portlet.GenericFacesTestSuitePortlet</portlet-class>
+        
+        <init-param>
+          <name>javax.portlet.faces.defaultViewId.view</name>
+          <value>/tests/MultiRequestTest.jsp</value>
+        </init-param>
+        
+        <init-param>
+          <name>javax.portlet.faces.bridgeEventHandler</name>
+          <value>org.apache.myfaces.portlet.faces.testsuite.tests.chapter_6.section_6_1_3_1.TestEventHandler</value>
+        </init-param>
+
+        <expiration-cache>0</expiration-cache>
+        
+       <supports>
+         <mime-type>text/html</mime-type>
+       </supports>
+        <portlet-info>
+                <title>chapter6_1_3_1Tests-encodeActionURLWithInvalidSecurityEventTest-portlet</title>
+        </portlet-info>
+        
+        <supported-publishing-event>
+          <qname xmlns:bridge="http://myfaces.apache.org/portlet-bridge/event_ns">bridge:myfaces.apache.org.tck.testEvent</qname>
+        </supported-publishing-event>
+        
+        <supported-processing-event>
+          <qname xmlns:bridge="http://myfaces.apache.org/portlet-bridge/event_ns">bridge:myfaces.apache.org.tck.testEvent</qname>
+        </supported-processing-event>
+    </portlet>
+    
+-->
     
     <portlet>
         <portlet-name>chapter6_1_3_1Tests-encodeActionURLJSFViewRenderTest-portlet</portlet-name>
@@ -2282,7 +2601,209 @@
                 <title>chapter6_1_3_1Tests-encodeActionURLWithInvalidSecurityRenderTest-portlet</title>
         </portlet-info>
     </portlet>
--->    
+-->  
+
+    <portlet>
+        <portlet-name>chapter6_1_3_1Tests-encodeActionURLJSFViewResourceTest-portlet</portlet-name>
+        <portlet-class>org.apache.myfaces.portlet.faces.testsuite.common.portlet.GenericFacesTestSuitePortlet</portlet-class>
+        
+        <init-param>
+          <name>javax.portlet.faces.defaultViewId.view</name>
+          <value>/tests/ResourceTrinidadResult.jsp</value>
+        </init-param>
+        
+        <init-param>
+          <!-- Use the Trinidad RenderKit -->
+          <name>javax.portlet.faces.defaultRenderKitId</name>
+          <value>org.apache.myfaces.trinidad.core</value>
+        </init-param>
+        
+        <expiration-cache>0</expiration-cache>
+
+       <supports>
+         <mime-type>text/html</mime-type>
+       </supports>
+        <portlet-info>
+                <title>chapter6_1_3_1Tests-encodeActionURLJSFViewResourceTest-portlet</title>
+        </portlet-info>
+    </portlet>
+    
+    <portlet>
+        <portlet-name>chapter6_1_3_1Tests-encodeActionURLWithParamResourceTest-portlet</portlet-name>
+        <portlet-class>org.apache.myfaces.portlet.faces.testsuite.common.portlet.GenericFacesTestSuitePortlet</portlet-class>
+        
+        <init-param>
+          <name>javax.portlet.faces.defaultViewId.view</name>
+          <value>/tests/ResourceTrinidadResult.jsp</value>
+        </init-param>
+        
+        <init-param>
+          <!-- Use the Trinidad RenderKit -->
+          <name>javax.portlet.faces.defaultRenderKitId</name>
+          <value>org.apache.myfaces.trinidad.core</value>
+        </init-param>
+        
+        <expiration-cache>0</expiration-cache>
+
+       <supports>
+         <mime-type>text/html</mime-type>
+       </supports>
+        <portlet-info>
+                <title>chapter6_1_3_1Tests-encodeActionURLWithParamResourceTest-portlet</title>
+        </portlet-info>
+    </portlet>    
+    
+    <portlet>
+        <portlet-name>chapter6_1_3_1Tests-encodeActionURLWithModeResourceTest-portlet</portlet-name>
+        <portlet-class>org.apache.myfaces.portlet.faces.testsuite.common.portlet.GenericFacesTestSuitePortlet</portlet-class>
+        
+        <init-param>
+          <name>javax.portlet.faces.defaultViewId.view</name>
+          <value>/tests/ResourceTrinidadResult.jsp</value>
+        </init-param>
+        
+        <init-param>
+          <!-- Use the Trinidad RenderKit -->
+          <name>javax.portlet.faces.defaultRenderKitId</name>
+          <value>org.apache.myfaces.trinidad.core</value>
+        </init-param>
+        
+        <expiration-cache>0</expiration-cache>
+
+       <supports>
+         <mime-type>text/html</mime-type>
+       </supports>
+        <portlet-info>
+                <title>chapter6_1_3_1Tests-encodeActionURLWithModeResourceTest-portlet</title>
+        </portlet-info>
+    </portlet>    
+    
+    <portlet>
+        <portlet-name>chapter6_1_3_1Tests-encodeActionURLWithInvalidModeResourceTest-portlet</portlet-name>
+        <portlet-class>org.apache.myfaces.portlet.faces.testsuite.common.portlet.GenericFacesTestSuitePortlet</portlet-class>
+        
+        <init-param>
+          <name>javax.portlet.faces.defaultViewId.view</name>
+          <value>/tests/ResourceTrinidadResult.jsp</value>
+        </init-param>
+        
+        <init-param>
+          <!-- Use the Trinidad RenderKit -->
+          <name>javax.portlet.faces.defaultRenderKitId</name>
+          <value>org.apache.myfaces.trinidad.core</value>
+        </init-param>
+        
+        <expiration-cache>0</expiration-cache>
+
+       <supports>
+         <mime-type>text/html</mime-type>
+       </supports>
+        <portlet-info>
+                <title>chapter6_1_3_1Tests-encodeActionURLWithInvalidModeResourceTest-portlet</title>
+        </portlet-info>
+    </portlet>
+    
+    <portlet>
+        <portlet-name>chapter6_1_3_1Tests-encodeActionURLWithWindowStateResourceTest-portlet</portlet-name>
+        <portlet-class>org.apache.myfaces.portlet.faces.testsuite.common.portlet.GenericFacesTestSuitePortlet</portlet-class>
+        
+        <init-param>
+          <name>javax.portlet.faces.defaultViewId.view</name>
+          <value>/tests/ResourceTrinidadResult.jsp</value>
+        </init-param>
+        
+        <init-param>
+          <!-- Use the Trinidad RenderKit -->
+          <name>javax.portlet.faces.defaultRenderKitId</name>
+          <value>org.apache.myfaces.trinidad.core</value>
+        </init-param>
+        
+        <expiration-cache>0</expiration-cache>
+
+       <supports>
+         <mime-type>text/html</mime-type>
+       </supports>
+        <portlet-info>
+                <title>chapter6_1_3_1Tests-encodeActionURLWithWindowStateResourceTest-portlet</title>
+        </portlet-info>
+    </portlet>
+    
+    <portlet>
+        <portlet-name>chapter6_1_3_1Tests-encodeActionURLWithInvalidWindowStateResourceTest-portlet</portlet-name>
+        <portlet-class>org.apache.myfaces.portlet.faces.testsuite.common.portlet.GenericFacesTestSuitePortlet</portlet-class>
+        
+        <init-param>
+          <name>javax.portlet.faces.defaultViewId.view</name>
+          <value>/tests/ResourceTrinidadResult.jsp</value>
+        </init-param>
+        
+        <init-param>
+          <!-- Use the Trinidad RenderKit -->
+          <name>javax.portlet.faces.defaultRenderKitId</name>
+          <value>org.apache.myfaces.trinidad.core</value>
+        </init-param>
+        
+        <expiration-cache>0</expiration-cache>
+
+       <supports>
+         <mime-type>text/html</mime-type>
+       </supports>
+        <portlet-info>
+                <title>chapter6_1_3_1Tests-encodeActionURLWithInvalidWindowStateResourceTest-portlet</title>
+        </portlet-info>
+    </portlet>
+
+ 
+ <!--   This relies on a feature that isn't required in the portlet containers - if your container supports
+       uncomment to check to see if the bridge is behaving as expected.        
+    <portlet>
+        <portlet-name>chapter6_1_3_1Tests-encodeActionURLWithSecurityResourceTest-portlet</portlet-name>
+        <portlet-class>org.apache.myfaces.portlet.faces.testsuite.common.portlet.GenericFacesTestSuitePortlet</portlet-class>
+        
+        <init-param>
+          <name>javax.portlet.faces.defaultViewId.view</name>
+          <value>/tests/ResourceTrinidadResult.jsp</value>
+        </init-param>
+        
+        <init-param>
+          <name>javax.portlet.faces.defaultRenderKitId</name>
+          <value>org.apache.myfaces.trinidad.core</value>
+        </init-param>
+        
+        <expiration-cache>0</expiration-cache>
+
+       <supports>
+         <mime-type>text/html</mime-type>
+       </supports>
+        <portlet-info>
+                <title>chapter6_1_3_1Tests-encodeActionURLWithSecurityResourceTest-portlet</title>
+        </portlet-info>
+    </portlet>
+    
+    <portlet>
+        <portlet-name>chapter6_1_3_1Tests-encodeActionURLWithInvalidSecurityResourceTest-portlet</portlet-name>
+        <portlet-class>org.apache.myfaces.portlet.faces.testsuite.common.portlet.GenericFacesTestSuitePortlet</portlet-class>
+        
+        <init-param>
+          <name>javax.portlet.faces.defaultViewId.view</name>
+          <value>/tests/ResourceTrinidadResult.jsp</value>
+        </init-param>
+        
+        <init-param>
+          <name>javax.portlet.faces.defaultRenderKitId</name>
+          <value>org.apache.myfaces.trinidad.core</value>
+        </init-param>
+        
+        <expiration-cache>0</expiration-cache>
+
+       <supports>
+         <mime-type>text/html</mime-type>
+       </supports>
+        <portlet-info>
+                <title>chapter6_1_3_1Tests-encodeActionURLWithInvalidSecurityResourceTest-portlet</title>
+        </portlet-info>
+    </portlet>
+-->
 
     <portlet>
         <portlet-name>chapter6_1_3_1Tests-encodeURLEscapingTest-portlet</portlet-name>
@@ -2510,12 +3031,107 @@
     <!-- *                                                             * -->
     <!-- *************************************************************** -->    
     <portlet>
-        <portlet-name>chapter6_1_3_1Tests-setRequestCharacterEncodingRenderTest-portlet</portlet-name>
+        <portlet-name>chapter6_1_3_1Tests-setRequestCharacterEncodingRenderTest-portlet</portlet-name>
+        <portlet-class>org.apache.myfaces.portlet.faces.testsuite.common.portlet.GenericFacesTestSuitePortlet</portlet-class>
+        
+        <init-param>
+          <name>javax.portlet.faces.defaultViewId.view</name>
+          <value>/tests/SingleRequestTest.jsp</value>
+        </init-param>
+        
+        <expiration-cache>0</expiration-cache>
+
+       <supports>
+         <mime-type>text/html</mime-type>
+       </supports>
+        <portlet-info>
+                <title>chapter6_1_3_1Tests-setRequestCharacterEncodingRenderTest-portlet</title>
+        </portlet-info>
+    </portlet>
+    
+    <portlet>
+        <portlet-name>chapter6_1_3_1Tests-setRequestCharacterEncodingActionTest-portlet</portlet-name>
+        <portlet-class>org.apache.myfaces.portlet.faces.testsuite.common.portlet.GenericFacesTestSuitePortlet</portlet-class>
+        
+        <init-param>
+          <name>javax.portlet.faces.defaultViewId.view</name>
+          <value>/tests/MultiRequestTest.jsp</value>
+        </init-param>
+        
+        <expiration-cache>0</expiration-cache>
+
+       <supports>
+         <mime-type>text/html</mime-type>
+       </supports>
+        <portlet-info>
+                <title>chapter6_1_3_1Tests-setRequestCharacterEncodingActionTest-portlet</title>
+        </portlet-info>
+    </portlet>
+
+
+    <!-- *************************************************************** -->
+    <!-- *                                                             * -->
+    <!-- * Portlet: getRequestHeaderMap                                * -->
+    <!-- *                                                             * -->
+    <!-- *************************************************************** -->    
+    <portlet>
+        <portlet-name>chapter6_1_3_1Tests-getRequestHeaderMapRenderTest-portlet</portlet-name>
+        <portlet-class>org.apache.myfaces.portlet.faces.testsuite.common.portlet.GenericFacesTestSuitePortlet</portlet-class>
+        
+        <init-param>
+          <name>javax.portlet.faces.defaultViewId.view</name>
+          <value>/tests/SingleRequestTest.jsp</value>
+        </init-param>
+        
+        <expiration-cache>0</expiration-cache>
+
+       <supports>
+         <mime-type>text/html</mime-type>
+       </supports>
+        <portlet-info>
+                <title>chapter6_1_3_1Tests-getRequestHeaderMapRenderTest-portlet</title>
+        </portlet-info>
+    </portlet>
+    
+    <portlet>
+        <portlet-name>chapter6_1_3_1Tests-getRequestHeaderMapEventTest-portlet</portlet-name>
+        <portlet-class>org.apache.myfaces.portlet.faces.testsuite.common.portlet.GenericFacesTestSuitePortlet</portlet-class>
+        
+        <init-param>
+          <name>javax.portlet.faces.defaultViewId.view</name>
+          <value>/tests/MultiRequestTest.jsp</value>
+        </init-param>
+        
+        <init-param>
+          <name>javax.portlet.faces.bridgeEventHandler</name>
+          <value>org.apache.myfaces.portlet.faces.testsuite.tests.chapter_6.section_6_1_3_1.TestEventHandler</value>
+        </init-param>
+        
+        <expiration-cache>0</expiration-cache>
+
+       <supports>
+         <mime-type>text/html</mime-type>
+       </supports>
+        <portlet-info>
+                <title>chapter6_1_3_1Tests-getRequestHeaderMapEventTest-portlet</title>
+        </portlet-info>
+        
+        <supported-publishing-event>
+          <qname xmlns:bridge="http://myfaces.apache.org/portlet-bridge/event_ns">bridge:myfaces.apache.org.tck.testEvent</qname>
+        </supported-publishing-event>
+        
+        <supported-processing-event>
+          <qname xmlns:bridge="http://myfaces.apache.org/portlet-bridge/event_ns">bridge:myfaces.apache.org.tck.testEvent</qname>
+        </supported-processing-event>
+    </portlet>  
+    
+    <portlet>
+        <portlet-name>chapter6_1_3_1Tests-getRequestHeaderMapActionTest-portlet</portlet-name>
         <portlet-class>org.apache.myfaces.portlet.faces.testsuite.common.portlet.GenericFacesTestSuitePortlet</portlet-class>
         
         <init-param>
           <name>javax.portlet.faces.defaultViewId.view</name>
-          <value>/tests/SingleRequestTest.jsp</value>
+          <value>/tests/MultiRequestTest.jsp</value>
         </init-param>
         
         <expiration-cache>0</expiration-cache>
@@ -2524,17 +3140,17 @@
          <mime-type>text/html</mime-type>
        </supports>
         <portlet-info>
-                <title>chapter6_1_3_1Tests-setRequestCharacterEncodingRenderTest-portlet</title>
+                <title>chapter6_1_3_1Tests-getRequestHeaderMapActionTest-portlet</title>
         </portlet-info>
     </portlet>
     
     <portlet>
-        <portlet-name>chapter6_1_3_1Tests-setRequestCharacterEncodingActionTest-portlet</portlet-name>
+        <portlet-name>chapter6_1_3_1Tests-getRequestHeaderMapResourceTest-portlet</portlet-name>
         <portlet-class>org.apache.myfaces.portlet.faces.testsuite.common.portlet.GenericFacesTestSuitePortlet</portlet-class>
         
         <init-param>
           <name>javax.portlet.faces.defaultViewId.view</name>
-          <value>/tests/MultiRequestTest.jsp</value>
+          <value>/tests/ResourceRequestTest.jsp</value>
         </init-param>
         
         <expiration-cache>0</expiration-cache>
@@ -2543,18 +3159,17 @@
          <mime-type>text/html</mime-type>
        </supports>
         <portlet-info>
-                <title>chapter6_1_3_1Tests-setRequestCharacterEncodingActionTest-portlet</title>
+                <title>chapter6_1_3_1Tests-getRequestHeaderMapResourceTest-portlet</title>
         </portlet-info>
-    </portlet>
-
-
+    </portlet>    
+    
     <!-- *************************************************************** -->
     <!-- *                                                             * -->
-    <!-- * Portlet: getRequestHeaderMap                                * -->
+    <!-- * Portlet: getRequestHeaderValuesMap                                * -->
     <!-- *                                                             * -->
     <!-- *************************************************************** -->    
     <portlet>
-        <portlet-name>chapter6_1_3_1Tests-getRequestHeaderMapRenderTest-portlet</portlet-name>
+        <portlet-name>chapter6_1_3_1Tests-getRequestHeaderValuesMapRenderTest-portlet</portlet-name>
         <portlet-class>org.apache.myfaces.portlet.faces.testsuite.common.portlet.GenericFacesTestSuitePortlet</portlet-class>
         
         <init-param>
@@ -2568,12 +3183,12 @@
          <mime-type>text/html</mime-type>
        </supports>
         <portlet-info>
-                <title>chapter6_1_3_1Tests-getRequestHeaderMapRenderTest-portlet</title>
+                <title>chapter6_1_3_1Tests-getRequestHeaderValuesMapRenderTest-portlet</title>
         </portlet-info>
     </portlet>
     
     <portlet>
-        <portlet-name>chapter6_1_3_1Tests-getRequestHeaderMapActionTest-portlet</portlet-name>
+        <portlet-name>chapter6_1_3_1Tests-getRequestHeaderValuesMapEventTest-portlet</portlet-name>
         <portlet-class>org.apache.myfaces.portlet.faces.testsuite.common.portlet.GenericFacesTestSuitePortlet</portlet-class>
         
         <init-param>
@@ -2581,28 +3196,36 @@
           <value>/tests/MultiRequestTest.jsp</value>
         </init-param>
         
+        <init-param>
+          <name>javax.portlet.faces.bridgeEventHandler</name>
+          <value>org.apache.myfaces.portlet.faces.testsuite.tests.chapter_6.section_6_1_3_1.TestEventHandler</value>
+        </init-param>
+        
         <expiration-cache>0</expiration-cache>
 
        <supports>
          <mime-type>text/html</mime-type>
        </supports>
         <portlet-info>
-                <title>chapter6_1_3_1Tests-getRequestHeaderMapActionTest-portlet</title>
+                <title>chapter6_1_3_1Tests-getRequestHeaderValuesMapEventTest-portlet</title>
         </portlet-info>
-    </portlet>
-    
-    <!-- *************************************************************** -->
-    <!-- *                                                             * -->
-    <!-- * Portlet: getRequestHeaderValuesMap                                * -->
-    <!-- *                                                             * -->
-    <!-- *************************************************************** -->    
+        
+        <supported-publishing-event>
+          <qname xmlns:bridge="http://myfaces.apache.org/portlet-bridge/event_ns">bridge:myfaces.apache.org.tck.testEvent</qname>
+        </supported-publishing-event>
+        
+        <supported-processing-event>
+          <qname xmlns:bridge="http://myfaces.apache.org/portlet-bridge/event_ns">bridge:myfaces.apache.org.tck.testEvent</qname>
+        </supported-processing-event>
+    </portlet>      
+       
     <portlet>
-        <portlet-name>chapter6_1_3_1Tests-getRequestHeaderValuesMapRenderTest-portlet</portlet-name>
+        <portlet-name>chapter6_1_3_1Tests-getRequestHeaderValuesMapActionTest-portlet</portlet-name>
         <portlet-class>org.apache.myfaces.portlet.faces.testsuite.common.portlet.GenericFacesTestSuitePortlet</portlet-class>
         
         <init-param>
           <name>javax.portlet.faces.defaultViewId.view</name>
-          <value>/tests/SingleRequestTest.jsp</value>
+          <value>/tests/MultiRequestTest.jsp</value>
         </init-param>
         
         <expiration-cache>0</expiration-cache>
@@ -2611,17 +3234,17 @@
          <mime-type>text/html</mime-type>
        </supports>
         <portlet-info>
-                <title>chapter6_1_3_1Tests-getRequestHeaderValuesMapRenderTest-portlet</title>
+                <title>chapter6_1_3_1Tests-getRequestHeaderValuesMapActionTest-portlet</title>
         </portlet-info>
     </portlet>
     
     <portlet>
-        <portlet-name>chapter6_1_3_1Tests-getRequestHeaderValuesMapActionTest-portlet</portlet-name>
+        <portlet-name>chapter6_1_3_1Tests-getRequestHeaderValuesMapResourceTest-portlet</portlet-name>
         <portlet-class>org.apache.myfaces.portlet.faces.testsuite.common.portlet.GenericFacesTestSuitePortlet</portlet-class>
         
         <init-param>
           <name>javax.portlet.faces.defaultViewId.view</name>
-          <value>/tests/MultiRequestTest.jsp</value>
+          <value>/tests/ResourceRequestTest.jsp</value>
         </init-param>
         
         <expiration-cache>0</expiration-cache>
@@ -2630,9 +3253,9 @@
          <mime-type>text/html</mime-type>
        </supports>
         <portlet-info>
-                <title>chapter6_1_3_1Tests-getRequestHeaderValuesMapActionTest-portlet</title>
+                <title>chapter6_1_3_1Tests-getRequestHeaderValuesMapResourceTest-portlet</title>
         </portlet-info>
-    </portlet>
+    </portlet>    
     
     <!-- *************************************************************** -->
     <!-- *                                                             * -->
@@ -2912,6 +3535,38 @@
     </portlet>
     
     <portlet>
+        <portlet-name>chapter6_1_3_1Tests-getRequestCharacterEncodingEventTest-portlet</portlet-name>
+        <portlet-class>org.apache.myfaces.portlet.faces.testsuite.common.portlet.GenericFacesTestSuitePortlet</portlet-class>
+        
+        <init-param>
+          <name>javax.portlet.faces.defaultViewId.view</name>
+          <value>/tests/MultiRequestTest.jsp</value>
+        </init-param>
+        
+        <init-param>
+          <name>javax.portlet.faces.bridgeEventHandler</name>
+          <value>org.apache.myfaces.portlet.faces.testsuite.tests.chapter_6.section_6_1_3_1.TestEventHandler</value>
+        </init-param>
+        
+        <expiration-cache>0</expiration-cache>
+
+       <supports>
+         <mime-type>text/html</mime-type>
+       </supports>
+        <portlet-info>
+                <title>chapter6_1_3_1Tests-getRequestCharacterEncodingEventTest-portlet</title>
+        </portlet-info>
+        
+        <supported-publishing-event>
+          <qname xmlns:bridge="http://myfaces.apache.org/portlet-bridge/event_ns">bridge:myfaces.apache.org.tck.testEvent</qname>
+        </supported-publishing-event>
+        
+        <supported-processing-event>
+          <qname xmlns:bridge="http://myfaces.apache.org/portlet-bridge/event_ns">bridge:myfaces.apache.org.tck.testEvent</qname>
+        </supported-processing-event>
+    </portlet>     
+    
+    <portlet>
         <portlet-name>chapter6_1_3_1Tests-getRequestCharacterEncodingActionTest-portlet</portlet-name>
         <portlet-class>org.apache.myfaces.portlet.faces.testsuite.common.portlet.GenericFacesTestSuitePortlet</portlet-class>
         
@@ -2931,6 +3586,25 @@
     </portlet>
     
     <portlet>
+        <portlet-name>chapter6_1_3_1Tests-getRequestCharacterEncodingResourceTest-portlet</portlet-name>
+        <portlet-class>org.apache.myfaces.portlet.faces.testsuite.common.portlet.GenericFacesTestSuitePortlet</portlet-class>
+        
+        <init-param>
+          <name>javax.portlet.faces.defaultViewId.view</name>
+          <value>/tests/ResourceRequestTest.jsp</value>
+        </init-param>
+        
+        <expiration-cache>0</expiration-cache>
+
+       <supports>
+         <mime-type>text/html</mime-type>
+       </supports>
+        <portlet-info>
+                <title>chapter6_1_3_1Tests-getRequestCharacterEncodingResourceTest-portlet</title>
+        </portlet-info>
+    </portlet>      
+    
+    <portlet>
         <portlet-name>chapter6_1_3_1Tests-getRequestContentTypeRenderTest-portlet</portlet-name>
         <portlet-class>org.apache.myfaces.portlet.faces.testsuite.common.portlet.GenericFacesTestSuitePortlet</portlet-class>
         
@@ -2969,6 +3643,57 @@
     </portlet>
     
     <portlet>
+        <portlet-name>chapter6_1_3_1Tests-getRequestContentTypeEventTest-portlet</portlet-name>
+        <portlet-class>org.apache.myfaces.portlet.faces.testsuite.common.portlet.GenericFacesTestSuitePortlet</portlet-class>
+        
+        <init-param>
+          <name>javax.portlet.faces.defaultViewId.view</name>
+          <value>/tests/MultiRequestTest.jsp</value>
+        </init-param>
+        
+        <init-param>
+          <name>javax.portlet.faces.bridgeEventHandler</name>
+          <value>org.apache.myfaces.portlet.faces.testsuite.tests.chapter_6.section_6_1_3_1.TestEventHandler</value>
+        </init-param>
+        
+        <expiration-cache>0</expiration-cache>
+
+       <supports>
+         <mime-type>text/html</mime-type>
+       </supports>
+        <portlet-info>
+                <title>chapter6_1_3_1Tests-getRequestContentTypeEventTest-portlet</title>
+        </portlet-info>
+        
+        <supported-publishing-event>
+          <qname xmlns:bridge="http://myfaces.apache.org/portlet-bridge/event_ns">bridge:myfaces.apache.org.tck.testEvent</qname>
+        </supported-publishing-event>
+        
+        <supported-processing-event>
+          <qname xmlns:bridge="http://myfaces.apache.org/portlet-bridge/event_ns">bridge:myfaces.apache.org.tck.testEvent</qname>
+        </supported-processing-event>
+    </portlet>     
+      
+    <portlet>
+        <portlet-name>chapter6_1_3_1Tests-getRequestContentTypeResourceTest-portlet</portlet-name>
+        <portlet-class>org.apache.myfaces.portlet.faces.testsuite.common.portlet.GenericFacesTestSuitePortlet</portlet-class>
+        
+        <init-param>
+          <name>javax.portlet.faces.defaultViewId.view</name>
+          <value>/tests/ResourceRequestTest.jsp</value>
+        </init-param>
+        
+        <expiration-cache>0</expiration-cache>
+
+       <supports>
+         <mime-type>text/html</mime-type>
+       </supports>
+        <portlet-info>
+                <title>chapter6_1_3_1Tests-getRequestContentTypeResourceTest-portlet</title>
+        </portlet-info>
+    </portlet>     
+    
+    <portlet>
         <portlet-name>chapter6_1_3_1Tests-getResponseCharacterEncodingRenderTest-portlet</portlet-name>
         <portlet-class>org.apache.myfaces.portlet.faces.testsuite.common.portlet.GenericFacesTestSuitePortlet</portlet-class>
         
@@ -3007,6 +3732,58 @@
     </portlet>
     
     <portlet>
+        <portlet-name>chapter6_1_3_1Tests-getResponseCharacterEncodingEventTest-portlet</portlet-name>
+        <portlet-class>org.apache.myfaces.portlet.faces.testsuite.common.portlet.GenericFacesTestSuitePortlet</portlet-class>
+        
+        <init-param>
+          <name>javax.portlet.faces.defaultViewId.view</name>
+          <value>/tests/MultiRequestTest.jsp</value>
+        </init-param>
+        
+        <init-param>
+          <name>javax.portlet.faces.bridgeEventHandler</name>
+          <value>org.apache.myfaces.portlet.faces.testsuite.tests.chapter_6.section_6_1_3_1.TestEventHandler</value>
+        </init-param>
+        
+        <expiration-cache>0</expiration-cache>
+
+       <supports>
+         <mime-type>text/html</mime-type>
+       </supports>
+        <portlet-info>
+                <title>chapter6_1_3_1Tests-getResponseCharacterEncodingEventTest-portlet</title>
+        </portlet-info>
+        
+        <supported-publishing-event>
+          <qname xmlns:bridge="http://myfaces.apache.org/portlet-bridge/event_ns">bridge:myfaces.apache.org.tck.testEvent</qname>
+        </supported-publishing-event>
+        
+        <supported-processing-event>
+          <qname xmlns:bridge="http://myfaces.apache.org/portlet-bridge/event_ns">bridge:myfaces.apache.org.tck.testEvent</qname>
+        </supported-processing-event>
+    </portlet>     
+
+    
+    <portlet>
+        <portlet-name>chapter6_1_3_1Tests-getResponseCharacterEncodingResourceTest-portlet</portlet-name>
+        <portlet-class>org.apache.myfaces.portlet.faces.testsuite.common.portlet.GenericFacesTestSuitePortlet</portlet-class>
+        
+        <init-param>
+          <name>javax.portlet.faces.defaultViewId.view</name>
+          <value>/tests/ResourceRequestTest.jsp</value>
+        </init-param>
+        
+        <expiration-cache>0</expiration-cache>
+
+       <supports>
+         <mime-type>text/html</mime-type>
+       </supports>
+        <portlet-info>
+                <title>chapter6_1_3_1Tests-getResponseCharacterEncodingResourceTest-portlet</title>
+        </portlet-info>
+    </portlet>
+    
+    <portlet>
         <portlet-name>chapter6_1_3_1Tests-getResponseContentTypeRenderTest-portlet</portlet-name>
         <portlet-class>org.apache.myfaces.portlet.faces.testsuite.common.portlet.GenericFacesTestSuitePortlet</portlet-class>
         
@@ -3043,6 +3820,57 @@
                 <title>chapter6_1_3_1Tests-getResponseContentTypeActionTest-portlet</title>
         </portlet-info>
     </portlet>
+    
+    <portlet>
+        <portlet-name>chapter6_1_3_1Tests-getResponseContentTypeEventTest-portlet</portlet-name>
+        <portlet-class>org.apache.myfaces.portlet.faces.testsuite.common.portlet.GenericFacesTestSuitePortlet</portlet-class>
+        
+        <init-param>
+          <name>javax.portlet.faces.defaultViewId.view</name>
+          <value>/tests/MultiRequestTest.jsp</value>
+        </init-param>
+        
+        <init-param>
+          <name>javax.portlet.faces.bridgeEventHandler</name>
+          <value>org.apache.myfaces.portlet.faces.testsuite.tests.chapter_6.section_6_1_3_1.TestEventHandler</value>
+        </init-param>
+        
+        <expiration-cache>0</expiration-cache>
+
+       <supports>
+         <mime-type>text/html</mime-type>
+       </supports>
+        <portlet-info>
+                <title>chapter6_1_3_1Tests-getResponseContentTypeEventTest-portlet</title>
+        </portlet-info>
+        
+        <supported-publishing-event>
+          <qname xmlns:bridge="http://myfaces.apache.org/portlet-bridge/event_ns">bridge:myfaces.apache.org.tck.testEvent</qname>
+        </supported-publishing-event>
+        
+        <supported-processing-event>
+          <qname xmlns:bridge="http://myfaces.apache.org/portlet-bridge/event_ns">bridge:myfaces.apache.org.tck.testEvent</qname>
+        </supported-processing-event>
+    </portlet>     
+      
+    <portlet>
+        <portlet-name>chapter6_1_3_1Tests-getResponseContentTypeResourceTest-portlet</portlet-name>
+        <portlet-class>org.apache.myfaces.portlet.faces.testsuite.common.portlet.GenericFacesTestSuitePortlet</portlet-class>
+        
+        <init-param>
+          <name>javax.portlet.faces.defaultViewId.view</name>
+          <value>/tests/ResourceRequestTest.jsp</value>
+        </init-param>
+        
+        <expiration-cache>0</expiration-cache>
+
+       <supports>
+         <mime-type>text/html</mime-type>
+       </supports>
+        <portlet-info>
+                <title>chapter6_1_3_1Tests-getResponseContentTypeResourceTest-portlet</title>
+        </portlet-info>
+    </portlet>         
 
 
     <!-- *************************************************************** -->
@@ -3072,6 +3900,38 @@
     </portlet>
     
     <portlet>
+        <portlet-name>chapter6_1_3_1Tests-redirectEventTest-portlet</portlet-name>
+        <portlet-class>org.apache.myfaces.portlet.faces.testsuite.common.portlet.GenericFacesTestSuitePortlet</portlet-class>
+        
+        <init-param>
+          <name>javax.portlet.faces.defaultViewId.view</name>
+          <value>/tests/MultiRequestTest.jsp</value>
+        </init-param>
+        
+        <init-param>
+          <name>javax.portlet.faces.bridgeEventHandler</name>
+          <value>org.apache.myfaces.portlet.faces.testsuite.tests.chapter_6.section_6_1_3_1.TestEventHandler</value>
+        </init-param>
+        
+        <expiration-cache>0</expiration-cache>
+
+       <supports>
+         <mime-type>text/html</mime-type>
+       </supports>
+        <portlet-info>
+                <title>chapter6_1_3_1Tests-redirectEventTest-portlet</title>
+        </portlet-info>
+        
+        <supported-publishing-event>
+          <qname xmlns:bridge="http://myfaces.apache.org/portlet-bridge/event_ns">bridge:myfaces.apache.org.tck.testEvent</qname>
+        </supported-publishing-event>
+        
+        <supported-processing-event>
+          <qname xmlns:bridge="http://myfaces.apache.org/portlet-bridge/event_ns">bridge:myfaces.apache.org.tck.testEvent</qname>
+        </supported-processing-event>
+    </portlet>         
+    
+    <portlet>
         <portlet-name>chapter6_1_3_1Tests-redirectRenderTest-portlet</portlet-name>
         <portlet-class>org.apache.myfaces.portlet.faces.testsuite.common.portlet.GenericFacesTestSuitePortlet</portlet-class>
         
@@ -3567,6 +4427,25 @@
                 <title>chapter6_2_1Tests-renderContentAfterViewTest-portlet</title>
         </portlet-info>
     </portlet>
+    
+    <portlet>
+        <portlet-name>chapter6_2_1Tests-implementsBridgeWriteBehindResponseTest-portlet</portlet-name>
+        <portlet-class>org.apache.myfaces.portlet.faces.testsuite.common.portlet.GenericFacesTestSuitePortlet</portlet-class>
+        
+        <init-param>
+          <name>javax.portlet.faces.defaultViewId.view</name>
+          <value>/tests/ImplementsBridgeWriteBehindResponseTest.jsp</value>
+        </init-param>   
+        
+        <expiration-cache>0</expiration-cache>
+
+       <supports>
+         <mime-type>text/html</mime-type>
+       </supports>
+        <portlet-info>
+                <title>chapter6_2_1Tests-implementsBridgeWriteBehindResponseTest-portlet</title>
+        </portlet-info>
+    </portlet>    
 
      <!-- *************************************************************** -->
      <!-- *                                                             * -->
@@ -3764,6 +4643,31 @@
         </portlet-info>
     </portlet>
     
+    <portlet>
+        <portlet-name>chapter6_9Tests-usesConfiguredRenderKitTest-portlet</portlet-name>
+        <portlet-class>org.apache.myfaces.portlet.faces.testsuite.common.portlet.GenericFacesTestSuitePortlet</portlet-class>
+        
+        <init-param>
+          <name>javax.portlet.faces.defaultViewId.view</name>
+          <value>/tests/TrinidadMultiRequest.jsp</value>
+        </init-param> 
+        
+        <init-param>
+          <!-- Use the Trinidad RenderKit -->
+          <name>javax.portlet.faces.defaultRenderKitId</name>
+          <value>org.apache.myfaces.trinidad.core</value>
+        </init-param>
+        
+        <expiration-cache>0</expiration-cache>
+
+       <supports>
+         <mime-type>text/html</mime-type>
+       </supports>
+        <portlet-info>
+                <title>chapter6_9Tests-usesConfiguredRenderKitTest-portlet</title>
+        </portlet-info>
+    </portlet>    
+    
     <event-definition>
   	<qname xmlns:bridge="http://myfaces.apache.org/portlet-bridge/event_ns">bridge:myfaces.apache.org.tck.testEvent</qname>
   	<value-type>java.lang.String</value-type>	

Added: myfaces/portlet-bridge/tck/trunk_2.0.x/portlet-bridge-tck-main/src/main/webapp/tests/ImplementsBridgeWriteBehindResponseTest.jsp
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/tck/trunk_2.0.x/portlet-bridge-tck-main/src/main/webapp/tests/ImplementsBridgeWriteBehindResponseTest.jsp?rev=1024428&view=auto
==============================================================================
--- myfaces/portlet-bridge/tck/trunk_2.0.x/portlet-bridge-tck-main/src/main/webapp/tests/ImplementsBridgeWriteBehindResponseTest.jsp (added)
+++ myfaces/portlet-bridge/tck/trunk_2.0.x/portlet-bridge-tck-main/src/main/webapp/tests/ImplementsBridgeWriteBehindResponseTest.jsp Tue Oct 19 21:55:51 2010
@@ -0,0 +1,56 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+"http://www.w3.org/TR/html4/loose.dtd">
+<%@ page contentType="text/html;charset=UTF-8"
+         isELIgnored="false"
+         session="true" 
+         import="java.util.*,
+                 javax.faces.context.*, javax.faces.component.*,
+                 javax.servlet.*, javax.portlet.*,
+                 javax.portlet.faces.*, javax.portlet.faces.preference.*" %>
+                 
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
+
+  <html>
+    <head>
+      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+      <title>Chapter 6_5 Tests</title>
+    </head>
+    <body>
+
+<%
+    // Note: JSP code runs before the JSF EL is executed
+  
+    FacesContext elFacesContext = FacesContext.getCurrentInstance();
+    ExternalContext elExternalContext = elFacesContext.getExternalContext();
+    RenderResponse renderResponse = (RenderResponse) elExternalContext.getResponse();
+    Map m = elExternalContext.getRequestMap();
+    
+    String detail = null;
+
+    if (renderResponse instanceof BridgeWriteBehindResponse)
+    {
+      m.put("org.apache.myfaces.portlet.faces.TCK.status", Boolean.TRUE);
+      m.put("org.apache.myfaces.portlet.faces.TCK.detail", "ExternalContext correctly returns a response object that implements BridgeWriteBehindResponseWrapper during a render (dispatch).");
+    }
+    else
+    {
+      m.put("org.apache.myfaces.portlet.faces.TCK.status", Boolean.FALSE);
+      m.put("org.apache.myfaces.portlet.faces.TCK.detail", "ExternalContext incorrectly returns a response object that doesn't implement BridgeWriteBehindResponseWrapper during a render (dispatch).");
+    }
+
+%>
+
+<f:view>
+       <h:form>
+        <h:panelGrid columns="1">
+          <h:outputText escape = "false" value="#{test.renderTestResult}"/>
+        </h:panelGrid>
+      </h:form> 
+</f:view>
+</body>
+</html>
+
+

Modified: myfaces/portlet-bridge/tck/trunk_2.0.x/portlet-bridge-tck-main/src/main/webapp/tests/RedisplayResourceTrinidadResult.jsp
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/tck/trunk_2.0.x/portlet-bridge-tck-main/src/main/webapp/tests/RedisplayResourceTrinidadResult.jsp?rev=1024428&r1=1024427&r2=1024428&view=diff
==============================================================================
--- myfaces/portlet-bridge/tck/trunk_2.0.x/portlet-bridge-tck-main/src/main/webapp/tests/RedisplayResourceTrinidadResult.jsp (original)
+++ myfaces/portlet-bridge/tck/trunk_2.0.x/portlet-bridge-tck-main/src/main/webapp/tests/RedisplayResourceTrinidadResult.jsp Tue Oct 19 21:55:51 2010
@@ -31,7 +31,7 @@
           <tr:outputFormatted id="pprResult"
                             partialTriggers="runPPR"
                             value="#{test.testResourceResult}"/>
-          <tr:commandButton id="runPPR" text="#{test.redisplayCommandName}" partialSubmit="true" actionListener="#{test.runActionListener}" />
+          <tr:commandButton id="runPPR" text="#{test.redisplayCommandName}" partialSubmit="true" partialTriggers="runPPR" actionListener="#{test.runActionListener}" />
           <tr:goLink id="pprGoLink" text="#{test.redisplayLinkName}"
             destination="portlet:render?_jsfBridgeViewId=_jsfBridgeCurrentView&amp;org.apache.portlet.faces.tck.redisplay=1"
             partialTriggers="runPPR" />

Added: myfaces/portlet-bridge/tck/trunk_2.0.x/portlet-bridge-tck-main/src/main/webapp/tests/ResourceTrinidadResult.jsp
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/tck/trunk_2.0.x/portlet-bridge-tck-main/src/main/webapp/tests/ResourceTrinidadResult.jsp?rev=1024428&view=auto
==============================================================================
--- myfaces/portlet-bridge/tck/trunk_2.0.x/portlet-bridge-tck-main/src/main/webapp/tests/ResourceTrinidadResult.jsp (added)
+++ myfaces/portlet-bridge/tck/trunk_2.0.x/portlet-bridge-tck-main/src/main/webapp/tests/ResourceTrinidadResult.jsp Tue Oct 19 21:55:51 2010
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="iso-8859-1" standalone="yes" ?>
+<!--
+    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.
+	   
+-->
+<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0"
+          xmlns:f="http://java.sun.com/jsf/core"
+          xmlns:tr="http://myfaces.apache.org/trinidad" >
+  <jsp:directive.page contentType="text/html;charset=utf-8"/>
+  <f:view>
+    <tr:document title="JSR 329 Resource Test(s)">
+       <tr:form>
+       
+        <tr:panelPage>
+          <tr:outputLabel value="PPR Result: "></tr:outputLabel>
+          <tr:outputFormatted id="pprResult"
+                            partialTriggers="runPPR"
+                            value="#{test.testResourceResult}"/>
+          <tr:commandButton id="runPPR" text="#{test.redisplayCommandName}"  partialSubmit="true" partialTriggers="runPPR"  />
+          <tr:commandButton id="clearTest" text="Clear Test" />
+        </tr:panelPage>
+       
+       </tr:form>
+    </tr:document>
+  </f:view>
+</jsp:root>

Added: myfaces/portlet-bridge/tck/trunk_2.0.x/portlet-bridge-tck-main/src/main/webapp/tests/TrinidadMultiRequest.jsp
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/tck/trunk_2.0.x/portlet-bridge-tck-main/src/main/webapp/tests/TrinidadMultiRequest.jsp?rev=1024428&view=auto
==============================================================================
--- myfaces/portlet-bridge/tck/trunk_2.0.x/portlet-bridge-tck-main/src/main/webapp/tests/TrinidadMultiRequest.jsp (added)
+++ myfaces/portlet-bridge/tck/trunk_2.0.x/portlet-bridge-tck-main/src/main/webapp/tests/TrinidadMultiRequest.jsp Tue Oct 19 21:55:51 2010
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="iso-8859-1" standalone="yes" ?>
+<!--
+    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.
+	   
+-->
+<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0"
+          xmlns:f="http://java.sun.com/jsf/core"
+          xmlns:tr="http://myfaces.apache.org/trinidad" >
+  <jsp:directive.page contentType="text/html;charset=utf-8"/>
+  <f:view>
+    <tr:document title="JSR 329 TCK Test(s)">
+       <tr:form>
+       
+        <tr:panelPage>
+          <tr:commandButton id="runPPR" text="Run Test" action="#{test.runActionTest}" />
+        </tr:panelPage>       
+       </tr:form>
+    </tr:document>
+  </f:view>
+</jsp:root>

Added: myfaces/portlet-bridge/tck/trunk_2.0.x/portlet-bridge-tck-main/src/main/webapp/tests/TrinidadMultiRequestTestResult.jsp
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/tck/trunk_2.0.x/portlet-bridge-tck-main/src/main/webapp/tests/TrinidadMultiRequestTestResult.jsp?rev=1024428&view=auto
==============================================================================
--- myfaces/portlet-bridge/tck/trunk_2.0.x/portlet-bridge-tck-main/src/main/webapp/tests/TrinidadMultiRequestTestResult.jsp (added)
+++ myfaces/portlet-bridge/tck/trunk_2.0.x/portlet-bridge-tck-main/src/main/webapp/tests/TrinidadMultiRequestTestResult.jsp Tue Oct 19 21:55:51 2010
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="iso-8859-1" standalone="yes" ?>
+<!--
+    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.
+	   
+-->
+<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0"
+          xmlns:f="http://java.sun.com/jsf/core"
+          xmlns:tr="http://myfaces.apache.org/trinidad" >
+  <jsp:directive.page contentType="text/html;charset=utf-8"/>
+  <f:view>
+    <tr:document title="JSR 329 TCK Test(s)">
+       <tr:form>
+       
+        <tr:panelPage>
+          <tr:outputLabel value="Test Result: "></tr:outputLabel>
+          <tr:outputFormatted id="pprResult"
+                            value="#{test.renderTestResult}"/>
+        </tr:panelPage>       
+       </tr:form>
+    </tr:document>
+  </f:view>
+</jsp:root>

Modified: myfaces/portlet-bridge/tck/trunk_2.0.x/portlet-bridge-tck-main/src/main/webapp/tests/chapter6_5.jsp
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/tck/trunk_2.0.x/portlet-bridge-tck-main/src/main/webapp/tests/chapter6_5.jsp?rev=1024428&r1=1024427&r2=1024428&view=diff
==============================================================================
--- myfaces/portlet-bridge/tck/trunk_2.0.x/portlet-bridge-tck-main/src/main/webapp/tests/chapter6_5.jsp (original)
+++ myfaces/portlet-bridge/tck/trunk_2.0.x/portlet-bridge-tck-main/src/main/webapp/tests/chapter6_5.jsp Tue Oct 19 21:55:51 2010
@@ -90,7 +90,7 @@
 <c:set var="tck_portletPreferences" value="${portletPreferences}" scope="page"  />
 
 <%-- portletPreferencesValues --%>
-<c:set var="tck_portletportletPreferencesValues" value="${portletPreferencesValues}" scope="page"  />
+<c:set var="tck_portletPreferencesValues" value="${portletPreferencesValues}" scope="page"  />
 
 
 

Added: myfaces/portlet-bridge/tck/trunk_2.0.x/portlet-bridge-tck-section6-2-configured-response-wrapper/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/tck/trunk_2.0.x/portlet-bridge-tck-section6-2-configured-response-wrapper/pom.xml?rev=1024428&view=auto
==============================================================================
--- myfaces/portlet-bridge/tck/trunk_2.0.x/portlet-bridge-tck-section6-2-configured-response-wrapper/pom.xml (added)
+++ myfaces/portlet-bridge/tck/trunk_2.0.x/portlet-bridge-tck-section6-2-configured-response-wrapper/pom.xml Tue Oct 19 21:55:51 2010
@@ -0,0 +1,145 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  
+  <groupId>org.apache.myfaces.portlet-bridge</groupId>
+  <artifactId>portlet-bridge-tck-section6-2-configured-response-wrapper</artifactId>
+  <packaging>war</packaging>
+  <name>MyFaces Portlet Bridge Test Suite - Section 6.2 Configured Response Wrapper</name>
+  <description>
+  This project builds and tests a testsuite web application with a test portlet that verifies the configured ResponseWrapper is used.
+  </description>
+  
+  <parent>
+    <artifactId>portlet-bridge-tck</artifactId>
+    <groupId>org.apache.myfaces.portlet-bridge</groupId>
+    <version>jsr329-1.0.0-SNAPSHOT</version>
+  </parent>
+  <build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.codehaus.mojo</groupId>
+          <artifactId>selenium-maven-plugin</artifactId>
+          <executions>
+            <execution>
+              <id>start</id>
+              <phase>process-test-classes</phase>
+              <goals>
+                <goal>start-server</goal>
+              </goals>
+              <configuration>
+                <background>true</background>
+                <logOutput>true</logOutput>
+                <multiWindow>true</multiWindow>
+              </configuration>
+            </execution>
+          </executions>
+        </plugin>
+
+        <plugin>
+          <groupId>org.mortbay.jetty</groupId>
+          <artifactId>maven-jetty-plugin</artifactId>
+          <executions>
+            <execution>
+              <id>start-jetty</id>
+              <phase>process-test-classes</phase>
+              <goals>
+                <goal>run</goal>
+              </goals>
+              <configuration>
+                <scanIntervalSeconds>0</scanIntervalSeconds>
+                <daemon>true</daemon>
+              </configuration>
+            </execution>
+            <execution>
+              <id>stop-jetty</id>
+              <phase>test</phase>
+              <goals>
+                <goal>stop</goal>
+              </goals>
+            </execution>
+          </executions>
+        </plugin>
+
+        <plugin>
+          <groupId>org.apache.pluto</groupId>
+          <artifactId>maven-pluto-plugin</artifactId>
+          <version>${pluto.version}</version>
+          <executions>
+            <execution>
+              <phase>generate-resources</phase>
+              <goals>
+                <goal>assemble</goal>
+              </goals>
+            </execution>
+          </executions>
+        </plugin>
+
+        <plugin>
+          <groupId>org.apache.portals.pluto</groupId>
+          <artifactId>maven-pluto-plugin</artifactId>
+          <version>2.0.0</version>
+          <executions>
+            <execution>
+              <phase>generate-resources</phase>
+              <goals>
+                <goal>assemble</goal>
+              </goals>
+            </execution>
+          </executions>
+        </plugin>
+
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-surefire-report-plugin</artifactId>
+          <configuration>
+            <outputName>${artifactId}-report</outputName>
+            <outputDirectory>../target</outputDirectory>
+          </configuration>
+        </plugin>
+
+      </plugins>
+    </pluginManagement>
+
+    <plugins>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>build-helper-maven-plugin</artifactId>
+        <version>1.3</version>
+        <executions>
+          <execution>
+            <id>add-ts-source</id>
+            <phase>generate-sources</phase>
+            <goals>
+              <goal>add-source</goal>
+            </goals>
+            <configuration>
+              <sources>
+                <source>${basedir}/../src/main/java</source>
+              </sources>
+            </configuration>
+          </execution>
+          <execution>
+            <id>add-tck-source</id>
+            <phase>generate-sources</phase>
+            <goals>
+              <goal>add-test-source</goal>
+            </goals>
+            <configuration>
+              <sources>
+                <source>${basedir}/../src/test/java</source>
+              </sources>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>xml-maven-plugin</artifactId>
+      </plugin>
+
+    </plugins>
+  </build>
+
+</project>