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

svn commit: r822920 [4/5] - in /myfaces/portlet-bridge/testsuite/trunk/src/main/webapp: WEB-INF/ tests/

Modified: myfaces/portlet-bridge/testsuite/trunk/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/testsuite/trunk/src/main/webapp/WEB-INF/web.xml?rev=822920&r1=822919&r2=822920&view=diff
==============================================================================
--- myfaces/portlet-bridge/testsuite/trunk/src/main/webapp/WEB-INF/web.xml (original)
+++ myfaces/portlet-bridge/testsuite/trunk/src/main/webapp/WEB-INF/web.xml Wed Oct  7 21:19:30 2009
@@ -1,864 +1,864 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!DOCTYPE web-app PUBLIC '-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN' 'http://java.sun.com/dtd/web-app_2_3.dtd'>
-<web-app>
-  <display-name>bridge_Test_web</display-name>
-  <context-param>
-    <param-name>javax.faces.DEFAULT_SUFFIX</param-name>
-    <param-value>.jsp</param-value>
-  </context-param>
-  
-  <!-- MyFaces listeners + bridge listener -->
-  <listener>
-    <listener-class>org.apache.myfaces.webapp.MyFacesServletContextListener</listener-class>
-  </listener>
-  <listener>
-    <listener-class>org.apache.myfaces.webapp.MyFacesHttpSessionAttributeListener</listener-class>
-  </listener>
-  <listener>
-    <listener-class>org.apache.myfaces.webapp.MyFacesHttpSessionListener</listener-class>
-  </listener>
-  <listener>
-    <listener-class>org.apache.myfaces.webapp.MyfacesServletRequestAttributeListener</listener-class>
-  </listener>
-  <listener>
-    <listener-class>org.apache.myfaces.webapp.MyFacesServletRequestListener</listener-class>
-  </listener>
-  <listener>
-    <listener-class>org.apache.myfaces.portlet.faces.bridge.BridgeImpl</listener-class>
-  </listener>
-  
-  <!-- Faces Servlet -->
-  <servlet>
-    <servlet-name>faces</servlet-name>
-    <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
-  </servlet>
-  
-<!-- Chapter 3 Tests -->
-  <servlet>
-    <servlet-name>chapter3Tests-bridgeVersionTest-portlet</servlet-name>
-    <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
-    <init-param>
-      <param-name>portlet-name</param-name>
-      <param-value>chapter3Tests-bridgeVersionTest-portlet</param-value>
-    </init-param>
-    <load-on-startup>1</load-on-startup>
-  </servlet>
-
-<!-- Chapter 6 Tests -->
-
-<!-- FacesContextFactory tests -->
-  <servlet>
-    <servlet-name>chapter6Tests-facesContextFactoryServiceProviderTest-portlet</servlet-name>
-    <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
-    <init-param>
-      <param-name>portlet-name</param-name>
-      <param-value>chapter6Tests-facesContextFactoryServiceProviderTest-portlet</param-value>
-    </init-param>
-    <load-on-startup>1</load-on-startup>
-  </servlet>
-  
-  <servlet>
-    <servlet-name>chapter6Tests-wrappedFacesContextTest-portlet</servlet-name>
-    <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
-    <init-param>
-      <param-name>portlet-name</param-name>
-      <param-value>chapter6Tests-wrappedFacesContextTest-portlet</param-value>
-    </init-param>
-    <load-on-startup>1</load-on-startup>
-  </servlet>
-  
-<!-- Dispatch tests -->
-  <servlet>
-    <servlet-name>chapter6Tests-dispatchUsesIncludeTest-portlet</servlet-name>
-    <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
-    <init-param>
-      <param-name>portlet-name</param-name>
-      <param-value>chapter6Tests-dispatchUsesIncludeTest-portlet</param-value>
-    </init-param>
-    <load-on-startup>1</load-on-startup>
-  </servlet>
-  
-<!-- encodeActionURL tests -->
-  <servlet>
-    <servlet-name>chapter6Tests-encodeActionURLPoundCharTest-portlet</servlet-name>
-    <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
-    <init-param>
-      <param-name>portlet-name</param-name>
-      <param-value>chapter6Tests-encodeActionURLPoundCharTest-portlet</param-value>
-    </init-param>
-    <load-on-startup>1</load-on-startup>
-  </servlet>
-  
-  <servlet>
-    <servlet-name>chapter6Tests-encodeActionURLAbsoluteURLTest-portlet</servlet-name>
-    <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
-    <init-param>
-      <param-name>portlet-name</param-name>
-      <param-value>chapter6Tests-encodeActionURLAbsoluteURLTest-portlet</param-value>
-    </init-param>
-    <load-on-startup>1</load-on-startup>
-  </servlet>
-  
-  <servlet>
-    <servlet-name>chapter6Tests-encodeActionURLDirectLinkTrueTest-portlet</servlet-name>
-    <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
-    <init-param>
-      <param-name>portlet-name</param-name>
-      <param-value>chapter6Tests-encodeActionURLDirectLinkTrueTest-portlet</param-value>
-    </init-param>
-    <load-on-startup>1</load-on-startup>
-  </servlet>
-  
-  <servlet>
-    <servlet-name>chapter6Tests-encodeActionURLDirectLinkFalseTest-portlet</servlet-name>
-    <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
-    <init-param>
-      <param-name>portlet-name</param-name>
-      <param-value>chapter6Tests-encodeActionURLDirectLinkFalseTest-portlet</param-value>
-    </init-param>
-    <load-on-startup>1</load-on-startup>
-  </servlet>
-  
-  <servlet>
-    <servlet-name>chapter6Tests-encodeActionURLPortletRenderTest-portlet</servlet-name>
-    <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
-    <init-param>
-      <param-name>portlet-name</param-name>
-      <param-value>chapter6Tests-encodeActionURLPortletRenderTest-portlet</param-value>
-    </init-param>
-    <load-on-startup>1</load-on-startup>
-  </servlet>
-  
-  <servlet>
-    <servlet-name>chapter6Tests-encodeActionURLPortletActionTest-portlet</servlet-name>
-    <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
-    <init-param>
-      <param-name>portlet-name</param-name>
-      <param-value>chapter6Tests-encodeActionURLPortletActionTest-portlet</param-value>
-    </init-param>
-    <load-on-startup>1</load-on-startup>
-  </servlet>
-  
-  <servlet>
-    <servlet-name>chapter6Tests-encodeActionURLJSFViewActionTest-portlet</servlet-name>
-    <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
-    <init-param>
-      <param-name>portlet-name</param-name>
-      <param-value>chapter6Tests-encodeActionURLJSFViewActionTest-portlet</param-value>
-    </init-param>
-    <load-on-startup>1</load-on-startup>
-  </servlet>
-  
-  <servlet>
-    <servlet-name>chapter6Tests-encodeActionURLWithParamActionTest-portlet</servlet-name>
-    <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
-    <init-param>
-      <param-name>portlet-name</param-name>
-      <param-value>chapter6Tests-encodeActionURLWithParamActionTest-portlet</param-value>
-    </init-param>
-    <load-on-startup>1</load-on-startup>
-  </servlet>
-
-  <servlet>
-    <servlet-name>chapter6Tests-encodeActionURLWithModeActionTest-portlet</servlet-name>
-    <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
-    <init-param>
-      <param-name>portlet-name</param-name>
-      <param-value>chapter6Tests-encodeActionURLWithModeActionTest-portlet</param-value>
-    </init-param>
-    <load-on-startup>1</load-on-startup>
-  </servlet>
-
-  <servlet>
-    <servlet-name>chapter6Tests-encodeActionURLWithInvalidModeActionTest-portlet</servlet-name>
-    <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
-    <init-param>
-      <param-name>portlet-name</param-name>
-      <param-value>chapter6Tests-encodeActionURLWithInvalidModeActionTest-portlet</param-value>
-    </init-param>
-    <load-on-startup>1</load-on-startup>
-  </servlet>
-  
-  <servlet>
-    <servlet-name>chapter6Tests-encodeActionURLWithWindowStateActionTest-portlet</servlet-name>
-    <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
-    <init-param>
-      <param-name>portlet-name</param-name>
-      <param-value>chapter6Tests-encodeActionURLWithWindowStateActionTest-portlet</param-value>
-    </init-param>
-    <load-on-startup>1</load-on-startup>
-  </servlet>
-  
-  <servlet>
-    <servlet-name>chapter6Tests-encodeActionURLWithInvalidWindowStateActionTest-portlet</servlet-name>
-    <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
-    <init-param>
-      <param-name>portlet-name</param-name>
-      <param-value>chapter6Tests-encodeActionURLWithInvalidWindowStateActionTest-portlet</param-value>
-    </init-param>
-    <load-on-startup>1</load-on-startup>
-  </servlet>
-  
-  <servlet>
-    <servlet-name>chapter6Tests-encodeActionURLWithSecurityActionTest-portlet</servlet-name>
-    <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
-    <init-param>
-      <param-name>portlet-name</param-name>
-      <param-value>chapter6Tests-encodeActionURLWithSecurityActionTest-portlet</param-value>
-    </init-param>
-    <load-on-startup>1</load-on-startup>
-  </servlet>
-  
-  <servlet>
-    <servlet-name>chapter6Tests-encodeActionURLWithInvalidSecurityActionTest-portlet</servlet-name>
-    <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
-    <init-param>
-      <param-name>portlet-name</param-name>
-      <param-value>chapter6Tests-encodeActionURLWithInvalidSecurityActionTest-portlet</param-value>
-    </init-param>
-    <load-on-startup>1</load-on-startup>
-  </servlet>
-  
-  <servlet>
-    <servlet-name>chapter6Tests-encodeActionURLJSFViewRenderTest-portlet</servlet-name>
-    <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
-    <init-param>
-      <param-name>portlet-name</param-name>
-      <param-value>chapter6Tests-encodeActionURLJSFViewRenderTest-portlet</param-value>
-    </init-param>
-    <load-on-startup>1</load-on-startup>
-  </servlet>
-  
-  <servlet>
-    <servlet-name>chapter6Tests-encodeActionURLWithParamRenderTest-portlet</servlet-name>
-    <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
-    <init-param>
-      <param-name>portlet-name</param-name>
-      <param-value>chapter6Tests-encodeActionURLWithParamRenderTest-portlet</param-value>
-    </init-param>
-    <load-on-startup>1</load-on-startup>
-  </servlet>
-
-  <servlet>
-    <servlet-name>chapter6Tests-encodeActionURLWithModeRenderTest-portlet</servlet-name>
-    <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
-    <init-param>
-      <param-name>portlet-name</param-name>
-      <param-value>chapter6Tests-encodeActionURLWithModeRenderTest-portlet</param-value>
-    </init-param>
-    <load-on-startup>1</load-on-startup>
-  </servlet>
-
-  <servlet>
-    <servlet-name>chapter6Tests-encodeActionURLWithInvalidModeRenderTest-portlet</servlet-name>
-    <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
-    <init-param>
-      <param-name>portlet-name</param-name>
-      <param-value>chapter6Tests-encodeActionURLWithInvalidModeRenderTest-portlet</param-value>
-    </init-param>
-    <load-on-startup>1</load-on-startup>
-  </servlet>
-  
-  <servlet>
-    <servlet-name>chapter6Tests-encodeActionURLWithWindowStateRenderTest-portlet</servlet-name>
-    <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
-    <init-param>
-      <param-name>portlet-name</param-name>
-      <param-value>chapter6Tests-encodeActionURLWithWindowStateRenderTest-portlet</param-value>
-    </init-param>
-    <load-on-startup>1</load-on-startup>
-  </servlet>
-  
-  <servlet>
-    <servlet-name>chapter6Tests-encodeActionURLWithInvalidWindowStateRenderTest-portlet</servlet-name>
-    <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
-    <init-param>
-      <param-name>portlet-name</param-name>
-      <param-value>chapter6Tests-encodeActionURLWithInvalidWindowStateRenderTest-portlet</param-value>
-    </init-param>
-    <load-on-startup>1</load-on-startup>
-  </servlet>
-  
-  <servlet>
-    <servlet-name>chapter6Tests-encodeActionURLWithSecurityRenderTest-portlet</servlet-name>
-    <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
-    <init-param>
-      <param-name>portlet-name</param-name>
-      <param-value>chapter6Tests-encodeActionURLWithSecurityRenderTest-portlet</param-value>
-    </init-param>
-    <load-on-startup>1</load-on-startup>
-  </servlet>
-  
-  <servlet>
-    <servlet-name>chapter6Tests-encodeActionURLWithInvalidSecurityRenderTest-portlet</servlet-name>
-    <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
-    <init-param>
-      <param-name>portlet-name</param-name>
-      <param-value>chapter6Tests-encodeActionURLWithInvalidSecurityRenderTest-portlet</param-value>
-    </init-param>
-    <load-on-startup>1</load-on-startup>
-  </servlet>
-  
-  <!-- EncodeResourceURL Tests -->
-    <servlet>
-    <servlet-name>chapter6Tests-encodeResourceURLOpaqueTest-portlet</servlet-name>
-    <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
-    <init-param>
-      <param-name>portlet-name</param-name>
-      <param-value>chapter6Tests-encodeResourceURLOpaqueTest-portlet</param-value>
-    </init-param>
-    <load-on-startup>1</load-on-startup>
-  </servlet>
-  
-  <servlet>
-    <servlet-name>chapter6Tests-encodeResourceURLForeignExternalURLTest-portlet</servlet-name>
-    <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
-    <init-param>
-      <param-name>portlet-name</param-name>
-      <param-value>chapter6Tests-encodeResourceURLForeignExternalURLTest-portlet</param-value>
-    </init-param>
-    <load-on-startup>1</load-on-startup>
-  </servlet>
-  
-  <servlet>
-    <servlet-name>chapter6Tests-encodeResourceURLForeignExternalURLBackLinkTest-portlet</servlet-name>
-    <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
-    <init-param>
-      <param-name>portlet-name</param-name>
-      <param-value>chapter6Tests-encodeResourceURLForeignExternalURLBackLinkTest-portlet</param-value>
-    </init-param>
-    <load-on-startup>1</load-on-startup>
-  </servlet>
-  
-  <servlet>
-    <servlet-name>chapter6Tests-encodeResourceURLRelativeURLTest-portlet</servlet-name>
-    <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
-    <init-param>
-      <param-name>portlet-name</param-name>
-      <param-value>chapter6Tests-encodeResourceURLRelativeURLTest-portlet</param-value>
-    </init-param>
-    <load-on-startup>1</load-on-startup>
-  </servlet>
-  
-  <servlet>
-    <servlet-name>chapter6Tests-encodeResourceURLRelativeURLBackLinkTest-portlet</servlet-name>
-    <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
-    <init-param>
-      <param-name>portlet-name</param-name>
-      <param-value>chapter6Tests-encodeResourceURLRelativeURLBackLinkTest-portlet</param-value>
-    </init-param>
-    <load-on-startup>1</load-on-startup>
-  </servlet>
-  
-  <servlet>
-    <servlet-name>chapter6Tests-encodeResourceURLTest-portlet</servlet-name>
-    <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
-    <init-param>
-      <param-name>portlet-name</param-name>
-      <param-value>chapter6Tests-encodeResourceURLTest-portlet</param-value>
-    </init-param>
-    <load-on-startup>1</load-on-startup>
-  </servlet>
-  
-  <servlet>
-    <servlet-name>chapter6Tests-encodeResourceURLRelativeBackLinkTest-portlet</servlet-name>
-    <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
-    <init-param>
-      <param-name>portlet-name</param-name>
-      <param-value>chapter6Tests-encodeResourceURLRelativeBackLinkTest-portlet</param-value>
-    </init-param>
-    <load-on-startup>1</load-on-startup>
-  </servlet>
-
-  <servlet>
-    <servlet-name>chapter6Tests-encodeResourceURLViewLinkTest-portlet</servlet-name>
-    <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
-    <init-param>
-      <param-name>portlet-name</param-name>
-      <param-value>chapter6Tests-encodeResourceURLViewLinkTest-portlet</param-value>
-    </init-param>
-    <load-on-startup>1</load-on-startup>
-  </servlet>
-
-  <servlet>
-    <servlet-name>chapter6Tests-encodeResourceURLViewLinkWithBackLinkTest-portlet</servlet-name>
-    <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
-    <init-param>
-      <param-name>portlet-name</param-name>
-      <param-value>chapter6Tests-encodeResourceURLViewLinkWithBackLinkTest-portlet</param-value>
-    </init-param>
-    <load-on-startup>1</load-on-startup>
-  </servlet>
-  
-   <!-- getRequest and setRequest Test  -->  
-  <servlet>
-    <servlet-name>chapter6Tests-getSetRequestObjectTest-portlet</servlet-name>
-    <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
-    <init-param>
-      <param-name>portlet-name</param-name>
-      <param-value>chapter6Tests-getSetRequestObjectTest-portlet</param-value>
-    </init-param>
-    <load-on-startup>1</load-on-startup>
-  </servlet>
-  
-   <!-- setRequestCharacterEncoding Tests  -->  
-  <servlet>
-    <servlet-name>chapter6Tests-setRequestCharacterEncodingRenderTest-portlet</servlet-name>
-    <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
-    <init-param>
-      <param-name>portlet-name</param-name>
-      <param-value>chapter6Tests-setRequestCharacterEncodingRenderTest-portlet</param-value>
-    </init-param>
-    <load-on-startup>1</load-on-startup>
-  </servlet>
-  
-  <servlet>
-    <servlet-name>chapter6Tests-setRequestCharacterEncodingActionTest-portlet</servlet-name>
-    <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
-    <init-param>
-      <param-name>portlet-name</param-name>
-      <param-value>chapter6Tests-setRequestCharacterEncodingActionTest-portlet</param-value>
-    </init-param>
-    <load-on-startup>1</load-on-startup>
-  </servlet>
-
-   <!-- getRequestHeaderMap Tests  -->  
-  <servlet>
-    <servlet-name>chapter6Tests-getRequestHeaderMapRenderTest-portlet</servlet-name>
-    <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
-    <init-param>
-      <param-name>portlet-name</param-name>
-      <param-value>chapter6Tests-getRequestHeaderMapRenderTest-portlet</param-value>
-    </init-param>
-    <load-on-startup>1</load-on-startup>
-  </servlet>
-  
-  <servlet>
-    <servlet-name>chapter6Tests-getRequestHeaderMapActionTest-portlet</servlet-name>
-    <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
-    <init-param>
-      <param-name>portlet-name</param-name>
-      <param-value>chapter6Tests-getRequestHeaderMapActionTest-portlet</param-value>
-    </init-param>
-    <load-on-startup>1</load-on-startup>
-  </servlet>
-  
-
-   <!-- getRequestHeaderValuesMap Tests  -->  
-  <servlet>
-    <servlet-name>chapter6Tests-getRequestHeaderValuesMapRenderTest-portlet</servlet-name>
-    <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
-    <init-param>
-      <param-name>portlet-name</param-name>
-      <param-value>chapter6Tests-getRequestHeaderValuesMapRenderTest-portlet</param-value>
-    </init-param>
-    <load-on-startup>1</load-on-startup>
-  </servlet>
-  
-  <servlet>
-    <servlet-name>chapter6Tests-getRequestHeaderValuesMapActionTest-portlet</servlet-name>
-    <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
-    <init-param>
-      <param-name>portlet-name</param-name>
-      <param-value>chapter6Tests-getRequestHeaderValuesMapActionTest-portlet</param-value>
-    </init-param>
-    <load-on-startup>1</load-on-startup>
-  </servlet>
-  
-   <!-- getRequestMap Tests  -->  
-  <servlet>
-    <servlet-name>chapter6Tests-requestMapCoreTest-portlet</servlet-name>
-    <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
-    <init-param>
-      <param-name>portlet-name</param-name>
-      <param-value>chapter6Tests-requestMapCoreTest-portlet</param-value>
-    </init-param>
-    <load-on-startup>1</load-on-startup>
-  </servlet>
-  
-  <servlet>
-    <servlet-name>chapter6Tests-requestMapRequestScopeTest-portlet</servlet-name>
-    <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
-    <init-param>
-      <param-name>portlet-name</param-name>
-      <param-value>chapter6Tests-requestMapRequestScopeTest-portlet</param-value>
-    </init-param>
-    <load-on-startup>1</load-on-startup>
-  </servlet>
-  
-  <servlet>
-    <servlet-name>chapter6Tests-requestMapPreDestroyRemoveWithinActionTest-portlet</servlet-name>
-    <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
-    <init-param>
-      <param-name>portlet-name</param-name>
-      <param-value>chapter6Tests-requestMapPreDestroyRemoveWithinActionTest-portlet</param-value>
-    </init-param>
-    <load-on-startup>1</load-on-startup>
-  </servlet>
-  
-   <!-- getRequestParameterMap Tests  -->  
-  <servlet>
-    <servlet-name>chapter6Tests-getRequestParameterMapCoreTest-portlet</servlet-name>
-    <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
-    <init-param>
-      <param-name>portlet-name</param-name>
-      <param-value>chapter6Tests-getRequestParameterMapCoreTest-portlet</param-value>
-    </init-param>
-    <load-on-startup>1</load-on-startup>
-  </servlet>
-  
-  <servlet>
-    <servlet-name>chapter6Tests-getRequestParameterPreserveParamsTest-portlet</servlet-name>
-    <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
-    <init-param>
-      <param-name>portlet-name</param-name>
-      <param-value>chapter6Tests-getRequestParameterPreserveParamsTest-portlet</param-value>
-    </init-param>
-    <load-on-startup>1</load-on-startup>
-  </servlet>
-  
-  <servlet>
-    <servlet-name>chapter6Tests-getRequestParameterDefaultViewParamsTest-portlet</servlet-name>
-    <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
-    <init-param>
-      <param-name>portlet-name</param-name>
-      <param-value>chapter6Tests-getRequestParameterDefaultViewParamsTest-portlet</param-value>
-    </init-param>
-    <load-on-startup>1</load-on-startup>
-  </servlet>
-  
-   <!-- getRequestParameterNames Tests  -->  
-  <servlet>
-    <servlet-name>chapter6Tests-getRequestParameterNamesCoreTest-portlet</servlet-name>
-    <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
-    <init-param>
-      <param-name>portlet-name</param-name>
-      <param-value>chapter6Tests-getRequestParameterNamesCoreTest-portlet</param-value>
-    </init-param>
-    <load-on-startup>1</load-on-startup>
-  </servlet>
-  
-  <servlet>
-    <servlet-name>chapter6Tests-getRequestParameterNamesPreserveParamsTest-portlet</servlet-name>
-    <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
-    <init-param>
-      <param-name>portlet-name</param-name>
-      <param-value>chapter6Tests-getRequestParameterNamesPreserveParamsTest-portlet</param-value>
-    </init-param>
-    <load-on-startup>1</load-on-startup>
-  </servlet>
-  
-  
-   <!-- getRequestPathInfo/getRequestServletPath Tests  -->  
-  <servlet>
-    <servlet-name>chapter6Tests-getRequestPathInfoTest-portlet</servlet-name>
-    <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
-    <init-param>
-      <param-name>portlet-name</param-name>
-      <param-value>chapter6Tests-getRequestPathInfoTest-portlet</param-value>
-    </init-param>
-    <load-on-startup>1</load-on-startup>
-  </servlet>
-  
-  <servlet>
-    <servlet-name>chapter6Tests-getRequestServletPathTest-portlet</servlet-name>
-    <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
-    <init-param>
-      <param-name>portlet-name</param-name>
-      <param-value>chapter6Tests-getRequestServletPathTest-portlet</param-value>
-    </init-param>
-    <load-on-startup>1</load-on-startup>
-  </servlet>
-  
-  
-  <servlet>
-    <servlet-name>chapter6Tests-getRequestParameterNamesDefaultViewParamsTest-portlet</servlet-name>
-    <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
-    <init-param>
-      <param-name>portlet-name</param-name>
-      <param-value>chapter6Tests-getRequestParameterNamesDefaultViewParamsTest-portlet</param-value>
-    </init-param>
-    <load-on-startup>1</load-on-startup>
-  </servlet>
-  
-   <!-- Samples Tests that use Generic Test JSF.jsp pages -->  
-  <servlet>
-    <servlet-name>sampleTests-singleRequestTest-portlet</servlet-name>
-    <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
-    <init-param>
-      <param-name>portlet-name</param-name>
-      <param-value>sampleTests-singleRequestTest-portlet</param-value>
-    </init-param>
-    <load-on-startup>1</load-on-startup>
-  </servlet>
-  <servlet>
-    <servlet-name>sampleTests-multiRequestTest-portlet</servlet-name>
-    <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
-    <init-param>
-      <param-name>portlet-name</param-name>
-      <param-value>sampleTests-multiRequestTest-portlet</param-value>
-    </init-param>
-    <load-on-startup>1</load-on-startup>
-  </servlet>
-  <!-- Faces Servlet Mappings -->
-  <!-- 
-    In this demo application, I chose to use suffix mapping.  I did this because it makes urls
-    in the portlet world look nicer in the source.  The portlet url should be the same 
-    reguardless.
-  -->
-  <servlet-mapping>
-    <servlet-name>faces</servlet-name>
-    <url-pattern>*.jsf</url-pattern>
-  </servlet-mapping>
-  
-  <!-- Chapter 3 tests -->
-  <servlet-mapping>
-    <servlet-name>chapter3Tests-bridgeVersionTest-portlet</servlet-name>
-    <url-pattern>/PlutoInvoker/chapter3Tests-bridgeVersionTest-portlet</url-pattern>
-  </servlet-mapping>
-
-  <!-- Chapter 6 tests -->
-  <servlet-mapping>
-    <servlet-name>chapter6Tests-facesContextFactoryServiceProviderTest-portlet</servlet-name>
-    <url-pattern>/PlutoInvoker/chapter6Tests-facesContextFactoryServiceProviderTest-portlet</url-pattern>
-  </servlet-mapping>
-  <servlet-mapping>
-    <servlet-name>chapter6Tests-wrappedFacesContextTest-portlet</servlet-name>
-    <url-pattern>/PlutoInvoker/chapter6Tests-wrappedFacesContextTest-portlet</url-pattern>
-  </servlet-mapping>  
-  <servlet-mapping>
-    <servlet-name>chapter6Tests-dispatchUsesIncludeTest-portlet</servlet-name>
-    <url-pattern>/PlutoInvoker/chapter6Tests-dispatchUsesIncludeTest-portlet</url-pattern>
-  </servlet-mapping>
-  <servlet-mapping>
-    <servlet-name>chapter6Tests-encodeActionURLPoundCharTest-portlet</servlet-name>
-    <url-pattern>/PlutoInvoker/chapter6Tests-encodeActionURLPoundCharTest-portlet</url-pattern>
-  </servlet-mapping> 
-  <servlet-mapping>
-    <servlet-name>chapter6Tests-encodeActionURLAbsoluteURLTest-portlet</servlet-name>
-    <url-pattern>/PlutoInvoker/chapter6Tests-encodeActionURLAbsoluteURLTest-portlet</url-pattern>
-  </servlet-mapping>
-  <servlet-mapping>
-    <servlet-name>chapter6Tests-encodeActionURLDirectLinkTrueTest-portlet</servlet-name>
-    <url-pattern>/PlutoInvoker/chapter6Tests-encodeActionURLDirectLinkTrueTest-portlet</url-pattern>
-  </servlet-mapping>  
-  <servlet-mapping>
-    <servlet-name>chapter6Tests-encodeActionURLDirectLinkFalseTest-portlet</servlet-name>
-    <url-pattern>/PlutoInvoker/chapter6Tests-encodeActionURLDirectLinkFalseTest-portlet</url-pattern>
-  </servlet-mapping>
-  <servlet-mapping>
-    <servlet-name>chapter6Tests-encodeActionURLPortletRenderTest-portlet</servlet-name>
-    <url-pattern>/PlutoInvoker/chapter6Tests-encodeActionURLPortletRenderTest-portlet</url-pattern>
-  </servlet-mapping>
-  <servlet-mapping>
-    <servlet-name>chapter6Tests-encodeActionURLPortletActionTest-portlet</servlet-name>
-    <url-pattern>/PlutoInvoker/chapter6Tests-encodeActionURLPortletActionTest-portlet</url-pattern>
-  </servlet-mapping>
-  <servlet-mapping>
-    <servlet-name>chapter6Tests-encodeActionURLJSFViewActionTest-portlet</servlet-name>
-    <url-pattern>/PlutoInvoker/chapter6Tests-encodeActionURLJSFViewActionTest-portlet</url-pattern>
-  </servlet-mapping>  
-  <servlet-mapping>
-    <servlet-name>chapter6Tests-encodeActionURLWithParamActionTest-portlet</servlet-name>
-    <url-pattern>/PlutoInvoker/chapter6Tests-encodeActionURLWithParamActionTest-portlet</url-pattern>
-  </servlet-mapping>
-  <servlet-mapping>
-    <servlet-name>chapter6Tests-encodeActionURLWithModeActionTest-portlet</servlet-name>
-    <url-pattern>/PlutoInvoker/chapter6Tests-encodeActionURLWithModeActionTest-portlet</url-pattern>
-  </servlet-mapping>
-  <servlet-mapping>
-    <servlet-name>chapter6Tests-encodeActionURLWithInvalidModeActionTest-portlet</servlet-name>
-    <url-pattern>/PlutoInvoker/chapter6Tests-encodeActionURLWithInvalidModeActionTest-portlet</url-pattern>
-  </servlet-mapping>
-  <servlet-mapping>
-    <servlet-name>chapter6Tests-encodeActionURLWithWindowStateActionTest-portlet</servlet-name>
-    <url-pattern>/PlutoInvoker/chapter6Tests-encodeActionURLWithWindowStateActionTest-portlet</url-pattern>
-  </servlet-mapping>  
-  <servlet-mapping>
-    <servlet-name>chapter6Tests-encodeActionURLWithInvalidWindowStateActionTest-portlet</servlet-name>
-    <url-pattern>/PlutoInvoker/chapter6Tests-encodeActionURLWithInvalidWindowStateActionTest-portlet</url-pattern>
-  </servlet-mapping>
-  <servlet-mapping>
-    <servlet-name>chapter6Tests-encodeActionURLWithSecurityActionTest-portlet</servlet-name>
-    <url-pattern>/PlutoInvoker/chapter6Tests-encodeActionURLWithSecurityActionTest-portlet</url-pattern>
-  </servlet-mapping>  
-  <servlet-mapping>
-    <servlet-name>chapter6Tests-encodeActionURLWithInvalidSecurityActionTest-portlet</servlet-name>
-    <url-pattern>/PlutoInvoker/chapter6Tests-encodeActionURLWithInvalidSecurityActionTest-portlet</url-pattern>
-  </servlet-mapping>
-  <servlet-mapping>
-    <servlet-name>chapter6Tests-encodeActionURLJSFViewRenderTest-portlet</servlet-name>
-    <url-pattern>/PlutoInvoker/chapter6Tests-encodeActionURLJSFViewRenderTest-portlet</url-pattern>
-  </servlet-mapping>  
-  <servlet-mapping>
-    <servlet-name>chapter6Tests-encodeActionURLWithParamRenderTest-portlet</servlet-name>
-    <url-pattern>/PlutoInvoker/chapter6Tests-encodeActionURLWithParamRenderTest-portlet</url-pattern>
-  </servlet-mapping>
-  <servlet-mapping>
-    <servlet-name>chapter6Tests-encodeActionURLWithModeRenderTest-portlet</servlet-name>
-    <url-pattern>/PlutoInvoker/chapter6Tests-encodeActionURLWithModeRenderTest-portlet</url-pattern>
-  </servlet-mapping>
-  <servlet-mapping>
-    <servlet-name>chapter6Tests-encodeActionURLWithInvalidModeRenderTest-portlet</servlet-name>
-    <url-pattern>/PlutoInvoker/chapter6Tests-encodeActionURLWithInvalidModeRenderTest-portlet</url-pattern>
-  </servlet-mapping>
-  <servlet-mapping>
-    <servlet-name>chapter6Tests-encodeActionURLWithWindowStateRenderTest-portlet</servlet-name>
-    <url-pattern>/PlutoInvoker/chapter6Tests-encodeActionURLWithWindowStateRenderTest-portlet</url-pattern>
-  </servlet-mapping>  
-  <servlet-mapping>
-    <servlet-name>chapter6Tests-encodeActionURLWithInvalidWindowStateRenderTest-portlet</servlet-name>
-    <url-pattern>/PlutoInvoker/chapter6Tests-encodeActionURLWithInvalidWindowStateRenderTest-portlet</url-pattern>
-  </servlet-mapping>
-  <servlet-mapping>
-    <servlet-name>chapter6Tests-encodeActionURLWithSecurityRenderTest-portlet</servlet-name>
-    <url-pattern>/PlutoInvoker/chapter6Tests-encodeActionURLWithSecurityRenderTest-portlet</url-pattern>
-  </servlet-mapping>  
-  <servlet-mapping>
-    <servlet-name>chapter6Tests-encodeActionURLWithInvalidSecurityRenderTest-portlet</servlet-name>
-    <url-pattern>/PlutoInvoker/chapter6Tests-encodeActionURLWithInvalidSecurityRenderTest-portlet</url-pattern>
-  </servlet-mapping>
-  
-  <!-- encodeResourceURL tests -->
-  <servlet-mapping>
-    <servlet-name>chapter6Tests-encodeResourceURLOpaqueTest-portlet</servlet-name>
-    <url-pattern>/PlutoInvoker/chapter6Tests-encodeResourceURLOpaqueTest-portlet</url-pattern>
-  </servlet-mapping> 
-  <servlet-mapping>
-    <servlet-name>chapter6Tests-encodeResourceURLForeignExternalURLTest-portlet</servlet-name>
-    <url-pattern>/PlutoInvoker/chapter6Tests-encodeResourceURLForeignExternalURLTest-portlet</url-pattern>
-  </servlet-mapping>
-  <servlet-mapping>
-    <servlet-name>chapter6Tests-encodeResourceURLForeignExternalURLBackLinkTest-portlet</servlet-name>
-    <url-pattern>/PlutoInvoker/chapter6Tests-encodeResourceURLForeignExternalURLBackLinkTest-portlet</url-pattern>
-  </servlet-mapping>
-  <servlet-mapping>
-    <servlet-name>chapter6Tests-encodeResourceURLRelativeURLTest-portlet</servlet-name>
-    <url-pattern>/PlutoInvoker/chapter6Tests-encodeResourceURLRelativeURLTest-portlet</url-pattern>
-  </servlet-mapping>
-  <servlet-mapping>
-    <servlet-name>chapter6Tests-encodeResourceURLRelativeURLBackLinkTest-portlet</servlet-name>
-    <url-pattern>/PlutoInvoker/chapter6Tests-encodeResourceURLRelativeURLBackLinkTest-portlet</url-pattern>
-  </servlet-mapping>
-  <servlet-mapping>
-    <servlet-name>chapter6Tests-encodeResourceURLTest-portlet</servlet-name>
-    <url-pattern>/PlutoInvoker/chapter6Tests-encodeResourceURLTest-portlet</url-pattern>
-  </servlet-mapping>  
-  <servlet-mapping>
-    <servlet-name>chapter6Tests-encodeResourceURLRelativeBackLinkTest-portlet</servlet-name>
-    <url-pattern>/PlutoInvoker/chapter6Tests-encodeResourceURLRelativeBackLinkTest-portlet</url-pattern>
-  </servlet-mapping>
-  <servlet-mapping>
-    <servlet-name>chapter6Tests-encodeResourceURLViewLinkTest-portlet</servlet-name>
-    <url-pattern>/PlutoInvoker/chapter6Tests-encodeResourceURLViewLinkTest-portlet</url-pattern>
-  </servlet-mapping>
-  <servlet-mapping>
-    <servlet-name>chapter6Tests-encodeResourceURLViewLinkWithBackLinkTest-portlet</servlet-name>
-    <url-pattern>/PlutoInvoker/chapter6Tests-encodeResourceURLViewLinkWithBackLinkTest-portlet</url-pattern>
-  </servlet-mapping>
-  
-  <!-- getRequest and setRequest Test -->
-  <servlet-mapping>
-    <servlet-name>chapter6Tests-getSetRequestObjectTest-portlet</servlet-name>
-    <url-pattern>/PlutoInvoker/chapter6Tests-getSetRequestObjectTest-portlet</url-pattern>
-  </servlet-mapping>  
-  
-    <!-- getRequestCharacterEncoding Tests -->
-  <servlet-mapping>
-    <servlet-name>chapter6Tests-setRequestCharacterEncodingRenderTest-portlet</servlet-name>
-    <url-pattern>/PlutoInvoker/chapter6Tests-setRequestCharacterEncodingRenderTest-portlet</url-pattern>
-  </servlet-mapping> 
-
-  <servlet-mapping>
-    <servlet-name>chapter6Tests-setRequestCharacterEncodingActionTest-portlet</servlet-name>
-    <url-pattern>/PlutoInvoker/chapter6Tests-setRequestCharacterEncodingActionTest-portlet</url-pattern>
-  </servlet-mapping> 
-  
-  <!-- getRequestHeaderMap Tests -->
-  <servlet-mapping>
-    <servlet-name>chapter6Tests-getRequestHeaderMapRenderTest-portlet</servlet-name>
-    <url-pattern>/PlutoInvoker/chapter6Tests-getRequestHeaderMapRenderTest-portlet</url-pattern>
-  </servlet-mapping> 
-
-  <servlet-mapping>
-    <servlet-name>chapter6Tests-getRequestHeaderMapActionTest-portlet</servlet-name>
-    <url-pattern>/PlutoInvoker/chapter6Tests-getRequestHeaderMapActionTest-portlet</url-pattern>
-  </servlet-mapping> 
-  
-  <!-- getRequestHeaderValuesMap Tests -->
-  <servlet-mapping>
-    <servlet-name>chapter6Tests-getRequestHeaderValuesMapRenderTest-portlet</servlet-name>
-    <url-pattern>/PlutoInvoker/chapter6Tests-getRequestHeaderValuesMapRenderTest-portlet</url-pattern>
-  </servlet-mapping> 
-
-  <servlet-mapping>
-    <servlet-name>chapter6Tests-getRequestHeaderValuesMapActionTest-portlet</servlet-name>
-    <url-pattern>/PlutoInvoker/chapter6Tests-getRequestHeaderValuesMapActionTest-portlet</url-pattern>
-  </servlet-mapping> 
-  
-  <!-- getRequestMap Tests -->
-  <servlet-mapping>
-    <servlet-name>chapter6Tests-requestMapCoreTest-portlet</servlet-name>
-    <url-pattern>/PlutoInvoker/chapter6Tests-requestMapCoreTest-portlet</url-pattern>
-  </servlet-mapping> 
-
-  <servlet-mapping>
-    <servlet-name>chapter6Tests-requestMapRequestScopeTest-portlet</servlet-name>
-    <url-pattern>/PlutoInvoker/chapter6Tests-requestMapRequestScopeTest-portlet</url-pattern>
-  </servlet-mapping> 
-  
-  <servlet-mapping>
-    <servlet-name>chapter6Tests-requestMapPreDestroyRemoveWithinActionTest-portlet</servlet-name>
-    <url-pattern>/PlutoInvoker/chapter6Tests-requestMapPreDestroyRemoveWithinActionTest-portlet</url-pattern>
-  </servlet-mapping>
-  
-  <!-- getRequestParameterMap Tests -->
-  <servlet-mapping>
-    <servlet-name>chapter6Tests-getRequestParameterMapCoreTest-portlet</servlet-name>
-    <url-pattern>/PlutoInvoker/chapter6Tests-getRequestParameterMapCoreTest-portlet</url-pattern>
-  </servlet-mapping> 
-  <servlet-mapping>
-    <servlet-name>chapter6Tests-getRequestParameterPreserveParamsTest-portlet</servlet-name>
-    <url-pattern>/PlutoInvoker/chapter6Tests-getRequestParameterPreserveParamsTest-portlet</url-pattern>
-  </servlet-mapping> 
-  <servlet-mapping>
-    <servlet-name>chapter6Tests-getRequestParameterDefaultViewParamsTest-portlet</servlet-name>
-    <url-pattern>/PlutoInvoker/chapter6Tests-getRequestParameterDefaultViewParamsTest-portlet</url-pattern>
-  </servlet-mapping> 
-  
-    <!-- getRequestParameterNames Tests -->
-  <servlet-mapping>
-    <servlet-name>chapter6Tests-getRequestParameterNamesCoreTest-portlet</servlet-name>
-    <url-pattern>/PlutoInvoker/chapter6Tests-getRequestParameterNamesCoreTest-portlet</url-pattern>
-  </servlet-mapping> 
-  <servlet-mapping>
-    <servlet-name>chapter6Tests-getRequestParameterNamesPreserveParamsTest-portlet</servlet-name>
-    <url-pattern>/PlutoInvoker/chapter6Tests-getRequestParameterNamesPreserveParamsTest-portlet</url-pattern>
-  </servlet-mapping> 
-  <servlet-mapping>
-    <servlet-name>chapter6Tests-getRequestParameterNamesDefaultViewParamsTest-portlet</servlet-name>
-    <url-pattern>/PlutoInvoker/chapter6Tests-getRequestParameterNamesDefaultViewParamsTest-portlet</url-pattern>
-  </servlet-mapping> 
-  
-    <!-- getRequestPathInfo/getRequestServletPath Tests -->
-  <servlet-mapping>
-    <servlet-name>chapter6Tests-getRequestPathInfoTest-portlet</servlet-name>
-    <url-pattern>/PlutoInvoker/chapter6Tests-getRequestPathInfoTest-portlet</url-pattern>
-  </servlet-mapping> 
-  <servlet-mapping>
-    <servlet-name>chapter6Tests-getRequestServletPathTest-portlet</servlet-name>
-    <url-pattern>/PlutoInvoker/chapter6Tests-getRequestServletPathTest-portlet</url-pattern>
-  </servlet-mapping> 
-  
-  <!-- Samples Tests that use Generic Test JSF.jsp pages -->  
-  <servlet-mapping>
-    <servlet-name>sampleTests-singleRequestTest-portlet</servlet-name>
-    <url-pattern>/PlutoInvoker/sampleTests-singleRequestTest-portlet</url-pattern>
-  </servlet-mapping>
-  <servlet-mapping>
-    <servlet-name>sampleTests-multiRequestTest-portlet</servlet-name>
-    <url-pattern>/PlutoInvoker/sampleTests-multiRequestTest-portlet</url-pattern>
-  </servlet-mapping>
-</web-app>
-
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE web-app PUBLIC '-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN' 'http://java.sun.com/dtd/web-app_2_3.dtd'>
+<web-app>
+  <display-name>bridge_Test_web</display-name>
+  <context-param>
+    <param-name>javax.faces.DEFAULT_SUFFIX</param-name>
+    <param-value>.jsp</param-value>
+  </context-param>
+  
+  <!-- MyFaces listeners + bridge listener -->
+  <listener>
+    <listener-class>org.apache.myfaces.webapp.MyFacesServletContextListener</listener-class>
+  </listener>
+  <listener>
+    <listener-class>org.apache.myfaces.webapp.MyFacesHttpSessionAttributeListener</listener-class>
+  </listener>
+  <listener>
+    <listener-class>org.apache.myfaces.webapp.MyFacesHttpSessionListener</listener-class>
+  </listener>
+  <listener>
+    <listener-class>org.apache.myfaces.webapp.MyfacesServletRequestAttributeListener</listener-class>
+  </listener>
+  <listener>
+    <listener-class>org.apache.myfaces.webapp.MyFacesServletRequestListener</listener-class>
+  </listener>
+  <listener>
+    <listener-class>org.apache.myfaces.portlet.faces.bridge.BridgeImpl</listener-class>
+  </listener>
+  
+  <!-- Faces Servlet -->
+  <servlet>
+    <servlet-name>faces</servlet-name>
+    <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
+  </servlet>
+  
+<!-- Chapter 3 Tests -->
+  <servlet>
+    <servlet-name>chapter3Tests-bridgeVersionTest-portlet</servlet-name>
+    <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
+    <init-param>
+      <param-name>portlet-name</param-name>
+      <param-value>chapter3Tests-bridgeVersionTest-portlet</param-value>
+    </init-param>
+    <load-on-startup>1</load-on-startup>
+  </servlet>
+
+<!-- Chapter 6 Tests -->
+
+<!-- FacesContextFactory tests -->
+  <servlet>
+    <servlet-name>chapter6Tests-facesContextFactoryServiceProviderTest-portlet</servlet-name>
+    <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
+    <init-param>
+      <param-name>portlet-name</param-name>
+      <param-value>chapter6Tests-facesContextFactoryServiceProviderTest-portlet</param-value>
+    </init-param>
+    <load-on-startup>1</load-on-startup>
+  </servlet>
+  
+  <servlet>
+    <servlet-name>chapter6Tests-wrappedFacesContextTest-portlet</servlet-name>
+    <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
+    <init-param>
+      <param-name>portlet-name</param-name>
+      <param-value>chapter6Tests-wrappedFacesContextTest-portlet</param-value>
+    </init-param>
+    <load-on-startup>1</load-on-startup>
+  </servlet>
+  
+<!-- Dispatch tests -->
+  <servlet>
+    <servlet-name>chapter6Tests-dispatchUsesIncludeTest-portlet</servlet-name>
+    <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
+    <init-param>
+      <param-name>portlet-name</param-name>
+      <param-value>chapter6Tests-dispatchUsesIncludeTest-portlet</param-value>
+    </init-param>
+    <load-on-startup>1</load-on-startup>
+  </servlet>
+  
+<!-- encodeActionURL tests -->
+  <servlet>
+    <servlet-name>chapter6Tests-encodeActionURLPoundCharTest-portlet</servlet-name>
+    <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
+    <init-param>
+      <param-name>portlet-name</param-name>
+      <param-value>chapter6Tests-encodeActionURLPoundCharTest-portlet</param-value>
+    </init-param>
+    <load-on-startup>1</load-on-startup>
+  </servlet>
+  
+  <servlet>
+    <servlet-name>chapter6Tests-encodeActionURLAbsoluteURLTest-portlet</servlet-name>
+    <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
+    <init-param>
+      <param-name>portlet-name</param-name>
+      <param-value>chapter6Tests-encodeActionURLAbsoluteURLTest-portlet</param-value>
+    </init-param>
+    <load-on-startup>1</load-on-startup>
+  </servlet>
+  
+  <servlet>
+    <servlet-name>chapter6Tests-encodeActionURLDirectLinkTrueTest-portlet</servlet-name>
+    <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
+    <init-param>
+      <param-name>portlet-name</param-name>
+      <param-value>chapter6Tests-encodeActionURLDirectLinkTrueTest-portlet</param-value>
+    </init-param>
+    <load-on-startup>1</load-on-startup>
+  </servlet>
+  
+  <servlet>
+    <servlet-name>chapter6Tests-encodeActionURLDirectLinkFalseTest-portlet</servlet-name>
+    <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
+    <init-param>
+      <param-name>portlet-name</param-name>
+      <param-value>chapter6Tests-encodeActionURLDirectLinkFalseTest-portlet</param-value>
+    </init-param>
+    <load-on-startup>1</load-on-startup>
+  </servlet>
+  
+  <servlet>
+    <servlet-name>chapter6Tests-encodeActionURLPortletRenderTest-portlet</servlet-name>
+    <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
+    <init-param>
+      <param-name>portlet-name</param-name>
+      <param-value>chapter6Tests-encodeActionURLPortletRenderTest-portlet</param-value>
+    </init-param>
+    <load-on-startup>1</load-on-startup>
+  </servlet>
+  
+  <servlet>
+    <servlet-name>chapter6Tests-encodeActionURLPortletActionTest-portlet</servlet-name>
+    <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
+    <init-param>
+      <param-name>portlet-name</param-name>
+      <param-value>chapter6Tests-encodeActionURLPortletActionTest-portlet</param-value>
+    </init-param>
+    <load-on-startup>1</load-on-startup>
+  </servlet>
+  
+  <servlet>
+    <servlet-name>chapter6Tests-encodeActionURLJSFViewActionTest-portlet</servlet-name>
+    <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
+    <init-param>
+      <param-name>portlet-name</param-name>
+      <param-value>chapter6Tests-encodeActionURLJSFViewActionTest-portlet</param-value>
+    </init-param>
+    <load-on-startup>1</load-on-startup>
+  </servlet>
+  
+  <servlet>
+    <servlet-name>chapter6Tests-encodeActionURLWithParamActionTest-portlet</servlet-name>
+    <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
+    <init-param>
+      <param-name>portlet-name</param-name>
+      <param-value>chapter6Tests-encodeActionURLWithParamActionTest-portlet</param-value>
+    </init-param>
+    <load-on-startup>1</load-on-startup>
+  </servlet>
+
+  <servlet>
+    <servlet-name>chapter6Tests-encodeActionURLWithModeActionTest-portlet</servlet-name>
+    <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
+    <init-param>
+      <param-name>portlet-name</param-name>
+      <param-value>chapter6Tests-encodeActionURLWithModeActionTest-portlet</param-value>
+    </init-param>
+    <load-on-startup>1</load-on-startup>
+  </servlet>
+
+  <servlet>
+    <servlet-name>chapter6Tests-encodeActionURLWithInvalidModeActionTest-portlet</servlet-name>
+    <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
+    <init-param>
+      <param-name>portlet-name</param-name>
+      <param-value>chapter6Tests-encodeActionURLWithInvalidModeActionTest-portlet</param-value>
+    </init-param>
+    <load-on-startup>1</load-on-startup>
+  </servlet>
+  
+  <servlet>
+    <servlet-name>chapter6Tests-encodeActionURLWithWindowStateActionTest-portlet</servlet-name>
+    <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
+    <init-param>
+      <param-name>portlet-name</param-name>
+      <param-value>chapter6Tests-encodeActionURLWithWindowStateActionTest-portlet</param-value>
+    </init-param>
+    <load-on-startup>1</load-on-startup>
+  </servlet>
+  
+  <servlet>
+    <servlet-name>chapter6Tests-encodeActionURLWithInvalidWindowStateActionTest-portlet</servlet-name>
+    <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
+    <init-param>
+      <param-name>portlet-name</param-name>
+      <param-value>chapter6Tests-encodeActionURLWithInvalidWindowStateActionTest-portlet</param-value>
+    </init-param>
+    <load-on-startup>1</load-on-startup>
+  </servlet>
+  
+  <servlet>
+    <servlet-name>chapter6Tests-encodeActionURLWithSecurityActionTest-portlet</servlet-name>
+    <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
+    <init-param>
+      <param-name>portlet-name</param-name>
+      <param-value>chapter6Tests-encodeActionURLWithSecurityActionTest-portlet</param-value>
+    </init-param>
+    <load-on-startup>1</load-on-startup>
+  </servlet>
+  
+  <servlet>
+    <servlet-name>chapter6Tests-encodeActionURLWithInvalidSecurityActionTest-portlet</servlet-name>
+    <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
+    <init-param>
+      <param-name>portlet-name</param-name>
+      <param-value>chapter6Tests-encodeActionURLWithInvalidSecurityActionTest-portlet</param-value>
+    </init-param>
+    <load-on-startup>1</load-on-startup>
+  </servlet>
+  
+  <servlet>
+    <servlet-name>chapter6Tests-encodeActionURLJSFViewRenderTest-portlet</servlet-name>
+    <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
+    <init-param>
+      <param-name>portlet-name</param-name>
+      <param-value>chapter6Tests-encodeActionURLJSFViewRenderTest-portlet</param-value>
+    </init-param>
+    <load-on-startup>1</load-on-startup>
+  </servlet>
+  
+  <servlet>
+    <servlet-name>chapter6Tests-encodeActionURLWithParamRenderTest-portlet</servlet-name>
+    <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
+    <init-param>
+      <param-name>portlet-name</param-name>
+      <param-value>chapter6Tests-encodeActionURLWithParamRenderTest-portlet</param-value>
+    </init-param>
+    <load-on-startup>1</load-on-startup>
+  </servlet>
+
+  <servlet>
+    <servlet-name>chapter6Tests-encodeActionURLWithModeRenderTest-portlet</servlet-name>
+    <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
+    <init-param>
+      <param-name>portlet-name</param-name>
+      <param-value>chapter6Tests-encodeActionURLWithModeRenderTest-portlet</param-value>
+    </init-param>
+    <load-on-startup>1</load-on-startup>
+  </servlet>
+
+  <servlet>
+    <servlet-name>chapter6Tests-encodeActionURLWithInvalidModeRenderTest-portlet</servlet-name>
+    <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
+    <init-param>
+      <param-name>portlet-name</param-name>
+      <param-value>chapter6Tests-encodeActionURLWithInvalidModeRenderTest-portlet</param-value>
+    </init-param>
+    <load-on-startup>1</load-on-startup>
+  </servlet>
+  
+  <servlet>
+    <servlet-name>chapter6Tests-encodeActionURLWithWindowStateRenderTest-portlet</servlet-name>
+    <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
+    <init-param>
+      <param-name>portlet-name</param-name>
+      <param-value>chapter6Tests-encodeActionURLWithWindowStateRenderTest-portlet</param-value>
+    </init-param>
+    <load-on-startup>1</load-on-startup>
+  </servlet>
+  
+  <servlet>
+    <servlet-name>chapter6Tests-encodeActionURLWithInvalidWindowStateRenderTest-portlet</servlet-name>
+    <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
+    <init-param>
+      <param-name>portlet-name</param-name>
+      <param-value>chapter6Tests-encodeActionURLWithInvalidWindowStateRenderTest-portlet</param-value>
+    </init-param>
+    <load-on-startup>1</load-on-startup>
+  </servlet>
+  
+  <servlet>
+    <servlet-name>chapter6Tests-encodeActionURLWithSecurityRenderTest-portlet</servlet-name>
+    <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
+    <init-param>
+      <param-name>portlet-name</param-name>
+      <param-value>chapter6Tests-encodeActionURLWithSecurityRenderTest-portlet</param-value>
+    </init-param>
+    <load-on-startup>1</load-on-startup>
+  </servlet>
+  
+  <servlet>
+    <servlet-name>chapter6Tests-encodeActionURLWithInvalidSecurityRenderTest-portlet</servlet-name>
+    <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
+    <init-param>
+      <param-name>portlet-name</param-name>
+      <param-value>chapter6Tests-encodeActionURLWithInvalidSecurityRenderTest-portlet</param-value>
+    </init-param>
+    <load-on-startup>1</load-on-startup>
+  </servlet>
+  
+  <!-- EncodeResourceURL Tests -->
+    <servlet>
+    <servlet-name>chapter6Tests-encodeResourceURLOpaqueTest-portlet</servlet-name>
+    <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
+    <init-param>
+      <param-name>portlet-name</param-name>
+      <param-value>chapter6Tests-encodeResourceURLOpaqueTest-portlet</param-value>
+    </init-param>
+    <load-on-startup>1</load-on-startup>
+  </servlet>
+  
+  <servlet>
+    <servlet-name>chapter6Tests-encodeResourceURLForeignExternalURLTest-portlet</servlet-name>
+    <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
+    <init-param>
+      <param-name>portlet-name</param-name>
+      <param-value>chapter6Tests-encodeResourceURLForeignExternalURLTest-portlet</param-value>
+    </init-param>
+    <load-on-startup>1</load-on-startup>
+  </servlet>
+  
+  <servlet>
+    <servlet-name>chapter6Tests-encodeResourceURLForeignExternalURLBackLinkTest-portlet</servlet-name>
+    <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
+    <init-param>
+      <param-name>portlet-name</param-name>
+      <param-value>chapter6Tests-encodeResourceURLForeignExternalURLBackLinkTest-portlet</param-value>
+    </init-param>
+    <load-on-startup>1</load-on-startup>
+  </servlet>
+  
+  <servlet>
+    <servlet-name>chapter6Tests-encodeResourceURLRelativeURLTest-portlet</servlet-name>
+    <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
+    <init-param>
+      <param-name>portlet-name</param-name>
+      <param-value>chapter6Tests-encodeResourceURLRelativeURLTest-portlet</param-value>
+    </init-param>
+    <load-on-startup>1</load-on-startup>
+  </servlet>
+  
+  <servlet>
+    <servlet-name>chapter6Tests-encodeResourceURLRelativeURLBackLinkTest-portlet</servlet-name>
+    <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
+    <init-param>
+      <param-name>portlet-name</param-name>
+      <param-value>chapter6Tests-encodeResourceURLRelativeURLBackLinkTest-portlet</param-value>
+    </init-param>
+    <load-on-startup>1</load-on-startup>
+  </servlet>
+  
+  <servlet>
+    <servlet-name>chapter6Tests-encodeResourceURLTest-portlet</servlet-name>
+    <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
+    <init-param>
+      <param-name>portlet-name</param-name>
+      <param-value>chapter6Tests-encodeResourceURLTest-portlet</param-value>
+    </init-param>
+    <load-on-startup>1</load-on-startup>
+  </servlet>
+  
+  <servlet>
+    <servlet-name>chapter6Tests-encodeResourceURLRelativeBackLinkTest-portlet</servlet-name>
+    <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
+    <init-param>
+      <param-name>portlet-name</param-name>
+      <param-value>chapter6Tests-encodeResourceURLRelativeBackLinkTest-portlet</param-value>
+    </init-param>
+    <load-on-startup>1</load-on-startup>
+  </servlet>
+
+  <servlet>
+    <servlet-name>chapter6Tests-encodeResourceURLViewLinkTest-portlet</servlet-name>
+    <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
+    <init-param>
+      <param-name>portlet-name</param-name>
+      <param-value>chapter6Tests-encodeResourceURLViewLinkTest-portlet</param-value>
+    </init-param>
+    <load-on-startup>1</load-on-startup>
+  </servlet>
+
+  <servlet>
+    <servlet-name>chapter6Tests-encodeResourceURLViewLinkWithBackLinkTest-portlet</servlet-name>
+    <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
+    <init-param>
+      <param-name>portlet-name</param-name>
+      <param-value>chapter6Tests-encodeResourceURLViewLinkWithBackLinkTest-portlet</param-value>
+    </init-param>
+    <load-on-startup>1</load-on-startup>
+  </servlet>
+  
+   <!-- getRequest and setRequest Test  -->  
+  <servlet>
+    <servlet-name>chapter6Tests-getSetRequestObjectTest-portlet</servlet-name>
+    <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
+    <init-param>
+      <param-name>portlet-name</param-name>
+      <param-value>chapter6Tests-getSetRequestObjectTest-portlet</param-value>
+    </init-param>
+    <load-on-startup>1</load-on-startup>
+  </servlet>
+  
+   <!-- setRequestCharacterEncoding Tests  -->  
+  <servlet>
+    <servlet-name>chapter6Tests-setRequestCharacterEncodingRenderTest-portlet</servlet-name>
+    <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
+    <init-param>
+      <param-name>portlet-name</param-name>
+      <param-value>chapter6Tests-setRequestCharacterEncodingRenderTest-portlet</param-value>
+    </init-param>
+    <load-on-startup>1</load-on-startup>
+  </servlet>
+  
+  <servlet>
+    <servlet-name>chapter6Tests-setRequestCharacterEncodingActionTest-portlet</servlet-name>
+    <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
+    <init-param>
+      <param-name>portlet-name</param-name>
+      <param-value>chapter6Tests-setRequestCharacterEncodingActionTest-portlet</param-value>
+    </init-param>
+    <load-on-startup>1</load-on-startup>
+  </servlet>
+
+   <!-- getRequestHeaderMap Tests  -->  
+  <servlet>
+    <servlet-name>chapter6Tests-getRequestHeaderMapRenderTest-portlet</servlet-name>
+    <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
+    <init-param>
+      <param-name>portlet-name</param-name>
+      <param-value>chapter6Tests-getRequestHeaderMapRenderTest-portlet</param-value>
+    </init-param>
+    <load-on-startup>1</load-on-startup>
+  </servlet>
+  
+  <servlet>
+    <servlet-name>chapter6Tests-getRequestHeaderMapActionTest-portlet</servlet-name>
+    <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
+    <init-param>
+      <param-name>portlet-name</param-name>
+      <param-value>chapter6Tests-getRequestHeaderMapActionTest-portlet</param-value>
+    </init-param>
+    <load-on-startup>1</load-on-startup>
+  </servlet>
+  
+
+   <!-- getRequestHeaderValuesMap Tests  -->  
+  <servlet>
+    <servlet-name>chapter6Tests-getRequestHeaderValuesMapRenderTest-portlet</servlet-name>
+    <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
+    <init-param>
+      <param-name>portlet-name</param-name>
+      <param-value>chapter6Tests-getRequestHeaderValuesMapRenderTest-portlet</param-value>
+    </init-param>
+    <load-on-startup>1</load-on-startup>
+  </servlet>
+  
+  <servlet>
+    <servlet-name>chapter6Tests-getRequestHeaderValuesMapActionTest-portlet</servlet-name>
+    <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
+    <init-param>
+      <param-name>portlet-name</param-name>
+      <param-value>chapter6Tests-getRequestHeaderValuesMapActionTest-portlet</param-value>
+    </init-param>
+    <load-on-startup>1</load-on-startup>
+  </servlet>
+  
+   <!-- getRequestMap Tests  -->  
+  <servlet>
+    <servlet-name>chapter6Tests-requestMapCoreTest-portlet</servlet-name>
+    <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
+    <init-param>
+      <param-name>portlet-name</param-name>
+      <param-value>chapter6Tests-requestMapCoreTest-portlet</param-value>
+    </init-param>
+    <load-on-startup>1</load-on-startup>
+  </servlet>
+  
+  <servlet>
+    <servlet-name>chapter6Tests-requestMapRequestScopeTest-portlet</servlet-name>
+    <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
+    <init-param>
+      <param-name>portlet-name</param-name>
+      <param-value>chapter6Tests-requestMapRequestScopeTest-portlet</param-value>
+    </init-param>
+    <load-on-startup>1</load-on-startup>
+  </servlet>
+  
+  <servlet>
+    <servlet-name>chapter6Tests-requestMapPreDestroyRemoveWithinActionTest-portlet</servlet-name>
+    <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
+    <init-param>
+      <param-name>portlet-name</param-name>
+      <param-value>chapter6Tests-requestMapPreDestroyRemoveWithinActionTest-portlet</param-value>
+    </init-param>
+    <load-on-startup>1</load-on-startup>
+  </servlet>
+  
+   <!-- getRequestParameterMap Tests  -->  
+  <servlet>
+    <servlet-name>chapter6Tests-getRequestParameterMapCoreTest-portlet</servlet-name>
+    <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
+    <init-param>
+      <param-name>portlet-name</param-name>
+      <param-value>chapter6Tests-getRequestParameterMapCoreTest-portlet</param-value>
+    </init-param>
+    <load-on-startup>1</load-on-startup>
+  </servlet>
+  
+  <servlet>
+    <servlet-name>chapter6Tests-getRequestParameterPreserveParamsTest-portlet</servlet-name>
+    <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
+    <init-param>
+      <param-name>portlet-name</param-name>
+      <param-value>chapter6Tests-getRequestParameterPreserveParamsTest-portlet</param-value>
+    </init-param>
+    <load-on-startup>1</load-on-startup>
+  </servlet>
+  
+  <servlet>
+    <servlet-name>chapter6Tests-getRequestParameterDefaultViewParamsTest-portlet</servlet-name>
+    <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
+    <init-param>
+      <param-name>portlet-name</param-name>
+      <param-value>chapter6Tests-getRequestParameterDefaultViewParamsTest-portlet</param-value>
+    </init-param>
+    <load-on-startup>1</load-on-startup>
+  </servlet>
+  
+   <!-- getRequestParameterNames Tests  -->  
+  <servlet>
+    <servlet-name>chapter6Tests-getRequestParameterNamesCoreTest-portlet</servlet-name>
+    <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
+    <init-param>
+      <param-name>portlet-name</param-name>
+      <param-value>chapter6Tests-getRequestParameterNamesCoreTest-portlet</param-value>
+    </init-param>
+    <load-on-startup>1</load-on-startup>
+  </servlet>
+  
+  <servlet>
+    <servlet-name>chapter6Tests-getRequestParameterNamesPreserveParamsTest-portlet</servlet-name>
+    <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
+    <init-param>
+      <param-name>portlet-name</param-name>
+      <param-value>chapter6Tests-getRequestParameterNamesPreserveParamsTest-portlet</param-value>
+    </init-param>
+    <load-on-startup>1</load-on-startup>
+  </servlet>
+  
+  
+   <!-- getRequestPathInfo/getRequestServletPath Tests  -->  
+  <servlet>
+    <servlet-name>chapter6Tests-getRequestPathInfoTest-portlet</servlet-name>
+    <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
+    <init-param>
+      <param-name>portlet-name</param-name>
+      <param-value>chapter6Tests-getRequestPathInfoTest-portlet</param-value>
+    </init-param>
+    <load-on-startup>1</load-on-startup>
+  </servlet>
+  
+  <servlet>
+    <servlet-name>chapter6Tests-getRequestServletPathTest-portlet</servlet-name>
+    <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
+    <init-param>
+      <param-name>portlet-name</param-name>
+      <param-value>chapter6Tests-getRequestServletPathTest-portlet</param-value>
+    </init-param>
+    <load-on-startup>1</load-on-startup>
+  </servlet>
+  
+  
+  <servlet>
+    <servlet-name>chapter6Tests-getRequestParameterNamesDefaultViewParamsTest-portlet</servlet-name>
+    <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
+    <init-param>
+      <param-name>portlet-name</param-name>
+      <param-value>chapter6Tests-getRequestParameterNamesDefaultViewParamsTest-portlet</param-value>
+    </init-param>
+    <load-on-startup>1</load-on-startup>
+  </servlet>
+  
+   <!-- Samples Tests that use Generic Test JSF.jsp pages -->  
+  <servlet>
+    <servlet-name>sampleTests-singleRequestTest-portlet</servlet-name>
+    <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
+    <init-param>
+      <param-name>portlet-name</param-name>
+      <param-value>sampleTests-singleRequestTest-portlet</param-value>
+    </init-param>
+    <load-on-startup>1</load-on-startup>
+  </servlet>
+  <servlet>
+    <servlet-name>sampleTests-multiRequestTest-portlet</servlet-name>
+    <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
+    <init-param>
+      <param-name>portlet-name</param-name>
+      <param-value>sampleTests-multiRequestTest-portlet</param-value>
+    </init-param>
+    <load-on-startup>1</load-on-startup>
+  </servlet>
+  <!-- Faces Servlet Mappings -->
+  <!-- 
+    In this demo application, I chose to use suffix mapping.  I did this because it makes urls
+    in the portlet world look nicer in the source.  The portlet url should be the same 
+    reguardless.
+  -->
+  <servlet-mapping>
+    <servlet-name>faces</servlet-name>
+    <url-pattern>*.jsf</url-pattern>
+  </servlet-mapping>
+  
+  <!-- Chapter 3 tests -->
+  <servlet-mapping>
+    <servlet-name>chapter3Tests-bridgeVersionTest-portlet</servlet-name>
+    <url-pattern>/PlutoInvoker/chapter3Tests-bridgeVersionTest-portlet</url-pattern>
+  </servlet-mapping>
+
+  <!-- Chapter 6 tests -->
+  <servlet-mapping>
+    <servlet-name>chapter6Tests-facesContextFactoryServiceProviderTest-portlet</servlet-name>
+    <url-pattern>/PlutoInvoker/chapter6Tests-facesContextFactoryServiceProviderTest-portlet</url-pattern>
+  </servlet-mapping>
+  <servlet-mapping>
+    <servlet-name>chapter6Tests-wrappedFacesContextTest-portlet</servlet-name>
+    <url-pattern>/PlutoInvoker/chapter6Tests-wrappedFacesContextTest-portlet</url-pattern>
+  </servlet-mapping>  
+  <servlet-mapping>
+    <servlet-name>chapter6Tests-dispatchUsesIncludeTest-portlet</servlet-name>
+    <url-pattern>/PlutoInvoker/chapter6Tests-dispatchUsesIncludeTest-portlet</url-pattern>
+  </servlet-mapping>
+  <servlet-mapping>
+    <servlet-name>chapter6Tests-encodeActionURLPoundCharTest-portlet</servlet-name>
+    <url-pattern>/PlutoInvoker/chapter6Tests-encodeActionURLPoundCharTest-portlet</url-pattern>
+  </servlet-mapping> 
+  <servlet-mapping>
+    <servlet-name>chapter6Tests-encodeActionURLAbsoluteURLTest-portlet</servlet-name>
+    <url-pattern>/PlutoInvoker/chapter6Tests-encodeActionURLAbsoluteURLTest-portlet</url-pattern>
+  </servlet-mapping>
+  <servlet-mapping>
+    <servlet-name>chapter6Tests-encodeActionURLDirectLinkTrueTest-portlet</servlet-name>
+    <url-pattern>/PlutoInvoker/chapter6Tests-encodeActionURLDirectLinkTrueTest-portlet</url-pattern>
+  </servlet-mapping>  
+  <servlet-mapping>
+    <servlet-name>chapter6Tests-encodeActionURLDirectLinkFalseTest-portlet</servlet-name>
+    <url-pattern>/PlutoInvoker/chapter6Tests-encodeActionURLDirectLinkFalseTest-portlet</url-pattern>
+  </servlet-mapping>
+  <servlet-mapping>
+    <servlet-name>chapter6Tests-encodeActionURLPortletRenderTest-portlet</servlet-name>
+    <url-pattern>/PlutoInvoker/chapter6Tests-encodeActionURLPortletRenderTest-portlet</url-pattern>
+  </servlet-mapping>
+  <servlet-mapping>
+    <servlet-name>chapter6Tests-encodeActionURLPortletActionTest-portlet</servlet-name>
+    <url-pattern>/PlutoInvoker/chapter6Tests-encodeActionURLPortletActionTest-portlet</url-pattern>
+  </servlet-mapping>
+  <servlet-mapping>
+    <servlet-name>chapter6Tests-encodeActionURLJSFViewActionTest-portlet</servlet-name>
+    <url-pattern>/PlutoInvoker/chapter6Tests-encodeActionURLJSFViewActionTest-portlet</url-pattern>
+  </servlet-mapping>  
+  <servlet-mapping>
+    <servlet-name>chapter6Tests-encodeActionURLWithParamActionTest-portlet</servlet-name>
+    <url-pattern>/PlutoInvoker/chapter6Tests-encodeActionURLWithParamActionTest-portlet</url-pattern>
+  </servlet-mapping>
+  <servlet-mapping>
+    <servlet-name>chapter6Tests-encodeActionURLWithModeActionTest-portlet</servlet-name>
+    <url-pattern>/PlutoInvoker/chapter6Tests-encodeActionURLWithModeActionTest-portlet</url-pattern>
+  </servlet-mapping>
+  <servlet-mapping>
+    <servlet-name>chapter6Tests-encodeActionURLWithInvalidModeActionTest-portlet</servlet-name>
+    <url-pattern>/PlutoInvoker/chapter6Tests-encodeActionURLWithInvalidModeActionTest-portlet</url-pattern>
+  </servlet-mapping>
+  <servlet-mapping>
+    <servlet-name>chapter6Tests-encodeActionURLWithWindowStateActionTest-portlet</servlet-name>
+    <url-pattern>/PlutoInvoker/chapter6Tests-encodeActionURLWithWindowStateActionTest-portlet</url-pattern>
+  </servlet-mapping>  
+  <servlet-mapping>
+    <servlet-name>chapter6Tests-encodeActionURLWithInvalidWindowStateActionTest-portlet</servlet-name>
+    <url-pattern>/PlutoInvoker/chapter6Tests-encodeActionURLWithInvalidWindowStateActionTest-portlet</url-pattern>
+  </servlet-mapping>
+  <servlet-mapping>
+    <servlet-name>chapter6Tests-encodeActionURLWithSecurityActionTest-portlet</servlet-name>
+    <url-pattern>/PlutoInvoker/chapter6Tests-encodeActionURLWithSecurityActionTest-portlet</url-pattern>
+  </servlet-mapping>  
+  <servlet-mapping>
+    <servlet-name>chapter6Tests-encodeActionURLWithInvalidSecurityActionTest-portlet</servlet-name>
+    <url-pattern>/PlutoInvoker/chapter6Tests-encodeActionURLWithInvalidSecurityActionTest-portlet</url-pattern>
+  </servlet-mapping>
+  <servlet-mapping>
+    <servlet-name>chapter6Tests-encodeActionURLJSFViewRenderTest-portlet</servlet-name>
+    <url-pattern>/PlutoInvoker/chapter6Tests-encodeActionURLJSFViewRenderTest-portlet</url-pattern>
+  </servlet-mapping>  
+  <servlet-mapping>
+    <servlet-name>chapter6Tests-encodeActionURLWithParamRenderTest-portlet</servlet-name>
+    <url-pattern>/PlutoInvoker/chapter6Tests-encodeActionURLWithParamRenderTest-portlet</url-pattern>
+  </servlet-mapping>
+  <servlet-mapping>
+    <servlet-name>chapter6Tests-encodeActionURLWithModeRenderTest-portlet</servlet-name>
+    <url-pattern>/PlutoInvoker/chapter6Tests-encodeActionURLWithModeRenderTest-portlet</url-pattern>
+  </servlet-mapping>
+  <servlet-mapping>
+    <servlet-name>chapter6Tests-encodeActionURLWithInvalidModeRenderTest-portlet</servlet-name>
+    <url-pattern>/PlutoInvoker/chapter6Tests-encodeActionURLWithInvalidModeRenderTest-portlet</url-pattern>
+  </servlet-mapping>
+  <servlet-mapping>
+    <servlet-name>chapter6Tests-encodeActionURLWithWindowStateRenderTest-portlet</servlet-name>
+    <url-pattern>/PlutoInvoker/chapter6Tests-encodeActionURLWithWindowStateRenderTest-portlet</url-pattern>
+  </servlet-mapping>  
+  <servlet-mapping>
+    <servlet-name>chapter6Tests-encodeActionURLWithInvalidWindowStateRenderTest-portlet</servlet-name>
+    <url-pattern>/PlutoInvoker/chapter6Tests-encodeActionURLWithInvalidWindowStateRenderTest-portlet</url-pattern>
+  </servlet-mapping>
+  <servlet-mapping>
+    <servlet-name>chapter6Tests-encodeActionURLWithSecurityRenderTest-portlet</servlet-name>
+    <url-pattern>/PlutoInvoker/chapter6Tests-encodeActionURLWithSecurityRenderTest-portlet</url-pattern>
+  </servlet-mapping>  
+  <servlet-mapping>
+    <servlet-name>chapter6Tests-encodeActionURLWithInvalidSecurityRenderTest-portlet</servlet-name>
+    <url-pattern>/PlutoInvoker/chapter6Tests-encodeActionURLWithInvalidSecurityRenderTest-portlet</url-pattern>
+  </servlet-mapping>
+  
+  <!-- encodeResourceURL tests -->
+  <servlet-mapping>
+    <servlet-name>chapter6Tests-encodeResourceURLOpaqueTest-portlet</servlet-name>
+    <url-pattern>/PlutoInvoker/chapter6Tests-encodeResourceURLOpaqueTest-portlet</url-pattern>
+  </servlet-mapping> 
+  <servlet-mapping>
+    <servlet-name>chapter6Tests-encodeResourceURLForeignExternalURLTest-portlet</servlet-name>
+    <url-pattern>/PlutoInvoker/chapter6Tests-encodeResourceURLForeignExternalURLTest-portlet</url-pattern>
+  </servlet-mapping>
+  <servlet-mapping>
+    <servlet-name>chapter6Tests-encodeResourceURLForeignExternalURLBackLinkTest-portlet</servlet-name>
+    <url-pattern>/PlutoInvoker/chapter6Tests-encodeResourceURLForeignExternalURLBackLinkTest-portlet</url-pattern>
+  </servlet-mapping>
+  <servlet-mapping>
+    <servlet-name>chapter6Tests-encodeResourceURLRelativeURLTest-portlet</servlet-name>
+    <url-pattern>/PlutoInvoker/chapter6Tests-encodeResourceURLRelativeURLTest-portlet</url-pattern>
+  </servlet-mapping>
+  <servlet-mapping>
+    <servlet-name>chapter6Tests-encodeResourceURLRelativeURLBackLinkTest-portlet</servlet-name>
+    <url-pattern>/PlutoInvoker/chapter6Tests-encodeResourceURLRelativeURLBackLinkTest-portlet</url-pattern>
+  </servlet-mapping>
+  <servlet-mapping>
+    <servlet-name>chapter6Tests-encodeResourceURLTest-portlet</servlet-name>
+    <url-pattern>/PlutoInvoker/chapter6Tests-encodeResourceURLTest-portlet</url-pattern>
+  </servlet-mapping>  
+  <servlet-mapping>
+    <servlet-name>chapter6Tests-encodeResourceURLRelativeBackLinkTest-portlet</servlet-name>
+    <url-pattern>/PlutoInvoker/chapter6Tests-encodeResourceURLRelativeBackLinkTest-portlet</url-pattern>
+  </servlet-mapping>
+  <servlet-mapping>
+    <servlet-name>chapter6Tests-encodeResourceURLViewLinkTest-portlet</servlet-name>
+    <url-pattern>/PlutoInvoker/chapter6Tests-encodeResourceURLViewLinkTest-portlet</url-pattern>
+  </servlet-mapping>
+  <servlet-mapping>
+    <servlet-name>chapter6Tests-encodeResourceURLViewLinkWithBackLinkTest-portlet</servlet-name>
+    <url-pattern>/PlutoInvoker/chapter6Tests-encodeResourceURLViewLinkWithBackLinkTest-portlet</url-pattern>
+  </servlet-mapping>
+  
+  <!-- getRequest and setRequest Test -->
+  <servlet-mapping>
+    <servlet-name>chapter6Tests-getSetRequestObjectTest-portlet</servlet-name>
+    <url-pattern>/PlutoInvoker/chapter6Tests-getSetRequestObjectTest-portlet</url-pattern>
+  </servlet-mapping>  
+  
+    <!-- getRequestCharacterEncoding Tests -->
+  <servlet-mapping>
+    <servlet-name>chapter6Tests-setRequestCharacterEncodingRenderTest-portlet</servlet-name>
+    <url-pattern>/PlutoInvoker/chapter6Tests-setRequestCharacterEncodingRenderTest-portlet</url-pattern>
+  </servlet-mapping> 
+
+  <servlet-mapping>
+    <servlet-name>chapter6Tests-setRequestCharacterEncodingActionTest-portlet</servlet-name>
+    <url-pattern>/PlutoInvoker/chapter6Tests-setRequestCharacterEncodingActionTest-portlet</url-pattern>
+  </servlet-mapping> 
+  
+  <!-- getRequestHeaderMap Tests -->
+  <servlet-mapping>
+    <servlet-name>chapter6Tests-getRequestHeaderMapRenderTest-portlet</servlet-name>
+    <url-pattern>/PlutoInvoker/chapter6Tests-getRequestHeaderMapRenderTest-portlet</url-pattern>
+  </servlet-mapping> 
+
+  <servlet-mapping>
+    <servlet-name>chapter6Tests-getRequestHeaderMapActionTest-portlet</servlet-name>
+    <url-pattern>/PlutoInvoker/chapter6Tests-getRequestHeaderMapActionTest-portlet</url-pattern>
+  </servlet-mapping> 
+  
+  <!-- getRequestHeaderValuesMap Tests -->
+  <servlet-mapping>
+    <servlet-name>chapter6Tests-getRequestHeaderValuesMapRenderTest-portlet</servlet-name>
+    <url-pattern>/PlutoInvoker/chapter6Tests-getRequestHeaderValuesMapRenderTest-portlet</url-pattern>
+  </servlet-mapping> 
+
+  <servlet-mapping>
+    <servlet-name>chapter6Tests-getRequestHeaderValuesMapActionTest-portlet</servlet-name>
+    <url-pattern>/PlutoInvoker/chapter6Tests-getRequestHeaderValuesMapActionTest-portlet</url-pattern>
+  </servlet-mapping> 
+  
+  <!-- getRequestMap Tests -->
+  <servlet-mapping>
+    <servlet-name>chapter6Tests-requestMapCoreTest-portlet</servlet-name>
+    <url-pattern>/PlutoInvoker/chapter6Tests-requestMapCoreTest-portlet</url-pattern>
+  </servlet-mapping> 
+
+  <servlet-mapping>
+    <servlet-name>chapter6Tests-requestMapRequestScopeTest-portlet</servlet-name>
+    <url-pattern>/PlutoInvoker/chapter6Tests-requestMapRequestScopeTest-portlet</url-pattern>
+  </servlet-mapping> 
+  
+  <servlet-mapping>
+    <servlet-name>chapter6Tests-requestMapPreDestroyRemoveWithinActionTest-portlet</servlet-name>
+    <url-pattern>/PlutoInvoker/chapter6Tests-requestMapPreDestroyRemoveWithinActionTest-portlet</url-pattern>
+  </servlet-mapping>
+  
+  <!-- getRequestParameterMap Tests -->
+  <servlet-mapping>
+    <servlet-name>chapter6Tests-getRequestParameterMapCoreTest-portlet</servlet-name>
+    <url-pattern>/PlutoInvoker/chapter6Tests-getRequestParameterMapCoreTest-portlet</url-pattern>
+  </servlet-mapping> 
+  <servlet-mapping>
+    <servlet-name>chapter6Tests-getRequestParameterPreserveParamsTest-portlet</servlet-name>
+    <url-pattern>/PlutoInvoker/chapter6Tests-getRequestParameterPreserveParamsTest-portlet</url-pattern>
+  </servlet-mapping> 
+  <servlet-mapping>
+    <servlet-name>chapter6Tests-getRequestParameterDefaultViewParamsTest-portlet</servlet-name>
+    <url-pattern>/PlutoInvoker/chapter6Tests-getRequestParameterDefaultViewParamsTest-portlet</url-pattern>
+  </servlet-mapping> 
+  
+    <!-- getRequestParameterNames Tests -->
+  <servlet-mapping>
+    <servlet-name>chapter6Tests-getRequestParameterNamesCoreTest-portlet</servlet-name>
+    <url-pattern>/PlutoInvoker/chapter6Tests-getRequestParameterNamesCoreTest-portlet</url-pattern>
+  </servlet-mapping> 
+  <servlet-mapping>
+    <servlet-name>chapter6Tests-getRequestParameterNamesPreserveParamsTest-portlet</servlet-name>
+    <url-pattern>/PlutoInvoker/chapter6Tests-getRequestParameterNamesPreserveParamsTest-portlet</url-pattern>
+  </servlet-mapping> 
+  <servlet-mapping>
+    <servlet-name>chapter6Tests-getRequestParameterNamesDefaultViewParamsTest-portlet</servlet-name>
+    <url-pattern>/PlutoInvoker/chapter6Tests-getRequestParameterNamesDefaultViewParamsTest-portlet</url-pattern>
+  </servlet-mapping> 
+  
+    <!-- getRequestPathInfo/getRequestServletPath Tests -->
+  <servlet-mapping>
+    <servlet-name>chapter6Tests-getRequestPathInfoTest-portlet</servlet-name>
+    <url-pattern>/PlutoInvoker/chapter6Tests-getRequestPathInfoTest-portlet</url-pattern>
+  </servlet-mapping> 
+  <servlet-mapping>
+    <servlet-name>chapter6Tests-getRequestServletPathTest-portlet</servlet-name>
+    <url-pattern>/PlutoInvoker/chapter6Tests-getRequestServletPathTest-portlet</url-pattern>
+  </servlet-mapping> 
+  
+  <!-- Samples Tests that use Generic Test JSF.jsp pages -->  
+  <servlet-mapping>
+    <servlet-name>sampleTests-singleRequestTest-portlet</servlet-name>
+    <url-pattern>/PlutoInvoker/sampleTests-singleRequestTest-portlet</url-pattern>
+  </servlet-mapping>
+  <servlet-mapping>
+    <servlet-name>sampleTests-multiRequestTest-portlet</servlet-name>
+    <url-pattern>/PlutoInvoker/sampleTests-multiRequestTest-portlet</url-pattern>
+  </servlet-mapping>
+</web-app>
+

