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/03/26 00:42:50 UTC

svn commit: r927641 [1/3] - in /myfaces/portlet-bridge/testsuite/trunk: ./ portlet-bridge-testsuite-main/ portlet-bridge-testsuite-main/src/ portlet-bridge-testsuite-main/src/main/ portlet-bridge-testsuite-main/src/main/webapp/ portlet-bridge-testsuite...

Author: mfreedman
Date: Thu Mar 25 23:42:48 2010
New Revision: 927641

URL: http://svn.apache.org/viewvc?rev=927641&view=rev
Log: (empty)

Added:
    myfaces/portlet-bridge/testsuite/trunk/portlet-bridge-testsuite-main/
    myfaces/portlet-bridge/testsuite/trunk/portlet-bridge-testsuite-main/pom.xml
    myfaces/portlet-bridge/testsuite/trunk/portlet-bridge-testsuite-main/src/
    myfaces/portlet-bridge/testsuite/trunk/portlet-bridge-testsuite-main/src/main/
    myfaces/portlet-bridge/testsuite/trunk/portlet-bridge-testsuite-main/src/main/webapp/
    myfaces/portlet-bridge/testsuite/trunk/portlet-bridge-testsuite-main/src/main/webapp/WEB-INF/
    myfaces/portlet-bridge/testsuite/trunk/portlet-bridge-testsuite-main/src/main/webapp/WEB-INF/faces-config.xml
    myfaces/portlet-bridge/testsuite/trunk/portlet-bridge-testsuite-main/src/main/webapp/WEB-INF/portlet.xml
    myfaces/portlet-bridge/testsuite/trunk/portlet-bridge-testsuite-main/src/main/webapp/WEB-INF/web.xml
    myfaces/portlet-bridge/testsuite/trunk/portlet-bridge-testsuite-main/src/main/webapp/images/
    myfaces/portlet-bridge/testsuite/trunk/portlet-bridge-testsuite-main/src/main/webapp/images/portlet_bridge_logo.png   (with props)
    myfaces/portlet-bridge/testsuite/trunk/portlet-bridge-testsuite-main/src/main/webapp/tests/
    myfaces/portlet-bridge/testsuite/trunk/portlet-bridge-testsuite-main/src/main/webapp/tests/DispatchTest.jsp
    myfaces/portlet-bridge/testsuite/trunk/portlet-bridge-testsuite-main/src/main/webapp/tests/ModeViewIdResult.jsp
    myfaces/portlet-bridge/testsuite/trunk/portlet-bridge-testsuite-main/src/main/webapp/tests/ModeViewIdTest.jsp
    myfaces/portlet-bridge/testsuite/trunk/portlet-bridge-testsuite-main/src/main/webapp/tests/MultiRequestFormDataTest.jsp
    myfaces/portlet-bridge/testsuite/trunk/portlet-bridge-testsuite-main/src/main/webapp/tests/MultiRequestTest.jsp
    myfaces/portlet-bridge/testsuite/trunk/portlet-bridge-testsuite-main/src/main/webapp/tests/MultiRequestTestResult.jsp
    myfaces/portlet-bridge/testsuite/trunk/portlet-bridge-testsuite-main/src/main/webapp/tests/MultiRequestTestResultRenderCheck.jsp
    myfaces/portlet-bridge/testsuite/trunk/portlet-bridge-testsuite-main/src/main/webapp/tests/PortletSetsViewIdTestFailed.jsp
    myfaces/portlet-bridge/testsuite/trunk/portlet-bridge-testsuite-main/src/main/webapp/tests/PortletSetsViewIdTestSuccess.jsp
    myfaces/portlet-bridge/testsuite/trunk/portlet-bridge-testsuite-main/src/main/webapp/tests/RedirectTestResultRenderCheck.jsp
    myfaces/portlet-bridge/testsuite/trunk/portlet-bridge-testsuite-main/src/main/webapp/tests/RedisplayActionRequestTest.jsp
    myfaces/portlet-bridge/testsuite/trunk/portlet-bridge-testsuite-main/src/main/webapp/tests/RedisplayRenderNewModeRequestTest.jsp
    myfaces/portlet-bridge/testsuite/trunk/portlet-bridge-testsuite-main/src/main/webapp/tests/RedisplayRenderRequestTest.jsp
    myfaces/portlet-bridge/testsuite/trunk/portlet-bridge-testsuite-main/src/main/webapp/tests/SingleRequestAfterContentTest.jsp
    myfaces/portlet-bridge/testsuite/trunk/portlet-bridge-testsuite-main/src/main/webapp/tests/SingleRequestTest.jsp
    myfaces/portlet-bridge/testsuite/trunk/portlet-bridge-testsuite-main/src/main/webapp/tests/chapter4_2_5Result.jsp
    myfaces/portlet-bridge/testsuite/trunk/portlet-bridge-testsuite-main/src/main/webapp/tests/chapter6_5.jsp
    myfaces/portlet-bridge/testsuite/trunk/portlet-bridge-testsuite-section3-2-render-policy-always-delegate/
    myfaces/portlet-bridge/testsuite/trunk/portlet-bridge-testsuite-section3-2-render-policy-always-delegate/pom.xml
    myfaces/portlet-bridge/testsuite/trunk/portlet-bridge-testsuite-section3-2-render-policy-always-delegate/src/
    myfaces/portlet-bridge/testsuite/trunk/portlet-bridge-testsuite-section3-2-render-policy-always-delegate/src/main/
    myfaces/portlet-bridge/testsuite/trunk/portlet-bridge-testsuite-section3-2-render-policy-always-delegate/src/main/webapp/
    myfaces/portlet-bridge/testsuite/trunk/portlet-bridge-testsuite-section3-2-render-policy-always-delegate/src/main/webapp/WEB-INF/
    myfaces/portlet-bridge/testsuite/trunk/portlet-bridge-testsuite-section3-2-render-policy-always-delegate/src/main/webapp/WEB-INF/faces-config.xml
    myfaces/portlet-bridge/testsuite/trunk/portlet-bridge-testsuite-section3-2-render-policy-always-delegate/src/main/webapp/WEB-INF/portlet.xml
    myfaces/portlet-bridge/testsuite/trunk/portlet-bridge-testsuite-section3-2-render-policy-always-delegate/src/main/webapp/WEB-INF/web.xml
    myfaces/portlet-bridge/testsuite/trunk/portlet-bridge-testsuite-section3-2-render-policy-always-delegate/src/main/webapp/tests/
    myfaces/portlet-bridge/testsuite/trunk/portlet-bridge-testsuite-section3-2-render-policy-always-delegate/src/main/webapp/tests/SingleRequestTest.jsp
    myfaces/portlet-bridge/testsuite/trunk/portlet-bridge-testsuite-section3-2-render-policy-default/
    myfaces/portlet-bridge/testsuite/trunk/portlet-bridge-testsuite-section3-2-render-policy-default/pom.xml
    myfaces/portlet-bridge/testsuite/trunk/portlet-bridge-testsuite-section3-2-render-policy-default/src/
    myfaces/portlet-bridge/testsuite/trunk/portlet-bridge-testsuite-section3-2-render-policy-default/src/main/
    myfaces/portlet-bridge/testsuite/trunk/portlet-bridge-testsuite-section3-2-render-policy-default/src/main/webapp/
    myfaces/portlet-bridge/testsuite/trunk/portlet-bridge-testsuite-section3-2-render-policy-default/src/main/webapp/WEB-INF/
    myfaces/portlet-bridge/testsuite/trunk/portlet-bridge-testsuite-section3-2-render-policy-default/src/main/webapp/WEB-INF/faces-config.xml
    myfaces/portlet-bridge/testsuite/trunk/portlet-bridge-testsuite-section3-2-render-policy-default/src/main/webapp/WEB-INF/portlet.xml
    myfaces/portlet-bridge/testsuite/trunk/portlet-bridge-testsuite-section3-2-render-policy-default/src/main/webapp/WEB-INF/web.xml
    myfaces/portlet-bridge/testsuite/trunk/portlet-bridge-testsuite-section3-2-render-policy-default/src/main/webapp/tests/
    myfaces/portlet-bridge/testsuite/trunk/portlet-bridge-testsuite-section3-2-render-policy-default/src/main/webapp/tests/SingleRequestTest.jsp
    myfaces/portlet-bridge/testsuite/trunk/portlet-bridge-testsuite-section3-2-render-policy-never-delegate/
    myfaces/portlet-bridge/testsuite/trunk/portlet-bridge-testsuite-section3-2-render-policy-never-delegate/src/
    myfaces/portlet-bridge/testsuite/trunk/portlet-bridge-testsuite-section3-2-render-policy-never-delegate/src/main/
    myfaces/portlet-bridge/testsuite/trunk/portlet-bridge-testsuite-section3-2-render-policy-never-delegate/src/main/webapp/
    myfaces/portlet-bridge/testsuite/trunk/portlet-bridge-testsuite-section3-2-render-policy-never-delegate/src/main/webapp/WEB-INF/
    myfaces/portlet-bridge/testsuite/trunk/portlet-bridge-testsuite-section3-2-render-policy-never-delegate/src/main/webapp/WEB-INF/faces-config.xml
    myfaces/portlet-bridge/testsuite/trunk/portlet-bridge-testsuite-section3-2-render-policy-never-delegate/src/main/webapp/WEB-INF/portlet.xml
    myfaces/portlet-bridge/testsuite/trunk/portlet-bridge-testsuite-section3-2-render-policy-never-delegate/src/main/webapp/WEB-INF/web.xml
    myfaces/portlet-bridge/testsuite/trunk/portlet-bridge-testsuite-section3-2-render-policy-never-delegate/src/main/webapp/tests/
    myfaces/portlet-bridge/testsuite/trunk/portlet-bridge-testsuite-section3-2-render-policy-never-delegate/src/main/webapp/tests/SingleRequestTest.jsp
