Author: alexsmirnov Date: 2008-11-04 19:06:58 -0500 (Tue, 04 Nov 2008) New Revision: 11026 Added: branches/jsf2.0/examples/repeater/ branches/jsf2.0/examples/repeater/pom.xml branches/jsf2.0/examples/repeater/src/ branches/jsf2.0/examples/repeater/src/main/ branches/jsf2.0/examples/repeater/src/main/java/ branches/jsf2.0/examples/repeater/src/main/java/org/ branches/jsf2.0/examples/repeater/src/main/java/org/richfaces/ branches/jsf2.0/examples/repeater/src/main/java/org/richfaces/examples/ branches/jsf2.0/examples/repeater/src/main/java/org/richfaces/examples/Bean.java branches/jsf2.0/examples/repeater/src/main/resources/ branches/jsf2.0/examples/repeater/src/main/webapp/ branches/jsf2.0/examples/repeater/src/main/webapp/META-INF/ branches/jsf2.0/examples/repeater/src/main/webapp/META-INF/MANIFEST.MF branches/jsf2.0/examples/repeater/src/main/webapp/WEB-INF/ branches/jsf2.0/examples/repeater/src/main/webapp/WEB-INF/faces-config.xml branches/jsf2.0/examples/repeater/src/main/webapp/WEB-INF/lib/ branches/jsf2.0/examples/repeater/src/main/webapp/WEB-INF/web.xml branches/jsf2.0/examples/repeater/src/main/webapp/index.jsp branches/jsf2.0/examples/repeater/src/main/webapp/pages/ branches/jsf2.0/examples/repeater/src/main/webapp/pages/index.jsp branches/jsf2.0/examples/repeater/src/main/webapp/pages/index.xhtml branches/jsf2.0/examples/repeater/src/test/ branches/jsf2.0/examples/repeater/src/test/java/ branches/jsf2.0/examples/repeater/src/test/java/org/ branches/jsf2.0/examples/repeater/src/test/java/org/richfaces/ branches/jsf2.0/examples/repeater/src/test/java/org/richfaces/examples/ branches/jsf2.0/examples/repeater/src/test/java/org/richfaces/examples/BeanTest.java branches/jsf2.0/framework/jsf-test/src/test/java/org/richfaces/test/HelloBean.java Modified: branches/jsf2.0/framework/jsf-test/src/test/java/org/richfaces/test/FacesServerTest.java branches/jsf2.0/framework/jsf-test/src/test/java/org/richfaces/test/stub/ServerResourceTest.java branches/jsf2.0/framework/jsf-test/src/test/resources/org/richfaces/test/faces-config.xml branches/jsf2.0/framework/pom.xml Log: Facelets helloWord test have been run. Added: branches/jsf2.0/examples/repeater/pom.xml =================================================================== --- branches/jsf2.0/examples/repeater/pom.xml (rev 0) +++ branches/jsf2.0/examples/repeater/pom.xml 2008-11-05 00:06:58 UTC (rev 11026) @@ -0,0 +1,38 @@ +<?xml version="1.0"?><project> + <parent> + <artifactId>examples</artifactId> + <groupId>org.richfaces</groupId> + <version>4.0.0-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.richfaces.examples</groupId> + <artifactId>repeater</artifactId> + <packaging>war</packaging> + <name>repeater Maven Webapp</name> + <version>4.0.0-SNAPSHOT</version> + <build> + <finalName>repeater</finalName> + <plugins> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.5</source> + <target>1.5</target> + </configuration> + </plugin> + </plugins> + </build> + <dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>3.8.1</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>com.sun.faces</groupId> + <artifactId>mojarra-jsf-impl</artifactId> + <version>2.0.0-SNAPSHOT</version> + </dependency> + </dependencies> +</project> \ No newline at end of file Property changes on: branches/jsf2.0/examples/repeater/pom.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: branches/jsf2.0/examples/repeater/src/main/java/org/richfaces/examples/Bean.java =================================================================== --- branches/jsf2.0/examples/repeater/src/main/java/org/richfaces/examples/Bean.java (rev 0) +++ branches/jsf2.0/examples/repeater/src/main/java/org/richfaces/examples/Bean.java 2008-11-05 00:06:58 UTC (rev 11026) @@ -0,0 +1,29 @@ +/** + * License Agreement. + * + * Rich Faces - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package org.richfaces.examples; +/** + * @author $Autor$ + * + */ +public class Bean { + +} \ No newline at end of file Property changes on: branches/jsf2.0/examples/repeater/src/main/java/org/richfaces/examples/Bean.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: branches/jsf2.0/examples/repeater/src/main/webapp/META-INF/MANIFEST.MF =================================================================== --- branches/jsf2.0/examples/repeater/src/main/webapp/META-INF/MANIFEST.MF (rev 0) +++ branches/jsf2.0/examples/repeater/src/main/webapp/META-INF/MANIFEST.MF 2008-11-05 00:06:58 UTC (rev 11026) @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +Class-Path: + Property changes on: branches/jsf2.0/examples/repeater/src/main/webapp/META-INF/MANIFEST.MF ___________________________________________________________________ Name: svn:mime-type + text/plain Added: branches/jsf2.0/examples/repeater/src/main/webapp/WEB-INF/faces-config.xml =================================================================== --- branches/jsf2.0/examples/repeater/src/main/webapp/WEB-INF/faces-config.xml (rev 0) +++ branches/jsf2.0/examples/repeater/src/main/webapp/WEB-INF/faces-config.xml 2008-11-05 00:06:58 UTC (rev 11026) @@ -0,0 +1,10 @@ +<?xml version="1.0"?> +<faces-config version="1.2" 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_1_2.xsd"> + <managed-bean> + <managed-bean-name>bean</managed-bean-name> + <managed-bean-class>org.richfaces.examples.Bean</managed-bean-class> + <managed-bean-scope>request</managed-bean-scope> + </managed-bean> +</faces-config> Property changes on: branches/jsf2.0/examples/repeater/src/main/webapp/WEB-INF/faces-config.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: branches/jsf2.0/examples/repeater/src/main/webapp/WEB-INF/web.xml =================================================================== --- branches/jsf2.0/examples/repeater/src/main/webapp/WEB-INF/web.xml (rev 0) +++ branches/jsf2.0/examples/repeater/src/main/webapp/WEB-INF/web.xml 2008-11-05 00:06:58 UTC (rev 11026) @@ -0,0 +1,46 @@ +<?xml version="1.0" encoding="UTF-8"?> +<web-app 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" + version="2.5"> + <display-name>Archetype Created Web Application</display-name> + <context-param> + <param-name>javax.faces.CONFIG_FILES</param-name> + <param-value>/WEB-INF/faces-config.xml</param-value> + </context-param> + <context-param> + <param-name>javax.faces.STATE_SAVING_METHOD</param-name> + <param-value>server</param-value> + </context-param> + <!-- + --> + <filter> + <display-name>Ajax4jsf Filter</display-name> + <filter-name>ajax4jsf</filter-name> + <filter-class>org.ajax4jsf.Filter</filter-class> + </filter> + <filter-mapping> + <filter-name>ajax4jsf</filter-name> + <servlet-name>Faces Servlet</servlet-name> + <dispatcher>REQUEST</dispatcher> + <dispatcher>FORWARD</dispatcher> + <dispatcher>INCLUDE</dispatcher> + <dispatcher>ERROR</dispatcher> + </filter-mapping> + <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>/faces/*</url-pattern> + </servlet-mapping> + <servlet-mapping> + <servlet-name>Faces Servlet</servlet-name> + <url-pattern>*.jsf</url-pattern> + </servlet-mapping> + <login-config> + <auth-method>BASIC</auth-method> + </login-config> +</web-app> Property changes on: branches/jsf2.0/examples/repeater/src/main/webapp/WEB-INF/web.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: branches/jsf2.0/examples/repeater/src/main/webapp/index.jsp =================================================================== --- branches/jsf2.0/examples/repeater/src/main/webapp/index.jsp (rev 0) +++ branches/jsf2.0/examples/repeater/src/main/webapp/index.jsp 2008-11-05 00:06:58 UTC (rev 11026) @@ -0,0 +1,11 @@ +<!doctype html public "-//w3c//dtd html 4.0 transitional//en"> + +<html> + +<head></head> + + <body> + <jsp:forward page="/pages/index.jsf" /> + </body> + +</html> \ No newline at end of file Property changes on: branches/jsf2.0/examples/repeater/src/main/webapp/index.jsp ___________________________________________________________________ Name: svn:mime-type + text/plain Added: branches/jsf2.0/examples/repeater/src/main/webapp/pages/index.jsp =================================================================== --- branches/jsf2.0/examples/repeater/src/main/webapp/pages/index.jsp (rev 0) +++ branches/jsf2.0/examples/repeater/src/main/webapp/pages/index.jsp 2008-11-05 00:06:58 UTC (rev 11026) @@ -0,0 +1,12 @@ +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> +<html> + <head> + <title></title> + </head> + <body> + <f:view> + + </f:view> + </body> +</html> Property changes on: branches/jsf2.0/examples/repeater/src/main/webapp/pages/index.jsp ___________________________________________________________________ Name: svn:mime-type + text/plain Added: branches/jsf2.0/examples/repeater/src/main/webapp/pages/index.xhtml =================================================================== --- branches/jsf2.0/examples/repeater/src/main/webapp/pages/index.xhtml (rev 0) +++ branches/jsf2.0/examples/repeater/src/main/webapp/pages/index.xhtml 2008-11-05 00:06:58 UTC (rev 11026) @@ -0,0 +1,12 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:a4j="https://ajax4jsf.dev.java.net/ajax" + xmlns:c="http://java.sun.com/jsp/jstl/core" + > + <f:view> + + </f:view> +</html> \ No newline at end of file Property changes on: branches/jsf2.0/examples/repeater/src/main/webapp/pages/index.xhtml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: branches/jsf2.0/examples/repeater/src/test/java/org/richfaces/examples/BeanTest.java =================================================================== --- branches/jsf2.0/examples/repeater/src/test/java/org/richfaces/examples/BeanTest.java (rev 0) +++ branches/jsf2.0/examples/repeater/src/test/java/org/richfaces/examples/BeanTest.java 2008-11-05 00:06:58 UTC (rev 11026) @@ -0,0 +1,46 @@ +/** + * License Agreement. + * + * Rich Faces - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package org.richfaces.examples; + +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; + +/** +*/ +public class BeanTest + extends TestCase +{ + /** + * Create the test case + * + * @param testName name of the test case + */ + public BeanTest( String testName ) + { + super( testName ); + } + + public void testStub() throws Exception { + + } +} Property changes on: branches/jsf2.0/examples/repeater/src/test/java/org/richfaces/examples/BeanTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: branches/jsf2.0/framework/jsf-test/src/test/java/org/richfaces/test/FacesServerTest.java =================================================================== --- branches/jsf2.0/framework/jsf-test/src/test/java/org/richfaces/test/FacesServerTest.java 2008-11-04 17:55:54 UTC (rev 11025) +++ branches/jsf2.0/framework/jsf-test/src/test/java/org/richfaces/test/FacesServerTest.java 2008-11-05 00:06:58 UTC (rev 11026) @@ -58,7 +58,7 @@ "org/richfaces/test/web.xml"); facesServer.addResource("/WEB-INF/faces-config.xml", "org/richfaces/test/faces-config.xml"); - facesServer.addResource("/hello.xhml", "org/richfaces/test/hello.xhml"); + facesServer.addResource("/hello.xhtml", "org/richfaces/test/hello.xhtml"); facesServer.addInitParameter(StateManager.STATE_SAVING_METHOD_PARAM_NAME, StateManager.STATE_SAVING_METHOD_SERVER); facesServer.addInitParameter(ViewHandler.DEFAULT_SUFFIX_PARAM_NAME, ".xhtml"); facesServer.addInitParameter("com.sun.faces.validateXml", "true"); Added: branches/jsf2.0/framework/jsf-test/src/test/java/org/richfaces/test/HelloBean.java =================================================================== --- branches/jsf2.0/framework/jsf-test/src/test/java/org/richfaces/test/HelloBean.java (rev 0) +++ branches/jsf2.0/framework/jsf-test/src/test/java/org/richfaces/test/HelloBean.java 2008-11-05 00:06:58 UTC (rev 11026) @@ -0,0 +1,15 @@ +package org.richfaces.test; + +import java.io.Serializable; + +public class HelloBean implements Serializable { + + private String name; + + public HelloBean() {} + + public String getName() { return name;} + + public void setName(String name) { this.name = name; } + +} Property changes on: branches/jsf2.0/framework/jsf-test/src/test/java/org/richfaces/test/HelloBean.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: branches/jsf2.0/framework/jsf-test/src/test/java/org/richfaces/test/stub/ServerResourceTest.java =================================================================== --- branches/jsf2.0/framework/jsf-test/src/test/java/org/richfaces/test/stub/ServerResourceTest.java 2008-11-04 17:55:54 UTC (rev 11025) +++ branches/jsf2.0/framework/jsf-test/src/test/java/org/richfaces/test/stub/ServerResourceTest.java 2008-11-05 00:06:58 UTC (rev 11026) @@ -90,6 +90,23 @@ /** * Test method for + * {@link org.richfaces.test.stub.ServerResourcesDirectory#getResource(org.richfaces.test.stub.ServerResourcePath)} + * . + */ + @Test + public void testGetResourceRoot() { + ServerResourcesDirectory root = new ServerResourcesDirectory(); + MockResource indexXhtml = new MockResource(); + root.addResource(new ServerResourcePath("/index.xhtml"), indexXhtml); + ServerResource index = root.getResource(new ServerResourcePath("/index.xhtml")); + assertNotNull(index); + assertNull(root.getResource(new ServerResourcePath("/foo"))); + assertNull(root.getResource(new ServerResourcePath("/foo/baz"))); + assertEquals(1, root.getPaths().size()); + } + + /** + * Test method for * {@link org.richfaces.test.stub.ServerResourcesDirectory#getAsStream()}. * * @throws IOException Modified: branches/jsf2.0/framework/jsf-test/src/test/resources/org/richfaces/test/faces-config.xml =================================================================== --- branches/jsf2.0/framework/jsf-test/src/test/resources/org/richfaces/test/faces-config.xml 2008-11-04 17:55:54 UTC (rev 11025) +++ branches/jsf2.0/framework/jsf-test/src/test/resources/org/richfaces/test/faces-config.xml 2008-11-05 00:06:58 UTC (rev 11026) @@ -44,7 +44,7 @@ <!-- our NumberBean we created before --> <managed-bean> <managed-bean-name>HelloBean</managed-bean-name> - <managed-bean-class>helloFacelet.HelloBean</managed-bean-class> + <managed-bean-class>org.richfaces.test.HelloBean</managed-bean-class> <managed-bean-scope>session</managed-bean-scope> </managed-bean> Modified: branches/jsf2.0/framework/pom.xml =================================================================== --- branches/jsf2.0/framework/pom.xml 2008-11-04 17:55:54 UTC (rev 11025) +++ branches/jsf2.0/framework/pom.xml 2008-11-05 00:06:58 UTC (rev 11026) @@ -94,7 +94,7 @@ <dependency> <groupId>com.sun.faces</groupId> <artifactId>jsf-api</artifactId> - <version>2.0.0-b04</version> + <version>2.0.0-b05</version> </dependency> <dependency> <groupId>javax.annotation</groupId>