Modified: myfaces/portlet-bridge/testsuite/trunk/src/main/webapp/tests/DispatchTest.jsp
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/testsuite/trunk/src/main/webapp/tests/DispatchTest.jsp?rev=822920&r1=822919&r2=822920&view=diff
==============================================================================
--- myfaces/portlet-bridge/testsuite/trunk/src/main/webapp/tests/DispatchTest.jsp (original)
+++ myfaces/portlet-bridge/testsuite/trunk/src/main/webapp/tests/DispatchTest.jsp Wed Oct  7 21:19:30 2009
@@ -1,21 +1,21 @@
-<!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"%>
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-     
-  <html>
-    <head>
-      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-      <title>JSR 301 Dispatch Test</title>
-    </head>
-    <body>
-      <%
-      if (request.getAttribute("javax.servlet.include.servlet_path") != null)
-         request.setAttribute("org.apache.myfaces.portlet.faces.testsuite.dispatchInclude", Boolean.TRUE);
-      else 
-        request.setAttribute("org.apache.myfaces.portlet.faces.testsuite.dispatchInclude", Boolean.FALSE);
-      %>
-      <jsp:include page="SingleRequestTest.jsp" />
-    </body>
-  </html>
+<!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"%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
+     
+  <html>
+    <head>
+      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+      <title>JSR 301 Dispatch Test</title>
+    </head>
+    <body>
+      <%
+      if (request.getAttribute("javax.servlet.include.servlet_path") != null)
+         request.setAttribute("org.apache.myfaces.portlet.faces.testsuite.dispatchInclude", Boolean.TRUE);
+      else 
+        request.setAttribute("org.apache.myfaces.portlet.faces.testsuite.dispatchInclude", Boolean.FALSE);
+      %>
+      <jsp:include page="SingleRequestTest.jsp" />
+    </body>
+  </html>