Removed:
    myfaces/portlet-bridge/testsuite/trunk/src/main/webapp/WEB-INF/portlet.xml
    myfaces/portlet-bridge/testsuite/trunk/src/main/webapp/WEB-INF/web.xml
    myfaces/portlet-bridge/testsuite/trunk/src/main/webapp/images/
    myfaces/portlet-bridge/testsuite/trunk/src/main/webapp/tests/
Modified:
    myfaces/portlet-bridge/testsuite/trunk/pom.xml

Modified: myfaces/portlet-bridge/testsuite/trunk/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/testsuite/trunk/pom.xml?rev=927641&r1=927640&r2=927641&view=diff
==============================================================================
--- myfaces/portlet-bridge/testsuite/trunk/pom.xml (original)
+++ myfaces/portlet-bridge/testsuite/trunk/pom.xml Thu Mar 25 23:42:48 2010
@@ -2,16 +2,17 @@
   <modelVersion>4.0.0</modelVersion>
   
   <groupId>org.apache.myfaces.portlet-bridge</groupId>
-  <artifactId>portlet-bridge-testsuite</artifactId>
-  <packaging>war</packaging>
-  <name>MyFaces Portlet Bridge Test Suite</name>
+  <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>  
   <description>
   Portlet 1.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 tests for the TCK which validate an implementations
