You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lu...@apache.org on 2009/07/12 02:01:52 UTC

svn commit: r793247 - in /myfaces/current20/test-webapp: ./ jar/ jar/src/ jar/src/main/ jar/src/main/java/ jar/src/main/resources/ webapp/ webapp/src/ webapp/src/main/ webapp/src/main/java/ webapp/src/main/java/org/ webapp/src/main/java/org/apache/ web...

Author: lu4242
Date: Sun Jul 12 00:01:51 2009
New Revision: 793247

URL: http://svn.apache.org/viewvc?rev=793247&view=rev
Log:
test webapp for debug core 2.0

Added:
    myfaces/current20/test-webapp/   (with props)
    myfaces/current20/test-webapp/jar/   (with props)
    myfaces/current20/test-webapp/jar/pom.xml   (with props)
    myfaces/current20/test-webapp/jar/src/
    myfaces/current20/test-webapp/jar/src/main/
    myfaces/current20/test-webapp/jar/src/main/java/
    myfaces/current20/test-webapp/jar/src/main/resources/
    myfaces/current20/test-webapp/pom.xml   (with props)
    myfaces/current20/test-webapp/webapp/   (with props)
    myfaces/current20/test-webapp/webapp/pom.xml   (with props)
    myfaces/current20/test-webapp/webapp/src/
    myfaces/current20/test-webapp/webapp/src/main/
    myfaces/current20/test-webapp/webapp/src/main/java/
    myfaces/current20/test-webapp/webapp/src/main/java/org/
    myfaces/current20/test-webapp/webapp/src/main/java/org/apache/
    myfaces/current20/test-webapp/webapp/src/main/java/org/apache/myfaces/
    myfaces/current20/test-webapp/webapp/src/main/java/org/apache/myfaces/blank/
    myfaces/current20/test-webapp/webapp/src/main/java/org/apache/myfaces/blank/HelloWorldController.java   (with props)
    myfaces/current20/test-webapp/webapp/src/main/java/org/apache/myfaces/flash/
    myfaces/current20/test-webapp/webapp/src/main/java/org/apache/myfaces/flash/FlashBean.java   (with props)
    myfaces/current20/test-webapp/webapp/src/main/java/org/apache/myfaces/flash/HelloWorldFlashBean.java   (with props)
    myfaces/current20/test-webapp/webapp/src/main/log4j/
    myfaces/current20/test-webapp/webapp/src/main/log4j/log4j.properties   (with props)
    myfaces/current20/test-webapp/webapp/src/main/resources/
    myfaces/current20/test-webapp/webapp/src/main/webapp/
    myfaces/current20/test-webapp/webapp/src/main/webapp/WEB-INF/   (with props)
    myfaces/current20/test-webapp/webapp/src/main/webapp/WEB-INF/faces-config.xml   (with props)
    myfaces/current20/test-webapp/webapp/src/main/webapp/WEB-INF/web.xml   (with props)
    myfaces/current20/test-webapp/webapp/src/main/webapp/flash1.jsp   (with props)
    myfaces/current20/test-webapp/webapp/src/main/webapp/flash2.jsp   (with props)
    myfaces/current20/test-webapp/webapp/src/main/webapp/flash3.jsp   (with props)
    myfaces/current20/test-webapp/webapp/src/main/webapp/flashhw1.jsp   (with props)
    myfaces/current20/test-webapp/webapp/src/main/webapp/flashhw2.jsp   (with props)
    myfaces/current20/test-webapp/webapp/src/main/webapp/flashprg1.jsp   (with props)
    myfaces/current20/test-webapp/webapp/src/main/webapp/flashprg2.jsp   (with props)
    myfaces/current20/test-webapp/webapp/src/main/webapp/helloWorld.jsp   (with props)
    myfaces/current20/test-webapp/webapp/src/main/webapp/index.jsp   (with props)
    myfaces/current20/test-webapp/webapp/src/main/webapp/page2.jsp   (with props)
    myfaces/current20/test-webapp/webapp/src/test/
    myfaces/current20/test-webapp/webapp/src/test/java/
    myfaces/current20/test-webapp/webapp/src/test/java/org/
    myfaces/current20/test-webapp/webapp/src/test/java/org/apache/
    myfaces/current20/test-webapp/webapp/src/test/java/org/apache/myfaces/
    myfaces/current20/test-webapp/webapp/src/test/java/org/apache/myfaces/test/
    myfaces/current20/test-webapp/webapp/src/test/java/org/apache/myfaces/test/Constants.java   (with props)
    myfaces/current20/test-webapp/webapp/src/test/java/org/apache/myfaces/test/it/
    myfaces/current20/test-webapp/webapp/src/test/java/org/apache/myfaces/test/it/HelloWorldTest.java   (with props)
    myfaces/current20/test-webapp/webapp/src/test/java/org/apache/myfaces/test/it/WebappTest.java   (with props)
    myfaces/current20/test-webapp/webapp/src/test/resources/

Propchange: myfaces/current20/test-webapp/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun Jul 12 00:01:51 2009
@@ -0,0 +1,10 @@
+target
+.classpath
+.project
+.wtpmodules
+*.ipr
+*.iml
+*.iws
+.settings
+maven-eclipse.xml
+.externalToolBuilders

Propchange: myfaces/current20/test-webapp/jar/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun Jul 12 00:01:51 2009
@@ -0,0 +1,10 @@
+target
+.classpath
+.project
+.wtpmodules
+*.ipr
+*.iml
+*.iws
+.settings
+maven-eclipse.xml
+.externalToolBuilders

Added: myfaces/current20/test-webapp/jar/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/current20/test-webapp/jar/pom.xml?rev=793247&view=auto
==============================================================================
--- myfaces/current20/test-webapp/jar/pom.xml (added)
+++ myfaces/current20/test-webapp/jar/pom.xml Sun Jul 12 00:01:51 2009
@@ -0,0 +1,12 @@
+<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</groupId>
+  <artifactId>test-res-jar</artifactId>
+  <packaging>jar</packaging>
+  <version>2.0.0-SNAPSHOT</version>
+  <name>Simple jar to test resource loading</name>
+  <url>http://maven.apache.org</url>
+  <dependencies>
+  </dependencies>
+</project>

Propchange: myfaces/current20/test-webapp/jar/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/current20/test-webapp/jar/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Added: myfaces/current20/test-webapp/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/current20/test-webapp/pom.xml?rev=793247&view=auto
==============================================================================
--- myfaces/current20/test-webapp/pom.xml (added)
+++ myfaces/current20/test-webapp/pom.xml Sun Jul 12 00:01:51 2009
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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.test</groupId>
+  <artifactId>myfaces-test-base</artifactId>
+  <packaging>pom</packaging>
+  <version>2.0.0-SNAPSHOT</version>
+  <name>Myfaces Test Webapp Build Project</name>
+  <url>http://myfaces.apache.org</url>
+
+  <scm>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/current20/test-webapp</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/current20/test-webapp</developerConnection>
+    <url>http://svn.apache.org/viewcvs.cgi/myfaces/current20/test-webapp</url>
+  </scm>
+
+  <modules>
+    <module>jar</module>
+    <module>webapp</module>
+  </modules>
+
+  <build>
+  	<defaultGoal>install</defaultGoal>
+  </build>
+
+</project>
\ No newline at end of file