Modified: myfaces/portlet-bridge/testsuite/trunk/src/main/webapp/tests/MultiRequestFormDataTest.jsp
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/testsuite/trunk/src/main/webapp/tests/MultiRequestFormDataTest.jsp?rev=822920&r1=822919&r2=822920&view=diff
==============================================================================
--- myfaces/portlet-bridge/testsuite/trunk/src/main/webapp/tests/MultiRequestFormDataTest.jsp (original)
+++ myfaces/portlet-bridge/testsuite/trunk/src/main/webapp/tests/MultiRequestFormDataTest.jsp Wed Oct  7 21:19:30 2009
@@ -1,23 +1,23 @@
-<!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"%>
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-
-<f:view>
-  <html>
-    <head>
-      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-      <title>JSR 301 Multi-Request TCK Test</title>
-    </head>
-    <body>
-      <h:form>
-        <h:panelGrid columns="1">
-          <h:inputText id="formDataField1" label="field1" value="value1" readonly="true" />
-          <h:inputText id="formDataField2" label = "field2" value="value2" readonly="true" />
-          <h:commandButton value="Run Test" action="#{test.runActionTest}"/>
-        </h:panelGrid>
-      </h:form>
-    </body>
-  </html>
+<!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"%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
+
+<f:view>
+  <html>
+    <head>
+      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+      <title>JSR 301 Multi-Request TCK Test</title>
+    </head>
+    <body>
+      <h:form>
+        <h:panelGrid columns="1">
+          <h:inputText id="formDataField1" label="field1" value="value1" readonly="true" />
+          <h:inputText id="formDataField2" label = "field2" value="value2" readonly="true" />
+          <h:commandButton value="Run Test" action="#{test.runActionTest}"/>
+        </h:panelGrid>
+      </h:form>
+    </body>
+  </html>
 </f:view>
