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/04/01 19:08:16 UTC
svn commit: r930045 - in /myfaces/portlet-bridge/testsuite/trunk_2.0.x: ./
portlet-bridge-testsuite-main/
portlet-bridge-testsuite-main/src/main/webapp/WEB-INF/
portlet-bridge-testsuite-main/src/main/webapp/tests/
portlet-bridge-testsuite-section3-2-li...
Author: mfreedman
Date: Thu Apr 1 17:08:15 2010
New Revision: 930045
URL: http://svn.apache.org/viewvc?rev=930045&view=rev
Log:
Initial check-in after fixing up poms/tests to run in a portlet 2.0 JSR 329 environment.
Removed:
myfaces/portlet-bridge/testsuite/trunk_2.0.x/src/main/java/org/apache/myfaces/portlet/faces/testsuite/common/portlet/wrapper/
Modified:
myfaces/portlet-bridge/testsuite/trunk_2.0.x/pom.xml
myfaces/portlet-bridge/testsuite/trunk_2.0.x/portlet-bridge-testsuite-main/pom.xml
myfaces/portlet-bridge/testsuite/trunk_2.0.x/portlet-bridge-testsuite-main/src/main/webapp/WEB-INF/faces-config.xml
myfaces/portlet-bridge/testsuite/trunk_2.0.x/portlet-bridge-testsuite-main/src/main/webapp/WEB-INF/portlet.xml
myfaces/portlet-bridge/testsuite/trunk_2.0.x/portlet-bridge-testsuite-main/src/main/webapp/tests/DispatchTest.jsp
myfaces/portlet-bridge/testsuite/trunk_2.0.x/portlet-bridge-testsuite-main/src/main/webapp/tests/chapter6_5.jsp
myfaces/portlet-bridge/testsuite/trunk_2.0.x/portlet-bridge-testsuite-section3-2-lifecycle-set/pom.xml
myfaces/portlet-bridge/testsuite/trunk_2.0.x/portlet-bridge-testsuite-section3-2-render-policy-always-delegate/pom.xml
myfaces/portlet-bridge/testsuite/trunk_2.0.x/portlet-bridge-testsuite-section3-2-render-policy-default/pom.xml
myfaces/portlet-bridge/testsuite/trunk_2.0.x/portlet-bridge-testsuite-section3-2-render-policy-never-delegate/pom.xml
myfaces/portlet-bridge/testsuite/trunk_2.0.x/src/main/java/org/apache/myfaces/portlet/faces/testsuite/tests/chapter_3/BridgeVersionTestPortlet.java
myfaces/portlet-bridge/testsuite/trunk_2.0.x/src/main/java/org/apache/myfaces/portlet/faces/testsuite/tests/chapter_6/section_6_1_1/Tests.java
myfaces/portlet-bridge/testsuite/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/testsuite/trunk_2.0.x/src/main/java/org/apache/myfaces/portlet/faces/testsuite/tests/chapter_6/section_6_1_3_2/Tests.java
myfaces/portlet-bridge/testsuite/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/testsuite/trunk_2.0.x/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/testsuite/trunk_2.0.x/pom.xml?rev=930045&r1=930044&r2=930045&view=diff
==============================================================================
--- myfaces/portlet-bridge/testsuite/trunk_2.0.x/pom.xml (original)
+++ myfaces/portlet-bridge/testsuite/trunk_2.0.x/pom.xml Thu Apr 1 17:08:15 2010
@@ -5,17 +5,17 @@
<artifactId>portlet-bridge-testsuite-master</artifactId>
<packaging>pom</packaging>
<name>MyFaces Portlet Bridge Test Suite Master</name>
- <version>1.0.0-SNAPSHOT</version>
- <inceptionYear>2007</inceptionYear>
+ <version>2.0.0-SNAPSHOT</version>
+ <inceptionYear>2010</inceptionYear>
<description>
- Portlet 1.0 Bridge for JavaServer Faces is a subproject of Apache MyFaces which provides an
+ Portlet 2.0 Bridge for JavaServer Faces is a subproject of Apache MyFaces which provides an
implementation of the standardized Portlet Bridge as outlined by JSR-301 and subsequent
specifications. This project contains the build and profile definitions for the TCK test
web applications which validate an implementation fidelity to the specification. The child war modules
actually build and test the web applications themselves.
</description>
- <url>http://myfaces.apache.org/portlet-bridge/1.0</url>
+ <url>http://myfaces.apache.org/portlet-bridge/2.0</url>
<parent>
<artifactId>portlet-bridge-master-pom</artifactId>
@@ -34,11 +34,11 @@
<properties>
<!-- Specification Configurations -->
<servlet.version>2.5</servlet.version>
- <portlet.version>1.0</portlet.version>
+ <portlet.version>2.0</portlet.version>
<jsp.version>2.1</jsp.version>
<!-- Bridge Configurations -->
- <portlet-bridge.version>1.0.0-SNAPSHOT</portlet-bridge.version>
+ <portlet-bridge.version>2.0.0-SNAPSHOT</portlet-bridge.version>
<portlet-bridge.groupId>${project.groupId}</portlet-bridge.groupId>
<portlet-bridge.api.groupId>${portlet-bridge.groupId}</portlet-bridge.api.groupId>
@@ -176,7 +176,7 @@
</dependency>
<dependency>
- <groupId>portlet-api</groupId>
+ <groupId>javax.portlet</groupId>
<artifactId>portlet-api</artifactId>
<version>${portlet.version}</version>
<scope>provided</scope>
Modified: myfaces/portlet-bridge/testsuite/trunk_2.0.x/portlet-bridge-testsuite-main/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/testsuite/trunk_2.0.x/portlet-bridge-testsuite-main/pom.xml?rev=930045&r1=930044&r2=930045&view=diff
==============================================================================
--- myfaces/portlet-bridge/testsuite/trunk_2.0.x/portlet-bridge-testsuite-main/pom.xml (original)
+++ myfaces/portlet-bridge/testsuite/trunk_2.0.x/portlet-bridge-testsuite-main/pom.xml Thu Apr 1 17:08:15 2010
@@ -5,7 +5,7 @@
<artifactId>portlet-bridge-testsuite-main</artifactId>
<packaging>war</packaging>
<name>MyFaces Portlet Bridge Test Suite Main</name>
- <version>1.0.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<description>
This project builds and tests a testsuite web application containing all of
the test portlets with no portlet context parameters set.
@@ -15,7 +15,7 @@
<parent>
<artifactId>portlet-bridge-testsuite-master</artifactId>
<groupId>org.apache.myfaces.portlet-bridge</groupId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<build>
<pluginManagement>
Modified: myfaces/portlet-bridge/testsuite/trunk_2.0.x/portlet-bridge-testsuite-main/src/main/webapp/WEB-INF/faces-config.xml
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/testsuite/trunk_2.0.x/portlet-bridge-testsuite-main/src/main/webapp/WEB-INF/faces-config.xml?rev=930045&r1=930044&r2=930045&view=diff
==============================================================================
--- myfaces/portlet-bridge/testsuite/trunk_2.0.x/portlet-bridge-testsuite-main/src/main/webapp/WEB-INF/faces-config.xml (original)
+++ myfaces/portlet-bridge/testsuite/trunk_2.0.x/portlet-bridge-testsuite-main/src/main/webapp/WEB-INF/faces-config.xml Thu Apr 1 17:08:15 2010
@@ -81,11 +81,6 @@
<managed-bean-scope>request</managed-bean-scope>
</managed-bean>
<managed-bean>
- <managed-bean-name>chapter6_7Tests</managed-bean-name>
- <managed-bean-class>org.apache.myfaces.portlet.faces.testsuite.tests.chapter_6.section_6_7.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>
@@ -133,7 +128,6 @@
</navigation-case>
</navigation-rule>
-
<!-- Chapter 4 Test -->
<navigation-rule>
<from-view-id>/tests/MultiRequestTest.jsp</from-view-id>
@@ -349,14 +343,6 @@
<from-outcome>portletNamingContainerClientIdConsistentTest</from-outcome>
<to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp</to-view-id>
</navigation-case>
- <navigation-case>
- <from-outcome>restoredViewStateParameterTest</from-outcome>
- <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp</to-view-id>
- </navigation-case>
- <navigation-case>
- <from-outcome>setsIsPostbackAttributeTest</from-outcome>
- <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp</to-view-id>
- </navigation-case>
</navigation-rule>
<navigation-rule>
@@ -387,4 +373,4 @@
<phase-listener>org.apache.myfaces.portlet.faces.testsuite.tests.chapter_5.section_5_2.Tests</phase-listener>
</lifecycle>
-</faces-config>
+</faces-config>
\ No newline at end of file
Modified: myfaces/portlet-bridge/testsuite/trunk_2.0.x/portlet-bridge-testsuite-main/src/main/webapp/WEB-INF/portlet.xml
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/testsuite/trunk_2.0.x/portlet-bridge-testsuite-main/src/main/webapp/WEB-INF/portlet.xml?rev=930045&r1=930044&r2=930045&view=diff
==============================================================================
--- myfaces/portlet-bridge/testsuite/trunk_2.0.x/portlet-bridge-testsuite-main/src/main/webapp/WEB-INF/portlet.xml (original)
+++ myfaces/portlet-bridge/testsuite/trunk_2.0.x/portlet-bridge-testsuite-main/src/main/webapp/WEB-INF/portlet.xml Thu Apr 1 17:08:15 2010
@@ -487,7 +487,6 @@
</portlet-info>
</portlet>
-
<portlet>
<portlet-name>chapter4_2_12Tests-getFacesBridgeMethodTest-portlet</portlet-name>
<portlet-class>org.apache.myfaces.portlet.faces.testsuite.tests.chapter_4.section_4_2_12.GetFacesBridgeMethodTestPortlet</portlet-class>
@@ -1162,7 +1161,7 @@
<!-- *************************************************************** -->
<portlet>
- <portlet-name>chapter6_1_3_1Tests-dispatchUsesIncludeTest-portlet</portlet-name>
+ <portlet-name>chapter6_1_3_1Tests-dispatchUsesForwardTest-portlet</portlet-name>
<portlet-class>org.apache.myfaces.portlet.faces.testsuite.common.portlet.GenericFacesTestSuitePortlet</portlet-class>
<init-param>
@@ -1175,7 +1174,7 @@
<mime-type>text/html</mime-type>
</supports>
<portlet-info>
- <title>chapter6_1_3_1Tests-dispatchUsesIncludeTest-portlet</title>
+ <title>chapter6_1_3_1Tests-dispatchUsesForwardTest-portlet</title>
</portlet-info>
</portlet>
@@ -1622,6 +1621,7 @@
<title>chapter6_1_3_1Tests-encodeActionURLWithInvalidSecurityRenderTest-portlet</title>
</portlet-info>
</portlet>
+-->
<portlet>
<portlet-name>chapter6_1_3_1Tests-encodeURLEscapingTest-portlet</portlet-name>
@@ -1641,8 +1641,6 @@
<title>chapter6_1_3_1Tests-encodeURLEscapingTest-portlet</title>
</portlet-info>
</portlet>
-
--->
<!-- *************************************************************** -->
<!-- * * -->
@@ -3027,44 +3025,6 @@
</portlet-info>
</portlet>
- <portlet>
- <portlet-name>chapter6_7Tests-restoredViewStateParameterTest-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_7Tests-restoredViewStateParameterTest-portlet</title>
- </portlet-info>
- </portlet>
-
- <portlet>
- <portlet-name>chapter6_7Tests-setsIsPostbackAttributeTest-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_7Tests-setsIsPostbackAttributeTest-portlet</title>
- </portlet-info>
- </portlet>
-
<!-- *************************************************************** -->
<!-- * * -->
<!-- * Portlet: SingleRequestTestPortlet * -->
Modified: myfaces/portlet-bridge/testsuite/trunk_2.0.x/portlet-bridge-testsuite-main/src/main/webapp/tests/DispatchTest.jsp
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/testsuite/trunk_2.0.x/portlet-bridge-testsuite-main/src/main/webapp/tests/DispatchTest.jsp?rev=930045&r1=930044&r2=930045&view=diff
==============================================================================
--- myfaces/portlet-bridge/testsuite/trunk_2.0.x/portlet-bridge-testsuite-main/src/main/webapp/tests/DispatchTest.jsp (original)
+++ myfaces/portlet-bridge/testsuite/trunk_2.0.x/portlet-bridge-testsuite-main/src/main/webapp/tests/DispatchTest.jsp Thu Apr 1 17:08:15 2010
@@ -11,10 +11,10 @@
</head>
<body>
<%
- if (request.getAttribute("javax.servlet.include.servlet_path") != null)
- request.setAttribute("org.apache.myfaces.portlet.faces.testsuite.dispatchInclude", Boolean.TRUE);
+ if (request.getAttribute("javax.servlet.forward.servlet_path") != null)
+ request.setAttribute("org.apache.myfaces.portlet.faces.testsuite.dispatchForward", Boolean.TRUE);
else
- request.setAttribute("org.apache.myfaces.portlet.faces.testsuite.dispatchInclude", Boolean.FALSE);
+ request.setAttribute("org.apache.myfaces.portlet.faces.testsuite.dispatchForward", Boolean.FALSE);
%>
<jsp:include page="SingleRequestTest.jsp" />
</body>
Modified: myfaces/portlet-bridge/testsuite/trunk_2.0.x/portlet-bridge-testsuite-main/src/main/webapp/tests/chapter6_5.jsp
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/testsuite/trunk_2.0.x/portlet-bridge-testsuite-main/src/main/webapp/tests/chapter6_5.jsp?rev=930045&r1=930044&r2=930045&view=diff
==============================================================================
--- myfaces/portlet-bridge/testsuite/trunk_2.0.x/portlet-bridge-testsuite-main/src/main/webapp/tests/chapter6_5.jsp (original)
+++ myfaces/portlet-bridge/testsuite/trunk_2.0.x/portlet-bridge-testsuite-main/src/main/webapp/tests/chapter6_5.jsp Thu Apr 1 17:08:15 2010
@@ -11,7 +11,7 @@
<%@ 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" prefix="portlet"%>
+<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
<html>
<head>
@@ -80,6 +80,19 @@
<%-- renderResponse --%>
<c:set var="tck_renderResponse" value="${renderResponse}" scope="page" />
+<%-- portletSession --%>
+<c:set var="tck_portletSession" value="${portletSession}" scope="page" />
+
+<%-- portletSessionScope --%>
+<c:set var="tck_portletSessionScope" value="${portletSessionScope}" scope="page" />
+
+<%-- portletPreferences --%>
+<c:set var="tck_portletPreferences" value="${portletPreferences}" scope="page" />
+
+<%-- portletPreferencesValues --%>
+<c:set var="tck_portletportletPreferencesValues" value="${portletPreferencesValues}" scope="page" />
+
+
<%-- Objects resolved by Face's JSP ELResolver --%>
<%-- facesContext --%>
@@ -90,21 +103,9 @@
<%-- Objects resolved by Bridge's JSP ELResolver --%>
-<%-- portletSession --%>
-<c:set var="tck_portletSession" value="${portletSession}" scope="page" />
-
-<%-- portletSessionScope --%>
-<c:set var="tck_portletSessionScope" value="${portletSessionScope}" scope="page" />
-
<%-- httpSessionScope --%>
<c:set var="tck_httpSessionScope" value="${httpSessionScope}" scope="page" />
-<%-- portletPreferences --%>
-<c:set var="tck_portletPreferences" value="${portletPreferences}" scope="page" />
-
-<%-- portletPreferencesValues --%>
-<c:set var="tck_portletPreferencesValues" value="${portletPreferencesValues}" scope="page" />
-
<%-- mutablePortletPreferencesValues --%>
<c:set var="tck_mutablePortletPreferencesValues" value="${mutablePortletPreferencesValues}" scope="page" />
@@ -203,6 +204,30 @@
detail += "'renderResponse' improperly resolved. 'portlet:defineObjects' isn't used in this JSP meaning the EL shouldn't have resolved, but it did. This implies the Bridge's EL resolver handled the resolution which is wrong.<br>";
}
+ if (pageContext.getAttribute("tck_portletSession") != null)
+ {
+ status = false;
+ detail += "'portletSession' improperly resolved. 'portlet:defineObjects' isn't used in this JSP meaning the EL shouldn't have resolved, but it did. This implies the Bridge's EL resolver handled the resolution which is wrong.<br>";
+ }
+
+ if (pageContext.getAttribute("tck_portletSessionScope") != null)
+ {
+ status = false;
+ detail += "'portletSessionScope' improperly resolved. 'portlet:defineObjects' isn't used in this JSP meaning the EL shouldn't have resolved, but it did. This implies the Bridge's EL resolver handled the resolution which is wrong.<br>";
+ }
+
+ if (pageContext.getAttribute("tck_portletPreferences") != null)
+ {
+ status = false;
+ detail += "'portletPreferences' improperly resolved. 'portlet:defineObjects' isn't used in this JSP meaning the EL shouldn't have resolved, but it did. This implies the Bridge's EL resolver handled the resolution which is wrong.<br>";
+ }
+
+ if (pageContext.getAttribute("tck_portletPreferencesValues") != null)
+ {
+ status = false;
+ detail += "'portletPreferencesValues' improperly resolved. 'portlet:defineObjects' isn't used in this JSP meaning the EL shouldn't have resolved, but it did. This implies the Bridge's EL resolver handled the resolution which is wrong.<br>";
+ }
+
/* Verify that the Faces specific implicit objects resolved correctly - test
* values to ensure the Bridge didn't perturb */
@@ -211,6 +236,7 @@
{
status = false;
detail += "JSF EL resolution of implict variable 'facesContext' failed<br>";
+ elFacesContext = FacesContext.getCurrentInstance();
}
UIViewRoot elView = (UIViewRoot) pageContext.getAttribute("tck_view");
@@ -222,41 +248,13 @@
/* Verify that the Bridge specific implicit objects resolved correctly - test
* values to ensure the Bridge got them right */
- Object elPortletSession = pageContext.getAttribute("tck_portletSession");
- if (elPortletSession == null || !testImplicitObject(elPortletSession, elFacesContext.getExternalContext().getSession(true)))
- {
- status = false;
- detail += "JSF EL resolution of implict variable 'portletSession' failed<br>";
- }
-
- Object elPortletSessionScope = pageContext.getAttribute("tck_portletSessionScope");
- if (elPortletSessionScope == null || !testImplicitObject(elPortletSessionScope, elFacesContext.getExternalContext().getSessionMap()))
- {
- status = false;
- detail += "JSF EL resolution of implict variable 'portletSessionScope' failed<br>";
- }
-
Map<String, Object> elHttpSessionScope = (Map<String, Object>) pageContext.getAttribute("tck_httpSessionScope");
if (elHttpSessionScope == null || !testHttpSessionScope(elHttpSessionScope, (PortletSession)elFacesContext.getExternalContext().getSession(true)))
{
status = false;
detail += "JSF EL resolution of implict variable 'httpSessionScope' failed<br>";
}
-
- Object elPortletPreferences = pageContext.getAttribute("tck_portletPreferences");
- if (elPortletPreferences == null || !testImplicitObject(elPortletPreferences, ((PortletRequest)elFacesContext.getExternalContext().getRequest()).getPreferences()))
- {
- status = false;
- detail += "JSF EL resolution of implict variable 'portletSessionScope' failed<br>";
- }
-
- Map<String, String[]> elPortletPreferencesValues = (Map<String, String[]>) pageContext.getAttribute("tck_portletPreferencesValues");
- if (elPortletPreferencesValues == null || !testImplicitObjectArrayMaps(elPortletPreferencesValues, ((PortletRequest)elFacesContext.getExternalContext().getRequest()).getPreferences().getMap()))
- {
- status = false;
- detail += "JSF EL resolution of implict variable 'portletPreferencesValues' failed<br>";
- }
-
+
Map<String, Preference> elMutablePortletPreferencesValues = (Map<String, Preference>) pageContext.getAttribute("tck_mutablePortletPreferencesValues");
if (elMutablePortletPreferencesValues == null || !testMutablePortletPreferencesValues(elMutablePortletPreferencesValues, ((PortletRequest)elFacesContext.getExternalContext().getRequest()).getPreferences().getMap()))
{
@@ -378,4 +376,4 @@
-%>
+%>
\ No newline at end of file
Modified: myfaces/portlet-bridge/testsuite/trunk_2.0.x/portlet-bridge-testsuite-section3-2-lifecycle-set/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/testsuite/trunk_2.0.x/portlet-bridge-testsuite-section3-2-lifecycle-set/pom.xml?rev=930045&r1=930044&r2=930045&view=diff
==============================================================================
--- myfaces/portlet-bridge/testsuite/trunk_2.0.x/portlet-bridge-testsuite-section3-2-lifecycle-set/pom.xml (original)
+++ myfaces/portlet-bridge/testsuite/trunk_2.0.x/portlet-bridge-testsuite-section3-2-lifecycle-set/pom.xml Thu Apr 1 17:08:15 2010
@@ -5,7 +5,7 @@
<artifactId>portlet-bridge-testsuite-section3-2-lifecycle-set</artifactId>
<packaging>war</packaging>
<name>MyFaces Portlet Bridge Test Suite - Section 3.2 LIFECYCLE_ID set to TCKLifecycle</name>
- <version>1.0.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<description>
This project builds and tests a testsuite web application with a single
lifecycle test portlet and the portlet context parameter
@@ -15,7 +15,7 @@
<parent>
<artifactId>portlet-bridge-testsuite-master</artifactId>
<groupId>org.apache.myfaces.portlet-bridge</groupId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<build>
<pluginManagement>
Modified: myfaces/portlet-bridge/testsuite/trunk_2.0.x/portlet-bridge-testsuite-section3-2-render-policy-always-delegate/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/testsuite/trunk_2.0.x/portlet-bridge-testsuite-section3-2-render-policy-always-delegate/pom.xml?rev=930045&r1=930044&r2=930045&view=diff
==============================================================================
--- myfaces/portlet-bridge/testsuite/trunk_2.0.x/portlet-bridge-testsuite-section3-2-render-policy-always-delegate/pom.xml (original)
+++ myfaces/portlet-bridge/testsuite/trunk_2.0.x/portlet-bridge-testsuite-section3-2-render-policy-always-delegate/pom.xml Thu Apr 1 17:08:15 2010
@@ -5,7 +5,7 @@
<artifactId>portlet-bridge-testsuite-section3-2-render-policy-always-delegate</artifactId>
<packaging>war</packaging>
<name>MyFaces Portlet Bridge Test Suite - Section 3.2 RENDER_POLICY set to ALWAYS_DELEGATE</name>
- <version>1.0.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<description>
This project builds and tests a testsuite web application with a single
renderPolicy test portlet and the portlet context parameter
@@ -15,7 +15,7 @@
<parent>
<artifactId>portlet-bridge-testsuite-master</artifactId>
<groupId>org.apache.myfaces.portlet-bridge</groupId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<build>
<pluginManagement>
Modified: myfaces/portlet-bridge/testsuite/trunk_2.0.x/portlet-bridge-testsuite-section3-2-render-policy-default/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/testsuite/trunk_2.0.x/portlet-bridge-testsuite-section3-2-render-policy-default/pom.xml?rev=930045&r1=930044&r2=930045&view=diff
==============================================================================
--- myfaces/portlet-bridge/testsuite/trunk_2.0.x/portlet-bridge-testsuite-section3-2-render-policy-default/pom.xml (original)
+++ myfaces/portlet-bridge/testsuite/trunk_2.0.x/portlet-bridge-testsuite-section3-2-render-policy-default/pom.xml Thu Apr 1 17:08:15 2010
@@ -5,7 +5,7 @@
<artifactId>portlet-bridge-testsuite-section3-2-render-policy-default</artifactId>
<packaging>war</packaging>
<name>MyFaces Portlet Bridge Test Suite - Section 3.2 RENDER_POLICY set to DEFAULT</name>
- <version>1.0.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<description>
This project builds and tests a testsuite web application with a single
renderPolicy test portlet and the portlet context parameter
@@ -15,7 +15,7 @@
<parent>
<artifactId>portlet-bridge-testsuite-master</artifactId>
<groupId>org.apache.myfaces.portlet-bridge</groupId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<build>
<pluginManagement>
Modified: myfaces/portlet-bridge/testsuite/trunk_2.0.x/portlet-bridge-testsuite-section3-2-render-policy-never-delegate/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/testsuite/trunk_2.0.x/portlet-bridge-testsuite-section3-2-render-policy-never-delegate/pom.xml?rev=930045&r1=930044&r2=930045&view=diff
==============================================================================
--- myfaces/portlet-bridge/testsuite/trunk_2.0.x/portlet-bridge-testsuite-section3-2-render-policy-never-delegate/pom.xml (original)
+++ myfaces/portlet-bridge/testsuite/trunk_2.0.x/portlet-bridge-testsuite-section3-2-render-policy-never-delegate/pom.xml Thu Apr 1 17:08:15 2010
@@ -5,7 +5,7 @@
<artifactId>portlet-bridge-testsuite-section3-2-render-policy-never-delegate</artifactId>
<packaging>war</packaging>
<name>MyFaces Portlet Bridge Test Suite - Section 3.2 RENDER_POLICY set to NEVER_DELEGATE</name>
- <version>1.0.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<description>
This project builds and tests a testsuite web application with a single
renderPolicy test portlet and the portlet context parameter
@@ -15,7 +15,7 @@
<parent>
<artifactId>portlet-bridge-testsuite-master</artifactId>
<groupId>org.apache.myfaces.portlet-bridge</groupId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<build>
<pluginManagement>
Modified: myfaces/portlet-bridge/testsuite/trunk_2.0.x/src/main/java/org/apache/myfaces/portlet/faces/testsuite/tests/chapter_3/BridgeVersionTestPortlet.java
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/testsuite/trunk_2.0.x/src/main/java/org/apache/myfaces/portlet/faces/testsuite/tests/chapter_3/BridgeVersionTestPortlet.java?rev=930045&r1=930044&r2=930045&view=diff
==============================================================================
--- myfaces/portlet-bridge/testsuite/trunk_2.0.x/src/main/java/org/apache/myfaces/portlet/faces/testsuite/tests/chapter_3/BridgeVersionTestPortlet.java (original)
+++ myfaces/portlet-bridge/testsuite/trunk_2.0.x/src/main/java/org/apache/myfaces/portlet/faces/testsuite/tests/chapter_3/BridgeVersionTestPortlet.java Thu Apr 1 17:08:15 2010
@@ -53,15 +53,15 @@ public class BridgeVersionTestPortlet ex
String name = c.getPackage().getSpecificationTitle();
String version = c.getPackage().getSpecificationVersion();
- if (name == null || !name.equals("Portlet 1.0 Bridge for JavaServer Faces 1.2"))
+ if (name == null || !name.equals("Portlet 2.0 Bridge for JavaServer Faces 1.2"))
{
resultWriter.setStatus(BridgeTCKResultWriter.FAIL);
- resultWriter.setDetail("Incorrect Specification Title: " + name + " should be 'Portlet 1.0 Bridge for JavaServer Faces 1.2'");
+ resultWriter.setDetail("Incorrect Specification Title: " + name + " should be 'Portlet 2.0 Bridge for JavaServer Faces 1.2'");
}
else if (version == null || !version.equals("1.0"))
{
resultWriter.setStatus(BridgeTCKResultWriter.FAIL);
- resultWriter.setDetail("Incorrect Specification Version: " + version + " should be '1.0'");
+ resultWriter.setDetail("Incorrect Specification Version: " + version + " should be '2.0'");
}
else
{
Modified: myfaces/portlet-bridge/testsuite/trunk_2.0.x/src/main/java/org/apache/myfaces/portlet/faces/testsuite/tests/chapter_6/section_6_1_1/Tests.java
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/testsuite/trunk_2.0.x/src/main/java/org/apache/myfaces/portlet/faces/testsuite/tests/chapter_6/section_6_1_1/Tests.java?rev=930045&r1=930044&r2=930045&view=diff
==============================================================================
--- myfaces/portlet-bridge/testsuite/trunk_2.0.x/src/main/java/org/apache/myfaces/portlet/faces/testsuite/tests/chapter_6/section_6_1_1/Tests.java (original)
+++ myfaces/portlet-bridge/testsuite/trunk_2.0.x/src/main/java/org/apache/myfaces/portlet/faces/testsuite/tests/chapter_6/section_6_1_1/Tests.java Thu Apr 1 17:08:15 2010
@@ -64,8 +64,6 @@ import javax.servlet.jsp.JspContext;
import org.apache.myfaces.portlet.faces.testsuite.annotation.BridgeTest;
import org.apache.myfaces.portlet.faces.testsuite.beans.TestRunnerBean;
import org.apache.myfaces.portlet.faces.testsuite.common.Constants;
-import org.apache.myfaces.portlet.faces.testsuite.common.portlet.wrapper.ActionRequestDecorator;
-import org.apache.myfaces.portlet.faces.testsuite.common.portlet.wrapper.RenderRequestDecorator;
public class Tests
Modified: myfaces/portlet-bridge/testsuite/trunk_2.0.x/src/main/java/org/apache/myfaces/portlet/faces/testsuite/tests/chapter_6/section_6_1_3_1/Tests.java
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/testsuite/trunk_2.0.x/src/main/java/org/apache/myfaces/portlet/faces/testsuite/tests/chapter_6/section_6_1_3_1/Tests.java?rev=930045&r1=930044&r2=930045&view=diff
==============================================================================
--- myfaces/portlet-bridge/testsuite/trunk_2.0.x/src/main/java/org/apache/myfaces/portlet/faces/testsuite/tests/chapter_6/section_6_1_3_1/Tests.java (original)
+++ myfaces/portlet-bridge/testsuite/trunk_2.0.x/src/main/java/org/apache/myfaces/portlet/faces/testsuite/tests/chapter_6/section_6_1_3_1/Tests.java Thu Apr 1 17:08:15 2010
@@ -20,7 +20,6 @@
package org.apache.myfaces.portlet.faces.testsuite.tests.chapter_6.section_6_1_3_1;
-import java.io.Reader;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
@@ -46,11 +45,13 @@ import javax.faces.context.FacesContext;
import javax.faces.render.ResponseStateManager;
import javax.portlet.ActionRequest;
+import javax.portlet.filter.ActionRequestWrapper;
import javax.portlet.PortletMode;
import javax.portlet.PortletRequest;
import javax.portlet.PortletResponse;
import javax.portlet.PortletURL;
import javax.portlet.RenderRequest;
+import javax.portlet.filter.RenderRequestWrapper;
import javax.portlet.RenderResponse;
import javax.portlet.WindowState;
@@ -65,8 +66,7 @@ import javax.servlet.jsp.JspContext;
import org.apache.myfaces.portlet.faces.testsuite.annotation.BridgeTest;
import org.apache.myfaces.portlet.faces.testsuite.beans.TestRunnerBean;
import org.apache.myfaces.portlet.faces.testsuite.common.Constants;
-import org.apache.myfaces.portlet.faces.testsuite.common.portlet.wrapper.ActionRequestDecorator;
-import org.apache.myfaces.portlet.faces.testsuite.common.portlet.wrapper.RenderRequestDecorator;
+
public class Tests
@@ -75,20 +75,20 @@ public class Tests
// Test is SingleRequest -- Render only
// Test #6.3
- @BridgeTest(test = "dispatchUsesIncludeTest")
- public String dispatchUsesIncludeTest(TestRunnerBean testRunner)
+ @BridgeTest(test = "dispatchUsesForwardTest")
+ public String dispatchUsesForwardTest(TestRunnerBean testRunner)
{
testRunner.setTestComplete(true);
- // Some servlet containers wrap ther request/response before invokign the dispatched servlet +
+ // Some servlet containers wrap their request/response before invoking the dispatched servlet +
// handle the servlet defined special (include/forward) attributes in a separate list which is
// managed in the wrapped request -- Pluto (2.0) does this. This means that inside of a JSF
// expression running in a JSP we can't merely get the externalContext and check if the
- // include attrbiute is set. Rather we must do an EL evaluation on the request object to
+ // forward attribute is set. Rather we must do an EL evaluation on the request object to
// do the check. Unfortunately ther is no easy way to get the JSP elcontext -- so instead
// do the check in the JSP itself and set a request attribute we will have access to.
Boolean value =
- (Boolean) FacesContext.getCurrentInstance().getExternalContext().getRequestMap().get("org.apache.myfaces.portlet.faces.testsuite.dispatchInclude");
+ (Boolean) FacesContext.getCurrentInstance().getExternalContext().getRequestMap().get("org.apache.myfaces.portlet.faces.testsuite.dispatchForward");
if (value == null)
{
@@ -99,13 +99,13 @@ public class Tests
else if (value.booleanValue())
{
testRunner.setTestResult(true,
- "Successfully accessed javax.servlet.include.servletPath attribute indicating we are inside a dispatch.include");
+ "Successfully accessed javax.servlet.forward.servletPath attribute indicating we are inside a dispatch.forward");
return Constants.TEST_SUCCESS;
}
else
{
testRunner.setTestResult(false,
- "javax.servlet.include.servletPath not set, but it would be if we are inside a dispatch.include");
+ "javax.servlet.forward.servletPath not set, but it would be if we are inside a dispatch.forward");
return Constants.TEST_FAILED;
}
}
@@ -1443,7 +1443,7 @@ public class Tests
Bridge.PortletPhase.ACTION_PHASE)
{
ActionRequest aRequest =
- new ActionRequestDecorator((ActionRequest) extCtx.getRequest());
+ new ActionRequestWrapper((ActionRequest) extCtx.getRequest());
extCtx.setRequest(aRequest);
if (extCtx.getRequest() == aRequest)
@@ -1465,7 +1465,7 @@ public class Tests
// Now do the same thing for render
RenderRequest rRequest =
- new RenderRequestDecorator((RenderRequest) extCtx.getRequest());
+ new RenderRequestWrapper((RenderRequest) extCtx.getRequest());
extCtx.setRequest(rRequest);
if (extCtx.getRequest() == rRequest)
@@ -1535,7 +1535,7 @@ public class Tests
String testEncoding = null;
// read the parameters to ensure setting the encoding is invalid.
Map m = ((PortletRequest) extCtx.getRequest()).getParameterMap();
-
+
if (s == null || (s != null && !s.equalsIgnoreCase(utf8)))
{
testEncoding = utf8;
@@ -3832,8 +3832,8 @@ public class Tests
}
catch (IllegalStateException i)
{
- testRunner.setTestResult(true,
- "extCtx.redirect() during render correctly threw the IllegalStateException when redirecting to a nonFaces view.");
+ testRunner.setTestResult(false,
+ "extCtx.redirect() during render incorrectly threw the IllegalStateException when redirecting to a nonFaces view.");
return Constants.TEST_SUCCESS;
}
catch (Exception e)
@@ -3843,8 +3843,8 @@ public class Tests
return Constants.TEST_FAILED;
}
- testRunner.setTestResult(false,
- "extCtx.redirect() during render failed: it didn't throw an illegalStateException when redirecting to a nonfaces view.");
+ testRunner.setTestResult(true,
+ "extCtx.redirect() during render: it correctly didn't throw an illegalStateException when redirecting to a nonfaces view.");
return Constants.TEST_FAILED;
}
else
Modified: myfaces/portlet-bridge/testsuite/trunk_2.0.x/src/main/java/org/apache/myfaces/portlet/faces/testsuite/tests/chapter_6/section_6_1_3_2/Tests.java
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/testsuite/trunk_2.0.x/src/main/java/org/apache/myfaces/portlet/faces/testsuite/tests/chapter_6/section_6_1_3_2/Tests.java?rev=930045&r1=930044&r2=930045&view=diff
==============================================================================
--- myfaces/portlet-bridge/testsuite/trunk_2.0.x/src/main/java/org/apache/myfaces/portlet/faces/testsuite/tests/chapter_6/section_6_1_3_2/Tests.java (original)
+++ myfaces/portlet-bridge/testsuite/trunk_2.0.x/src/main/java/org/apache/myfaces/portlet/faces/testsuite/tests/chapter_6/section_6_1_3_2/Tests.java Thu Apr 1 17:08:15 2010
@@ -73,8 +73,7 @@ import javax.servlet.jsp.JspContext;
import org.apache.myfaces.portlet.faces.testsuite.annotation.BridgeTest;
import org.apache.myfaces.portlet.faces.testsuite.beans.TestRunnerBean;
import org.apache.myfaces.portlet.faces.testsuite.common.Constants;
-import org.apache.myfaces.portlet.faces.testsuite.common.portlet.wrapper.ActionRequestDecorator;
-import org.apache.myfaces.portlet.faces.testsuite.common.portlet.wrapper.RenderRequestDecorator;
+
public class Tests
Modified: myfaces/portlet-bridge/testsuite/trunk_2.0.x/src/main/java/org/apache/myfaces/portlet/faces/testsuite/tests/chapter_6/section_6_2_1/Tests.java
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/testsuite/trunk_2.0.x/src/main/java/org/apache/myfaces/portlet/faces/testsuite/tests/chapter_6/section_6_2_1/Tests.java?rev=930045&r1=930044&r2=930045&view=diff
==============================================================================
--- myfaces/portlet-bridge/testsuite/trunk_2.0.x/src/main/java/org/apache/myfaces/portlet/faces/testsuite/tests/chapter_6/section_6_2_1/Tests.java (original)
+++ myfaces/portlet-bridge/testsuite/trunk_2.0.x/src/main/java/org/apache/myfaces/portlet/faces/testsuite/tests/chapter_6/section_6_2_1/Tests.java Thu Apr 1 17:08:15 2010
@@ -68,8 +68,6 @@ import javax.servlet.jsp.JspContext;
import org.apache.myfaces.portlet.faces.testsuite.annotation.BridgeTest;
import org.apache.myfaces.portlet.faces.testsuite.beans.TestRunnerBean;
import org.apache.myfaces.portlet.faces.testsuite.common.Constants;
-import org.apache.myfaces.portlet.faces.testsuite.common.portlet.wrapper.ActionRequestDecorator;
-import org.apache.myfaces.portlet.faces.testsuite.common.portlet.wrapper.RenderRequestDecorator;
public class Tests