Author: alexsmirnov Date: 2008-11-11 20:28:07 -0500 (Tue, 11 Nov 2008) New Revision: 11097 Modified: trunk/framework/jsf-test/pom.xml trunk/framework/jsf-test/src/main/java/org/richfaces/test/AbstractFacesTest.java trunk/framework/jsf-test/src/main/resources/org/richfaces/test/faces-config.xml Log: switch to jsf 1.2 Modified: trunk/framework/jsf-test/pom.xml =================================================================== --- trunk/framework/jsf-test/pom.xml 2008-11-12 01:00:39 UTC (rev 11096) +++ trunk/framework/jsf-test/pom.xml 2008-11-12 01:28:07 UTC (rev 11097) @@ -3,32 +3,34 @@ <parent> <artifactId>framework</artifactId> <groupId>org.richfaces</groupId> - <version>4.0.0-SNAPSHOT</version> + <version>3.3.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.framework</groupId> <artifactId>jsf-test</artifactId> <name>jsf-test</name> - <version>4.0.0-SNAPSHOT</version> - <url>http://maven.apache.org</url> + <version>3.3.0-SNAPSHOT</version> <dependencies> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <version>4.5</version> - <scope>test</scope> </dependency> <dependency> <groupId>net.sourceforge.htmlunit</groupId> <artifactId>htmlunit</artifactId> <version>2.3</version> </dependency> - <dependency> - <groupId>com.sun.faces</groupId> - <artifactId>mojarra-jsf-impl</artifactId> - <version>2.0.0-SNAPSHOT</version> - </dependency> - <dependency> + <dependency> + <groupId>javax.faces</groupId> + + <artifactId>jsf-impl</artifactId> + + <version>1.2_10</version> + + <scope>provided</scope> + </dependency> + <dependency> <groupId>el-impl</groupId> <artifactId>el-impl</artifactId> <version>1.0</version> Modified: trunk/framework/jsf-test/src/main/java/org/richfaces/test/AbstractFacesTest.java =================================================================== --- trunk/framework/jsf-test/src/main/java/org/richfaces/test/AbstractFacesTest.java 2008-11-12 01:00:39 UTC (rev 11096) +++ trunk/framework/jsf-test/src/main/java/org/richfaces/test/AbstractFacesTest.java 2008-11-12 01:28:07 UTC (rev 11097) @@ -51,7 +51,7 @@ contextClassLoader = Thread.currentThread().getContextClassLoader(); Thread.currentThread().setContextClassLoader( this.getClass().getClassLoader()); - InputStream stream = FacesServerTest.class + InputStream stream = this.getClass() .getResourceAsStream("logging.properties"); if (null != stream) { try { Modified: trunk/framework/jsf-test/src/main/resources/org/richfaces/test/faces-config.xml =================================================================== --- trunk/framework/jsf-test/src/main/resources/org/richfaces/test/faces-config.xml 2008-11-12 01:00:39 UTC (rev 11096) +++ trunk/framework/jsf-test/src/main/resources/org/richfaces/test/faces-config.xml 2008-11-12 01:28:07 UTC (rev 11097) @@ -38,9 +38,8 @@ <faces-config 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-facesconfig_2_0.xsd" - version="2.0"> - + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd" + version="1.2"> <!-- our NumberBean we created before --> <managed-bean> <managed-bean-name>HelloBean</managed-bean-name>