\ No newline at end of file

Modified: myfaces/portlet-bridge/testsuite/trunk/src/main/webapp/tests/MultiRequestTest.jsp
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/testsuite/trunk/src/main/webapp/tests/MultiRequestTest.jsp?rev=822920&r1=822919&r2=822920&view=diff
==============================================================================
--- myfaces/portlet-bridge/testsuite/trunk/src/main/webapp/tests/MultiRequestTest.jsp (original)
+++ myfaces/portlet-bridge/testsuite/trunk/src/main/webapp/tests/MultiRequestTest.jsp Wed Oct  7 21:19:30 2009
@@ -1,21 +1,21 @@
-<!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"%>
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-
-<f:view>
-  <html>
-    <head>
-      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-      <title>JSR 301 Multi-Request TCK Test</title>
-    </head>
-    <body>
-      <h:form>
-        <h:panelGrid columns="1">
-          <h:commandButton value="Run Test" action="#{test.runActionTest}"/>
-        </h:panelGrid>
-      </h:form>
-    </body>
-  </html>
+<!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"%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
+
+<f:view>
+  <html>
+    <head>
+      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+      <title>JSR 301 Multi-Request TCK Test</title>
+    </head>
+    <body>
+      <h:form>
+        <h:panelGrid columns="1">
+          <h:commandButton value="Run Test" action="#{test.runActionTest}"/>
+        </h:panelGrid>
+      </h:form>
+    </body>
+  </html>
 </f:view>