-  fidelity to the specification.
+  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>
@@ -22,6 +23,13 @@
     <version>3</version>
   </parent>
 
+  <modules>
+    <module>portlet-bridge-testsuite-main</module>
+    <module>portlet-bridge-testsuite-section3-2-render-policy-always-delegate</module>
+    <module>portlet-bridge-testsuite-section3-2-render-policy-never-delegate</module>
+    <module>portlet-bridge-testsuite-section3-2-render-policy-default</module>
+  </modules>
+
   <properties>
     <!-- Specification Configurations -->
     <servlet.version>2.5</servlet.version>
@@ -56,14 +64,14 @@
     <jstl.version>1.2</jstl.version>
 
     <!-- Implementation Configurations -->    
-    <jetty.version>6.1.10</jetty.version>
+    <jetty.version>6.1.22</jetty.version>
     <pluto-embedded.version>1.0.1</pluto-embedded.version>
     <pluto.version>1.1.7</pluto.version>    
     <selenium.version>1.0.1</selenium.version>
     <junit.version>4.7</junit.version>
     
     <!-- TCK Test Application Configuration -->
-    <bridge.tck.test.file.stylesheet>${basedir}/src/test/resources/test.xsl</bridge.tck.test.file.stylesheet>
+    <bridge.tck.test.file.stylesheet>${basedir}/../src/test/resources/test.xsl</bridge.tck.test.file.stylesheet>
     <bridge.tck.test.file.dir>${project.build.directory}/generated-resources/xml/xslt</bridge.tck.test.file.dir>
     <bridge.tck.test.file.name>test.xml</bridge.tck.test.file.name>
     <bridge.tck.test.host>localhost</bridge.tck.test.host>
@@ -75,7 +83,8 @@
     <bridge.tck.host>localhost</bridge.tck.host>
     <bridge.tck.port>4444</bridge.tck.port>
     <bridge.tck.browser>*firefox</bridge.tck.browser>
-    <bridge.tck.login-file></bridge.tck.login-file>    
+    <bridge.tck.login-file></bridge.tck.login-file>  
+
   </properties>
   
   <!-- issueManagement is in parent -->
@@ -230,33 +239,6 @@
         <artifactId>maven-jar-plugin</artifactId>
       </plugin>
 
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>xml-maven-plugin</artifactId>
-        <configuration>
-          <transformationSets>
-            <transformationSet>
-              <dir>${basedir}/src/main/webapp/WEB-INF</dir>
-              <includes>
-                <include>portlet.xml</include>
-              </includes>
-              <outputDir>${bridge.tck.test.file.dir}</outputDir>
-              <fileMappers>
-                <fileMapper implementation="org.codehaus.plexus.components.io.filemappers.MergeFileMapper">
-                  <targetName>${bridge.tck.test.file.name}</targetName>
-                </fileMapper>
-              </fileMappers>
-              <parameters>
-                <parameter>
-                  <name>page-path</name>
-                  <value>${bridge.tck.test.path}</value>
-                </parameter>
-              </parameters>                
-              <stylesheet>${bridge.tck.test.file.stylesheet}</stylesheet>
-            </transformationSet>
-          </transformationSets>
-        </configuration>
-      </plugin>
     </plugins>
     
     <pluginManagement>
@@ -264,31 +246,16 @@
         <plugin>
           <groupId>org.codehaus.mojo</groupId>
           <artifactId>selenium-maven-plugin</artifactId>
-          <executions>
-            <execution>
-              <id>start</id>
-              <phase>process-test-classes</phase>
-              <goals>
-                <goal>start-server</goal>
-              </goals>
-              <configuration>
-                <background>true</background>
-                <logOutput>true</logOutput>
-                <multiWindow>true</multiWindow>
-              </configuration>
-            </execution>
-          </executions>
         </plugin>
 
         <plugin>
           <artifactId>maven-surefire-plugin</artifactId>
           <configuration>
             <systemProperties>
-              <property>
-                <!--name>bridge.tck.host</name-->
+              <!--<property>
                 <name>bridge.tck.client.base.url</name>
                 <value>${bridge.tck.base-url}</value>
-             </property>
+             </property>-->
               <property>
                 <name>bridge.tck.test.file</name>
                 <value>${bridge.tck.test.file.dir}/${bridge.tck.test.file.name}</value>
@@ -297,6 +264,10 @@
                 <name>bridge.tck.test.base-url</name>
                 <value>http://${bridge.tck.test.host}:${bridge.tck.test.port}</value>
               </property>
+              <property>
+                <name>bridge.tck.login.file</name>
+                <value>${bridge.tck.login-file}</value>
+              </property>
             </systemProperties>
           </configuration>
         </plugin>
@@ -311,59 +282,18 @@
           <artifactId>maven-jetty-plugin</artifactId>
           <version>${jetty.version}</version>
           <configuration>
