[richfaces-svn-commits] JBoss Rich Faces SVN: r10901 - in trunk/test-applications/regressionArea/Seam-web/src/main: webapp/pages and 1 other directory.
Author: nbelaevski
Date: 2008-10-24 11:55:05 -0400 (Fri, 24 Oct 2008)
New Revision: 10901
Added:
trunk/test-applications/regressionArea/Seam-web/src/main/webapp/pages/rf4507.xhtml
Removed:
trunk/test-applications/regressionArea/Seam-web/src/main/webapp/pages/4500-4600/
Modified:
trunk/test-applications/regressionArea/Seam-web/src/main/java/org/ajax4jsf/bean/TemplateBean.java
Log:
Test pages moved level up
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-10-24
15:52:08 UTC (rev 10900)
+++
trunk/test-applications/regressionArea/Seam-web/src/main/java/org/ajax4jsf/bean/TemplateBean.java 2008-10-24
15:55:05 UTC (rev 10901)
@@ -58,7 +58,7 @@
* @return the template
*/
public String getTemplate() {
- return "../../template/" + template.getName() + ".xhtml";
+ return "/template/" + template.getName() + ".xhtml";
}
/**
Copied: trunk/test-applications/regressionArea/Seam-web/src/main/webapp/pages/rf4507.xhtml
(from rev 10884,
trunk/test-applications/regressionArea/Seam-web/src/main/webapp/pages/4500-4600/rf4507.xhtml)
===================================================================
--- trunk/test-applications/regressionArea/Seam-web/src/main/webapp/pages/rf4507.xhtml
(rev 0)
+++
trunk/test-applications/regressionArea/Seam-web/src/main/webapp/pages/rf4507.xhtml 2008-10-24
15:55:05 UTC (rev 10901)
@@ -0,0 +1,26 @@
+<!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:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:a4j="http://richfaces.org/a4j"
+ xmlns:rich="http://richfaces.org/rich">
+
+<ui:composition template="#{templateBean.template}">
+ <ui:define name="style">
+
+ </ui:define>
+ <ui:define name="component">
+ <h:form id="form">
+ <a4j:commandLink value="First Link" id="link1"
data="#{'firstLink'}" oncomplete="window.receivedData = data"
/>
+
+ <rich:calendar value="22-10-2008" id="calendar"
popup="false" mode="ajax" dataModel="#{rf4507}">
+ <h:outputText value="{data}" />
+ <f:convertDateTime pattern="dd-MM-yyyy"/>
+ </rich:calendar>
+
+ <a4j:commandLink value="Second Link" id="link2"
data="#{'secondLink'}" oncomplete="window.receivedData = data"
/>
+ </h:form>
+ </ui:define>
+</ui:composition>
+</html>
\ No newline at end of file
Property changes on:
trunk/test-applications/regressionArea/Seam-web/src/main/webapp/pages/rf4507.xhtml
___________________________________________________________________
Name: svn:mergeinfo
+