\ No newline at end of file

Modified: myfaces/portlet-bridge/testsuite/trunk/src/main/webapp/tests/MultiRequestTestResult.jsp
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/testsuite/trunk/src/main/webapp/tests/MultiRequestTestResult.jsp?rev=822920&r1=822919&r2=822920&view=diff
==============================================================================
--- myfaces/portlet-bridge/testsuite/trunk/src/main/webapp/tests/MultiRequestTestResult.jsp (original)
+++ myfaces/portlet-bridge/testsuite/trunk/src/main/webapp/tests/MultiRequestTestResult.jsp Wed Oct  7 21:19:30 2009
@@ -1,21 +1,21 @@
-<!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"%>
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-     
-<f:view>
-  <html>
-    <head>
-      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-      <title>JSR 301 Multi Request TCK Test</title>
-    </head>
-    <body>
-      <h:form>
-        <h:panelGrid columns="1">
-          <h:outputText escape = "false" value="#{test.testResult}"/>
-        </h:panelGrid>
-      </h:form>
-    </body>
-  </html>
+<!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"%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
+     
+<f:view>
+  <html>
+    <head>
+      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+      <title>JSR 301 Multi Request TCK Test</title>
+    </head>
+    <body>
+      <h:form>
+        <h:panelGrid columns="1">
+          <h:outputText escape = "false" value="#{test.testResult}"/>
+        </h:panelGrid>
+      </h:form>
+    </body>
+  </html>
 </f:view>
