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/11/09 19:03:27 UTC
svn commit: r834163 [1/3] - in /myfaces/portlet-bridge/testsuite/trunk: ./
src/main/java/org/apache/myfaces/portlet/faces/testsuite/annotation/
src/main/java/org/apache/myfaces/portlet/faces/testsuite/beans/
src/main/java/org/apache/myfaces/portlet/fac...
Author: sobryan
Date: Mon Nov 9 18:02:59 2009
New Revision: 834163
URL: http://svn.apache.org/viewvc?rev=834163&view=rev
Log:
Added SVN properties for EOL and removed extra EOL characters
Modified:
myfaces/portlet-bridge/testsuite/trunk/pom.xml (contents, props changed)
myfaces/portlet-bridge/testsuite/trunk/src/main/java/org/apache/myfaces/portlet/faces/testsuite/annotation/BridgeTest.java (props changed)
myfaces/portlet-bridge/testsuite/trunk/src/main/java/org/apache/myfaces/portlet/faces/testsuite/beans/PreDestroyBean1.java (props changed)
myfaces/portlet-bridge/testsuite/trunk/src/main/java/org/apache/myfaces/portlet/faces/testsuite/beans/PreDestroyBean2.java (props changed)
myfaces/portlet-bridge/testsuite/trunk/src/main/java/org/apache/myfaces/portlet/faces/testsuite/beans/TestRunnerBean.java (contents, props changed)
myfaces/portlet-bridge/testsuite/trunk/src/main/java/org/apache/myfaces/portlet/faces/testsuite/common/Constants.java (props changed)
myfaces/portlet-bridge/testsuite/trunk/src/main/java/org/apache/myfaces/portlet/faces/testsuite/common/portlet/GenericFacesTestSuitePortlet.java (props changed)
myfaces/portlet-bridge/testsuite/trunk/src/main/java/org/apache/myfaces/portlet/faces/testsuite/common/portlet/wrapper/ActionRequestDecorator.java (props changed)
myfaces/portlet-bridge/testsuite/trunk/src/main/java/org/apache/myfaces/portlet/faces/testsuite/common/portlet/wrapper/ActionResponseDecorator.java (props changed)
myfaces/portlet-bridge/testsuite/trunk/src/main/java/org/apache/myfaces/portlet/faces/testsuite/common/portlet/wrapper/PortletRequestDecorator.java (props changed)
myfaces/portlet-bridge/testsuite/trunk/src/main/java/org/apache/myfaces/portlet/faces/testsuite/common/portlet/wrapper/PortletResponseDecorator.java (props changed)
myfaces/portlet-bridge/testsuite/trunk/src/main/java/org/apache/myfaces/portlet/faces/testsuite/common/portlet/wrapper/RenderRequestDecorator.java (props changed)
myfaces/portlet-bridge/testsuite/trunk/src/main/java/org/apache/myfaces/portlet/faces/testsuite/common/portlet/wrapper/RenderResponseDecorator.java (props changed)
myfaces/portlet-bridge/testsuite/trunk/src/main/java/org/apache/myfaces/portlet/faces/testsuite/common/util/BridgeTCKResultWriter.java (props changed)
myfaces/portlet-bridge/testsuite/trunk/src/main/java/org/apache/myfaces/portlet/faces/testsuite/common/util/faces/context/TCK_FacesContextFactoryImpl.java (props changed)
myfaces/portlet-bridge/testsuite/trunk/src/main/java/org/apache/myfaces/portlet/faces/testsuite/common/util/faces/context/TCK_FacesContextImpl.java (props changed)
myfaces/portlet-bridge/testsuite/trunk/src/main/java/org/apache/myfaces/portlet/faces/testsuite/common/util/faces/render/TCK_PortletUrlRenderer.java (props changed)
myfaces/portlet-bridge/testsuite/trunk/src/main/java/org/apache/myfaces/portlet/faces/testsuite/common/util/tags/TCKSpanTag.java (props changed)
myfaces/portlet-bridge/testsuite/trunk/src/main/java/org/apache/myfaces/portlet/faces/testsuite/driver/PlutoPortalDriverFilter.java (props changed)
myfaces/portlet-bridge/testsuite/trunk/src/main/java/org/apache/myfaces/portlet/faces/testsuite/tests/chapter_3/BridgeVersionTestPortlet.java (props changed)
myfaces/portlet-bridge/testsuite/trunk/src/main/java/org/apache/myfaces/portlet/faces/testsuite/tests/chapter_6/section_6_1_1/FacesContextFactoryServiceProviderTest.java (props changed)
myfaces/portlet-bridge/testsuite/trunk/src/main/java/org/apache/myfaces/portlet/faces/testsuite/tests/chapter_6/section_6_1_1/Tests.java (props changed)
myfaces/portlet-bridge/testsuite/trunk/src/main/java/org/apache/myfaces/portlet/faces/testsuite/tests/chapter_6/section_6_1_3_1/EncodeActionURLRenderViewHandler.java (props changed)
myfaces/portlet-bridge/testsuite/trunk/src/main/java/org/apache/myfaces/portlet/faces/testsuite/tests/chapter_6/section_6_1_3_1/Tests.java (props changed)
myfaces/portlet-bridge/testsuite/trunk/src/main/java/org/apache/myfaces/portlet/faces/testsuite/tests/sample/SampleTests.java (props changed)
myfaces/portlet-bridge/testsuite/trunk/src/main/webapp/WEB-INF/faces-config.xml (contents, props changed)
myfaces/portlet-bridge/testsuite/trunk/src/main/webapp/WEB-INF/jetty-pluto-web-default.xml (props changed)
myfaces/portlet-bridge/testsuite/trunk/src/main/webapp/WEB-INF/portlet.xml (contents, props changed)
myfaces/portlet-bridge/testsuite/trunk/src/main/webapp/WEB-INF/web.xml (contents, props changed)
myfaces/portlet-bridge/testsuite/trunk/src/main/webapp/tests/DispatchTest.jsp (props changed)
myfaces/portlet-bridge/testsuite/trunk/src/main/webapp/tests/MultiRequestFormDataTest.jsp (props changed)
myfaces/portlet-bridge/testsuite/trunk/src/main/webapp/tests/MultiRequestTest.jsp (props changed)
myfaces/portlet-bridge/testsuite/trunk/src/main/webapp/tests/MultiRequestTestResult.jsp (props changed)
myfaces/portlet-bridge/testsuite/trunk/src/main/webapp/tests/MultiRequestTestResultRenderCheck.jsp (props changed)
myfaces/portlet-bridge/testsuite/trunk/src/main/webapp/tests/RedirectTestResultRenderCheck.jsp (contents, props changed)
myfaces/portlet-bridge/testsuite/trunk/src/main/webapp/tests/SingleRequestTest.jsp (props changed)
myfaces/portlet-bridge/testsuite/trunk/src/main/webapp/tests/chapter6.jsp (props changed)
myfaces/portlet-bridge/testsuite/trunk/src/test/java/org/apache/myfaces/portlet/faces/tckharness/TckParameterized.java (props changed)
myfaces/portlet-bridge/testsuite/trunk/src/test/java/org/apache/myfaces/portlet/faces/tckharness/TckTestCase.java (props changed)
myfaces/portlet-bridge/testsuite/trunk/src/test/resources/pluto-portal-driver-config.xsl (props changed)
myfaces/portlet-bridge/testsuite/trunk/src/test/resources/test.xsl (props changed)
Modified: myfaces/portlet-bridge/testsuite/trunk/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/testsuite/trunk/pom.xml?rev=834163&r1=834162&r2=834163&view=diff
==============================================================================
--- myfaces/portlet-bridge/testsuite/trunk/pom.xml (original)
+++ myfaces/portlet-bridge/testsuite/trunk/pom.xml Mon Nov 9 18:02:59 2009
@@ -1,36 +1,36 @@
-<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</artifactId>
- <packaging>war</packaging>
- <name>MyFaces Portlet Bridge Test Suite</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.
- </description>
-
- <url>http://myfaces.apache.org/portlet-bridge/1.0</url>
-
- <parent>
- <artifactId>portlet-bridge-master-pom</artifactId>
- <groupId>org.apache.myfaces.portlet-bridge</groupId>
- <version>3-SNAPSHOT</version>
- </parent>
-
+<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</artifactId>
+ <packaging>war</packaging>
+ <name>MyFaces Portlet Bridge Test Suite</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.
+ </description>
+
+ <url>http://myfaces.apache.org/portlet-bridge/1.0</url>
+
+ <parent>
+ <artifactId>portlet-bridge-master-pom</artifactId>
+ <groupId>org.apache.myfaces.portlet-bridge</groupId>
+ <version>3-SNAPSHOT</version>
+ </parent>
+
<properties>
- <!-- Specification Configurations -->
- <servlet.version>2.5</servlet.version>
- <portlet.version>1.0</portlet.version>
+ <!-- Specification Configurations -->
+ <servlet.version>2.5</servlet.version>
+ <portlet.version>1.0</portlet.version>
<jsp.version>2.1</jsp.version>
<!-- Bridge Configurations -->
<portlet-bridge.version>1.0.0-SNAPSHOT</portlet-bridge.version>
- <portlet-bridge.groupId>${project.groupId}</portlet-bridge.groupId>
+ <portlet-bridge.groupId>${project.groupId}</portlet-bridge.groupId>
<portlet-bridge.api.groupId>${portlet-bridge.groupId}</portlet-bridge.api.groupId>
<portlet-bridge.api.artifactId>portlet-bridge-api</portlet-bridge.api.artifactId>
@@ -55,10 +55,10 @@
<jsf.impl.version>${jsf.version}</jsf.impl.version>
<!-- Implementation Configurations -->
- <jetty.version>6.1.10</jetty.version>
- <pluto-embedded.version>1.0.1</pluto-embedded.version>
+ <jetty.version>6.1.10</jetty.version>
+ <pluto-embedded.version>1.0.1</pluto-embedded.version>
<pluto.version>1.1.7</pluto.version>
- <selenium.version>1.0-beta-1</selenium.version>
+ <selenium.version>1.0-beta-1</selenium.version>
<junit.version>4.7</junit.version>
<!-- TCK Test Application Configuration -->
@@ -74,26 +74,26 @@
<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>
- </properties>
-
- <!-- issueManagement is in parent -->
- <!-- ciManagement are in parent -->
- <!-- mailingLists are in parent -->
- <!-- developers are in parent -->
- <!-- contributors are in parent -->
-
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/portlet-bridge/testsuite/trunk/</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/portlet-bridge/testsuite/trunk/</developerConnection>
- <url>http://svn.apache.org/viewcvs.cgi/myfaces/portlet-bridge/testsuite/trunk/</url>
- </scm>
-
- <distributionManagement>
- <site>
- <id>apache-site</id>
- <url>scpexe://minotaur.apache.org/www/myfaces.apache.org/portlet-bridge/testsuite</url>
- </site>
+ <bridge.tck.login-file></bridge.tck.login-file>
+ </properties>
+
+ <!-- issueManagement is in parent -->
+ <!-- ciManagement are in parent -->
+ <!-- mailingLists are in parent -->
+ <!-- developers are in parent -->
+ <!-- contributors are in parent -->
+
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/portlet-bridge/testsuite/trunk/</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/portlet-bridge/testsuite/trunk/</developerConnection>
+ <url>http://svn.apache.org/viewcvs.cgi/myfaces/portlet-bridge/testsuite/trunk/</url>
+ </scm>
+
+ <distributionManagement>
+ <site>
+ <id>apache-site</id>
+ <url>scpexe://minotaur.apache.org/www/myfaces.apache.org/portlet-bridge/testsuite</url>
+ </site>
</distributionManagement>
<dependencyManagement>
@@ -103,250 +103,250 @@
<artifactId>${jsf.api.artifactId}</artifactId>
<version>${jsf.api.version}</version>
<scope>provided</scope>
- </dependency>
+ </dependency>
<dependency>
<groupId>${jsf.impl.groupId}</groupId>
<artifactId>${jsf.impl.artifactId}</artifactId>
<version>${jsf.impl.version}</version>
<scope>runtime</scope>
- </dependency>
+ </dependency>
- <dependency>
- <groupId>${portlet-bridge.api.groupId}</groupId>
- <artifactId>${portlet-bridge.api.artifactId}</artifactId>
- <version>${portlet-bridge.api.version}</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>${portlet-bridge.impl.groupId}</groupId>
- <artifactId>${portlet-bridge.impl.artifactId}</artifactId>
- <version>${portlet-bridge.impl.version}</version>
- <scope>runtime</scope>
+ <dependency>
+ <groupId>${portlet-bridge.api.groupId}</groupId>
+ <artifactId>${portlet-bridge.api.artifactId}</artifactId>
+ <version>${portlet-bridge.api.version}</version>
+ <scope>provided</scope>
</dependency>
- <dependency>
- <groupId>com.bekk.boss</groupId>
- <artifactId>maven-jetty-pluto-embedded</artifactId>
- <version>${pluto-embedded.version}</version>
- <scope>provided</scope>
+ <dependency>
+ <groupId>${portlet-bridge.impl.groupId}</groupId>
+ <artifactId>${portlet-bridge.impl.artifactId}</artifactId>
+ <version>${portlet-bridge.impl.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>com.bekk.boss</groupId>
+ <artifactId>maven-jetty-pluto-embedded</artifactId>
+ <version>${pluto-embedded.version}</version>
+ <scope>provided</scope>
</dependency>
</dependencies>
- </dependencyManagement>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-annotation_1.0_spec</artifactId>
- <version>1.0</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>${servlet.version}</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>jsp-api</artifactId>
- <version>${jsp.version}</version>
- <scope>provided</scope>
+ </dependencyManagement>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-annotation_1.0_spec</artifactId>
+ <version>1.0</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>${servlet.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.servlet.jsp</groupId>
+ <artifactId>jsp-api</artifactId>
+ <version>${jsp.version}</version>
+ <scope>provided</scope>
</dependency>
- <dependency>
- <groupId>portlet-api</groupId>
- <artifactId>portlet-api</artifactId>
- <version>${portlet.version}</version>
- <scope>provided</scope>
- </dependency>
+ <dependency>
+ <groupId>portlet-api</groupId>
+ <artifactId>portlet-api</artifactId>
+ <version>${portlet.version}</version>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>${jsf.api.groupId}</groupId>
<artifactId>${jsf.api.artifactId}</artifactId>
- </dependency>
-
- <dependency>
- <groupId>${portlet-bridge.api.groupId}</groupId>
- <artifactId>${portlet-bridge.api.artifactId}</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>${portlet-bridge.api.groupId}</groupId>
+ <artifactId>${portlet-bridge.api.artifactId}</artifactId>
</dependency>
- <dependency>
- <groupId>com.bekk.boss</groupId>
- <artifactId>maven-jetty-pluto-embedded</artifactId>
+ <dependency>
+ <groupId>com.bekk.boss</groupId>
+ <artifactId>maven-jetty-pluto-embedded</artifactId>
</dependency>
- <dependency>
- <groupId>org.openqa.selenium.client-drivers</groupId>
- <artifactId>selenium-java-client-driver</artifactId>
- <version>${selenium.version}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junit.version}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-jdev-plugin</artifactId>
- <groupId>org.apache.myfaces.trinidadbuild</groupId>
- <configuration>
- <libraries>
- <library>JSP Runtime</library>
- </libraries>
- </configuration>
- </plugin>
-
- <!-- Generates the Javadocs for the Website. Wagon will transport it -->
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <links>
- <link>http://java.sun.com/j2se/1.5.0/docs/api</link>
- <link>http://java.sun.com/javaee/javaserverfaces/1.2_MR1/docs/api</link>
- <link>http://portals.apache.org/pluto/portlet-1.0-apidocs/</link>
- </links>
- </configuration>
- </plugin>
-
- <plugin>
- <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>
+ <dependency>
+ <groupId>org.openqa.selenium.client-drivers</groupId>
+ <artifactId>selenium-java-client-driver</artifactId>
+ <version>${selenium.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit.version}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-jdev-plugin</artifactId>
+ <groupId>org.apache.myfaces.trinidadbuild</groupId>
+ <configuration>
+ <libraries>
+ <library>JSP Runtime</library>
+ </libraries>
+ </configuration>
+ </plugin>
+
+ <!-- Generates the Javadocs for the Website. Wagon will transport it -->
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <links>
+ <link>http://java.sun.com/j2se/1.5.0/docs/api</link>
+ <link>http://java.sun.com/javaee/javaserverfaces/1.2_MR1/docs/api</link>
+ <link>http://portals.apache.org/pluto/portlet-1.0-apidocs/</link>
+ </links>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <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>
+ <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>
<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>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <systemProperties>
- <property>
+ <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-->
- <name>bridge.tck.client.base.url</name>
- <value>${bridge.tck.base-url}</value>
- </property>
- <property>
- <name>bridge.tck.test.file</name>
- <value>${bridge.tck.test.file.dir}/${bridge.tck.test.file.name}</value>
+ <name>bridge.tck.client.base.url</name>
+ <value>${bridge.tck.base-url}</value>
+ </property>
+ <property>
+ <name>bridge.tck.test.file</name>
+ <value>${bridge.tck.test.file.dir}/${bridge.tck.test.file.name}</value>
</property>
<property>
<name>bridge.tck.test.base-url</name>
<value>http://${bridge.tck.test.host}:${bridge.tck.test.port}</value>
- </property>
- </systemProperties>
- </configuration>
+ </property>
+ </systemProperties>
+ </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
</plugin>
-
- <plugin>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>maven-jetty-plugin</artifactId>
- <version>${jetty.version}</version>
- <configuration>
- <webDefaultXml>${basedir}/src/main/webapp/WEB-INF/jetty-pluto-web-default.xml</webDefaultXml>
+
+ <plugin>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>maven-jetty-plugin</artifactId>
+ <version>${jetty.version}</version>
+ <configuration>
+ <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>
+ </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>
</plugins>
- </pluginManagement>
- </build>
-
+ </pluginManagement>
+ </build>
+
<profiles>
<profile>
<id>tck-default</id>
@@ -361,46 +361,46 @@
<groupId>${jsf.api.groupId}</groupId>
<artifactId>${jsf.api.artifactId}</artifactId>
<scope>compile</scope>
- </dependency>
+ </dependency>
<dependency>
<groupId>${jsf.impl.groupId}</groupId>
<artifactId>${jsf.impl.artifactId}</artifactId>
</dependency>
- <dependency>
- <groupId>${portlet-bridge.api.groupId}</groupId>
- <artifactId>${portlet-bridge.api.artifactId}</artifactId>
- <scope>compile</scope>
- </dependency>
+ <dependency>
+ <groupId>${portlet-bridge.api.groupId}</groupId>
+ <artifactId>${portlet-bridge.api.artifactId}</artifactId>
+ <scope>compile</scope>
+ </dependency>
- <dependency>
- <groupId>${portlet-bridge.impl.groupId}</groupId>
- <artifactId>${portlet-bridge.impl.artifactId}</artifactId>
+ <dependency>
+ <groupId>${portlet-bridge.impl.groupId}</groupId>
+ <artifactId>${portlet-bridge.impl.artifactId}</artifactId>
</dependency>
- <dependency>
- <groupId>com.bekk.boss</groupId>
+ <dependency>
+ <groupId>com.bekk.boss</groupId>
<artifactId>maven-jetty-pluto-embedded</artifactId>
- <scope>compile</scope>
+ <scope>compile</scope>
</dependency>
- </dependencies>
+ </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
<artifactId>selenium-maven-plugin</artifactId>
</plugin>
- <plugin>
+ <plugin>
<artifactId>maven-surefire-plugin</artifactId>
</plugin>
- <plugin>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>maven-jetty-plugin</artifactId>
+ <plugin>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>maven-jetty-plugin</artifactId>
</plugin>
- <plugin>
- <groupId>org.apache.pluto</groupId>
+ <plugin>
+ <groupId>org.apache.pluto</groupId>
<artifactId>maven-pluto-plugin</artifactId>
</plugin>
</plugins>
@@ -431,9 +431,9 @@
</activation>
<build>
- <plugins>
- <plugin>
- <groupId>org.apache.pluto</groupId>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.pluto</groupId>
<artifactId>maven-pluto-plugin</artifactId>
</plugin>
<plugin>
@@ -482,7 +482,7 @@
<groupId>${jsf.api.groupId}</groupId>
<artifactId>${jsf.api.artifactId}</artifactId>
<scope>compile</scope>
- </dependency>
+ </dependency>
<dependency>
<groupId>${jsf.impl.groupId}</groupId>
@@ -507,84 +507,84 @@
</property>
</activation>
<dependencies>
- <dependency>
- <groupId>${portlet-bridge.api.groupId}</groupId>
- <artifactId>${portlet-bridge.api.artifactId}</artifactId>
- <scope>compile</scope>
- </dependency>
+ <dependency>
+ <groupId>${portlet-bridge.api.groupId}</groupId>
+ <artifactId>${portlet-bridge.api.artifactId}</artifactId>
+ <scope>compile</scope>
+ </dependency>
- <dependency>
- <groupId>${portlet-bridge.impl.groupId}</groupId>
- <artifactId>${portlet-bridge.impl.artifactId}</artifactId>
+ <dependency>
+ <groupId>${portlet-bridge.impl.groupId}</groupId>
+ <artifactId>${portlet-bridge.impl.artifactId}</artifactId>
</dependency>
</dependencies>
</profile>
- <!-- This profile is invoked by -DprepareRelease=true. This allows mvn release:prepare to
- run successfully on the assembly projects. -->
- <profile>
- <id>prepare-release</id>
- <activation>
- <property>
- <name>prepareRelease</name>
- </property>
- </activation>
- <modules>
- <module>assembly</module>
- </modules>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-release-plugin</artifactId>
- <configuration>
- <arguments>-DprepareRelease</arguments>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <profile>
- <id>perform-release</id>
- <activation>
- <property>
- <name>performRelease</name>
- <value>true</value>
- </property>
- </activation>
- <modules>
- <module>assembly</module>
- </modules>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.2</version>
- <executions>
- <execution>
- <id>attach-javadocs</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-scm-plugin</artifactId>
- <executions>
- <execution>
- <phase>validate</phase>
- <id>getting-scm.revision</id>
- <goals>
- <goal>update</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-</project>
+ <!-- This profile is invoked by -DprepareRelease=true. This allows mvn release:prepare to
+ run successfully on the assembly projects. -->
+ <profile>
+ <id>prepare-release</id>
+ <activation>
+ <property>
+ <name>prepareRelease</name>
+ </property>
+ </activation>
+ <modules>
+ <module>assembly</module>
+ </modules>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-release-plugin</artifactId>
+ <configuration>
+ <arguments>-DprepareRelease</arguments>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <profile>
+ <id>perform-release</id>
+ <activation>
+ <property>
+ <name>performRelease</name>
+ <value>true</value>
+ </property>
+ </activation>
+ <modules>
+ <module>assembly</module>
+ </modules>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.2</version>
+ <executions>
+ <execution>
+ <id>attach-javadocs</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-scm-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>validate</phase>
+ <id>getting-scm.revision</id>
+ <goals>
+ <goal>update</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+</project>
Propchange: myfaces/portlet-bridge/testsuite/trunk/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/portlet-bridge/testsuite/trunk/src/main/java/org/apache/myfaces/portlet/faces/testsuite/annotation/BridgeTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/portlet-bridge/testsuite/trunk/src/main/java/org/apache/myfaces/portlet/faces/testsuite/beans/PreDestroyBean1.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/portlet-bridge/testsuite/trunk/src/main/java/org/apache/myfaces/portlet/faces/testsuite/beans/PreDestroyBean2.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: myfaces/portlet-bridge/testsuite/trunk/src/main/java/org/apache/myfaces/portlet/faces/testsuite/beans/TestRunnerBean.java
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/testsuite/trunk/src/main/java/org/apache/myfaces/portlet/faces/testsuite/beans/TestRunnerBean.java?rev=834163&r1=834162&r2=834163&view=diff
==============================================================================
--- myfaces/portlet-bridge/testsuite/trunk/src/main/java/org/apache/myfaces/portlet/faces/testsuite/beans/TestRunnerBean.java (original)
+++ myfaces/portlet-bridge/testsuite/trunk/src/main/java/org/apache/myfaces/portlet/faces/testsuite/beans/TestRunnerBean.java Mon Nov 9 18:02:59 2009
@@ -1,201 +1,201 @@
-/* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-package org.apache.myfaces.portlet.faces.testsuite.beans;
-
-import java.lang.IllegalStateException;
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Method;
-
-
-import java.util.Map;
-
-
-import javax.faces.context.FacesContext;
-
-
-import org.apache.myfaces.portlet.faces.testsuite.annotation.BridgeTest;
-
-import org.apache.myfaces.portlet.faces.testsuite.common.Constants;
-import org.apache.myfaces.portlet.faces.testsuite.common.util.BridgeTCKResultWriter;
-
-
-public class TestRunnerBean
- extends Object
-{
-
- // The portlet's name is testGroup-testName-portlet. For example encodeActionURL_absoluteURLTest-portlet.
- // testGroup corresponds to the managedBean name that holds the object containing the test.
- // testName corresponds to the name of the Test that is the value of the
- // test method annotation we look for to determine which method is called to run the test.
- private String mTestGroup;
- private String mTestName;
-
- private Object mTest;
-
- private BridgeTCKResultWriter mResultWriter;
- private boolean mStatus = false;
- private boolean mTestComplete = false;
- private Method mTestMethod;
-
- public TestRunnerBean()
- {
- // Get the Test information from the request (attributes)
- // Placed into the request by the GenericFacesTestSuitePortlet
- FacesContext context = FacesContext.getCurrentInstance();
- Map<String, Object> m = context.getExternalContext().getRequestMap();
- mTestGroup = (String) m.get(Constants.TEST_BEAN_NAME);
- mTestName = (String) m.get(Constants.TEST_NAME);
-
-
- if (mTestGroup == null || mTestName == null)
- {
- throw new IllegalStateException("Couldn't locate the TestGroup or TestName in the request. Did you use the GenericFacesTestSuitePortlet?");
- }
-
- // Now lookup the object that implements the test. There should be a managedBean with the same name as
- // the testGroup.
- mTest = context.getELContext()
- .getELResolver().getValue(context.getELContext(), null, mTestGroup);
-
- if (mTest == null)
- {
- throw new IllegalStateException("Couldn't locate managed bean containing the test: " + mTestGroup);
- }
-
- // The test is annotated by a method annotation with a parameter value = mTestName -- so
- // look it up.
- mTestMethod = getAnnotatedTestMethod(mTestName, mTest);
-
-
-
- if (mTestMethod == null)
- throw new IllegalStateException("Couldn't locate (annotation for) test: " + mTestName + "Test in the test object.");
- }
-
- public String runActionTest()
- {
-
- // Called either because the action is submitted
- return runTest();
- }
-
- public boolean getTestStatus()
- {
- return mStatus;
- }
-
- public boolean isTestComplete()
- {
- return mTestComplete;
- }
-
- public void setTestComplete(boolean complete)
- {
- mTestComplete = complete;
- }
-
- // Run the test and renders the result
- public String getRenderTestResult()
- {
- runTest();
- return getTestResult();
- }
-
- public void setTestResult(boolean passed, String detail)
- {
- mResultWriter = new BridgeTCKResultWriter(mTestName);
- mResultWriter.setStatus(passed);
- mResultWriter.addDetail(detail);
-
- mStatus = passed;
- }
-
- // Merely renders the test result that was previously set.
- public String getTestResult()
- {
- if (mResultWriter == null)
- setTestResult(false, "Test failed: A test result hasn't been set! Usually this indicates the request flow broken due to bridge failure.");
-
-
- return mResultWriter.toString();
- }
-
- public void appendTestDetail(String detail)
- {
- if (mResultWriter != null)
- {
- mResultWriter.addDetail(detail);
- }
- }
-
- private String runTest()
- {
- // Only run the test once
- if (mTestComplete)
- {
- return (mStatus) ? Constants.TEST_SUCCESS : Constants.TEST_FAILED;
- }
-
- // run the test and return the result.
- if (mTestMethod != null)
- {
- try
- {
- return (String) mTestMethod.invoke(mTest, this);
- }
- catch (Exception e)
- {
- setTestResult(false, "Test failed: " + e.toString() + " thrown during invocation");
- return Constants.TEST_FAILED;
- }
- }
- else
- {
- setTestResult(false, "Test failed: unable to determine test method to call. Is the portletName properly encoded? Syntax: testBean-testMethodName-portlet");
- return Constants.TEST_FAILED;
- }
- }
-
- private Method getAnnotatedTestMethod(String testName, Object testObj)
- {
- // search methods for one annotated by the BridgeTest annotation and
- // with a test (parameter) value = portletNameTest
- for (Method method: testObj.getClass().getMethods())
- {
- Annotation[] annotations = method.getAnnotations();
- if (annotations != null)
- {
- for (Annotation annotation: annotations)
- {
- Class<? extends Annotation> annotationType =
- annotation.annotationType();
- if (BridgeTest.class.equals(annotationType))
- {
- String annotatedTestName = ((BridgeTest) annotation).test();
- if (annotatedTestName != null && annotatedTestName.length() > 0
- && annotatedTestName.equalsIgnoreCase(testName))
- return method;
- }
- }
- }
- }
- return null;
- }
-}
+/* Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+package org.apache.myfaces.portlet.faces.testsuite.beans;
+
+import java.lang.IllegalStateException;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Method;
+
+
+import java.util.Map;
+
+
+import javax.faces.context.FacesContext;
+
+
+import org.apache.myfaces.portlet.faces.testsuite.annotation.BridgeTest;
+
+import org.apache.myfaces.portlet.faces.testsuite.common.Constants;
+import org.apache.myfaces.portlet.faces.testsuite.common.util.BridgeTCKResultWriter;
+
+
+public class TestRunnerBean
+ extends Object
+{
+
+ // The portlet's name is testGroup-testName-portlet. For example encodeActionURL_absoluteURLTest-portlet.
+ // testGroup corresponds to the managedBean name that holds the object containing the test.
+ // testName corresponds to the name of the Test that is the value of the
+ // test method annotation we look for to determine which method is called to run the test.
+ private String mTestGroup;
+ private String mTestName;
+
+ private Object mTest;
+
+ private BridgeTCKResultWriter mResultWriter;
+ private boolean mStatus = false;
+ private boolean mTestComplete = false;
+ private Method mTestMethod;
+
+ public TestRunnerBean()
+ {
+ // Get the Test information from the request (attributes)
+ // Placed into the request by the GenericFacesTestSuitePortlet
+ FacesContext context = FacesContext.getCurrentInstance();
+ Map<String, Object> m = context.getExternalContext().getRequestMap();
+ mTestGroup = (String) m.get(Constants.TEST_BEAN_NAME);
+ mTestName = (String) m.get(Constants.TEST_NAME);
+
+
+ if (mTestGroup == null || mTestName == null)
+ {
+ throw new IllegalStateException("Couldn't locate the TestGroup or TestName in the request. Did you use the GenericFacesTestSuitePortlet?");
+ }
+
+ // Now lookup the object that implements the test. There should be a managedBean with the same name as
+ // the testGroup.
+ mTest = context.getELContext()
+ .getELResolver().getValue(context.getELContext(), null, mTestGroup);
+
+ if (mTest == null)
+ {
+ throw new IllegalStateException("Couldn't locate managed bean containing the test: " + mTestGroup);
+ }
+
+ // The test is annotated by a method annotation with a parameter value = mTestName -- so
+ // look it up.
+ mTestMethod = getAnnotatedTestMethod(mTestName, mTest);
+
+
+
+ if (mTestMethod == null)
+ throw new IllegalStateException("Couldn't locate (annotation for) test: " + mTestName + "Test in the test object.");
+ }
+
+ public String runActionTest()
+ {
+
+ // Called either because the action is submitted
+ return runTest();
+ }
+
+ public boolean getTestStatus()
+ {
+ return mStatus;
+ }
+
+ public boolean isTestComplete()
+ {
+ return mTestComplete;
+ }
+
+ public void setTestComplete(boolean complete)
+ {
+ mTestComplete = complete;
+ }
+
+ // Run the test and renders the result
+ public String getRenderTestResult()
+ {
+ runTest();
+ return getTestResult();
+ }
+
+ public void setTestResult(boolean passed, String detail)
+ {
+ mResultWriter = new BridgeTCKResultWriter(mTestName);
+ mResultWriter.setStatus(passed);
+ mResultWriter.addDetail(detail);
+
+ mStatus = passed;
+ }
+
+ // Merely renders the test result that was previously set.
+ public String getTestResult()
+ {
+ if (mResultWriter == null)
+ setTestResult(false, "Test failed: A test result hasn't been set! Usually this indicates the request flow broken due to bridge failure.");
+
+
+ return mResultWriter.toString();
+ }
+
+ public void appendTestDetail(String detail)
+ {
+ if (mResultWriter != null)
+ {
+ mResultWriter.addDetail(detail);
+ }
+ }
+
+ private String runTest()
+ {
+ // Only run the test once
+ if (mTestComplete)
+ {
+ return (mStatus) ? Constants.TEST_SUCCESS : Constants.TEST_FAILED;
+ }
+
+ // run the test and return the result.
+ if (mTestMethod != null)
+ {
+ try
+ {
+ return (String) mTestMethod.invoke(mTest, this);
+ }
+ catch (Exception e)
+ {
+ setTestResult(false, "Test failed: " + e.toString() + " thrown during invocation");
+ return Constants.TEST_FAILED;
+ }
+ }
+ else
+ {
+ setTestResult(false, "Test failed: unable to determine test method to call. Is the portletName properly encoded? Syntax: testBean-testMethodName-portlet");
+ return Constants.TEST_FAILED;
+ }
+ }
+
+ private Method getAnnotatedTestMethod(String testName, Object testObj)
+ {
+ // search methods for one annotated by the BridgeTest annotation and
+ // with a test (parameter) value = portletNameTest
+ for (Method method: testObj.getClass().getMethods())
+ {
+ Annotation[] annotations = method.getAnnotations();
+ if (annotations != null)
+ {
+ for (Annotation annotation: annotations)
+ {
+ Class<? extends Annotation> annotationType =
+ annotation.annotationType();
+ if (BridgeTest.class.equals(annotationType))
+ {
+ String annotatedTestName = ((BridgeTest) annotation).test();
+ if (annotatedTestName != null && annotatedTestName.length() > 0
+ && annotatedTestName.equalsIgnoreCase(testName))
+ return method;
+ }
+ }
+ }
+ }
+ return null;
+ }
+}
Propchange: myfaces/portlet-bridge/testsuite/trunk/src/main/java/org/apache/myfaces/portlet/faces/testsuite/beans/TestRunnerBean.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/portlet-bridge/testsuite/trunk/src/main/java/org/apache/myfaces/portlet/faces/testsuite/common/Constants.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/portlet-bridge/testsuite/trunk/src/main/java/org/apache/myfaces/portlet/faces/testsuite/common/portlet/GenericFacesTestSuitePortlet.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/portlet-bridge/testsuite/trunk/src/main/java/org/apache/myfaces/portlet/faces/testsuite/common/portlet/wrapper/ActionRequestDecorator.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/portlet-bridge/testsuite/trunk/src/main/java/org/apache/myfaces/portlet/faces/testsuite/common/portlet/wrapper/ActionResponseDecorator.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/portlet-bridge/testsuite/trunk/src/main/java/org/apache/myfaces/portlet/faces/testsuite/common/portlet/wrapper/PortletRequestDecorator.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/portlet-bridge/testsuite/trunk/src/main/java/org/apache/myfaces/portlet/faces/testsuite/common/portlet/wrapper/PortletResponseDecorator.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/portlet-bridge/testsuite/trunk/src/main/java/org/apache/myfaces/portlet/faces/testsuite/common/portlet/wrapper/RenderRequestDecorator.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/portlet-bridge/testsuite/trunk/src/main/java/org/apache/myfaces/portlet/faces/testsuite/common/portlet/wrapper/RenderResponseDecorator.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/portlet-bridge/testsuite/trunk/src/main/java/org/apache/myfaces/portlet/faces/testsuite/common/util/BridgeTCKResultWriter.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/portlet-bridge/testsuite/trunk/src/main/java/org/apache/myfaces/portlet/faces/testsuite/common/util/faces/context/TCK_FacesContextFactoryImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/portlet-bridge/testsuite/trunk/src/main/java/org/apache/myfaces/portlet/faces/testsuite/common/util/faces/context/TCK_FacesContextImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/portlet-bridge/testsuite/trunk/src/main/java/org/apache/myfaces/portlet/faces/testsuite/common/util/faces/render/TCK_PortletUrlRenderer.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/portlet-bridge/testsuite/trunk/src/main/java/org/apache/myfaces/portlet/faces/testsuite/common/util/tags/TCKSpanTag.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/portlet-bridge/testsuite/trunk/src/main/java/org/apache/myfaces/portlet/faces/testsuite/driver/PlutoPortalDriverFilter.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/portlet-bridge/testsuite/trunk/src/main/java/org/apache/myfaces/portlet/faces/testsuite/tests/chapter_3/BridgeVersionTestPortlet.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/portlet-bridge/testsuite/trunk/src/main/java/org/apache/myfaces/portlet/faces/testsuite/tests/chapter_6/section_6_1_1/FacesContextFactoryServiceProviderTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/portlet-bridge/testsuite/trunk/src/main/java/org/apache/myfaces/portlet/faces/testsuite/tests/chapter_6/section_6_1_1/Tests.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/portlet-bridge/testsuite/trunk/src/main/java/org/apache/myfaces/portlet/faces/testsuite/tests/chapter_6/section_6_1_3_1/EncodeActionURLRenderViewHandler.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/portlet-bridge/testsuite/trunk/src/main/java/org/apache/myfaces/portlet/faces/testsuite/tests/chapter_6/section_6_1_3_1/Tests.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/portlet-bridge/testsuite/trunk/src/main/java/org/apache/myfaces/portlet/faces/testsuite/tests/sample/SampleTests.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: myfaces/portlet-bridge/testsuite/trunk/src/main/webapp/WEB-INF/faces-config.xml
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/testsuite/trunk/src/main/webapp/WEB-INF/faces-config.xml?rev=834163&r1=834162&r2=834163&view=diff
==============================================================================
--- myfaces/portlet-bridge/testsuite/trunk/src/main/webapp/WEB-INF/faces-config.xml (original)
+++ myfaces/portlet-bridge/testsuite/trunk/src/main/webapp/WEB-INF/faces-config.xml Mon Nov 9 18:02:59 2009
@@ -1,193 +1,193 @@
-<?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.tests.chapter_6.section_6_1_3_1.EncodeActionURLRenderViewHandler</view-handler>
- <application-extension>
- <bridge:excluded-attributes>
- <bridge:excluded-attribute>myFacesConfigExcludedNamespace.*</bridge:excluded-attribute>
- <bridge:excluded-attribute>myFacesConfigExcludedKey</bridge:excluded-attribute>
- </bridge:excluded-attributes>
- </application-extension>
- </application>
- <factory>
- <faces-context-factory>org.apache.myfaces.portlet.faces.testsuite.common.util.faces.context.TCK_FacesContextFactoryImpl</faces-context-factory>
- </factory>
- <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-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&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&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&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&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&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&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-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-rule>
-
-
- <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>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>
+<?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.tests.chapter_6.section_6_1_3_1.EncodeActionURLRenderViewHandler</view-handler>
+ <application-extension>
+ <bridge:excluded-attributes>
+ <bridge:excluded-attribute>myFacesConfigExcludedNamespace.*</bridge:excluded-attribute>
+ <bridge:excluded-attribute>myFacesConfigExcludedKey</bridge:excluded-attribute>
+ </bridge:excluded-attributes>
+ </application-extension>
+ </application>
+ <factory>
+ <faces-context-factory>org.apache.myfaces.portlet.faces.testsuite.common.util.faces.context.TCK_FacesContextFactoryImpl</faces-context-factory>
+ </factory>
+ <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-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&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&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&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&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&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&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-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-rule>
+
+
+ <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>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>
</faces-config>
\ No newline at end of file
Propchange: myfaces/portlet-bridge/testsuite/trunk/src/main/webapp/WEB-INF/faces-config.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/portlet-bridge/testsuite/trunk/src/main/webapp/WEB-INF/jetty-pluto-web-default.xml
------------------------------------------------------------------------------
svn:eol-style = native