-            <webDefaultXml>${basedir}/src/main/webapp/WEB-INF/jetty-pluto-web-default.xml</webDefaultXml>
+              <contextPath>/${project.artifactId}</contextPath>
+            <!--<webAppConfig>
+              <contextPath>/${project.artifactId}</contextPath>
+              <defaultsDescriptor>${basedir}/../src/main/webapp/WEB-INF/jetty-pluto-web-default.xml</defaultsDescriptor>
+              <overrideDescriptor>${project.build.directory}/pluto-resources/web.xml</overrideDescriptor>
+            </webAppConfig>-->
+            <webDefaultXml>${basedir}/../src/main/webapp/WEB-INF/jetty-pluto-web-default.xml</webDefaultXml>
             <webXml>${project.build.directory}/pluto-resources/web.xml</webXml>
+
             <stopPort>9966</stopPort>
             <stopKey>foo</stopKey>
           </configuration>
-          <executions>
-            <execution>
-              <id>start-jetty</id>
-              <phase>process-test-classes</phase>
-              <goals>
-                <goal>run</goal>
-              </goals>
-              <configuration>
-                <scanIntervalSeconds>0</scanIntervalSeconds>
-                <daemon>true</daemon>
-              </configuration>
-            </execution>
-            <execution>
-              <id>stop-jetty</id>
-              <phase>test</phase>
-              <goals>
-                <goal>stop</goal>
-              </goals>
-            </execution>
-          </executions>
-        </plugin>
-
-        <plugin>
-          <groupId>org.apache.pluto</groupId>
-          <artifactId>maven-pluto-plugin</artifactId>
-          <version>${pluto.version}</version>
-          <executions>
-            <execution>
-              <phase>generate-resources</phase>
-              <goals>
-                <goal>assemble</goal>
-              </goals>
-            </execution>
-          </executions>
-        </plugin>
- 
-        <plugin>
-          <groupId>org.apache.portals.pluto</groupId>
-          <artifactId>maven-pluto-plugin</artifactId>
-          <version>2.0.0</version>
-          <executions>
-            <execution>
-              <phase>generate-resources</phase>
-              <goals>
-                <goal>assemble</goal>
-              </goals>
-            </execution>
-          </executions>
         </plugin>
       </plugins>
     </pluginManagement>
@@ -377,6 +307,10 @@
           <name>!tck.generate-war</name>
         </property>
       </activation>
+
+      <properties>
+        <maven.test.failure.ignore>true</maven.test.failure.ignore>
+      </properties>
       
       <dependencies>
         <dependency>
@@ -428,7 +362,7 @@
         </plugins>
       </build>
     </profile>
-    
+
     <profile>
       <id>tck-war</id>
       <activation>
@@ -443,6 +377,34 @@
       
     </profile>
     
+    <profile>
+      <!-- Using this profile the TCK acts as a client only, so only the test 
+           and selenium plugins are used.-->
+      <id>tck-client-only</id>
+      <activation>
+        <property>
+          <name>tck.generate-war</name>
+          <value>client-only</value>
+        </property>
+      </activation>
+
+      <properties>
+        <maven.test.skip>false</maven.test.skip>
+      </properties>
+
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>selenium-maven-plugin</artifactId>
+          </plugin>
+          <plugin>
+            <artifactId>maven-surefire-plugin</artifactId>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+    
     <!-- Generates a war file to work in a Pluto 1.x environment --> 
     <profile>
       <id>tck-war-pluto</id>

Added: myfaces/portlet-bridge/testsuite/trunk/portlet-bridge-testsuite-main/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/testsuite/trunk/portlet-bridge-testsuite-main/pom.xml?rev=927641&view=auto
==============================================================================
--- myfaces/portlet-bridge/testsuite/trunk/portlet-bridge-testsuite-main/pom.xml (added)
+++ myfaces/portlet-bridge/testsuite/trunk/portlet-bridge-testsuite-main/pom.xml Thu Mar 25 23:42:48 2010
@@ -0,0 +1,161 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  
+  <groupId>org.apache.myfaces.portlet-bridge</groupId>
+  <artifactId>portlet-bridge-testsuite-main</artifactId>
+  <packaging>war</packaging>
+  <name>MyFaces Portlet Bridge Test Suite Main</name>
+  <version>1.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. 
+  </description>
+  
+  
+  <parent>
+    <artifactId>portlet-bridge-testsuite-master</artifactId>
+    <groupId>org.apache.myfaces.portlet-bridge</groupId>
+    <version>1.0.0-SNAPSHOT</version>
+  </parent>
+  <build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.codehaus.mojo</groupId>
+          <artifactId>selenium-maven-plugin</artifactId>
+          <executions>
+            <execution>
+              <id>start</id>
+              <phase>process-test-classes</phase>
+              <goals>
+                <goal>start-server</goal>
+              </goals>
+              <configuration>
+                <background>true</background>
+                <logOutput>true</logOutput>
+                <multiWindow>true</multiWindow>
+              </configuration>
+            </execution>
+          </executions>
+        </plugin>
+
+        <plugin>
+          <groupId>org.mortbay.jetty</groupId>
+          <artifactId>maven-jetty-plugin</artifactId>
+          <executions>
+            <execution>
+              <id>start-jetty</id>
+              <phase>process-test-classes</phase>
+              <goals>
+                <goal>run</goal>
+              </goals>
+              <configuration>
+                <scanIntervalSeconds>0</scanIntervalSeconds>
+                <daemon>true</daemon>
+              </configuration>
+            </execution>
+            <execution>
+              <id>stop-jetty</id>
+              <phase>test</phase>
+              <goals>
+                <goal>stop</goal>
+              </goals>
+            </execution>
+          </executions>
+        </plugin>
+
+        <plugin>
+          <groupId>org.apache.pluto</groupId>
+          <artifactId>maven-pluto-plugin</artifactId>
+          <version>${pluto.version}</version>
+          <executions>
+            <execution>
+              <phase>generate-resources</phase>
+              <goals>
+                <goal>assemble</goal>
+              </goals>
+            </execution>
+          </executions>
+        </plugin>
+
+        <plugin>
+          <groupId>org.apache.portals.pluto</groupId>
+          <artifactId>maven-pluto-plugin</artifactId>
+          <version>2.0.0</version>
+          <executions>
+            <execution>
+              <phase>generate-resources</phase>
+              <goals>
+                <goal>assemble</goal>
+              </goals>
+            </execution>
+          </executions>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+
+    <plugins>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>build-helper-maven-plugin</artifactId>
+        <version>1.3</version>
+        <executions>
+          <execution>
+            <id>add-ts-source</id>
+            <phase>generate-sources</phase>
+            <goals>
+              <goal>add-source</goal>
+            </goals>
+            <configuration>
+              <sources>
+                <source>${basedir}/../src/main/java</source>
+              </sources>
+            </configuration>
+          </execution>
+          <execution>
+            <id>add-tck-source</id>
+            <phase>generate-sources</phase>
+            <goals>
+              <goal>add-test-source</goal>
+            </goals>
+            <configuration>
+              <sources>
+                <source>${basedir}/../src/test/java</source>
+              </sources>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>xml-maven-plugin</artifactId>
+        <configuration>
+          <transformationSets>
+            <transformationSet>
+              <dir>${basedir}/src/main/webapp/WEB-INF</dir>
+              <includes>
+                <include>portlet.xml</include>
+              </includes>
+              <outputDir>${bridge.tck.test.file.dir}</outputDir>
+              <fileMappers>
+                <fileMapper implementation="org.codehaus.plexus.components.io.filemappers.MergeFileMapper">
+                  <targetName>${bridge.tck.test.file.name}</targetName>
+                </fileMapper>
+              </fileMappers>
+              <parameters>
+                <parameter>
+                  <name>page-path</name>
+                  <value>${bridge.tck.test.path}</value>
+                </parameter>
+              </parameters>                
+              <stylesheet>${bridge.tck.test.file.stylesheet}</stylesheet>
+            </transformationSet>
+          </transformationSets>
+        </configuration>
+      </plugin>
+
+    </plugins>
+  </build>
+
+</project>

