[richfaces-svn-commits] JBoss Rich Faces SVN: r10512 - in trunk/test-applications/regressionArea: Seam-ear and 8 other directories.

Author: andrei_exadel Date: 2008-09-19 11:36:11 -0400 (Fri, 19 Sep 2008) New Revision: 10512 Added: trunk/test-applications/regressionArea/Seam-web/src/main/webapp/pages/001-100/ trunk/test-applications/regressionArea/Seam-web/src/main/webapp/pages/101-200/ trunk/test-applications/regressionArea/Seam-web/src/main/webapp/pages/examples/ trunk/test-applications/regressionArea/Seam-web/src/main/webapp/pages/examples/home.jsp trunk/test-applications/regressionArea/Seam-web/src/main/webapp/pages/examples/home.xhtml trunk/test-applications/regressionArea/Test.bat trunk/test-applications/regressionArea/build.bat Removed: trunk/test-applications/regressionArea/Seam-web/src/main/webapp/pages/home.xhtml Modified: trunk/test-applications/regressionArea/Seam-ear/pom.xml trunk/test-applications/regressionArea/Seam-ejb/pom.xml trunk/test-applications/regressionArea/Seam-web/pom.xml trunk/test-applications/regressionArea/Seam-web/src/main/java/org/ajax4jsf/bean/TemplateBean.java trunk/test-applications/regressionArea/Seam-web/src/main/webapp/WEB-INF/faces-config.xml trunk/test-applications/regressionArea/Seam-web/src/main/webapp/WEB-INF/web.xml trunk/test-applications/regressionArea/Seam-web/src/main/webapp/home.xhtml trunk/test-applications/regressionArea/Seam-web/src/test/java/org/richfaces/testng/SimpleTest.java trunk/test-applications/regressionArea/pom.xml Log: Facelets + JSP Modified: trunk/test-applications/regressionArea/Seam-ear/pom.xml =================================================================== --- trunk/test-applications/regressionArea/Seam-ear/pom.xml 2008-09-19 15:06:53 UTC (rev 10511) +++ trunk/test-applications/regressionArea/Seam-ear/pom.xml 2008-09-19 15:36:11 UTC (rev 10512) @@ -8,6 +8,7 @@ <artifactId>regressionArea</artifactId> <version>1.0-SNAPSHOT</version> </parent> + <version>1.0-SNAPSHOT</version> <groupId>org.richfaces.test-applications.regressionArea</groupId> <artifactId>Seam-ear</artifactId> <name>Seam App Ear Module</name> @@ -15,11 +16,6 @@ <dependencies> <dependency> - <groupId>org.richfaces.framework</groupId> - <artifactId>richfaces-api</artifactId> - <version>${richversion}</version> - </dependency> - <dependency> <groupId>org.richfaces.test-applications.regressionArea</groupId> <artifactId>Seam-web</artifactId> <version>1.0-SNAPSHOT</version> @@ -40,6 +36,18 @@ <artifactId>javassist</artifactId> <groupId>jboss</groupId> </exclusion> + <exclusion> + <groupId>org.richfaces.framework</groupId> + <artifactId>richfaces-api</artifactId> + </exclusion> + <exclusion> + <groupId>org.richfaces.framework</groupId> + <artifactId>richfaces-impl</artifactId> + </exclusion> + <exclusion> + <groupId>org.richfaces.ui</groupId> + <artifactId>richfaces-ui</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -72,6 +80,18 @@ <groupId>org.jboss.seam</groupId> <artifactId>jboss-seam</artifactId> </exclusion> + <exclusion> + <groupId>org.richfaces.framework</groupId> + <artifactId>richfaces-api</artifactId> + </exclusion> + <exclusion> + <groupId>org.richfaces.framework</groupId> + <artifactId>richfaces-impl</artifactId> + </exclusion> + <exclusion> + <groupId>org.richfaces.ui</groupId> + <artifactId>richfaces-ui</artifactId> + </exclusion> </exclusions> </dependency> </dependencies> Modified: trunk/test-applications/regressionArea/Seam-ejb/pom.xml =================================================================== --- trunk/test-applications/regressionArea/Seam-ejb/pom.xml 2008-09-19 15:06:53 UTC (rev 10511) +++ trunk/test-applications/regressionArea/Seam-ejb/pom.xml 2008-09-19 15:36:11 UTC (rev 10512) @@ -21,6 +21,11 @@ <artifactId>jsf-impl</artifactId> <version>${jsfversion}</version> </dependency> + <dependency> + <groupId>org.richfaces.framework</groupId> + <artifactId>richfaces-api</artifactId> + <version>${richversion}</version> + </dependency> <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> Modified: trunk/test-applications/regressionArea/Seam-web/pom.xml =================================================================== --- trunk/test-applications/regressionArea/Seam-web/pom.xml 2008-09-19 15:06:53 UTC (rev 10511) +++ trunk/test-applications/regressionArea/Seam-web/pom.xml 2008-09-19 15:36:11 UTC (rev 10512) @@ -12,6 +12,33 @@ <packaging>war</packaging> <dependencies> + <dependency> + <groupId>org.richfaces.framework</groupId> + <artifactId>richfaces-api</artifactId> + <version>${richversion}</version> + <exclusions> + <exclusion> + <artifactId>commons-logging</artifactId> + <groupId>commons-logging</groupId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.richfaces.framework</groupId> + <artifactId>richfaces-impl</artifactId> + <version>${richversion}</version> + <exclusions> + <exclusion> + <artifactId>commons-logging</artifactId> + <groupId>commons-logging</groupId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>richfaces-ui</artifactId> + <version>${richversion}</version> + </dependency> <dependency> <groupId>org.richfaces.test-applications.regressionArea</groupId> <artifactId>Seam-ejb</artifactId> Modified: trunk/test-applications/regressionArea/Seam-web/src/main/java/org/ajax4jsf/bean/TemplateBean.java =================================================================== --- trunk/test-applications/regressionArea/Seam-web/src/main/java/org/ajax4jsf/bean/TemplateBean.java 2008-09-19 15:06:53 UTC (rev 10511) +++ trunk/test-applications/regressionArea/Seam-web/src/main/java/org/ajax4jsf/bean/TemplateBean.java 2008-09-19 15:36:11 UTC (rev 10512) @@ -58,7 +58,7 @@ * @return the template */ public String getTemplate() { - return "../template/" + template.getName() + ".xhtml"; + return "../../template/" + template.getName() + ".xhtml"; } /** Modified: trunk/test-applications/regressionArea/Seam-web/src/main/webapp/WEB-INF/faces-config.xml =================================================================== --- trunk/test-applications/regressionArea/Seam-web/src/main/webapp/WEB-INF/faces-config.xml 2008-09-19 15:06:53 UTC (rev 10511) +++ trunk/test-applications/regressionArea/Seam-web/src/main/webapp/WEB-INF/faces-config.xml 2008-09-19 15:36:11 UTC (rev 10512) @@ -2,9 +2,9 @@ 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_1_2.xsd"> - <application> + <!-- application> <view-handler>com.sun.facelets.FaceletViewHandler</view-handler> - </application> + </application--> <managed-bean> Modified: trunk/test-applications/regressionArea/Seam-web/src/main/webapp/WEB-INF/web.xml =================================================================== --- trunk/test-applications/regressionArea/Seam-web/src/main/webapp/WEB-INF/web.xml 2008-09-19 15:06:53 UTC (rev 10511) +++ trunk/test-applications/regressionArea/Seam-web/src/main/webapp/WEB-INF/web.xml 2008-09-19 15:36:11 UTC (rev 10512) @@ -21,6 +21,24 @@ </context-param> <context-param> + <param-name>javax.faces.DEFAULT_SUFFIX</param-name> + <param-value>.jsp</param-value> + </context-param> + + + <context-param> + <param-name>facelets.VIEW_MAPPINGS</param-name> + <param-value>*xhtml</param-value> + </context-param> + + <context-param> + <param-name>org.ajax4jsf.VIEW_HANDLERS</param-name> + <param-value>com.sun.facelets.FaceletViewHandler</param-value> + </context-param> + + + + <context-param> <param-name>org.ajax4jsf.xmlparser.ORDER</param-name> <param-value>NONE,TIDY,NEKO</param-value> </context-param> @@ -88,11 +106,7 @@ <param-value>true</param-value> </context-param> - <context-param> - <param-name>javax.faces.DEFAULT_SUFFIX</param-name> - <param-value>.xhtml</param-value> - </context-param> - + <servlet> <servlet-name>Faces Servlet</servlet-name> <servlet-class>javax.faces.webapp.FacesServlet</servlet-class> @@ -101,14 +115,9 @@ <!-- Faces Servlet Mapping --> + <servlet-mapping> <servlet-name>Faces Servlet</servlet-name> - <url-pattern>*.seam</url-pattern> - </servlet-mapping> - - - <servlet-mapping> - <servlet-name>Faces Servlet</servlet-name> <url-pattern>/faces/NEKO/*</url-pattern> </servlet-mapping> Modified: trunk/test-applications/regressionArea/Seam-web/src/main/webapp/home.xhtml =================================================================== --- trunk/test-applications/regressionArea/Seam-web/src/main/webapp/home.xhtml 2008-09-19 15:06:53 UTC (rev 10511) +++ trunk/test-applications/regressionArea/Seam-web/src/main/webapp/home.xhtml 2008-09-19 15:36:11 UTC (rev 10512) @@ -14,16 +14,7 @@ <body id="pgHome"> <f:view> <h:form id="_form"> - <rich:panel header="Rich Users"> - <rich:dataTable id="tb" value="#{usersBean.users}" var="us"> - <rich:column> - <f:facet name="header"> - <h:outputText value="Name"></h:outputText> - </f:facet> - <h:outputText value="#{us.name}"></h:outputText> - </rich:column> - </rich:dataTable> - </rich:panel> + Successfull </h:form> </f:view> </body> Added: trunk/test-applications/regressionArea/Seam-web/src/main/webapp/pages/examples/home.jsp =================================================================== --- trunk/test-applications/regressionArea/Seam-web/src/main/webapp/pages/examples/home.jsp (rev 0) +++ trunk/test-applications/regressionArea/Seam-web/src/main/webapp/pages/examples/home.jsp 2008-09-19 15:36:11 UTC (rev 10512) @@ -0,0 +1,29 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> + +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%> +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> +<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> + +<html> +<head> +<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> +<title>Resression Area : Seam Application</title> +</head> +<body id="pgHome"> +<f:view> + <h:form id="_form"> + <rich:panel header="Rich Users"> + <rich:dataTable id="tb" value="#{usersBean.users}" var="us"> + <rich:column> + <f:facet name="header"> + <h:outputText value="Name"></h:outputText> + </f:facet> + <h:outputText value="#{us.name}"></h:outputText> + </rich:column> + </rich:dataTable> + </rich:panel> + </h:form> +</f:view> +</body> +</html> Added: trunk/test-applications/regressionArea/Seam-web/src/main/webapp/pages/examples/home.xhtml =================================================================== --- trunk/test-applications/regressionArea/Seam-web/src/main/webapp/pages/examples/home.xhtml (rev 0) +++ trunk/test-applications/regressionArea/Seam-web/src/main/webapp/pages/examples/home.xhtml 2008-09-19 15:36:11 UTC (rev 10512) @@ -0,0 +1,27 @@ +<!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:s="http://jboss.com/products/seam/taglib" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:rich="http://richfaces.org/rich" + xmlns:a4j="http://richfaces.org/a4j"> + +<ui:composition template="#{templateBean.template}"> + <ui:define name="style"> + + </ui:define> + <ui:define name="component"> + <rich:panel header="Rich Users"> + <rich:dataTable id="tb" value="#{usersBean.users}" var="us"> + <rich:column> + <f:facet name="header"> + <h:outputText value="Name"></h:outputText> + </f:facet> + <h:outputText value="#{us.name}"></h:outputText> + </rich:column> + </rich:dataTable> + </rich:panel> + </ui:define> +</ui:composition> +</html> Deleted: trunk/test-applications/regressionArea/Seam-web/src/main/webapp/pages/home.xhtml =================================================================== --- trunk/test-applications/regressionArea/Seam-web/src/main/webapp/pages/home.xhtml 2008-09-19 15:06:53 UTC (rev 10511) +++ trunk/test-applications/regressionArea/Seam-web/src/main/webapp/pages/home.xhtml 2008-09-19 15:36:11 UTC (rev 10512) @@ -1,27 +0,0 @@ -<!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:s="http://jboss.com/products/seam/taglib" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:rich="http://richfaces.org/rich" - xmlns:a4j="http://richfaces.org/a4j"> - -<ui:composition template="#{templateBean.template}"> - <ui:define name="style"> - - </ui:define> - <ui:define name="component"> - <rich:panel header="Rich Users"> - <rich:dataTable id="tb" value="#{usersBean.users}" var="us"> - <rich:column> - <f:facet name="header"> - <h:outputText value="Name"></h:outputText> - </f:facet> - <h:outputText value="#{us.name}"></h:outputText> - </rich:column> - </rich:dataTable> - </rich:panel> - </ui:define> -</ui:composition> -</html> Modified: trunk/test-applications/regressionArea/Seam-web/src/test/java/org/richfaces/testng/SimpleTest.java =================================================================== --- trunk/test-applications/regressionArea/Seam-web/src/test/java/org/richfaces/testng/SimpleTest.java 2008-09-19 15:06:53 UTC (rev 10511) +++ trunk/test-applications/regressionArea/Seam-web/src/test/java/org/richfaces/testng/SimpleTest.java 2008-09-19 15:36:11 UTC (rev 10512) @@ -4,19 +4,24 @@ import org.richfaces.SeleniumTestBase; import org.testng.annotations.Test; -public class SimpleTest extends SeleniumTestBase{ - - @Test - public void testAjaxActionParameterComponent(Template template) { - renderPage(template); - String parentId = getParentId(); - - } +public class SimpleTest extends SeleniumTestBase { - - @Override - public String getTestUrl() { - return "pages/home.xhtml"; - } + @Test + public void testXHTML(Template template) { + renderPage(template); + } + + @Test + public void testJSP(Template template) { + selenium.open("http://localhost:" + serverPort + "/" + APPLICATION_NAME + "/faces/NEKO/pages/examples/home.jsp"); + waitForPageToLoad(); + + } + + @Override + public String getTestUrl() { + return "pages/examples/home.xhtml"; + } + } Added: trunk/test-applications/regressionArea/Test.bat =================================================================== --- trunk/test-applications/regressionArea/Test.bat (rev 0) +++ trunk/test-applications/regressionArea/Test.bat 2008-09-19 15:36:11 UTC (rev 10512) @@ -0,0 +1,2 @@ +cd /Seam-web +mvn integration-test -P Test \ No newline at end of file Added: trunk/test-applications/regressionArea/build.bat =================================================================== --- trunk/test-applications/regressionArea/build.bat (rev 0) +++ trunk/test-applications/regressionArea/build.bat 2008-09-19 15:36:11 UTC (rev 10512) @@ -0,0 +1 @@ +mvn clean install \ No newline at end of file Modified: trunk/test-applications/regressionArea/pom.xml =================================================================== --- trunk/test-applications/regressionArea/pom.xml 2008-09-19 15:06:53 UTC (rev 10511) +++ trunk/test-applications/regressionArea/pom.xml 2008-09-19 15:36:11 UTC (rev 10512) @@ -23,7 +23,7 @@ <properties> <contextroot>Seam</contextroot> - <earname>Seam-${version}</earname> + <earname>Seam-ear-${version}</earname> <richversion>3.2.2.GA</richversion> <seamversion>2.0.1.GA</seamversion> <jsfversion>1.2_09</jsfversion> @@ -31,6 +31,24 @@ <jbosscontext>default</jbosscontext> </properties> +<!--dependencies> + <dependency> + <groupId>org.richfaces.framework</groupId> + <artifactId>richfaces-api</artifactId> + <version>${richversion}</version> + </dependency> + <dependency> + <groupId>org.richfaces.framework</groupId> + <artifactId>richfaces-impl</artifactId> + <version>${richversion}</version> + </dependency> + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>richfaces-ui</artifactId> + <version>${richversion}</version> + </dependency> + + </dependencies--> <modules> <module>Seam-ejb</module>