Propchange: myfaces/current20/test-webapp/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/current20/test-webapp/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: myfaces/current20/test-webapp/webapp/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun Jul 12 00:01:51 2009
@@ -0,0 +1,10 @@
+target
+.classpath
+.project
+.wtpmodules
+*.ipr
+*.iml
+*.iws
+.settings
+maven-eclipse.xml
+.externalToolBuilders

Added: myfaces/current20/test-webapp/webapp/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/current20/test-webapp/webapp/pom.xml?rev=793247&view=auto
==============================================================================
--- myfaces/current20/test-webapp/webapp/pom.xml (added)
+++ myfaces/current20/test-webapp/webapp/pom.xml Sun Jul 12 00:01:51 2009
@@ -0,0 +1,325 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<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">
+
+    <parent>
+        <groupId>org.apache.myfaces</groupId>
+        <artifactId>myfaces</artifactId>
+        <version>6</version>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.apache.myfaces</groupId>
+    <artifactId>test-webapp</artifactId>
+    <packaging>war</packaging>
+    <version>2.0.0-SNAPSHOT</version>
+    <name>Example test webapp to test myfaces 2.0</name>
+    <description>
+        Example test webapp to test myfaces 2.0. This pom allows to run 
+        integrational tests using cargo(tomcat) or jetty and htmlunit,
+        and run the demo with trace logging enabled using profile -PjettyConfig.
+    </description>
+    <url>http://myfaces.apache.org</url>
+
+    <!-- Project dependencies -->
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.myfaces</groupId>
+            <artifactId>test-res-jar</artifactId>
+            <version>2.0.0-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>jstl</artifactId>
+            <version>1.2</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>3.8.1</version>
+            <scope>test</scope>
+        </dependency>
+  
+        <dependency>
+            <groupId>net.sourceforge.htmlunit</groupId>
+            <artifactId>htmlunit</artifactId>
+            <version>${htmlunit.version}</version>
+            <scope>test</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>net.sourceforge.htmlunit</groupId>
+            <artifactId>htmlunit-core-js</artifactId>
+            <version>${htmlunit.version}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <finalName>test-webapp</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <!-- Exclude all integration tests so that they are not executed during the test phase.
+                        This is because of a limitation in Maven 2.0.x which only supports compiling a
+                        single test source tree. The recommendation is to create a separate module for
+                        functional tests as is done in the cargo-archetype-webapp-functional-test-module -->
+                    <excludes>
+                        <exclude>**/it/**</exclude>
+                    </excludes>
+                </configuration>
+                <executions>
+                    <execution>
+                        <phase>integration-test</phase>
+                        <goals>
+                            <goal>test</goal>
+                        </goals>
+                        <configuration>                       
+                            <!-- Include only integration tests so that they are executed during the
+                                integration-test phase. Again this this is because of a limitation in
+                                Maven 2.0.x which only supports compiling a single test source tree. The
+                                recommendation is to create a separate module for functional tests as is done
+                                in the cargo-archetype-webapp-functional-test-module -->
+                            <excludes>
+                                <exclude>none</exclude>
+                            </excludes>
+                            <includes>
+                                <include>**/it/**</include>
+                            </includes>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.cargo</groupId>
+                <artifactId>cargo-maven2-plugin</artifactId>
+                <version>${cargo.version}</version>
+            </plugin>
+        </plugins>
+    </build>
+
+    <profiles>
+        <profile>
+            <!-- Debug profile for myfaces and jetty.
+                It allows to see debug messages using -PjettyConfig -->
+            <id>jettyConfig</id>
+            <build>
+                <resources>
+                    <resource>
+                        <directory>src/main/resources</directory>
+                    </resource>
+                    <resource>
+                        <directory>src/main/log4j</directory>
+                    </resource>
+                </resources>
+                <plugins>
+                    <plugin>
+                        <!--This plugin allows to run the example using mvn jetty:run -->
+                        <groupId>org.mortbay.jetty</groupId>
+                        <artifactId>maven-jetty-plugin</artifactId>
+                        <version>${maven.jetty.plugin.version}</version>
+                        <configuration>
+                            <scanIntervalSeconds>10</scanIntervalSeconds>
+                            <systemProperties>
+                                <systemProperty>
+                                    <name>org.apache.commons.logging.Log</name>
+                                    <value>org.apache.commons.logging.impl.Log4JLogger</value>
+                                </systemProperty>
+                            </systemProperties>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+            <dependencies>
+                <dependency>
+                    <groupId>log4j</groupId>
+                    <artifactId>log4j</artifactId>
+                    <version>${log4j.version}</version>
+                    <type>jar</type>
+                </dependency>
+            </dependencies>
+        </profile>
+
+        <profile>
+            <id>myfaces</id>
+            <activation>
+                <property>
+                    <name>!jsf</name>
+                </property>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>org.apache.myfaces.core</groupId>
+                    <artifactId>myfaces-api</artifactId>
+                    <version>${jsf-myfaces.version}</version>
+                    <scope>compile</scope>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.myfaces.core</groupId>
+                    <artifactId>myfaces-impl</artifactId>
+                    <version>${jsf-myfaces.version}</version>
+                    <scope>compile</scope>
+                </dependency>
+            </dependencies>
+        </profile>
+        <profile>
+            <id>jsf-ri</id>
+            <activation>
+                <property>
+                    <name>jsf</name>
+                    <value>ri</value>
+                </property>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>javax.faces</groupId>
+                    <artifactId>jsf-api</artifactId>
+                    <version>${jsf-ri.version}</version>
+                </dependency>
+                <dependency>
+                    <groupId>javax.faces</groupId>
+                    <artifactId>jsf-impl</artifactId>
+                    <version>${jsf-ri.version}</version>
+                </dependency>
+            </dependencies>
+        </profile>
+        <!-- Profiles for run automated integration tests -->
+        <profile>
+            <id>jetty6x</id>
+            <activation>
+                <property>
+                    <name>!it</name>
+                </property>            
+            </activation>
+            <build>
+                <plugins>
+                    <!-- Unfortunately if we use this profile we can't control
+                    which jetty version we use and the version cargo use has
+                    a problem with EL libraries. Instead we call directly jetty.                
+                    <plugin>
+                        <groupId>org.codehaus.cargo</groupId>
+                        <artifactId>cargo-maven2-plugin</artifactId>
+                        <version>${cargo.version}</version>
+                        <configuration>
+                            <container>
+                                <containerId>jetty6x</containerId>
+                                <type>embedded</type>
+                            </container>
+                        </configuration>
+                    </plugin> -->
+                    <plugin>
+                        <!--This plugin allows to run the example using mvn jetty:run -->
+                        <groupId>org.mortbay.jetty</groupId>
+                        <artifactId>maven-jetty-plugin</artifactId>
+                        <version>${maven.jetty.plugin.version}</version>
+                        <configuration>
+                            <scanIntervalSeconds>10</scanIntervalSeconds>
+                            <stopPort>9966</stopPort>
+                            <stopKey>foo</stopKey>
+                        </configuration>
+                        <executions>
+                            <execution>
+                                <id>start-jetty</id>
+                                <phase>pre-integration-test</phase>
+                                <goals>
+                                    <!-- run-exploded allow run annotation
+                                    code correctly.
+                                    <goal>run</goal> -->
+                                    <goal>run-exploded</goal>
+                                </goals>
+                                <configuration>
+                                    <daemon>true</daemon>
+                                </configuration>
+                            </execution>
+                            <execution>
+                                <id>stop-jetty</id>
+                                <phase>post-integration-test</phase>
+                                <goals>
+                                    <goal>stop</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>tomcat6x</id>
+            <activation>
+                <property>
+                    <name>it</name>
+                    <value>tomcat6x</value>
+                </property>            
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.codehaus.cargo</groupId>
+                        <artifactId>cargo-maven2-plugin</artifactId>
+                        <version>${cargo.version}</version>
+                        <configuration>
+                            <wait>false</wait>
+                            <container>
+                                <containerId>tomcat6x</containerId>
+                                <zipUrlInstaller>
+                                    <url>
+                                        http://www.apache.org/dist/tomcat/tomcat-6/v6.0.20/bin/apache-tomcat-6.0.20.zip
+                                    </url>
+                                </zipUrlInstaller>
+                            </container>
+                        </configuration>
+                        <executions>
+                            <execution>
+                                <id>start</id>
+                                <phase>pre-integration-test</phase>
+                                <goals>
+                                    <goal>start</goal>
+                                </goals>
+                            </execution>
+                            <execution>
+                                <id>stop</id>
+                                <phase>post-integration-test</phase>
+                                <goals>
+                                    <goal>stop</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+
+    <repositories>
+        <repository>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+            <id>apache-maven-snapshots</id>
+            <url>http://people.apache.org/repo/m2-snapshot-repository</url>
+        </repository>
+        <repository>
+            <id>java.net</id>
+            <url>http://download.java.net/maven/1</url>
+            <layout>legacy</layout>
+        </repository>
+    </repositories>
+
+    <properties>
+        <jsf-ri.version>2.0.0-SNAPSHOT</jsf-ri.version>
+        <jsf-myfaces.version>2.0.0-SNAPSHOT</jsf-myfaces.version>
+        <maven.jetty.plugin.version>6.1.16</maven.jetty.plugin.version>
+        <log4j.version>1.2.13</log4j.version>
+        <cargo.version>1.0</cargo.version>
+        <htmlunit.version>2.5</htmlunit.version>
+    </properties>
+</project>

Propchange: myfaces/current20/test-webapp/webapp/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/current20/test-webapp/webapp/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Added: myfaces/current20/test-webapp/webapp/src/main/java/org/apache/myfaces/blank/HelloWorldController.java
URL: http://svn.apache.org/viewvc/myfaces/current20/test-webapp/webapp/src/main/java/org/apache/myfaces/blank/HelloWorldController.java?rev=793247&view=auto
==============================================================================
--- myfaces/current20/test-webapp/webapp/src/main/java/org/apache/myfaces/blank/HelloWorldController.java (added)
+++ myfaces/current20/test-webapp/webapp/src/main/java/org/apache/myfaces/blank/HelloWorldController.java Sun Jul 12 00:01:51 2009
@@ -0,0 +1,52 @@
+/*
+ * 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.blank;
+
+/**
+ * A typical simple backing bean, that is backed to <code>helloworld.jsp</code>
+ * 
+ */
+public class HelloWorldController {
+
+    
+    //properties
+    private String name;
+    
+    /**
+     * default empty constructor
+     */
+    public HelloWorldController(){
+    }
+    
+    //-------------------getter & setter
+    public String getName() {
+        return name;
+    }
+    public void setName(String name) {
+        this.name = name;
+    }
+    
+    /**
+     * Method that is backed to a submit button of a form.
+     */
+    public String send(){
+        //do real logic, return a string which will be used for the navigation system of JSF
+        return "success";
+    }
+}
\ No newline at end of file