Added: myfaces/portlet-bridge/testsuite/trunk/portlet-bridge-testsuite-main/src/main/webapp/WEB-INF/faces-config.xml
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/testsuite/trunk/portlet-bridge-testsuite-main/src/main/webapp/WEB-INF/faces-config.xml?rev=927641&view=auto
==============================================================================
--- myfaces/portlet-bridge/testsuite/trunk/portlet-bridge-testsuite-main/src/main/webapp/WEB-INF/faces-config.xml (added)
+++ myfaces/portlet-bridge/testsuite/trunk/portlet-bridge-testsuite-main/src/main/webapp/WEB-INF/faces-config.xml Thu Mar 25 23:42:48 2010
@@ -0,0 +1,377 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faces-config version="1.2" xmlns="http://java.sun.com/xml/ns/javaee"
+              xmlns:bridge="http://www.apache.org/myfaces/xml/ns/bridge/bridge-extension"
+              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd">
+  <application>
+<!--    <view-handler>org.apache.myfaces.portlet.faces.testsuite.common.util.faces.application.TestSuiteViewHandlerImpl</view-handler> -->
+    <application-extension>
+      <bridge:excluded-attributes>
+        <bridge:excluded-attribute>myFacesConfigExcludedNamespace.*</bridge:excluded-attribute>
+        <bridge:excluded-attribute>myFacesConfigExcludedKey</bridge:excluded-attribute>
+        <bridge:excluded-attribute>org.apache.myfaces.portlet.faces.tck.WildcardFacesConfigTest.*</bridge:excluded-attribute>
+        <bridge:excluded-attribute>org.apache.myfaces.portlet.faces.tck.ExcludeByFacesConfigRef</bridge:excluded-attribute>
+      </bridge:excluded-attributes>
+    </application-extension>
+  </application>
+  <factory>
+    <application-factory>org.apache.myfaces.portlet.faces.testsuite.common.util.faces.application.TestSuiteApplicationFactoryImpl</application-factory>
+    <faces-context-factory>org.apache.myfaces.portlet.faces.testsuite.common.util.faces.context.TCK_FacesContextFactoryImpl</faces-context-factory>
+    <lifecycle-factory>org.apache.myfaces.portlet.faces.testsuite.common.util.faces.application.TestSuiteLifecycleFactoryImpl</lifecycle-factory>
+  </factory>
+  
+  <managed-bean>
+    <managed-bean-name>chapter3Tests</managed-bean-name>
+    <managed-bean-class>org.apache.myfaces.portlet.faces.testsuite.tests.chapter_3.Tests</managed-bean-class>
+    <managed-bean-scope>request</managed-bean-scope>
+  </managed-bean> 
+  <managed-bean>
+    <managed-bean-name>chapter4_2_5Tests</managed-bean-name>
+    <managed-bean-class>org.apache.myfaces.portlet.faces.testsuite.tests.chapter_4.section_4_2_5.Tests</managed-bean-class>
+    <managed-bean-scope>request</managed-bean-scope>
+  </managed-bean> 
+  <managed-bean>
+    <managed-bean-name>chapter4_2_12Tests</managed-bean-name>
+    <managed-bean-class>org.apache.myfaces.portlet.faces.testsuite.tests.chapter_4.section_4_2_12.Tests</managed-bean-class>
+    <managed-bean-scope>request</managed-bean-scope>
+  </managed-bean> 
+  <managed-bean>
+    <managed-bean-name>chapter5_1_2Tests</managed-bean-name>
+    <managed-bean-class>org.apache.myfaces.portlet.faces.testsuite.tests.chapter_5.section_5_1_2.Tests</managed-bean-class>
+    <managed-bean-scope>request</managed-bean-scope>
+  </managed-bean> 
+  <managed-bean>
+    <managed-bean-name>chapter5_2Tests</managed-bean-name>
+    <managed-bean-class>org.apache.myfaces.portlet.faces.testsuite.tests.chapter_5.section_5_2.Tests</managed-bean-class>
+    <managed-bean-scope>request</managed-bean-scope>
+  </managed-bean> 
+  <managed-bean>
+    <managed-bean-name>chapter5_3Tests</managed-bean-name>
+    <managed-bean-class>org.apache.myfaces.portlet.faces.testsuite.tests.chapter_5.section_5_3.Tests</managed-bean-class>
+    <managed-bean-scope>request</managed-bean-scope>
+  </managed-bean> 
+  <managed-bean>
+    <managed-bean-name>chapter6_1_1Tests</managed-bean-name>
+    <managed-bean-class>org.apache.myfaces.portlet.faces.testsuite.tests.chapter_6.section_6_1_1.Tests</managed-bean-class>
+    <managed-bean-scope>request</managed-bean-scope>
+  </managed-bean>
+  <managed-bean>
+    <managed-bean-name>chapter6_1_3_1Tests</managed-bean-name>
+    <managed-bean-class>org.apache.myfaces.portlet.faces.testsuite.tests.chapter_6.section_6_1_3_1.Tests</managed-bean-class>
+    <managed-bean-scope>request</managed-bean-scope>
+  </managed-bean>
+  <managed-bean>
+    <managed-bean-name>chapter6_1_3_2Tests</managed-bean-name>
+    <managed-bean-class>org.apache.myfaces.portlet.faces.testsuite.tests.chapter_6.section_6_1_3_2.Tests</managed-bean-class>
+    <managed-bean-scope>request</managed-bean-scope>
+  </managed-bean>
+  <managed-bean>
+    <managed-bean-name>chapter6_2_1Tests</managed-bean-name>
+    <managed-bean-class>org.apache.myfaces.portlet.faces.testsuite.tests.chapter_6.section_6_2_1.Tests</managed-bean-class>
+    <managed-bean-scope>request</managed-bean-scope>
+  </managed-bean>
+  <managed-bean>
+    <managed-bean-name>chapter6_5_1Tests</managed-bean-name>
+    <managed-bean-class>org.apache.myfaces.portlet.faces.testsuite.tests.chapter_6.section_6_5_1.Tests</managed-bean-class>
+    <managed-bean-scope>request</managed-bean-scope>
+  </managed-bean>
+  <managed-bean>
+    <managed-bean-name>chapter6_6Tests</managed-bean-name>
+    <managed-bean-class>org.apache.myfaces.portlet.faces.testsuite.tests.chapter_6.section_6_6.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>
+  </managed-bean>
+  <managed-bean>
+    <managed-bean-name>predestroySessionBean</managed-bean-name>
+    <managed-bean-class>org.apache.myfaces.portlet.faces.testsuite.beans.PreDestroyBean1</managed-bean-class>
+    <managed-bean-scope>session</managed-bean-scope>
+  </managed-bean>
+  <managed-bean>
+    <managed-bean-name>sampleTests</managed-bean-name>
+    <managed-bean-class>org.apache.myfaces.portlet.faces.testsuite.tests.sample.SampleTests</managed-bean-class>
+    <managed-bean-scope>request</managed-bean-scope>
+  </managed-bean>
+  <managed-bean>
+    <managed-bean-name>test</managed-bean-name>
+    <managed-bean-class>org.apache.myfaces.portlet.faces.testsuite.beans.TestRunnerBean</managed-bean-class>
+    <managed-bean-scope>request</managed-bean-scope>
+  </managed-bean>  
+  
+  <navigation-rule>
+    <from-view-id>/tests/*</from-view-id>
+    <navigation-case>
+      <from-outcome>multiRequestTest</from-outcome>
+      <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp</to-view-id>
+    </navigation-case>
+    <navigation-case>
+      <from-outcome>requestProcessingNonFacesTest</from-outcome>
+      <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp?_jsfBridgeNonFacesView=/tests/chapter4_2_5Result.jsp</to-view-id>
+    </navigation-case>
+  </navigation-rule>
+  <!-- Chapter 3 Test -->
+  <navigation-rule>
+    <from-view-id>/tests/MultiRequestTest.jsp</from-view-id>
+    <navigation-case>
+      <from-outcome>actionDestroyTest</from-outcome>
+      <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp</to-view-id>
+    </navigation-case>
+  </navigation-rule>
+  <navigation-rule>
+    <from-view-id>/tests/MultiRequestTest.jsp</from-view-id>
+    <navigation-case>
+      <from-outcome>actionNullRequestTest</from-outcome>
+      <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp</to-view-id>
+    </navigation-case>
+  </navigation-rule>
+
+
+  <!-- Chapter 4 Test -->
+  <navigation-rule>
+    <from-view-id>/tests/MultiRequestTest.jsp</from-view-id>
+    <navigation-case>
+      <from-outcome>getFacesBridgeMethodTest</from-outcome>
+      <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp</to-view-id>
+    </navigation-case>
+  </navigation-rule>
+  
+  <!-- Chapter 5 Tests -->
+  <navigation-rule>
+    <from-view-id>/tests/MultiRequestTest.jsp</from-view-id>
+    <navigation-case>
+      <from-outcome>requestScopeRestartedOnActionTest_Action2</from-outcome>
+      <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp</to-view-id>
+    </navigation-case>
+    <navigation-case>
+      <from-outcome>requestNoScopeOnRedirectTest</from-outcome>
+      <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp</to-view-id>
+      <redirect/>
+    </navigation-case>
+    <navigation-case>
+      <from-outcome>requestNoScopeOnModeChangeTest</from-outcome>
+      <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp?javax.portlet.faces.PortletMode=edit&amp;param1=testValue</to-view-id>
+    </navigation-case>
+    <navigation-case>
+      <from-outcome>requestRenderIgnoresScopeViaCreateViewTest</from-outcome>
+      <to-view-id>/tests/RedisplayRenderNewModeRequestTest.jsp</to-view-id>
+    </navigation-case>
+        <navigation-case>
+      <from-outcome>requestRenderRedisplayTest</from-outcome>
+      <to-view-id>/tests/RedisplayRenderRequestTest.jsp</to-view-id>
+    </navigation-case>
+    <navigation-case>
+      <from-outcome>requestRedisplayOutOfScopeTest</from-outcome>
+      <to-view-id>/tests/RedisplayRenderNewModeRequestTest.jsp</to-view-id>
+    </navigation-case>
+    <navigation-case>
+      <from-outcome>excludedAttributesTest</from-outcome>
+      <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp</to-view-id>
+    </navigation-case>
+    <navigation-case>
+      <from-outcome>verifyPortletPhaseTest</from-outcome>
+      <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp</to-view-id>
+    </navigation-case>
+    <navigation-case>
+      <from-outcome>renderRedirectTest</from-outcome>
+      <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp</to-view-id>
+    </navigation-case>
+    <navigation-case>
+      <from-outcome>facesContextReleasedActionTest</from-outcome>
+      <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp</to-view-id>
+    </navigation-case>
+    <navigation-case>
+      <from-outcome>portletPhaseRemovedActionTest</from-outcome>
+      <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp</to-view-id>
+    </navigation-case>
+    <navigation-case>
+      <from-outcome>isPostbackTest</from-outcome>
+      <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp</to-view-id>
+    </navigation-case>
+    <navigation-case>
+      <from-outcome>noViewStateParamOnModeChangeTest</from-outcome>
+      <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp?javax.portlet.faces.PortletMode=edit</to-view-id>
+    </navigation-case>
+  </navigation-rule>
+  
+  <navigation-rule>
+    <from-view-id>/tests/MultiRequestFormDataTest.jsp</from-view-id>
+    <navigation-case>
+      <from-outcome>requestPreserveActionParamsTest</from-outcome>
+      <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp</to-view-id>
+    </navigation-case>
+  </navigation-rule>
+  
+  <navigation-rule>
+    <from-view-id>/tests/MultiRequestTest.jsp*</from-view-id>
+    <navigation-case>
+      <from-outcome>navigateToLastViewTest1</from-outcome>
+      <to-view-id>/tests/RedisplayActionRequestTest.jsp?org.apache.myfaces.portlet.faces.tck.testAttr=value1</to-view-id>
+    </navigation-case>
+    <navigation-case>
+      <from-outcome>navigateToLastViewTest3</from-outcome>
+      <to-view-id>#{sessionScope['javax.portlet.faces.viewIdHistory.view']}</to-view-id>
+    </navigation-case>
+  </navigation-rule>
+  
+  <navigation-rule>
+    <from-view-id>/tests/RedisplayActionRequestTest.jsp*</from-view-id>
+    <navigation-case>
+      <from-outcome>navigateToLastViewTest2</from-outcome>
+      <to-view-id>/tests/MultiRequestTest.jsp?javax.portlet.faces.PortletMode=edit</to-view-id>
+    </navigation-case>
+  </navigation-rule>
+
+  
+  <!-- Chapter 6 Tests -->
+  <navigation-rule>
+    <from-view-id>/tests/MultiRequestTest.jsp</from-view-id>
+    <navigation-case>
+      <from-outcome>wrappedFacesContextTest</from-outcome>
+      <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp</to-view-id>
+    </navigation-case>
+    <navigation-case>
+      <from-outcome>encodeActionURLJSFViewActionTest</from-outcome>
+      <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp</to-view-id>
+    </navigation-case>
+    <navigation-case>
+      <from-outcome>encodeActionURLWithParamActionTest</from-outcome>
+      <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp?param1=testValue</to-view-id>
+    </navigation-case>
+    <navigation-case>
+      <from-outcome>encodeActionURLWithModeActionTest</from-outcome>
+      <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp?javax.portlet.faces.PortletMode=edit&amp;param1=testValue</to-view-id>
+    </navigation-case>
+    <navigation-case>
+      <from-outcome>encodeActionURLWithInvalidModeActionTest</from-outcome>
+      <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp?javax.portlet.faces.PortletMode=blue&amp;param1=testValue</to-view-id>
+    </navigation-case>
+    <navigation-case>
+      <from-outcome>encodeActionURLWithWindowStateActionTest</from-outcome>
+      <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp?javax.portlet.faces.WindowState=maximized&amp;param1=testValue</to-view-id>
+    </navigation-case>
+    <navigation-case>
+      <from-outcome>encodeActionURLWithInvalidWindowStateActionTest</from-outcome>
+      <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp?javax.portlet.faces.WindowState=blue&amp;param1=testValue</to-view-id>
+    </navigation-case>
+    <navigation-case>
+      <from-outcome>encodeActionURLWithSecurityActionTest</from-outcome>
+      <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp?javax.portlet.faces.Secure=true&amp;param1=testValue</to-view-id>
+    </navigation-case>
+    <navigation-case>
+      <from-outcome>encodeActionURLWithInvalidSecurityActionTest</from-outcome>
+      <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp?javax.portlet.faces.Secure=blue&amp;param1=testValue</to-view-id>
+    </navigation-case>
+    <navigation-case>
+      <from-outcome>encodeActionURLJSFViewRenderTest</from-outcome>
+      <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp</to-view-id>
+    </navigation-case>
+    <navigation-case>
+      <from-outcome>encodeActionURLWithParamRenderTest</from-outcome>
+      <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp</to-view-id>
+    </navigation-case>
+    <navigation-case>
+      <from-outcome>encodeActionURLWithModeRenderTest</from-outcome>
+      <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp</to-view-id>
+    </navigation-case>
+    <navigation-case>
+      <from-outcome>encodeActionURLWithInvalidModeRenderTest</from-outcome>
+      <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp</to-view-id>
+    </navigation-case>
+    <navigation-case>
+      <from-outcome>encodeActionURLWithWindowStateRenderTest</from-outcome>
+      <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp</to-view-id>
+    </navigation-case>
+    <navigation-case>
+      <from-outcome>encodeActionURLWithInvalidWindowStateRenderTest</from-outcome>
+      <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp</to-view-id>
+    </navigation-case>
+    <navigation-case>
+      <from-outcome>encodeActionURLWithSecurityRenderTest</from-outcome>
+      <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp</to-view-id>
+    </navigation-case>
+    <navigation-case>
+      <from-outcome>encodeActionURLWithInvalidSecurityRenderTest</from-outcome>
+      <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp</to-view-id>
+    </navigation-case>
+    <navigation-case>
+      <from-outcome>getSetRequestObjectTest</from-outcome>
+      <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp</to-view-id>
+    </navigation-case>
+    <navigation-case>
+      <from-outcome>setRequestCharacterEncodingActionTest</from-outcome>
+      <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp?param1=testValue</to-view-id>
+    </navigation-case>
+    <navigation-case>
+      <from-outcome>getRequestHeaderMapActionTest</from-outcome>
+      <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp?param1=testValue</to-view-id>
+    </navigation-case>
+    <navigation-case>
+      <from-outcome>getRequestHeaderValuesMapActionTest</from-outcome>
+      <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp?param1=testValue</to-view-id>
+    </navigation-case>
+    <navigation-case>
+      <from-outcome>requestMapRequestScopeTest</from-outcome>
+      <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp?param1=testValue</to-view-id>
+    </navigation-case>
+    <navigation-case>
+      <from-outcome>requestMapPreDestroyRemoveWithinActionTest</from-outcome>
+      <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp</to-view-id>
+    </navigation-case>
+    <navigation-case>
+      <from-outcome>getRequestCharacterEncodingActionTest</from-outcome>
+      <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp</to-view-id>
+    </navigation-case>
+    <navigation-case>
+      <from-outcome>getRequestContentTypeActionTest</from-outcome>
+      <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp</to-view-id>
+    </navigation-case>
+    <navigation-case>
+      <from-outcome>getResponseCharacterEncodingActionTest</from-outcome>
+      <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp</to-view-id>
+    </navigation-case>
+    <navigation-case>
+      <from-outcome>getResponseContentTypeActionTest</from-outcome>
+      <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp</to-view-id>
+    </navigation-case>
+    <navigation-case>
+      <from-outcome>redirectActionTest</from-outcome>
+      <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp</to-view-id>
+    </navigation-case>   
+    <navigation-case>
+      <from-outcome>portletNamingContainerClientIdConsistentTest</from-outcome>
+      <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp</to-view-id>
+    </navigation-case>   
+  </navigation-rule>
+    
+  <navigation-rule>
+    <from-view-id>/tests/MultiRequestFormDataTest.jsp</from-view-id>
+    <navigation-case>
+      <from-outcome>getRequestParameterMapCoreTest</from-outcome>
+      <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp</to-view-id>
+    </navigation-case>
+    <navigation-case>
+      <from-outcome>getRequestParameterPreserveParamsTest</from-outcome>
+      <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp</to-view-id>
+    </navigation-case>
+    <navigation-case>
+      <from-outcome>getRequestParameterNamesCoreTest</from-outcome>
+      <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp</to-view-id>
+    </navigation-case>
+    <navigation-case>
+      <from-outcome>getRequestParameterNamesPreserveParamsTest</from-outcome>
+      <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp</to-view-id>
+    </navigation-case>
+    <navigation-case>
+      <from-outcome>JSF_ELTest</from-outcome>
+      <to-view-id>/tests/MultiRequestTestResultRenderCheck.jsp</to-view-id>
+    </navigation-case> 
+  </navigation-rule>
+  
+  <lifecycle>
+    <phase-listener>org.apache.myfaces.portlet.faces.testsuite.tests.chapter_5.section_5_2.Tests</phase-listener>
+  </lifecycle>
+  
+</faces-config>