\ No newline at end of file

Modified: myfaces/portlet-bridge/testsuite/trunk/src/main/webapp/tests/MultiRequestTestResultRenderCheck.jsp
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/testsuite/trunk/src/main/webapp/tests/MultiRequestTestResultRenderCheck.jsp?rev=822920&r1=822919&r2=822920&view=diff
==============================================================================
--- myfaces/portlet-bridge/testsuite/trunk/src/main/webapp/tests/MultiRequestTestResultRenderCheck.jsp (original)
+++ myfaces/portlet-bridge/testsuite/trunk/src/main/webapp/tests/MultiRequestTestResultRenderCheck.jsp Wed Oct  7 21:19:30 2009
@@ -1,21 +1,21 @@
-<!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"%>
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-     
-<f:view>
-  <html>
-    <head>
-      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-      <title>JSR 301 Multi Request TCK Test</title>
-    </head>
-    <body>
-      <h:form>
-        <h:panelGrid columns="1">
-          <h:outputText escape = "false" value="#{test.renderTestResult}"/>
-        </h:panelGrid>
-      </h:form>
-    </body>
-  </html>
+<!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"%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
+     
+<f:view>
+  <html>
+    <head>
+      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+      <title>JSR 301 Multi Request TCK Test</title>
+    </head>
+    <body>
+      <h:form>
+        <h:panelGrid columns="1">
+          <h:outputText escape = "false" value="#{test.renderTestResult}"/>
+        </h:panelGrid>
+      </h:form>
+    </body>
+  </html>
 </f:view>
\ No newline at end of file