Propchange: myfaces/current20/test-webapp/webapp/src/main/java/org/apache/myfaces/blank/HelloWorldController.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/current20/test-webapp/webapp/src/main/java/org/apache/myfaces/blank/HelloWorldController.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Added: myfaces/current20/test-webapp/webapp/src/main/java/org/apache/myfaces/flash/FlashBean.java
URL: http://svn.apache.org/viewvc/myfaces/current20/test-webapp/webapp/src/main/java/org/apache/myfaces/flash/FlashBean.java?rev=793247&view=auto
==============================================================================
--- myfaces/current20/test-webapp/webapp/src/main/java/org/apache/myfaces/flash/FlashBean.java (added)
+++ myfaces/current20/test-webapp/webapp/src/main/java/org/apache/myfaces/flash/FlashBean.java Sun Jul 12 00:01:51 2009
@@ -0,0 +1,41 @@
+/*
+ * 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.flash;
+
+import java.awt.event.ActionEvent;
+
+public class FlashBean
+{
+
+    public String gotoFlash2()
+    {
+        return "flash2";
+    }
+    
+    public String gotoFlash3()
+    {
+        return "flash3";
+    }
+
+    public String gotoFlash1()
+    {
+        return "flash1"; 
+    }
+
+}

Propchange: myfaces/current20/test-webapp/webapp/src/main/java/org/apache/myfaces/flash/FlashBean.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/current20/test-webapp/webapp/src/main/java/org/apache/myfaces/flash/FlashBean.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Added: myfaces/current20/test-webapp/webapp/src/main/java/org/apache/myfaces/flash/HelloWorldFlashBean.java
URL: http://svn.apache.org/viewvc/myfaces/current20/test-webapp/webapp/src/main/java/org/apache/myfaces/flash/HelloWorldFlashBean.java?rev=793247&view=auto
==============================================================================
--- myfaces/current20/test-webapp/webapp/src/main/java/org/apache/myfaces/flash/HelloWorldFlashBean.java (added)
+++ myfaces/current20/test-webapp/webapp/src/main/java/org/apache/myfaces/flash/HelloWorldFlashBean.java Sun Jul 12 00:01:51 2009
@@ -0,0 +1,120 @@
+/*
+ * 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.flash;
+
+import javax.faces.application.FacesMessage;
+import javax.faces.context.ExternalContext;
+import javax.faces.context.FacesContext;
+import javax.faces.context.Flash;
+import javax.faces.event.PhaseEvent;
+
+/**
+ * A typical simple backing bean, that is backed to <code>helloworld.jsp</code>
+ * 
+ */
+public class HelloWorldFlashBean {
+
+    //Log log = LogFactory.getLog(HelloWorldFlashBean.class);
+    
+    private int before = 0;
+    
+    private int after = 0;
+    
+    public void beforePhase(PhaseEvent phaseEvent){
+        
+        FacesContext facesContext = FacesContext.getCurrentInstance();      
+        before++;       
+        facesContext.addMessage(null, new FacesMessage("This is the message for phase before "+phaseEvent.getPhaseId().toString()+" : "+before+" "+facesContext.getExternalContext().getFlash().get("lastName")));
+        //log.info("This is the message for phase before "+phaseEvent.getPhaseId().toString()+" : "+before);
+    }
+    
+    public void afterPhase(PhaseEvent phaseEvent){
+
+        FacesContext facesContext = FacesContext.getCurrentInstance();      
+        after++;        
+        facesContext.addMessage(null, new FacesMessage("This is the message for phase after "+phaseEvent.getPhaseId().toString()+" : "+after+" "+facesContext.getExternalContext().getFlash().get("lastName")));
+        //log.info("This is the message for phase after "+phaseEvent.getPhaseId().toString()+" : "+after);
+    }
+
+    //properties
+    private String name;
+    
+    private String lastName;
+    
+    /**
+     * default empty constructor
+     */
+    public HelloWorldFlashBean(){
+    }
+    
+    //-------------------getter & setter
+    public String getName() {
+        return name;
+    }
+    public void setName(String name) {
+        this.name = name;
+    }
+    
+    public String getLastName()
+    {
+        return lastName;
+    }
+
+    public void setLastName(String lastName)
+    {
+        this.lastName = lastName;
+    }
+
+    /**
+     * Method that is backed to a submit button of a form.
+     */
+    public String send(){
+        //do real logic, return a string which will be used for the navigation system of JSF
+        
+        FacesContext facesContext = FacesContext.getCurrentInstance();
+        ExternalContext externalContext = facesContext.getExternalContext();
+        Flash flash = externalContext.getFlash();
+        
+        flash.put("name", getName());
+        flash.setKeepMessages(true);
+        facesContext.addMessage(null, new FacesMessage("var name put on flash scope"));
+        
+        return "success";
+    }
+    
+    public String sendPutNow(){
+        //do real logic, return a string which will be used for the navigation system of JSF
+        
+        FacesContext facesContext = FacesContext.getCurrentInstance();
+        ExternalContext externalContext = facesContext.getExternalContext();
+        Flash flash = externalContext.getFlash();
+    
+        flash.putNow("name", getName());
+        flash.keep("name");
+        flash.setKeepMessages(true);
+        facesContext.addMessage(null, new FacesMessage("var name putNow on flash scope"));
+        
+        return "success";
+    }
+
+    
+    public String back(){
+        return "back";
+    }
+}
\ No newline at end of file

