[prettyfaces] r475 committed - First try of adding a Tomcat 6.0.x profile for Arquillian tests

[prett...@googlecode.com]

Revision: 475
Author: chkalt
Date: Sat Dec 11 07:11:08 2010
Log: First try of adding a Tomcat 6.0.x profile for Arquillian tests
http://code.google.com/p/prettyfaces/source/detail?r=475

Added:
/prettyfaces/trunk/tests-jsf2/src/test/resources-tomcat
/prettyfaces/trunk/tests-jsf2/src/test/resources-tomcat/jsf-web.xml
Modified:
/prettyfaces/trunk/tests-jsf2/pom.xml

=======================================
--- /dev/null
+++ /prettyfaces/trunk/tests-jsf2/src/test/resources-tomcat/jsf-web.xml Sat
Dec 11 07:11:08 2010
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee"
+ 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-app_2_5.xsd">
+
+ <!--
+ ConfigureListener and expressionFactory required if JSP is not
available
+ as Mojarra is loads them via TLD configuration FIXME fix the Jetty
container
+ so this isn't needed
+ -->
+ <listener>
+
<listener-class>com.sun.faces.config.ConfigureListener</listener-class>
+ </listener>
+ <listener>
+
<listener-class>org.jboss.weld.environment.servlet.Listener</listener-class>
+ </listener>
+ <listener>
+
<listener-class>com.ocpsoft.pretty.faces.config.PrettyConfigListener</listener-class>
+ </listener>
+
+ <context-param>
+ <param-name>com.sun.faces.expressionFactory</param-name>
+ <param-value>com.sun.el.ExpressionFactoryImpl</param-value>
+ </context-param>
+
+ <context-param>
+ <param-name>javax.faces.PROJECT_STAGE</param-name>
+ <param-value>Development</param-value>
+ </context-param>
+
+ <!-- PrettyFilter -->
+ <filter>
+ <filter-name>Pretty Filter</filter-name>
+ <filter-class>com.ocpsoft.pretty.PrettyFilter</filter-class>
+ </filter>
+ <filter-mapping>
+ <filter-name>Pretty Filter</filter-name>
+ <url-pattern>/*</url-pattern>
+ <dispatcher>REQUEST</dispatcher>
+ <dispatcher>FORWARD</dispatcher>
+ <dispatcher>ERROR</dispatcher>
+ </filter-mapping>
+
+ <!-- Seems like JSFUnit's filter has to be added manually -->
+ <filter>
+ <filter-name>JSFUnitFilter</filter-name>
+
<filter-class>org.jboss.jsfunit.framework.JSFUnitFilter</filter-class>
+ </filter>
+ <filter-mapping>
+ <filter-name>JSFUnitFilter</filter-name>
+ <servlet-name>Faces Servlet</servlet-name>
+ </filter-mapping>
+ <filter-mapping>
+ <filter-name>JSFUnitFilter</filter-name>
+ <servlet-name>ServletTestRunner</servlet-name>
+ </filter-mapping>
+
+ <!-- Required for Tomcat due to ARQ-217 -->
+ <servlet>
+ <servlet-name>ServletTestRunner</servlet-name>
+
<servlet-class>org.jboss.arquillian.protocol.servlet_3.ServletTestRunner</servlet-class>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>ServletTestRunner</servlet-name>
+ <url-pattern>/ArquillianServletRunner</url-pattern>
+ </servlet-mapping>
+
+ <!-- FacesServlet -->
+ <servlet>
+ <servlet-name>Faces Servlet</servlet-name>
+ <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>Faces Servlet</servlet-name>
+ <url-pattern>*.jsf</url-pattern>
+ </servlet-mapping>
+
+ <welcome-file-list>
+ <welcome-file>index.jsf</welcome-file>
+ </welcome-file-list>
+
+</web-app>
=======================================
--- /prettyfaces/trunk/tests-jsf2/pom.xml Mon Oct 18 16:46:11 2010
+++ /prettyfaces/trunk/tests-jsf2/pom.xml Sat Dec 11 07:11:08 2010
@@ -14,6 +14,7 @@
<properties>
<version.arquillian>1.0.0.Alpha4</version.arquillian>
<version.jetty>8.0.0.M1</version.jetty>
+ <version.tomcat>6.0.29</version.tomcat>
<version.weld-servlet>1.1.0.Beta1</version.weld-servlet>
</properties>

@@ -152,6 +153,72 @@
</testResource>
</testResources>
</build>
+ </profile>
+ <!-- Doesn't work correctly yet -->
+ <profile>
+ <id>arq-tomcat-embedded</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.arquillian.container</groupId>
+ <artifactId>arquillian-tomcat-embedded-6</artifactId>
+ <version>${version.arquillian}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>catalina</artifactId>
+ <version>${version.tomcat}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>coyote</artifactId>
+ <version>${version.tomcat}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>jasper</artifactId>
+ <version>${version.tomcat}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ <version>2.0.3</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
+ <version>2.0.3</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.web</groupId>
+ <artifactId>el-impl</artifactId>
+ <version>2.2</version>
+ <scope>test</scope>
+ </dependency>
+ <!--
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-validator</artifactId>
+ <version>4.0.0.GA</version>
+ <scope>test</scope>
+ </dependency>
+ -->
+ </dependencies>
+ <build>
+ <testResources>
+ <testResource>
+ <directory>src/test/resources</directory>
+ </testResource>
+ <testResource>
+ <directory>src/test/resources-tomcat</directory>
+ </testResource>
+ </testResources>
+ </build>
</profile>
<profile>
<!-- This profile will copy all the test dependencies to
target/test-libs