[richfaces-svn-commits] JBoss Rich Faces SVN: r20768 - in trunk: examples/richfaces-showcase/src/main/webapp/WEB-INF and 1 other directories.
Author: nbelaevski
Date: 2010-12-23 09:08:01 -0500 (Thu, 23 Dec 2010)
New Revision: 20768
Modified:
trunk/examples/richfaces-showcase/pom.xml
trunk/examples/richfaces-showcase/src/main/webapp/WEB-INF/web.xml
trunk/ui/misc/ui/src/test/java/org/richfaces/function/RichFunctionTest.java
Log:
Fixed Unit test failure with JSF 2.1.0
Removed validation-api from showcase pom.xml
Removed mime-type mapping for *.ecss files
Modified: trunk/examples/richfaces-showcase/pom.xml
===================================================================
--- trunk/examples/richfaces-showcase/pom.xml 2010-12-23 13:45:36 UTC (rev 20767)
+++ trunk/examples/richfaces-showcase/pom.xml 2010-12-23 14:08:01 UTC (rev 20768)
@@ -36,10 +36,6 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.validation</groupId>
- <artifactId>validation-api</artifactId>
- </dependency>
- <dependency>
<groupId>javax.servlet.jsp</groupId>
<artifactId>jsp-api</artifactId>
<scope>provided</scope>
Modified: trunk/examples/richfaces-showcase/src/main/webapp/WEB-INF/web.xml
===================================================================
--- trunk/examples/richfaces-showcase/src/main/webapp/WEB-INF/web.xml 2010-12-23 13:45:36
UTC (rev 20767)
+++ trunk/examples/richfaces-showcase/src/main/webapp/WEB-INF/web.xml 2010-12-23 14:08:01
UTC (rev 20768)
@@ -40,10 +40,6 @@
<servlet-name>Faces Servlet</servlet-name>
<url-pattern>/faces/*</url-pattern>
</servlet-mapping>
- <mime-mapping>
- <extension>ecss</extension>
- <mime-type>text/css</mime-type>
- </mime-mapping>
<welcome-file-list>
<welcome-file>index.html</welcome-file>
<welcome-file>index.htm</welcome-file>
Modified: trunk/ui/misc/ui/src/test/java/org/richfaces/function/RichFunctionTest.java
===================================================================
--- trunk/ui/misc/ui/src/test/java/org/richfaces/function/RichFunctionTest.java 2010-12-23
13:45:36 UTC (rev 20767)
+++ trunk/ui/misc/ui/src/test/java/org/richfaces/function/RichFunctionTest.java 2010-12-23
14:08:01 UTC (rev 20768)
@@ -112,7 +112,7 @@
@Before
public void setUp() throws Exception {
- environment = MockFacesEnvironment.createEnvironment();
+ environment = MockFacesEnvironment.createNiceEnvironment();
facesContext = environment.getFacesContext();
expect(facesContext.getAttributes()).andStubReturn(new HashMap<Object,
Object>());