Propchange: myfaces/current20/test-webapp/webapp/src/main/java/org/apache/myfaces/flash/HelloWorldFlashBean.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/current20/test-webapp/webapp/src/main/java/org/apache/myfaces/flash/HelloWorldFlashBean.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Added: myfaces/current20/test-webapp/webapp/src/main/log4j/log4j.properties
URL: http://svn.apache.org/viewvc/myfaces/current20/test-webapp/webapp/src/main/log4j/log4j.properties?rev=793247&view=auto
==============================================================================
--- myfaces/current20/test-webapp/webapp/src/main/log4j/log4j.properties (added)
+++ myfaces/current20/test-webapp/webapp/src/main/log4j/log4j.properties Sun Jul 12 00:01:51 2009
@@ -0,0 +1,33 @@
+# 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.
+
+log4j.rootLogger=INFO, A1, A2
+log4j.appender.A1=org.apache.log4j.ConsoleAppender
+log4j.appender.A1.layout=org.apache.log4j.PatternLayout
+
+log4j.appender.A2=org.apache.log4j.RollingFileAppender
+log4j.appender.A2.File=target/log4j.log
+log4j.appender.A2.MaxFileSize=1000KB
+# Keep one backup file
+log4j.appender.A2.MaxBackupIndex=1
+log4j.appender.A2.layout=org.apache.log4j.PatternLayout
+log4j.appender.A2.layout.ConversionPattern=%p %t %c - %m%n
+
+log4j.logger.org.apache.commons=INFO
+log4j.logger.org.apache.myfaces=TRACE
+log4j.logger.javax.faces=TRACE
+
+# Print the date in ISO 8601 format
+log4j.appender.A1.layout.ConversionPattern=%5p [%t] (%F:%L) - %m%n
\ No newline at end of file

Propchange: myfaces/current20/test-webapp/webapp/src/main/log4j/log4j.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/current20/test-webapp/webapp/src/main/log4j/log4j.properties
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: myfaces/current20/test-webapp/webapp/src/main/webapp/WEB-INF/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun Jul 12 00:01:51 2009
@@ -0,0 +1 @@
+*.jsfdia

Added: myfaces/current20/test-webapp/webapp/src/main/webapp/WEB-INF/faces-config.xml
URL: http://svn.apache.org/viewvc/myfaces/current20/test-webapp/webapp/src/main/webapp/WEB-INF/faces-config.xml?rev=793247&view=auto
==============================================================================
--- myfaces/current20/test-webapp/webapp/src/main/webapp/WEB-INF/faces-config.xml (added)
+++ myfaces/current20/test-webapp/webapp/src/main/webapp/WEB-INF/faces-config.xml Sun Jul 12 00:01:51 2009
@@ -0,0 +1,93 @@
+<?xml version="1.0"?>
+
+<faces-config version="2.0" 
+    xmlns="http://java.sun.com/xml/ns/javaee"
+    xmlns:xi="http://www.w3.org/2001/XInclude"
+    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_2_0.xsd">
+	
+	<!-- managed beans of the simple hello world app -->
+	<managed-bean>
+		<managed-bean-name>helloWorld</managed-bean-name>
+		<managed-bean-class>org.apache.myfaces.blank.HelloWorldController</managed-bean-class>
+		<managed-bean-scope>request</managed-bean-scope>
+	</managed-bean>
+    <managed-bean>
+        <managed-bean-name>flashBean</managed-bean-name>
+        <managed-bean-class>org.apache.myfaces.flash.FlashBean</managed-bean-class>
+        <managed-bean-scope>request</managed-bean-scope>
+    </managed-bean>
+    <managed-bean>
+        <managed-bean-name>helloWorldFlashBean</managed-bean-name>
+        <managed-bean-class>org.apache.myfaces.flash.HelloWorldFlashBean</managed-bean-class>
+        <managed-bean-scope>request</managed-bean-scope>
+    </managed-bean>
+	
+	<!-- navigation rules for helloWorld.jsp -->
+	<navigation-rule>
+		<from-view-id>/helloWorld.jsp</from-view-id>
+		<navigation-case>
+			<from-outcome>success</from-outcome>
+			<to-view-id>/page2.jsp</to-view-id>
+		</navigation-case>
+	</navigation-rule>
+	
+	<!-- navigation rules for page2.jsp -->
+	<navigation-rule>
+		<from-view-id>/page2.jsp</from-view-id>
+		<navigation-case>
+			<from-outcome>back</from-outcome>
+			<to-view-id>/helloWorld.jsp</to-view-id>
+		</navigation-case>
+	</navigation-rule>
+    
+ <navigation-rule>
+  <from-view-id>*</from-view-id>
+  <navigation-case>
+   <from-outcome>flash1</from-outcome>
+   <to-view-id>/flash1.jsp</to-view-id>
+  </navigation-case>
+  <navigation-case>
+   <from-outcome>flash2</from-outcome>
+   <to-view-id>/flash2.jsp</to-view-id>
+  </navigation-case>
+  <navigation-case>
+   <from-outcome>flash3</from-outcome>
+   <to-view-id>/flash3.jsp</to-view-id>
+  </navigation-case>
+ </navigation-rule>
+
+ <!-- navigation rules for helloWorld flash post-redirect-get pattern -->
+ <navigation-rule>
+  <from-view-id>/flashprg1.jsp</from-view-id>
+  <navigation-case>
+   <from-outcome>success</from-outcome>
+   <to-view-id>/flashprg2.jsp</to-view-id>
+   <redirect/>
+  </navigation-case>
+ </navigation-rule>
+  <navigation-rule>
+  <from-view-id>/flashprg2.jsp</from-view-id>
+  <navigation-case>
+   <from-outcome>back</from-outcome>
+   <to-view-id>/flashprg1.jsp</to-view-id>
+  </navigation-case>
+ </navigation-rule>
+ 
+ <!-- navigation rules for helloWorld flash using putNow/keep method to keep previous name -->
+ <navigation-rule>
+  <from-view-id>/flashhw1.jsp</from-view-id>
+  <navigation-case>
+   <from-outcome>success</from-outcome>
+   <to-view-id>/flashhw2.jsp</to-view-id>
+  </navigation-case>
+ </navigation-rule>
+ <navigation-rule>
+  <from-view-id>/flashhw2.jsp</from-view-id>
+  <navigation-case>
+   <from-outcome>back</from-outcome>
+   <to-view-id>/flashhw1.jsp</to-view-id>
+  </navigation-case>
+ </navigation-rule>
+    
+</faces-config>
\ No newline at end of file

