[richfaces-svn-commits] JBoss Rich Faces SVN: r11596 - in trunk/samples/seamIntegration: src/main/java/org/ajax4jsf and 2 other directories.
richfaces-svn-commits at lists.jboss.org
richfaces-svn-commits at lists.jboss.org
Fri Dec 5 20:42:50 EST 2008
Author: alexsmirnov
Date: 2008-12-05 20:42:50 -0500 (Fri, 05 Dec 2008)
New Revision: 11596
Added:
trunk/samples/seamIntegration/src/main/webapp/pages/trinidad.xhtml
Modified:
trunk/samples/seamIntegration/pom.xml
trunk/samples/seamIntegration/src/main/java/org/ajax4jsf/Bean.java
trunk/samples/seamIntegration/src/main/webapp/WEB-INF/faces-config.xml
trunk/samples/seamIntegration/src/main/webapp/WEB-INF/web.xml
Log:
https://jira.jboss.org/jira/browse/RF-4561 tests.
Modified: trunk/samples/seamIntegration/pom.xml
===================================================================
--- trunk/samples/seamIntegration/pom.xml 2008-12-05 18:20:20 UTC (rev 11595)
+++ trunk/samples/seamIntegration/pom.xml 2008-12-06 01:42:50 UTC (rev 11596)
@@ -13,7 +13,7 @@
<packaging>war</packaging>
<name>seamIntegration Maven Webapp</name>
<properties>
- <seam.version>2.1.1-SNAPSHOT</seam.version>
+ <seam.version>2.1.1-SNAPSHOT</seam.version>
</properties>
<build>
<finalName>seamIntegration</finalName>
@@ -86,6 +86,17 @@
<version>${seam.version}</version>
</dependency>
<dependency>
+ <groupId>org.jboss.el</groupId>
+ <artifactId>jboss-el</artifactId>
+ <version>2.0.2.CR1</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.el</groupId>
+ <artifactId>el-api</artifactId>
+ <version>1.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam-ui</artifactId>
<version>${seam.version}</version>
@@ -106,5 +117,16 @@
<artifactId>jstl</artifactId>
<version>1.2</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.myfaces.trinidad</groupId>
+ <artifactId>trinidad-api</artifactId>
+ <version>1.2.10</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.myfaces.trinidad</groupId>
+ <artifactId>trinidad-impl</artifactId>
+ <version>1.2.10</version>
+ <scope>runtime</scope>
+ </dependency>
</dependencies>
</project>
\ No newline at end of file
Modified: trunk/samples/seamIntegration/src/main/java/org/ajax4jsf/Bean.java
===================================================================
--- trunk/samples/seamIntegration/src/main/java/org/ajax4jsf/Bean.java 2008-12-05 18:20:20 UTC (rev 11595)
+++ trunk/samples/seamIntegration/src/main/java/org/ajax4jsf/Bean.java 2008-12-06 01:42:50 UTC (rev 11596)
@@ -22,6 +22,7 @@
package org.ajax4jsf;
import java.io.Serializable;
+import java.util.Date;
import javax.faces.context.ExternalContext;
import javax.faces.context.FacesContext;
@@ -45,8 +46,40 @@
private static final long serialVersionUID = -4209339000953631111L;
private String text;
private String text2;
+
+ private Date date;
+
+ private Date date1 = new Date();
/**
+ * @return the date
+ */
+ public Date getDate() {
+ return date;
+ }
+
+ /**
+ * @param date the date to set
+ */
+ public void setDate(Date date) {
+ this.date = date;
+ }
+
+ /**
+ * @return the date1
+ */
+ public Date getDate1() {
+ return date1;
+ }
+
+ /**
+ * @param date1 the date1 to set
+ */
+ public void setDate1(Date date1) {
+ this.date1 = date1;
+ }
+
+ /**
* @return the text
*/
public String getText() {
Modified: trunk/samples/seamIntegration/src/main/webapp/WEB-INF/faces-config.xml
===================================================================
--- trunk/samples/seamIntegration/src/main/webapp/WEB-INF/faces-config.xml 2008-12-05 18:20:20 UTC (rev 11595)
+++ trunk/samples/seamIntegration/src/main/webapp/WEB-INF/faces-config.xml 2008-12-06 01:42:50 UTC (rev 11596)
@@ -13,6 +13,8 @@
<!--
<view-handler>com.sun.facelets.FaceletViewHandler</view-handler>
-->
+ <default-render-kit-id>
+ org.apache.myfaces.trinidad.core
+ </default-render-kit-id>
</application>
-
</faces-config>
Modified: trunk/samples/seamIntegration/src/main/webapp/WEB-INF/web.xml
===================================================================
--- trunk/samples/seamIntegration/src/main/webapp/WEB-INF/web.xml 2008-12-05 18:20:20 UTC (rev 11595)
+++ trunk/samples/seamIntegration/src/main/webapp/WEB-INF/web.xml 2008-12-06 01:42:50 UTC (rev 11596)
@@ -1,17 +1,19 @@
<?xml version="1.0" ?>
-<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">
+<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">
<!-- Ajax4jsf -->
-
+ <!--
+ <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.VIEW_HANDLERS</param-name>
+ <param-name>org.apache.myfaces.trinidad.ALTERNATE_VIEW_HANDLER</param-name>
<param-value>com.sun.facelets.FaceletViewHandler</param-value>
</context-param>
-
<context-param>
<param-name>org.ajax4jsf.SKIN</param-name>
<param-value>blueSky</param-value>
@@ -22,64 +24,75 @@
</context-param>
<!-- Seam -->
-
<listener>
- <listener-class>
- org.jboss.seam.servlet.SeamListener
- </listener-class>
+ <listener-class>org.jboss.seam.servlet.SeamListener</listener-class>
</listener>
-
<filter>
<filter-name>Seam Filter</filter-name>
<filter-class>org.jboss.seam.servlet.SeamFilter</filter-class>
</filter>
-
<filter-mapping>
<filter-name>Seam Filter</filter-name>
- <url-pattern>/*</url-pattern>
+ <servlet-name>Faces Servlet</servlet-name>
+ <dispatcher>REQUEST</dispatcher>
+ <dispatcher>FORWARD</dispatcher>
+ <dispatcher>INCLUDE</dispatcher>
+ <dispatcher>ERROR</dispatcher>
</filter-mapping>
-
+ <filter>
+ <filter-name>trinidad</filter-name>
+ <filter-class>org.apache.myfaces.trinidad.webapp.TrinidadFilter</filter-class>
+ </filter>
+ <filter-mapping>
+ <filter-name>trinidad</filter-name>
+ <!-- This assumes that the FacesServlet has been registered -->
+ <!-- under the name "faces" -->
+ <servlet-name>Faces Servlet</servlet-name>
+ <dispatcher>REQUEST</dispatcher>
+ <dispatcher>FORWARD</dispatcher>
+ <dispatcher>INCLUDE</dispatcher>
+ <dispatcher>ERROR</dispatcher>
+ </filter-mapping>
<servlet>
<servlet-name>Seam Resource Servlet</servlet-name>
- <servlet-class>
- org.jboss.seam.servlet.SeamResourceServlet
- </servlet-class>
+ <servlet-class>org.jboss.seam.servlet.SeamResourceServlet</servlet-class>
</servlet>
-
<servlet-mapping>
<servlet-name>Seam Resource Servlet</servlet-name>
<url-pattern>/seam/resource/*</url-pattern>
</servlet-mapping>
<!-- Facelets development mode (disable in production) -->
-
<context-param>
<param-name>facelets.DEVELOPMENT</param-name>
<param-value>true</param-value>
</context-param>
<!-- JSF -->
-
<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>
<load-on-startup>1</load-on-startup>
</servlet>
-
<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/*</url-pattern>
</servlet-mapping>
-
-
-</web-app>
+ <servlet>
+ <servlet-name>resources</servlet-name>
+ <servlet-class>org.apache.myfaces.trinidad.webapp.ResourceServlet</servlet-class>
+ </servlet>
+ <!-- This cannot be configured currently -->
+ <servlet-mapping>
+ <servlet-name>resources</servlet-name>
+ <url-pattern>/adf/*</url-pattern>
+ </servlet-mapping>
+</web-app>
\ No newline at end of file
Added: trunk/samples/seamIntegration/src/main/webapp/pages/trinidad.xhtml
===================================================================
--- trunk/samples/seamIntegration/src/main/webapp/pages/trinidad.xhtml (rev 0)
+++ trunk/samples/seamIntegration/src/main/webapp/pages/trinidad.xhtml 2008-12-06 01:42:50 UTC (rev 11596)
@@ -0,0 +1,43 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<f:view xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:a4j="http://richfaces.org/a4j"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:tr="http://myfaces.apache.org/trinidad">
+ <tr:document title="InputText Demo">
+ <tr:form>
+ <tr:panelGroupLayout layout="vertical">
+ <f:facet name="separator">
+ <tr:separator/>
+ </f:facet>
+ <tr:panelGroupLayout layout="horizontal">
+ <tr:commandLink immediate="true" text="Component Guide" action="guide"/>
+ <tr:spacer width="10"/>
+ <tr:goLink destination="http://myfaces.apache.org/trinidad/trinidad-api/tagdoc/tr_inputText.html"
+ text="Tag Documentation"/>
+ <tr:spacer width="10"/>
+ <tr:goLink destination="http://myfaces.apache.org/trinidad/skin-selectors.html#inputText"
+ text="Skinning Key Documentation"/>
+ </tr:panelGroupLayout>
+ <tr:outputFormatted styleUsage="instruction" value="<b>inputText</b>"/>
+ <tr:inputText label="Label" value="Some text"/>
+ <tr:commandButton text="Submit"/>
+ <tr:outputFormatted styleUsage="instruction"
+ value="<b>InputText Bound To Date</b>"/>
+ <tr:inputText label="Label2" value="#{seamBean.date1}" autoSubmit="true">
+ <f:convertDateTime dateStyle="long"/>
+ </tr:inputText>
+ <a4j:commandButton value="RichFaces AJAX Submit" reRender="output"/>
+ <tr:outputText styleClass="AFInstructionText" value="The submitted value was: "/>
+ <tr:outputText id="output" value="#{seamBean.date1}"/>
+ <tr:outputFormatted styleUsage="instruction"
+ value="<b>InputText with help facet</b>"/>
+ <tr:inputText label="Label3">
+ <f:facet name="help">
+ <tr:outputText value="Help facet text"/>
+ </f:facet>
+ </tr:inputText>
+ </tr:panelGroupLayout>
+ </tr:form>
+ </tr:document>
+</f:view>
\ No newline at end of file
Property changes on: trunk/samples/seamIntegration/src/main/webapp/pages/trinidad.xhtml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
More information about the richfaces-svn-commits
mailing list