You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2008/11/13 14:59:59 UTC
svn commit: r713724 - in /myfaces/tobago/trunk/example/demo/src/main:
java/org/apache/myfaces/tobago/example/demo/ webapp/ webapp/WEB-INF/
webapp/WEB-INF/tags/layout/ webapp/overview/
Author: lofwyr
Date: Thu Nov 13 05:59:59 2008
New Revision: 713724
URL: http://svn.apache.org/viewvc?rev=713724&view=rev
Log:
TOBAGO-723: Using the demo with Faceles and JSP
The template pages and one single page are now available Facelet. You can switch with a button in the footer.
Added:
myfaces/tobago/trunk/example/demo/src/main/webapp/WEB-INF/tags/layout/overview.xhtml
myfaces/tobago/trunk/example/demo/src/main/webapp/WEB-INF/tags/layout/plain.tag (contents, props changed)
- copied, changed from r713180, myfaces/tobago/trunk/example/demo/src/main/webapp/WEB-INF/tags/layout/overview.tag
myfaces/tobago/trunk/example/demo/src/main/webapp/WEB-INF/tags/layout/plain.xhtml
myfaces/tobago/trunk/example/demo/src/main/webapp/footer.xhtml (contents, props changed)
- copied, changed from r713180, myfaces/tobago/trunk/example/demo/src/main/webapp/footer.jsp
myfaces/tobago/trunk/example/demo/src/main/webapp/header.xhtml (contents, props changed)
- copied, changed from r713180, myfaces/tobago/trunk/example/demo/src/main/webapp/header.jsp
myfaces/tobago/trunk/example/demo/src/main/webapp/menu.xhtml (contents, props changed)
- copied, changed from r713180, myfaces/tobago/trunk/example/demo/src/main/webapp/menu.jsp
myfaces/tobago/trunk/example/demo/src/main/webapp/navigation.xhtml (contents, props changed)
- copied, changed from r713180, myfaces/tobago/trunk/example/demo/src/main/webapp/navigation.jsp
myfaces/tobago/trunk/example/demo/src/main/webapp/overview/basic.xhtml (contents, props changed)
- copied, changed from r713180, myfaces/tobago/trunk/example/demo/src/main/webapp/overview/basic.jsp
Modified:
myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/Navigation.java
myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/TobagoDemoController.java
myfaces/tobago/trunk/example/demo/src/main/webapp/WEB-INF/faces-config.xml
myfaces/tobago/trunk/example/demo/src/main/webapp/WEB-INF/tags/layout/overview.tag
myfaces/tobago/trunk/example/demo/src/main/webapp/WEB-INF/web.xml
myfaces/tobago/trunk/example/demo/src/main/webapp/footer.jsp
myfaces/tobago/trunk/example/demo/src/main/webapp/header.jsp
myfaces/tobago/trunk/example/demo/src/main/webapp/index.jsp
myfaces/tobago/trunk/example/demo/src/main/webapp/navigation.jsp
myfaces/tobago/trunk/example/demo/src/main/webapp/overview/basic.jsp
Modified: myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/Navigation.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/Navigation.java?rev=713724&r1=713723&r2=713724&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/Navigation.java (original)
+++ myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/Navigation.java Thu Nov 13 05:59:59 2008
@@ -52,7 +52,7 @@
DefaultMutableTreeNode overview = new DefaultMutableTreeNode(new Node("overview", "overview/intro"));
// overview.add(new DefaultMutableTreeNode(new Node("intro", "overview/intro")));
- overview.add(new DefaultMutableTreeNode(new Node("basic", "overview/basic")));
+ overview.add(new DefaultMutableTreeNode(new Node("basic", "overview/basic.jsp")));
overview.add(new DefaultMutableTreeNode(new Node("sheet", "overview/sheet")));
overview.add(new DefaultMutableTreeNode(new Node("tree", "overview/tree")));
overview.add(new DefaultMutableTreeNode(new Node("tab", "overview/tab")));
Modified: myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/TobagoDemoController.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/TobagoDemoController.java?rev=713724&r1=713723&r2=713724&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/TobagoDemoController.java (original)
+++ myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/TobagoDemoController.java Thu Nov 13 05:59:59 2008
@@ -221,6 +221,39 @@
return update;
}
+ public boolean isJsp() {
+ String viewId = FacesContext.getCurrentInstance().getViewRoot().getViewId();
+ int end = viewId.lastIndexOf(".xhtml");
+ return end < 0;
+ }
+
+ public boolean isDoubleDefined() {
+ String viewId = FacesContext.getCurrentInstance().getViewRoot().getViewId();
+ String name = viewId.substring(1, viewId.lastIndexOf("."));
+ String path = ResourceManagerUtil.getImageWithPath(FacesContext.getCurrentInstance(), name + ".xhtml", true);
+ return path != null;
+ }
+
+ public String asJsp() {
+ String viewId = FacesContext.getCurrentInstance().getViewRoot().getViewId();
+ int end = viewId.lastIndexOf(".xhtml");
+ if (end >= 0) {
+ return viewId.substring(1, end) + ".jsp";
+ }
+ LOG.warn("Can't create the outcome");
+ return null;
+ }
+
+ public String asFacelet() {
+ String viewId = FacesContext.getCurrentInstance().getViewRoot().getViewId();
+ int end = viewId.lastIndexOf(".jsp");
+ if (end >= 0) {
+ return viewId.substring(1, end) + ".xhtml";
+ }
+ LOG.warn("Can't create the outcome");
+ return null;
+ }
+
public void resetSession() throws IOException {
FacesContext facesContext = FacesContext.getCurrentInstance();
HttpSession session = (HttpSession) facesContext.getExternalContext().getSession(false);
Modified: myfaces/tobago/trunk/example/demo/src/main/webapp/WEB-INF/faces-config.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/webapp/WEB-INF/faces-config.xml?rev=713724&r1=713723&r2=713724&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/webapp/WEB-INF/faces-config.xml (original)
+++ myfaces/tobago/trunk/example/demo/src/main/webapp/WEB-INF/faces-config.xml Thu Nov 13 05:59:59 2008
@@ -24,6 +24,9 @@
<faces-config>
<application>
+ <view-handler>
+ com.sun.facelets.FaceletViewHandler
+ </view-handler>
<locale-config>
<default-locale>en</default-locale>
<supported-locale>en_US</supported-locale>
@@ -111,10 +114,14 @@
<to-view-id>/overview/intro.jsp</to-view-id>
</navigation-case>
<navigation-case>
- <from-outcome>overview/basic</from-outcome>
+ <from-outcome>overview/basic.jsp</from-outcome>
<to-view-id>/overview/basic.jsp</to-view-id>
</navigation-case>
<navigation-case>
+ <from-outcome>overview/basic.xhtml</from-outcome>
+ <to-view-id>/overview/basic.xhtml</to-view-id>
+ </navigation-case>
+ <navigation-case>
<from-outcome>overview/sheet</from-outcome>
<to-view-id>/overview/sheet.jsp</to-view-id>
</navigation-case>
Modified: myfaces/tobago/trunk/example/demo/src/main/webapp/WEB-INF/tags/layout/overview.tag
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/webapp/WEB-INF/tags/layout/overview.tag?rev=713724&r1=713723&r2=713724&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/webapp/WEB-INF/tags/layout/overview.tag (original)
+++ myfaces/tobago/trunk/example/demo/src/main/webapp/WEB-INF/tags/layout/overview.tag Thu Nov 13 05:59:59 2008
@@ -1,11 +1,3 @@
-<%@ tag import="org.apache.myfaces.tobago.example.reference.SimpleBean" %>
-<%@ tag import="org.apache.myfaces.tobago.model.TreeState" %>
-<%@ tag import="javax.faces.application.FacesMessage" %>
-<%@ tag import="javax.faces.context.FacesContext" %>
-<%@ tag import="javax.swing.tree.DefaultMutableTreeNode" %>
-<%@ tag import="java.io.PrintWriter" %>
-<%@ tag import="java.io.StringWriter" %>
-<%@ tag import="java.util.Date" %>
<%--
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
Added: myfaces/tobago/trunk/example/demo/src/main/webapp/WEB-INF/tags/layout/overview.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/webapp/WEB-INF/tags/layout/overview.xhtml?rev=713724&view=auto
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/webapp/WEB-INF/tags/layout/overview.xhtml (added)
+++ myfaces/tobago/trunk/example/demo/src/main/webapp/WEB-INF/tags/layout/overview.xhtml Thu Nov 13 05:59:59 2008
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+-->
+
+<ui:composition xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:tc="http://myfaces.apache.org/tobago/component"
+ xmlns:tf="http://myfaces.apache.org/tobago/facelet-extension"
+ xmlns:ui="http://java.sun.com/jsf/facelets">
+ <f:view locale="#{clientConfigController.locale}">
+ <tc:loadBundle basename="overview" var="overviewBundle"/>
+ <tc:page applicationIcon="icon/favicon.ico" label="#{overviewBundle.pageTitle}" id="page" width="1000px"
+ height="750px">
+
+ <ui:include src="/menu.xhtml"/>
+
+ <f:facet name="layout">
+ <tc:gridLayout border="0" columns="*;4*"
+ margin="10px" rows="100px;*;fixed"/>
+ </f:facet>
+
+ <tc:cell spanX="2">
+ <ui:include src="/header.xhtml"/>
+ </tc:cell>
+
+ <tc:cell spanY="2">
+ <ui:include src="/navigation.xhtml"/>
+ </tc:cell>
+
+ <tc:cell>
+ <ui:insert/>
+ </tc:cell>
+
+ <tc:cell>
+ <ui:include src="/footer.xhtml"/>
+ </tc:cell>
+
+ </tc:page>
+ </f:view>
+</ui:composition>
Copied: myfaces/tobago/trunk/example/demo/src/main/webapp/WEB-INF/tags/layout/plain.tag (from r713180, myfaces/tobago/trunk/example/demo/src/main/webapp/WEB-INF/tags/layout/overview.tag)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/webapp/WEB-INF/tags/layout/plain.tag?p2=myfaces/tobago/trunk/example/demo/src/main/webapp/WEB-INF/tags/layout/plain.tag&p1=myfaces/tobago/trunk/example/demo/src/main/webapp/WEB-INF/tags/layout/overview.tag&r1=713180&r2=713724&rev=713724&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/webapp/WEB-INF/tags/layout/overview.tag (original)
+++ myfaces/tobago/trunk/example/demo/src/main/webapp/WEB-INF/tags/layout/plain.tag Thu Nov 13 05:59:59 2008
@@ -1,11 +1,3 @@
-<%@ tag import="org.apache.myfaces.tobago.example.reference.SimpleBean" %>
-<%@ tag import="org.apache.myfaces.tobago.model.TreeState" %>
-<%@ tag import="javax.faces.application.FacesMessage" %>
-<%@ tag import="javax.faces.context.FacesContext" %>
-<%@ tag import="javax.swing.tree.DefaultMutableTreeNode" %>
-<%@ tag import="java.io.PrintWriter" %>
-<%@ tag import="java.io.StringWriter" %>
-<%@ tag import="java.util.Date" %>
<%--
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -25,37 +17,15 @@
<%@ taglib uri="http://myfaces.apache.org/tobago/component" prefix="tc" %>
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+
<f:view locale="#{clientConfigController.locale}">
<tc:loadBundle basename="overview" var="overviewBundle"/>
- <tc:page applicationIcon="icon/favicon.ico" label="#{overviewBundle.pageTitle}" id="page" width="1000px" height="750px">
-
- <jsp:include page="/menu.jsp" />
- <%--f:facet name="backButtonDetector">
- <tc:hidden value="#{overviewNavigation.currentRequestTime}"
- converter="org.apache.myfaces.tobago.converter.BackButtonDetection" >
- <f:validator validatorId="org.apache.myfaces.tobago.validator.BackButtonDetection" />
- </tc:hidden>
- </f:facet--%>
+ <tc:page label="Test" id="page" width="1000px" height="750px">
<f:facet name="layout">
- <tc:gridLayout border="0" columns="*;4*"
- margin="10px" rows="100px;*;fixed" />
+ <tc:gridLayout/>
</f:facet>
- <tc:cell spanX="2">
- <jsp:include page="/header.jsp"/>
- </tc:cell>
-
- <tc:cell spanY="2" >
- <jsp:include page="/navigation.jsp"/>
- </tc:cell>
-
- <tc:cell>
- <jsp:doBody/>
- </tc:cell>
-
- <tc:cell>
- <jsp:include page="/footer.jsp" />
- </tc:cell>
+ <jsp:doBody/>
</tc:page>
</f:view>
Propchange: myfaces/tobago/trunk/example/demo/src/main/webapp/WEB-INF/tags/layout/plain.tag
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/example/demo/src/main/webapp/WEB-INF/tags/layout/plain.tag
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: myfaces/tobago/trunk/example/demo/src/main/webapp/WEB-INF/tags/layout/plain.tag
------------------------------------------------------------------------------
svn:mergeinfo =
Added: myfaces/tobago/trunk/example/demo/src/main/webapp/WEB-INF/tags/layout/plain.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/webapp/WEB-INF/tags/layout/plain.xhtml?rev=713724&view=auto
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/webapp/WEB-INF/tags/layout/plain.xhtml (added)
+++ myfaces/tobago/trunk/example/demo/src/main/webapp/WEB-INF/tags/layout/plain.xhtml Thu Nov 13 05:59:59 2008
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+-->
+
+<ui:composition xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:tc="http://myfaces.apache.org/tobago/component"
+ xmlns:tf="http://myfaces.apache.org/tobago/facelet-extension"
+ xmlns:ui="http://java.sun.com/jsf/facelets">
+
+ <f:view locale="#{clientConfigController.locale}">
+ <tc:loadBundle basename="overview" var="overviewBundle"/>
+ <tc:page label="Test" id="page" width="1000px" height="750px">
+ <f:facet name="layout">
+ <tc:gridLayout/>
+ </f:facet>
+
+ <ui:insert/>
+
+ </tc:page>
+ </f:view>
+</ui:composition>
\ No newline at end of file
Modified: myfaces/tobago/trunk/example/demo/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/webapp/WEB-INF/web.xml?rev=713724&r1=713723&r2=713724&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/webapp/WEB-INF/web.xml (original)
+++ myfaces/tobago/trunk/example/demo/src/main/webapp/WEB-INF/web.xml Thu Nov 13 05:59:59 2008
@@ -29,6 +29,21 @@
<param-value>true</param-value>
</context-param>
+ <context-param>
+ <param-name>facelets.DEVELOPMENT</param-name>
+ <param-value>true</param-value>
+ </context-param>
+
+ <context-param>
+ <param-name>facelets.SKIP_COMMENTS</param-name>
+ <param-value>true</param-value>
+ </context-param>
+
+ <context-param>
+ <param-name>facelets.VIEW_MAPPINGS</param-name>
+ <param-value>*.xhtml</param-value>
+ </context-param>
+
<filter>
<filter-name>multipartFormdataFilter</filter-name>
<filter-class>org.apache.myfaces.tobago.webapp.TobagoMultipartFormdataFilter</filter-class>
Modified: myfaces/tobago/trunk/example/demo/src/main/webapp/footer.jsp
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/webapp/footer.jsp?rev=713724&r1=713723&r2=713724&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/webapp/footer.jsp (original)
+++ myfaces/tobago/trunk/example/demo/src/main/webapp/footer.jsp Thu Nov 13 05:59:59 2008
@@ -14,34 +14,42 @@
* See the License for the specific language governing permissions and
* limitations under the License.
--%>
+
<%@ taglib uri="http://myfaces.apache.org/tobago/component" prefix="tc" %>
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
-<f:subview id="footer" >
+
+<f:subview id="footer">
<tc:panel>
<f:facet name="layout">
- <tc:gridLayout columns="fixed;fixed;fixed;*" rows="15px;fixed"/>
+ <tc:gridLayout columns="fixed;fixed;fixed;fixed;fixed;*" rows="15px;fixed"/>
</f:facet>
- <tc:cell spanX="4">
+ <tc:cell spanX="6">
<tc:separator/>
</tc:cell>
<tc:button immediate="true"
- image="image/prev.gif"
- action="#{navigation.gotoPrevious}"
- disabled="#{navigation.first}"
- label="#{overviewBundle.footer_previous}"/>
+ image="image/prev.gif"
+ action="#{navigation.gotoPrevious}"
+ disabled="#{navigation.first}"
+ label="#{overviewBundle.footer_previous}"/>
<tc:button immediate="true"
- image="image/next.gif"
- action="#{navigation.gotoNext}"
- disabled="#{navigation.last}"
- label="#{overviewBundle.footer_next}"/>
+ image="image/next.gif"
+ action="#{navigation.gotoNext}"
+ disabled="#{navigation.last}"
+ label="#{overviewBundle.footer_next}"/>
<tc:button action="#{navigation.viewSource}"
- immediate="true" label="#{overviewBundle.footer_viewSource}"
- target="Source Viewer" transition="false"/>
+ immediate="true" label="#{overviewBundle.footer_viewSource}"
+ target="Source Viewer" transition="false"/>
+
+ <tc:button action="#{demo.asJsp}" disabled="#{demo.jsp}" rendered="#{demo.doubleDefined}" immediate="true"
+ label="As JSP" tip="Use JSP as render technologie"/>
+
+ <tc:button action="#{demo.asFacelet}" disabled="#{! demo.jsp}" rendered="#{demo.doubleDefined}" immediate="true"
+ label="As Facelet" tip="Use Facelets as render technologie"/>
<tc:out value="#{overviewBundle.notTranslated}"/>
Copied: myfaces/tobago/trunk/example/demo/src/main/webapp/footer.xhtml (from r713180, myfaces/tobago/trunk/example/demo/src/main/webapp/footer.jsp)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/webapp/footer.xhtml?p2=myfaces/tobago/trunk/example/demo/src/main/webapp/footer.xhtml&p1=myfaces/tobago/trunk/example/demo/src/main/webapp/footer.jsp&r1=713180&r2=713724&rev=713724&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/webapp/footer.jsp (original)
+++ myfaces/tobago/trunk/example/demo/src/main/webapp/footer.xhtml Thu Nov 13 05:59:59 2008
@@ -1,4 +1,6 @@
-<%--
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -13,35 +15,45 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
---%>
-<%@ taglib uri="http://myfaces.apache.org/tobago/component" prefix="tc" %>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
-<f:subview id="footer" >
+-->
+
+<f:subview id="footer"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:tc="http://myfaces.apache.org/tobago/component"
+ xmlns:tx="http://myfaces.apache.org/tobago/extension"
+ xmlns:tf="http://myfaces.apache.org/tobago/facelet-extension"
+ xmlns:ui="http://java.sun.com/jsf/facelets">
<tc:panel>
<f:facet name="layout">
- <tc:gridLayout columns="fixed;fixed;fixed;*" rows="15px;fixed"/>
+ <tc:gridLayout columns="fixed;fixed;fixed;fixed;fixed;*" rows="15px;fixed"/>
</f:facet>
- <tc:cell spanX="4">
+ <tc:cell spanX="6">
<tc:separator/>
</tc:cell>
<tc:button immediate="true"
- image="image/prev.gif"
- action="#{navigation.gotoPrevious}"
- disabled="#{navigation.first}"
- label="#{overviewBundle.footer_previous}"/>
+ image="image/prev.gif"
+ action="#{navigation.gotoPrevious}"
+ disabled="#{navigation.first}"
+ label="#{overviewBundle.footer_previous}"/>
<tc:button immediate="true"
- image="image/next.gif"
- action="#{navigation.gotoNext}"
- disabled="#{navigation.last}"
- label="#{overviewBundle.footer_next}"/>
+ image="image/next.gif"
+ action="#{navigation.gotoNext}"
+ disabled="#{navigation.last}"
+ label="#{overviewBundle.footer_next}"/>
<tc:button action="#{navigation.viewSource}"
- immediate="true" label="#{overviewBundle.footer_viewSource}"
- target="Source Viewer" transition="false"/>
+ immediate="true" label="#{overviewBundle.footer_viewSource}"
+ target="Source Viewer" transition="false"/>
+
+ <tc:button action="#{demo.asJsp}" disabled="#{demo.jsp}" rendered="#{demo.doubleDefined}" immediate="true"
+ label="As JSP" tip="Use JSP as render technologie"/>
+
+ <tc:button action="#{demo.asFacelet}" disabled="#{! demo.jsp}" rendered="#{demo.doubleDefined}" immediate="true"
+ label="As Facelet" tip="Use Facelets as render technologie"/>
<tc:out value="#{overviewBundle.notTranslated}"/>
Propchange: myfaces/tobago/trunk/example/demo/src/main/webapp/footer.xhtml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/example/demo/src/main/webapp/footer.xhtml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: myfaces/tobago/trunk/example/demo/src/main/webapp/footer.xhtml
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: myfaces/tobago/trunk/example/demo/src/main/webapp/header.jsp
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/webapp/header.jsp?rev=713724&r1=713723&r2=713724&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/webapp/header.jsp (original)
+++ myfaces/tobago/trunk/example/demo/src/main/webapp/header.jsp Thu Nov 13 05:59:59 2008
@@ -1,3 +1,9 @@
+<%@ page import="org.apache.myfaces.tobago.example.reference.SimpleBean" %>
+<%@ page import="javax.faces.application.FacesMessage" %>
+<%@ page import="javax.faces.context.FacesContext" %>
+<%@ page import="java.io.PrintWriter" %>
+<%@ page import="java.io.StringWriter" %>
+<%@ page import="java.util.Date" %>
<%--
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -14,26 +20,27 @@
* See the License for the specific language governing permissions and
* limitations under the License.
--%>
-<%@ taglib uri="http://myfaces.apache.org/tobago/component" prefix="tc"%>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
+<%@ taglib uri="http://myfaces.apache.org/tobago/component" prefix="tc" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
<f:subview id="header">
<tc:panel>
<f:facet name="layout">
- <tc:gridLayout columns="150px;*;200px" />
+ <tc:gridLayout columns="150px;*;200px"/>
</f:facet>
- <tc:link action="#{navigation.gotoFirst}" immediate="true" image="image/tobago_head.gif" />
+ <tc:link action="#{navigation.gotoFirst}" immediate="true" image="image/tobago_head.gif"/>
- <tc:cell />
+ <tc:cell/>
<tc:panel>
<f:facet name="layout">
- <tc:gridLayout rows="fixed;fixed;*" />
+ <tc:gridLayout rows="fixed;fixed;fixed;*"/>
</f:facet>
- <tc:out value="#{clientConfigController.localizedTheme}" />
- <tc:out value="#{clientConfigController.localizedLocale}" />
- <tc:cell />
+ <tc:out value="#{clientConfigController.localizedTheme}"/>
+ <tc:out value="#{clientConfigController.localizedLocale}"/>
+ <tc:out value="#{demo.jsp ? 'JSP' : 'Facelet'}"/>
+ <tc:cell/>
</tc:panel>
</tc:panel>
</f:subview>
Copied: myfaces/tobago/trunk/example/demo/src/main/webapp/header.xhtml (from r713180, myfaces/tobago/trunk/example/demo/src/main/webapp/header.jsp)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/webapp/header.xhtml?p2=myfaces/tobago/trunk/example/demo/src/main/webapp/header.xhtml&p1=myfaces/tobago/trunk/example/demo/src/main/webapp/header.jsp&r1=713180&r2=713724&rev=713724&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/webapp/header.jsp (original)
+++ myfaces/tobago/trunk/example/demo/src/main/webapp/header.xhtml Thu Nov 13 05:59:59 2008
@@ -1,4 +1,6 @@
-<%--
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -13,27 +15,31 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
---%>
-<%@ taglib uri="http://myfaces.apache.org/tobago/component" prefix="tc"%>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
+-->
-<f:subview id="header">
+<f:subview id="header"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:tc="http://myfaces.apache.org/tobago/component"
+ xmlns:tx="http://myfaces.apache.org/tobago/extension"
+ xmlns:tf="http://myfaces.apache.org/tobago/facelet-extension"
+ xmlns:ui="http://java.sun.com/jsf/facelets">
<tc:panel>
<f:facet name="layout">
- <tc:gridLayout columns="150px;*;200px" />
+ <tc:gridLayout columns="150px;*;200px"/>
</f:facet>
- <tc:link action="#{navigation.gotoFirst}" immediate="true" image="image/tobago_head.gif" />
+ <tc:link action="#{navigation.gotoFirst}" immediate="true" image="image/tobago_head.gif"/>
- <tc:cell />
+ <tc:cell/>
<tc:panel>
<f:facet name="layout">
- <tc:gridLayout rows="fixed;fixed;*" />
+ <tc:gridLayout rows="fixed;fixed;fixed;*"/>
</f:facet>
- <tc:out value="#{clientConfigController.localizedTheme}" />
- <tc:out value="#{clientConfigController.localizedLocale}" />
- <tc:cell />
+ <tc:out value="#{clientConfigController.localizedTheme}"/>
+ <tc:out value="#{clientConfigController.localizedLocale}"/>
+ <tc:out value="#{demo.jsp ? 'JSP' : 'Facelet'}"/>
+ <tc:cell/>
</tc:panel>
</tc:panel>
</f:subview>
Propchange: myfaces/tobago/trunk/example/demo/src/main/webapp/header.xhtml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/example/demo/src/main/webapp/header.xhtml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: myfaces/tobago/trunk/example/demo/src/main/webapp/header.xhtml
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: myfaces/tobago/trunk/example/demo/src/main/webapp/index.jsp
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/webapp/index.jsp?rev=713724&r1=713723&r2=713724&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/webapp/index.jsp (original)
+++ myfaces/tobago/trunk/example/demo/src/main/webapp/index.jsp Thu Nov 13 05:59:59 2008
@@ -14,4 +14,4 @@
* See the License for the specific language governing permissions and
* limitations under the License.
--%>
-<jsp:forward page="faces/overview/intro.jsp"/>
+<jsp:forward page="overview/intro.jsf"/>
Copied: myfaces/tobago/trunk/example/demo/src/main/webapp/menu.xhtml (from r713180, myfaces/tobago/trunk/example/demo/src/main/webapp/menu.jsp)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/webapp/menu.xhtml?p2=myfaces/tobago/trunk/example/demo/src/main/webapp/menu.xhtml&p1=myfaces/tobago/trunk/example/demo/src/main/webapp/menu.jsp&r1=713180&r2=713724&rev=713724&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/webapp/menu.jsp (original)
+++ myfaces/tobago/trunk/example/demo/src/main/webapp/menu.xhtml Thu Nov 13 05:59:59 2008
@@ -1,4 +1,6 @@
-<%--
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -13,46 +15,48 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
---%>
-<%@ taglib uri="http://myfaces.apache.org/tobago/component" prefix="tc" %>
-<%@ taglib uri="http://myfaces.apache.org/tobago/extension" prefix="tx" %>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
-<%-- !!!!!! no <f:subview here !!!!!!! --%>
- <f:facet name="menuBar" >
- <tc:menuBar >
- <tc:menu label="#{overviewBundle.menu_config}" >
- <tc:menu label="#{overviewBundle.menu_themes}" >
- <tc:menuItem action="#{clientConfigController.submit}">
- <f:facet name="items">
- <tc:selectOneRadio value="#{clientConfigController.theme}" >
- <f:selectItems value="#{clientConfigController.themeItems}" />
- </tc:selectOneRadio>
- </f:facet>
- </tc:menuItem>
- </tc:menu>
- <tc:menu label="#{overviewBundle.menu_locale}">
- <tx:menuRadio action="#{clientConfigController.submit}"
- value="#{clientConfigController.locale}">
- <f:selectItems value="#{clientConfigController.localeItems}" />
- </tx:menuRadio>
- </tc:menu>
- <%-- todo: may have something like immediate="true", but in this case, the value will not switched --%>
- <tc:menuCheckbox action="#{clientConfigController.submit}"
- label="#{overviewBundle.menu_debug}"
- value="#{clientConfigController.debugMode}"/>
- <tc:menuItem action="#{demo.resetSession}" label="Reset" />
- </tc:menu>
+-->
+<f:facet xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:tc="http://myfaces.apache.org/tobago/component"
+ xmlns:tx="http://myfaces.apache.org/tobago/extension"
+ xmlns:tf="http://myfaces.apache.org/tobago/facelet-extension"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ name="menuBar">
+ <tc:menuBar>
+ <tc:menu label="#{overviewBundle.menu_config}">
+ <tc:menu label="#{overviewBundle.menu_themes}">
+ <tc:menuItem action="#{clientConfigController.submit}">
+ <f:facet name="items">
+ <tc:selectOneRadio value="#{clientConfigController.theme}">
+ <f:selectItems value="#{clientConfigController.themeItems}"/>
+ </tc:selectOneRadio>
+ </f:facet>
+ </tc:menuItem>
+ </tc:menu>
+ <tc:menu label="#{overviewBundle.menu_locale}">
+ <tx:menuRadio action="#{clientConfigController.submit}"
+ value="#{clientConfigController.locale}">
+ <f:selectItems value="#{clientConfigController.localeItems}"/>
+ </tx:menuRadio>
+ </tc:menu>
+ <!-- todo: may have something like immediate="true", but in this case, the value will not switched -->
+ <tc:menuCheckbox action="#{clientConfigController.submit}"
+ label="#{overviewBundle.menu_debug}"
+ value="#{clientConfigController.debugMode}"/>
+ <tc:menuItem action="#{demo.resetSession}" label="Reset"/>
+ </tc:menu>
- <tc:menu label="#{overviewBundle.menu_help}">
- <tc:menuItem onclick="alert('#{overviewBundle.pageTitle}' + String.fromCharCode(10) + '#{info.version}' + String.fromCharCode(10) + '#{overviewBundle.tobago_url}' + String.fromCharCode(10))"
- label="#{overviewBundle.menu_about}" />
- <tc:menuItem onclick="LOG.show();"
- label="#{overviewBundle.menu_showLog}"
- rendered="#{clientConfigController.debugMode}"/>
- <tc:menuItem action="server-info" immediate="true"
- label="Server Info"
- disabled="#{! info.enabled}"/>
- </tc:menu>
- </tc:menuBar>
+ <tc:menu label="#{overviewBundle.menu_help}">
+ <tc:menuItem
+ onclick="alert('#{overviewBundle.pageTitle}' + String.fromCharCode(10) + '#{info.version}' + String.fromCharCode(10) + '#{overviewBundle.tobago_url}' + String.fromCharCode(10))"
+ label="#{overviewBundle.menu_about}"/>
+ <tc:menuItem onclick="LOG.show();"
+ label="#{overviewBundle.menu_showLog}"
+ rendered="#{clientConfigController.debugMode}"/>
+ <tc:menuItem action="server-info" immediate="true"
+ label="Server Info"
+ disabled="#{! info.enabled}"/>
+ </tc:menu>
+ </tc:menuBar>
- </f:facet>
+</f:facet>
Propchange: myfaces/tobago/trunk/example/demo/src/main/webapp/menu.xhtml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/example/demo/src/main/webapp/menu.xhtml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: myfaces/tobago/trunk/example/demo/src/main/webapp/menu.xhtml
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: myfaces/tobago/trunk/example/demo/src/main/webapp/navigation.jsp
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/webapp/navigation.jsp?rev=713724&r1=713723&r2=713724&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/webapp/navigation.jsp (original)
+++ myfaces/tobago/trunk/example/demo/src/main/webapp/navigation.jsp Thu Nov 13 05:59:59 2008
@@ -1,11 +1,3 @@
-<%@ page import="org.apache.myfaces.tobago.example.reference.SimpleBean" %>
-<%@ page import="org.apache.myfaces.tobago.model.TreeState" %>
-<%@ page import="javax.faces.application.FacesMessage" %>
-<%@ page import="javax.faces.context.FacesContext" %>
-<%@ page import="javax.swing.tree.DefaultMutableTreeNode" %>
-<%@ page import="java.io.PrintWriter" %>
-<%@ page import="java.io.StringWriter" %>
-<%@ page import="java.util.Date" %>
<%--
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
Copied: myfaces/tobago/trunk/example/demo/src/main/webapp/navigation.xhtml (from r713180, myfaces/tobago/trunk/example/demo/src/main/webapp/navigation.jsp)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/webapp/navigation.xhtml?p2=myfaces/tobago/trunk/example/demo/src/main/webapp/navigation.xhtml&p1=myfaces/tobago/trunk/example/demo/src/main/webapp/navigation.jsp&r1=713180&r2=713724&rev=713724&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/webapp/navigation.jsp (original)
+++ myfaces/tobago/trunk/example/demo/src/main/webapp/navigation.xhtml Thu Nov 13 05:59:59 2008
@@ -1,12 +1,6 @@
-<%@ page import="org.apache.myfaces.tobago.example.reference.SimpleBean" %>
-<%@ page import="org.apache.myfaces.tobago.model.TreeState" %>
-<%@ page import="javax.faces.application.FacesMessage" %>
-<%@ page import="javax.faces.context.FacesContext" %>
-<%@ page import="javax.swing.tree.DefaultMutableTreeNode" %>
-<%@ page import="java.io.PrintWriter" %>
-<%@ page import="java.io.StringWriter" %>
-<%@ page import="java.util.Date" %>
-<%--
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -21,11 +15,14 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
---%>
-<%@ taglib uri="http://myfaces.apache.org/tobago/component" prefix="tc" %>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+-->
-<f:subview id="navigator">
+<f:subview id="navigator"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:tc="http://myfaces.apache.org/tobago/component"
+ xmlns:tx="http://myfaces.apache.org/tobago/extension"
+ xmlns:tf="http://myfaces.apache.org/tobago/facelet-extension"
+ xmlns:ui="http://java.sun.com/jsf/facelets">
<tc:panel>
<f:facet name="layout">
<tc:gridLayout rows="*"/>
@@ -36,8 +33,8 @@
<tc:treeNode label="#{node.userObject.title}"
action="#{node.userObject.action}"
immediate="true"
- value="#{node}"
- expanded="true"/>
+ value="#{node}"
+ expanded="true"/>
</tc:treeData>
</tc:tree>
Propchange: myfaces/tobago/trunk/example/demo/src/main/webapp/navigation.xhtml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/example/demo/src/main/webapp/navigation.xhtml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: myfaces/tobago/trunk/example/demo/src/main/webapp/navigation.xhtml
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: myfaces/tobago/trunk/example/demo/src/main/webapp/overview/basic.jsp
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/webapp/overview/basic.jsp?rev=713724&r1=713723&r2=713724&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/webapp/overview/basic.jsp (original)
+++ myfaces/tobago/trunk/example/demo/src/main/webapp/overview/basic.jsp Thu Nov 13 05:59:59 2008
@@ -123,15 +123,15 @@
<f:facet name="layout">
<tc:gridLayout columns="120px;*;120px;*;120px" rows="fixed;fixed" border="0"/>
</f:facet>
- <tc:link id="link" action="overview/basic"
+ <tc:link id="link" action="overview/basic.jsp"
actionListener="#{overviewController.click}"
label="#{overviewBundle.basic_linkAction}" />
<tc:cell/>
- <tc:link id="image" action="overview/basic"
+ <tc:link id="image" action="overview/basic.jsp"
actionListener="#{overviewController.click}"
image="image/image_button.gif" />
<tc:cell/>
- <tc:button id="button" action="overview/basic"
+ <tc:button id="button" action="overview/basic.jsp"
actionListener="#{overviewController.click}"
label="#{overviewBundle.basic_buttonAction}" />
Copied: myfaces/tobago/trunk/example/demo/src/main/webapp/overview/basic.xhtml (from r713180, myfaces/tobago/trunk/example/demo/src/main/webapp/overview/basic.jsp)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/webapp/overview/basic.xhtml?p2=myfaces/tobago/trunk/example/demo/src/main/webapp/overview/basic.xhtml&p1=myfaces/tobago/trunk/example/demo/src/main/webapp/overview/basic.jsp&r1=713180&r2=713724&rev=713724&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/webapp/overview/basic.jsp (original)
+++ myfaces/tobago/trunk/example/demo/src/main/webapp/overview/basic.xhtml Thu Nov 13 05:59:59 2008
@@ -1,4 +1,6 @@
-<%--
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -13,38 +15,41 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
---%>
-<%@ taglib uri="http://myfaces.apache.org/tobago/component" prefix="tc" %>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
-<%@ taglib tagdir="/WEB-INF/tags/layout" prefix="layout" %>
-<%@ taglib uri="http://myfaces.apache.org/tobago/extension" prefix="tx" %>
+-->
+
+<ui:composition template="/WEB-INF/tags/layout/overview.xhtml"
+ xmlns:jsp="http://java.sun.com/JSP/Page"
+ xmlns:tc="http://myfaces.apache.org/tobago/component"
+ xmlns:tx="http://myfaces.apache.org/tobago/extension"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core">
+ <ui:param name="title" value="Basics"/>
-<layout:overview>
- <jsp:body>
<tc:box label="#{overviewBundle.basic}">
- <%--
+ <!--
<f:facet name="reload">
<tc:reload frequency="5000" />
</f:facet>
- --%>
+ -->
<f:facet name="layout">
<tc:gridLayout border="0" rows="fixed;fixed;fixed;fixed;fixed;fixed;fixed;fixed;fixed;fixed" />
</f:facet>
- <%-- row --%>
+ <!-- row -->
<tc:separator>
<f:facet name="label">
<tc:label value="#{overviewBundle.basic_sampleInputTitle}"/>
</f:facet>
</tc:separator>
- <%-- row --%>
+ <!-- row -->
<tc:messages />
- <%-- row --%>
+ <!-- row -->
<tc:out escape="false" value="#{overviewBundle.basic_text_input}" />
- <%-- row --%>
+ <!-- row -->
<tc:panel>
<f:facet name="layout">
<tc:gridLayout columns="*;*" border="0" />
@@ -70,17 +75,17 @@
label="#{overviewBundle.basic_textareaLabel}" />
</tc:panel>
- <%-- row --%>
+ <!-- row -->
<tc:separator>
<f:facet name="label">
<tc:label value="#{overviewBundle.basic_sampleSelectTitle}"/>
</f:facet>
</tc:separator>
- <%-- row --%>
+ <!-- row -->
<tc:out escape="false" value="#{overviewBundle.basic_text_select}" />
- <%-- row --%>
+ <!-- row -->
<tc:panel>
<f:facet name="layout">
<tc:gridLayout columns="*;*" border="0"/>
@@ -108,30 +113,30 @@
</tc:panel>
</tc:panel>
- <%-- row --%>
+ <!-- row -->
<tc:separator>
<f:facet name="label">
<tc:label value="#{overviewBundle.basic_sampleLinkTitle}"/>
</f:facet>
</tc:separator>
- <%-- row --%>
+ <!-- row -->
<tc:out escape="false" value="#{overviewBundle.basic_text_action}" />
- <%-- row --%>
+ <!-- row -->
<tc:panel>
<f:facet name="layout">
<tc:gridLayout columns="120px;*;120px;*;120px" rows="fixed;fixed" border="0"/>
</f:facet>
- <tc:link id="link" action="overview/basic"
+ <tc:link id="link" action="overview/basic.xhtml"
actionListener="#{overviewController.click}"
label="#{overviewBundle.basic_linkAction}" />
<tc:cell/>
- <tc:link id="image" action="overview/basic"
+ <tc:link id="image" action="overview/basic.xhtml"
actionListener="#{overviewController.click}"
image="image/image_button.gif" />
<tc:cell/>
- <tc:button id="button" action="overview/basic"
+ <tc:button id="button" action="overview/basic.xhtml"
actionListener="#{overviewController.click}"
label="#{overviewBundle.basic_buttonAction}" />
@@ -142,5 +147,4 @@
</tc:panel>
</tc:box>
- </jsp:body>
-</layout:overview>
+</ui:composition>
Propchange: myfaces/tobago/trunk/example/demo/src/main/webapp/overview/basic.xhtml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/example/demo/src/main/webapp/overview/basic.xhtml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: myfaces/tobago/trunk/example/demo/src/main/webapp/overview/basic.xhtml
------------------------------------------------------------------------------
svn:mergeinfo =