Propchange: myfaces/current20/test-webapp/webapp/src/main/webapp/WEB-INF/faces-config.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/current20/test-webapp/webapp/src/main/webapp/WEB-INF/faces-config.xml
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Added: myfaces/current20/test-webapp/webapp/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/myfaces/current20/test-webapp/webapp/src/main/webapp/WEB-INF/web.xml?rev=793247&view=auto
==============================================================================
--- myfaces/current20/test-webapp/webapp/src/main/webapp/WEB-INF/web.xml (added)
+++ myfaces/current20/test-webapp/webapp/src/main/webapp/WEB-INF/web.xml Sun Jul 12 00:01:51 2009
@@ -0,0 +1,215 @@
+<?xml version="1.0"?>
+
+<!--
+ * 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.
+-->
+<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
+         version="2.4">
+
+    <description>MyProject web.xml</description>
+
+    <!--optional: context-param>
+        <description>Comma separated list of URIs of (additional) faces config files.
+            (e.g. /WEB-INF/my-config.xml)
+            See JSF 1.0 PRD2, 10.3.2
+            Attention: You do not need to put /WEB-INF/faces-config.xml in here.
+        </description>
+        <param-name>javax.faces.CONFIG_FILES</param-name>
+        <param-value>/WEB-INF/examples-config.xml</param-value>
+    </context-param-->
+    <context-param>
+        <description>State saving method: "client" or "server" (= default)
+            See JSF Specification 2.5.3</description>
+        <param-name>javax.faces.STATE_SAVING_METHOD</param-name>
+        <param-value>client</param-value>
+    </context-param>
+    <context-param>
+        <description>Only applicable if state saving method is "server" (= default).
+            Defines the amount (default = 20) of the latest views are stored in session.</description>
+        <param-name>org.apache.myfaces.NUMBER_OF_VIEWS_IN_SESSION</param-name>
+        <param-value>20</param-value>
+    </context-param>
+    <context-param>
+        <description>Only applicable if state saving method is "server" (= default).
+            If true (default) the state will be serialized to a byte stream before it
+            is written to the session.
+            If false the state will not be serialized to a byte stream.</description>
+        <param-name>org.apache.myfaces.SERIALIZE_STATE_IN_SESSION</param-name>
+        <param-value>true</param-value>
+    </context-param>
+    <context-param>
+        <description>Only applicable if state saving method is "server" (= default) and if
+            org.apache.myfaces.SERIALIZE_STATE_IN_SESSION is true (= default)
+            If true (default) the serialized state will be compressed before it
+            is written to the session. If false the state will not be compressed.</description>
+        <param-name>org.apache.myfaces.COMPRESS_STATE_IN_SESSION</param-name>
+        <param-value>true</param-value>
+    </context-param>
+    <context-param>
+        <description>This parameter tells MyFaces if javascript code should be allowed in the
+            rendered HTML output.
+            If javascript is allowed, command_link anchors will have javascript code
+            that submits the corresponding form.
+            If javascript is not allowed, the state saving info and nested parameters
+            will be added as url parameters.
+            Default: "true"</description>
+        <param-name>org.apache.myfaces.ALLOW_JAVASCRIPT</param-name>
+        <param-value>true</param-value>
+    </context-param>
+    <context-param>
+        <param-name>org.apache.myfaces.DETECT_JAVASCRIPT</param-name>
+        <param-value>false</param-value>
+    </context-param>
+    <context-param>
+        <description>If true, rendered HTML code will be formatted, so that it is "human readable".
+            i.e. additional line separators and whitespace will be written, that do not
+            influence the HTML code.
+            Default: "true"</description>
+        <param-name>org.apache.myfaces.PRETTY_HTML</param-name>
+        <param-value>true</param-value>
+    </context-param>
+    <context-param>
+        <description>If true, a javascript function will be rendered that is able to restore the
+            former vertical scroll on every request. Convenient feature if you have pages
+            with long lists and you do not want the browser page to always jump to the top
+            if you trigger a link or button action that stays on the same page.
+            Default: "false"</description>
+        <param-name>org.apache.myfaces.AUTO_SCROLL</param-name>
+        <param-value>true</param-value>
+    </context-param>
+
+    <context-param>
+        <description>Used for encrypting view state. Only relevant for client side
+            state saving. See MyFaces wiki/web site documentation for instructions
+            on how to configure an application for diffenent encryption strengths.
+        </description>
+        <param-name>org.apache.myfaces.SECRET</param-name>
+        <param-value>NzY1NDMyMTA=</param-value>
+    </context-param>
+
+    <context-param>
+        <description>
+            Validate managed beans, navigation rules and ensure that forms are not nested.
+        </description>
+        <param-name>org.apache.myfaces.VALIDATE</param-name>
+        <param-value>true</param-value>
+    </context-param>
+    
+    <context-param>
+        <description>
+            Treat readonly same as if disabled attribute was set for select elements.
+        </description>
+        <param-name>org.apache.myfaces.READONLY_AS_DISABLED_FOR_SELECTS</param-name>
+        <param-value>true</param-value>
+    </context-param>    
+    
+    <context-param>
+        <description>
+            Use the defined class as the class which will be called when a resource is added to the
+            ExtensionFilter handling. Using StreamingAddResource here helps with performance. If you want to add
+            custom components and want to use the ExtensionFilter, you need to provide your custom implementation here.
+        </description>
+        <param-name>org.apache.myfaces.ADD_RESOURCE_CLASS</param-name>
+        <param-value>org.apache.myfaces.renderkit.html.util.DefaultAddResource</param-value>
+    </context-param>        
+
+    <context-param>
+        <description>
+            Virtual path in the URL which triggers loading of resources for the MyFaces extended components
+            in the ExtensionFilter.
+        </description>
+        <param-name>org.apache.myfaces.RESOURCE_VIRTUAL_PATH</param-name>
+        <param-value>/faces/myFacesExtensionResource</param-value>
+    </context-param>
+    
+    <context-param>
+        <description>
+            Check if the extensions-filter has been properly configured.
+        </description>
+        <param-name>org.apache.myfaces.CHECK_EXTENSIONS_FILTER</param-name>
+        <param-value>true</param-value>
+    </context-param>    
+
+    <context-param>
+        <description>
+            Define partial state saving as true/false.
+        </description>
+        <param-name>javax.faces.PARTIAL_STATE_SAVING_METHOD</param-name>
+        <param-value>false</param-value>
+    </context-param>    
+
+    <!-- Extensions Filter -->
+    <!-- 
+    <filter>
+        <filter-name>extensionsFilter</filter-name>
+        <filter-class>org.apache.myfaces.webapp.filter.ExtensionsFilter</filter-class>
+        <init-param>
+            <description>Set the size limit for uploaded files.
+                Format: 10 - 10 bytes
+                10k - 10 KB
+                10m - 10 MB
+                1g - 1 GB</description>
+            <param-name>uploadMaxFileSize</param-name>
+            <param-value>100m</param-value>
+        </init-param>
+        <init-param>
+            <description>Set the threshold size - files
+                below this limit are stored in memory, files above
+                this limit are stored on disk.
+
+                Format: 10 - 10 bytes
+                10k - 10 KB
+                10m - 10 MB
+                1g - 1 GB</description>
+            <param-name>uploadThresholdSize</param-name>
+            <param-value>100k</param-value>
+        </init-param>
+    </filter>
+
+    <filter-mapping>
+        <filter-name>extensionsFilter</filter-name>
+        <url-pattern>*.jsf</url-pattern>
+    </filter-mapping>
+    <filter-mapping>
+        <filter-name>extensionsFilter</filter-name>
+        <url-pattern>/faces/*</url-pattern>
+    </filter-mapping>
+    -->
+
+    <!-- Faces Servlet -->
+    <servlet>
+        <servlet-name>Faces Servlet</servlet-name>
+        <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
+        <load-on-startup>1</load-on-startup>
+    </servlet>
+
+    <!-- Faces Servlet Mapping -->
+    <servlet-mapping>
+        <servlet-name>Faces Servlet</servlet-name>
+        <url-pattern>*.jsf</url-pattern>
+    </servlet-mapping>
+
+    <!-- Welcome files -->
+    <welcome-file-list>
+        <welcome-file>index.jsp</welcome-file>
+        <welcome-file>index.html</welcome-file>
+    </welcome-file-list>
+
+</web-app>

Propchange: myfaces/current20/test-webapp/webapp/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/current20/test-webapp/webapp/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Added: myfaces/current20/test-webapp/webapp/src/main/webapp/flash1.jsp
URL: http://svn.apache.org/viewvc/myfaces/current20/test-webapp/webapp/src/main/webapp/flash1.jsp?rev=793247&view=auto
==============================================================================
--- myfaces/current20/test-webapp/webapp/src/main/webapp/flash1.jsp (added)
+++ myfaces/current20/test-webapp/webapp/src/main/webapp/flash1.jsp Sun Jul 12 00:01:51 2009
@@ -0,0 +1,24 @@
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<html>
+    <head>
+        <title>Flash 1</title>
+    </head>
+    <body>
+        <f:view>
+            <h:form id="mainForm">
+              <h:outputText value="Flash 1"/>
+              <h:panelGrid columns="2">
+                <c:set target="${flash}" property="testProperty1" value="fooValue" />
+                <h:outputLabel value="testProperty1" for="tp1" />
+                <h:outputText id="tp1" value="#{flash.testProperty1}"/>
+                <h:outputLabel value="testProperty2" for="tp2" />
+                <h:outputText id="tp2" value="#{flash.testProperty2}"/>
+                <h:commandButton value="Go to flash2.jsp" action="#{flashBean.gotoFlash2}"></h:commandButton>
+                <h:messages showDetail="true" showSummary="false"/>
+              </h:panelGrid>
+            </h:form>
+        </f:view>
+    </body>
+</html>

Propchange: myfaces/current20/test-webapp/webapp/src/main/webapp/flash1.jsp
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Added: myfaces/current20/test-webapp/webapp/src/main/webapp/flash2.jsp
URL: http://svn.apache.org/viewvc/myfaces/current20/test-webapp/webapp/src/main/webapp/flash2.jsp?rev=793247&view=auto
==============================================================================
--- myfaces/current20/test-webapp/webapp/src/main/webapp/flash2.jsp (added)
+++ myfaces/current20/test-webapp/webapp/src/main/webapp/flash2.jsp Sun Jul 12 00:01:51 2009
@@ -0,0 +1,24 @@
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<html>
+    <head>
+        <title>Flash 2</title>
+    </head>
+    <body>
+        <f:view>
+            <h:form id="mainForm">
+              <h:outputText value="Flash 2"/>
+              <c:set target="${flash}" property="testProperty2" value="fooValue2" />
+              <h:panelGrid columns="2">
+                <h:outputLabel value="testProperty1" for="tp1" />
+                <h:outputText id="tp1" value="#{flash.testProperty1}"/>
+                <h:outputLabel value="testProperty2" for="tp2" />
+                <h:outputText id="tp2" value="#{flash.testProperty2}"/>
+                <h:commandButton value="Go to flash3.jsp" action="#{flashBean.gotoFlash3}"/>
+                <h:messages showDetail="true" showSummary="false"/>
+              </h:panelGrid>
+            </h:form>
+        </f:view>
+    </body>
+</html>

Propchange: myfaces/current20/test-webapp/webapp/src/main/webapp/flash2.jsp
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Added: myfaces/current20/test-webapp/webapp/src/main/webapp/flash3.jsp
URL: http://svn.apache.org/viewvc/myfaces/current20/test-webapp/webapp/src/main/webapp/flash3.jsp?rev=793247&view=auto
==============================================================================
--- myfaces/current20/test-webapp/webapp/src/main/webapp/flash3.jsp (added)
+++ myfaces/current20/test-webapp/webapp/src/main/webapp/flash3.jsp Sun Jul 12 00:01:51 2009
@@ -0,0 +1,23 @@
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<html>
+    <head>
+        <title>Flash 3</title>
+    </head>
+    <body>
+        <f:view>
+            <h:form id="mainForm">
+              <h:outputText value="Flash 3"/>
+              <h:panelGrid columns="2">
+                <h:outputLabel value="testProperty1" for="tp1" />
+                <h:outputText id="tp1" value="#{flash.testProperty1}"/>
+                <h:outputLabel value="testProperty2" for="tp2" />
+                <h:outputText id="tp2" value="#{flash.testProperty2}"/>
+                <h:commandButton value="Go to flash1.jsp" action="#{flashBean.gotoFlash1}"/>
+                <h:messages showDetail="true" showSummary="false"/>
+              </h:panelGrid>
+            </h:form>
+        </f:view>
+    </body>
+</html>

Propchange: myfaces/current20/test-webapp/webapp/src/main/webapp/flash3.jsp
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Added: myfaces/current20/test-webapp/webapp/src/main/webapp/flashhw1.jsp
URL: http://svn.apache.org/viewvc/myfaces/current20/test-webapp/webapp/src/main/webapp/flashhw1.jsp?rev=793247&view=auto
==============================================================================
--- myfaces/current20/test-webapp/webapp/src/main/webapp/flashhw1.jsp (added)
+++ myfaces/current20/test-webapp/webapp/src/main/webapp/flashhw1.jsp Sun Jul 12 00:01:51 2009
@@ -0,0 +1,21 @@
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
+<html>
+    <head>
+        <title>Hello World</title>
+    </head>
+    <body>
+        <f:view>
+            <h:form id="mainForm">
+              <h:panelGrid columns="2">
+                <h:outputLabel for="name" value="Please enter your name" />
+                <h:inputText id="name" value="#{helloWorldFlashBean.name}" required="true"/>
+                <h:outputLabel for="pname" value="Previous name" />
+                <h:outputText id="pname" value="#{flash.name}"/>
+                <h:commandButton value="Press me" action="#{helloWorldFlashBean.sendPutNow}"/>
+                <h:messages showDetail="true" showSummary="false"/>
+              </h:panelGrid>
+            </h:form>
+        </f:view>
+    </body>
+</html>

Propchange: myfaces/current20/test-webapp/webapp/src/main/webapp/flashhw1.jsp
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Added: myfaces/current20/test-webapp/webapp/src/main/webapp/flashhw2.jsp
URL: http://svn.apache.org/viewvc/myfaces/current20/test-webapp/webapp/src/main/webapp/flashhw2.jsp?rev=793247&view=auto
==============================================================================
--- myfaces/current20/test-webapp/webapp/src/main/webapp/flashhw2.jsp (added)
+++ myfaces/current20/test-webapp/webapp/src/main/webapp/flashhw2.jsp Sun Jul 12 00:01:51 2009
@@ -0,0 +1,18 @@
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
+<html>
+    <head>
+        <title>Hello World</title>
+    </head>
+    <body>
+        <f:view>
+            <h:form id="mainForm">
+                <h2><h:outputText value="Hello #{helloWorldFlashBean.name}. Flash name should appear next request (press back)"/></h2>
+                <h:messages showDetail="true" showSummary="false"/>
+                <h:commandLink action="back">
+                    <h:outputText value="Home"/>
+                </h:commandLink>
+            </h:form>
+        </f:view>
+    </body>
+</html>
\ No newline at end of file

Propchange: myfaces/current20/test-webapp/webapp/src/main/webapp/flashhw2.jsp
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Added: myfaces/current20/test-webapp/webapp/src/main/webapp/flashprg1.jsp
URL: http://svn.apache.org/viewvc/myfaces/current20/test-webapp/webapp/src/main/webapp/flashprg1.jsp?rev=793247&view=auto
==============================================================================
--- myfaces/current20/test-webapp/webapp/src/main/webapp/flashprg1.jsp (added)
+++ myfaces/current20/test-webapp/webapp/src/main/webapp/flashprg1.jsp Sun Jul 12 00:01:51 2009
@@ -0,0 +1,19 @@
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
+<html>
+    <head>
+        <title>Hello World</title>
+    </head>
+    <body>
+        <f:view>
+            <h:form id="mainForm">
+              <h:panelGrid columns="2">
+                <h:outputLabel for="name" value="Please enter your name" />
+                <h:inputText id="name" value="#{helloWorldFlashBean.name}" required="true"/>
+                <h:commandButton value="Press me" action="#{helloWorldFlashBean.send}"/>
+                <h:messages showDetail="true" showSummary="false"/>
+              </h:panelGrid>
+            </h:form>
+        </f:view>
+    </body>
+</html>

Propchange: myfaces/current20/test-webapp/webapp/src/main/webapp/flashprg1.jsp
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Added: myfaces/current20/test-webapp/webapp/src/main/webapp/flashprg2.jsp
URL: http://svn.apache.org/viewvc/myfaces/current20/test-webapp/webapp/src/main/webapp/flashprg2.jsp?rev=793247&view=auto
==============================================================================
--- myfaces/current20/test-webapp/webapp/src/main/webapp/flashprg2.jsp (added)
+++ myfaces/current20/test-webapp/webapp/src/main/webapp/flashprg2.jsp Sun Jul 12 00:01:51 2009
@@ -0,0 +1,18 @@
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
+<html>
+    <head>
+        <title>Hello World</title>
+    </head>
+    <body>
+        <f:view>
+            <h:form id="mainForm">
+                <h2><h:outputText value="Hello #{flash.name}. We hope you enjoy Apache MyFaces"/></h2>
+                <h:messages showDetail="true" showSummary="false"/>
+                <h:commandLink action="#{helloWorldFlashBean.back}">
+                    <h:outputText value="Home"/>
+                </h:commandLink>
+            </h:form>
+        </f:view>
+    </body>
+</html>
\ No newline at end of file

Propchange: myfaces/current20/test-webapp/webapp/src/main/webapp/flashprg2.jsp
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Added: myfaces/current20/test-webapp/webapp/src/main/webapp/helloWorld.jsp
URL: http://svn.apache.org/viewvc/myfaces/current20/test-webapp/webapp/src/main/webapp/helloWorld.jsp?rev=793247&view=auto
==============================================================================
--- myfaces/current20/test-webapp/webapp/src/main/webapp/helloWorld.jsp (added)
+++ myfaces/current20/test-webapp/webapp/src/main/webapp/helloWorld.jsp Sun Jul 12 00:01:51 2009
@@ -0,0 +1,19 @@
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
+<html>
+    <head>
+        <title>Hello World</title>
+    </head>
+    <body>
+        <f:view>
+            <h:form id="mainForm">
+              <h:panelGrid columns="2">
+                <h:outputLabel for="name" value="Please enter your name" />
+                <h:inputText id="name" value="#{helloWorld.name}" required="true"/>
+                <h:commandButton id="submitbutton" value="Press me" action="#{helloWorld.send}"/>
+                <h:messages showDetail="true" showSummary="false"/>
+              </h:panelGrid>
+            </h:form>
+        </f:view>
+    </body>
+</html>

Propchange: myfaces/current20/test-webapp/webapp/src/main/webapp/helloWorld.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/current20/test-webapp/webapp/src/main/webapp/helloWorld.jsp
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Added: myfaces/current20/test-webapp/webapp/src/main/webapp/index.jsp
URL: http://svn.apache.org/viewvc/myfaces/current20/test-webapp/webapp/src/main/webapp/index.jsp?rev=793247&view=auto
==============================================================================
--- myfaces/current20/test-webapp/webapp/src/main/webapp/index.jsp (added)
+++ myfaces/current20/test-webapp/webapp/src/main/webapp/index.jsp Sun Jul 12 00:01:51 2009
@@ -0,0 +1,4 @@
+<%@ page session="false"%>
+<%
+response.sendRedirect("helloWorld.jsf");
+%>
\ No newline at end of file

Propchange: myfaces/current20/test-webapp/webapp/src/main/webapp/index.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/current20/test-webapp/webapp/src/main/webapp/index.jsp
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Added: myfaces/current20/test-webapp/webapp/src/main/webapp/page2.jsp
URL: http://svn.apache.org/viewvc/myfaces/current20/test-webapp/webapp/src/main/webapp/page2.jsp?rev=793247&view=auto
==============================================================================
--- myfaces/current20/test-webapp/webapp/src/main/webapp/page2.jsp (added)
+++ myfaces/current20/test-webapp/webapp/src/main/webapp/page2.jsp Sun Jul 12 00:01:51 2009
@@ -0,0 +1,17 @@
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
+<html>
+    <head>
+        <title>Hello World</title>
+    </head>
+    <body>
+        <f:view>
+            <h:form id="mainForm">
+                <h2>Hello <h:outputText id="name" value="#{helloWorld.name}"/>!</h2>
+                <h:commandLink action="back">
+                    <h:outputText value="Home"/>
+                </h:commandLink>
+            </h:form>
+        </f:view>
+    </body>
+</html>
\ No newline at end of file

Propchange: myfaces/current20/test-webapp/webapp/src/main/webapp/page2.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/current20/test-webapp/webapp/src/main/webapp/page2.jsp
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Added: myfaces/current20/test-webapp/webapp/src/test/java/org/apache/myfaces/test/Constants.java
URL: http://svn.apache.org/viewvc/myfaces/current20/test-webapp/webapp/src/test/java/org/apache/myfaces/test/Constants.java?rev=793247&view=auto
==============================================================================
--- myfaces/current20/test-webapp/webapp/src/test/java/org/apache/myfaces/test/Constants.java (added)
+++ myfaces/current20/test-webapp/webapp/src/test/java/org/apache/myfaces/test/Constants.java Sun Jul 12 00:01:51 2009
@@ -0,0 +1,25 @@
+/*
+ * 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.test;
+
+public interface Constants
+{
+    public static final String APP_URL = "http://localhost:8080/test-webapp";
+    
+}

Propchange: myfaces/current20/test-webapp/webapp/src/test/java/org/apache/myfaces/test/Constants.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/current20/test-webapp/webapp/src/test/java/org/apache/myfaces/test/Constants.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Added: myfaces/current20/test-webapp/webapp/src/test/java/org/apache/myfaces/test/it/HelloWorldTest.java
URL: http://svn.apache.org/viewvc/myfaces/current20/test-webapp/webapp/src/test/java/org/apache/myfaces/test/it/HelloWorldTest.java?rev=793247&view=auto
==============================================================================
--- myfaces/current20/test-webapp/webapp/src/test/java/org/apache/myfaces/test/it/HelloWorldTest.java (added)
+++ myfaces/current20/test-webapp/webapp/src/test/java/org/apache/myfaces/test/it/HelloWorldTest.java Sun Jul 12 00:01:51 2009
@@ -0,0 +1,53 @@
+/*
+ * 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.test.it;
+
+import org.apache.myfaces.test.Constants;
+
+import junit.framework.TestCase;
+
+import com.gargoylesoftware.htmlunit.WebClient;
+import com.gargoylesoftware.htmlunit.html.HtmlForm;
+import com.gargoylesoftware.htmlunit.html.HtmlPage;
+import com.gargoylesoftware.htmlunit.html.HtmlSubmitInput;
+import com.gargoylesoftware.htmlunit.html.HtmlTextInput;
+
+/**
+ * Simple webapp test integration test demo
+ */
+public class HelloWorldTest extends TestCase
+{
+    public void testCallIndexPage() throws Exception
+    {
+        WebClient webClient = new WebClient();
+        
+        HtmlPage page1 = (HtmlPage) webClient.getPage(Constants.APP_URL+"/helloWorld.jsf");
+
+        HtmlForm form = page1.getFormByName("mainForm");
+        
+        HtmlSubmitInput button = (HtmlSubmitInput) form.getInputByName("mainForm:submitbutton");
+        HtmlTextInput textField = (HtmlTextInput) form.getInputByName("mainForm:name");
+        
+        textField.setValueAttribute("John");
+        
+        HtmlPage page2 = (HtmlPage) button.click();
+        
+        assertEquals("John",page2.getElementById("mainForm:name").getTextContent());
+    }
+}

Propchange: myfaces/current20/test-webapp/webapp/src/test/java/org/apache/myfaces/test/it/HelloWorldTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/current20/test-webapp/webapp/src/test/java/org/apache/myfaces/test/it/HelloWorldTest.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Added: myfaces/current20/test-webapp/webapp/src/test/java/org/apache/myfaces/test/it/WebappTest.java
URL: http://svn.apache.org/viewvc/myfaces/current20/test-webapp/webapp/src/test/java/org/apache/myfaces/test/it/WebappTest.java?rev=793247&view=auto
==============================================================================
--- myfaces/current20/test-webapp/webapp/src/test/java/org/apache/myfaces/test/it/WebappTest.java (added)
+++ myfaces/current20/test-webapp/webapp/src/test/java/org/apache/myfaces/test/it/WebappTest.java Sun Jul 12 00:01:51 2009
@@ -0,0 +1,38 @@
+/*
+ * 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.test.it;
+
+import junit.framework.TestCase;
+
+import java.net.URL;
+import java.net.HttpURLConnection;
+
+/**
+ * Simple webapp test integration test demo
+ */
+public class WebappTest extends TestCase
+{
+    public void testCallIndexPage() throws Exception
+    {
+        URL url = new URL("http://localhost:8080/test-webapp");
+        HttpURLConnection connection = (HttpURLConnection) url.openConnection();
+        connection.connect();
+        assertEquals(200, connection.getResponseCode());
+    }
+}

Propchange: myfaces/current20/test-webapp/webapp/src/test/java/org/apache/myfaces/test/it/WebappTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/current20/test-webapp/webapp/src/test/java/org/apache/myfaces/test/it/WebappTest.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL