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/26 10:48:05 UTC
svn commit: r720779 - in /myfaces/tobago/trunk/example/demo/src/main:
java/org/apache/myfaces/tobago/example/demo/Navigation.java
webapp/WEB-INF/faces-config.xml webapp/reference/tree/tree-normal.jsp
webapp/reference/tree/tree-normal.xhtml
Author: lofwyr
Date: Wed Nov 26 01:48:04 2008
New Revision: 720779
URL: http://svn.apache.org/viewvc?rev=720779&view=rev
Log:
TOBAGO-723: Using the demo with Faceles and JSPX
The JSPX Files will be generated, the JSP files will be removed
Added:
myfaces/tobago/trunk/example/demo/src/main/webapp/reference/tree/tree-normal.xhtml (contents, props changed)
- copied, changed from r720745, myfaces/tobago/trunk/example/demo/src/main/webapp/reference/tree/tree-normal.jsp
Removed:
myfaces/tobago/trunk/example/demo/src/main/webapp/reference/tree/tree-normal.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/webapp/WEB-INF/faces-config.xml
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=720779&r1=720778&r2=720779&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 Wed Nov 26 01:48:04 2008
@@ -85,7 +85,7 @@
reference.add(new DefaultMutableTreeNode(new Node("reference_sheet", "reference/sheet")));
reference.add(new DefaultMutableTreeNode(new Node("reference_tab", "reference/tab")));
reference.add(new DefaultMutableTreeNode(new Node("reference_time", "reference/time")));
- reference.add(new DefaultMutableTreeNode(new Node("reference_tree", "reference/tree/tree-normal")));
+ reference.add(new DefaultMutableTreeNode(new Node("reference_tree", "/reference/tree/tree-normal")));
reference.add(new DefaultMutableTreeNode(new Node("reference_tool", "reference/tool")));
reference.add(new DefaultMutableTreeNode(new Node("reference_partial", "reference/partial")));
reference.add(new DefaultMutableTreeNode(new Node("reference_upload", "reference/upload")));
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=720779&r1=720778&r2=720779&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 Wed Nov 26 01:48:04 2008
@@ -397,14 +397,18 @@
<to-view-id>/reference/tool.jsp</to-view-id>
</navigation-case>
<navigation-case>
- <from-outcome>reference/tree/tree-normal</from-outcome>
- <to-view-id>/reference/tree/tree-normal.jsp</to-view-id>
+ <from-outcome>/reference/tree/tree-normal.jspx</from-outcome>
+ <to-view-id>/reference/tree/tree-normal.jspx</to-view-id>
+ </navigation-case>
+ <navigation-case>
+ <from-outcome>/reference/tree/tree-normal.xhtml</from-outcome>
+ <to-view-id>/reference/tree/tree-normal.xhtml</to-view-id>
</navigation-case>
<!--
tree-ajax.jsp
tree-editor.jsp
tree-menu.jsp
-tree-normal.jsp
+tree-normal.xhtml
tree-select.jsp
-->
<navigation-case>
Copied: myfaces/tobago/trunk/example/demo/src/main/webapp/reference/tree/tree-normal.xhtml (from r720745, myfaces/tobago/trunk/example/demo/src/main/webapp/reference/tree/tree-normal.jsp)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/webapp/reference/tree/tree-normal.xhtml?p2=myfaces/tobago/trunk/example/demo/src/main/webapp/reference/tree/tree-normal.xhtml&p1=myfaces/tobago/trunk/example/demo/src/main/webapp/reference/tree/tree-normal.jsp&r1=720745&r2=720779&rev=720779&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/webapp/reference/tree/tree-normal.jsp (original)
+++ myfaces/tobago/trunk/example/demo/src/main/webapp/reference/tree/tree-normal.xhtml Wed Nov 26 01:48:04 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,54 +15,54 @@
* 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" %>
-<%@ taglib tagdir="/WEB-INF/tags/layout" prefix="layout" %>
+-->
-<layout:plain>
- <jsp:body>
- <tc:box label="Tree - General">
- <f:facet name="layout">
- <tc:gridLayout margin="10px"/>
- </f:facet>
- <tc:tree id="tree"
- showIcons="true"
- showJunctions="true"
- showRootJunction="true"
- showRoot="true">
- <tc:treeNode label="Root" id="root" expanded="true">
- <tc:treeData value="#{treeController.tree}" var="node" id="data">
- <tc:treeNode label="#{node.userObject.name}"
- id="template"
- expanded="#{node.userObject.expanded}"
- markup="#{node.userObject.markup}"
- tip="#{node.userObject.tip}"
- action="#{node.userObject.action}"
- disabled="#{node.userObject.disabled}"
- value="#{node}"
- image="image/feather.png"
- treeExpansionListener="#{node.userObject.expansionListener}"/>
- </tc:treeData>
- <tc:treeNode label="2 Action 1" action="#{treeController.action1}" id="action1">
- <f:facet name="addendum">
- <tc:out value="(Addendum)"/>
- </f:facet>
- </tc:treeNode>
- <tc:treeNode label="3 Action 2 (with actionListener)" action="#{treeController.action2}"
- actionListener="#{treeController.actionListener}" id="action2"/>
- <tc:treeNode label="4 Action 3" action="#{treeController.action3}" id="action3">
- <tc:treeNode label="4.1 On Click 1" onclick="alert('On Click 1');" id="click1"/>
- <tc:treeNode label="4.2 On Click 2" onclick="alert('On Click 2');" id="click2">
- <tc:treeNode label="4.2.1 On Click 3" onclick="alert('On Click 3');" id="click3"/>
- </tc:treeNode>
+<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="Tree - General"/>
+ <tc:box label="Tree - General">
+ <f:facet name="layout">
+ <tc:gridLayout margin="10px"/>
+ </f:facet>
+ <tc:tree id="tree"
+ showIcons="true"
+ showJunctions="true"
+ showRootJunction="true"
+ showRoot="true">
+ <tc:treeNode label="Root" id="root" expanded="true">
+ <tc:treeData value="#{treeController.tree}" var="node" id="data">
+ <tc:treeNode label="#{node.userObject.name}"
+ id="template"
+ expanded="#{node.userObject.expanded}"
+ markup="#{node.userObject.markup}"
+ tip="#{node.userObject.tip}"
+ action="#{node.userObject.action}"
+ disabled="#{node.userObject.disabled}"
+ value="#{node}"
+ image="image/feather.png"
+ treeExpansionListener="#{node.userObject.expansionListener}"/>
+ </tc:treeData>
+ <tc:treeNode label="2 Action 1" action="#{treeController.action1}" id="action1">
+ <f:facet name="addendum">
+ <tc:out value="(Addendum)"/>
+ </f:facet>
+ </tc:treeNode>
+ <tc:treeNode label="3 Action 2 (with actionListener)" action="#{treeController.action2}"
+ actionListener="#{treeController.actionListener}" id="action2"/>
+ <tc:treeNode label="4 Action 3" action="#{treeController.action3}" id="action3">
+ <tc:treeNode label="4.1 On Click 1" onclick="alert('On Click 1');" id="click1"/>
+ <tc:treeNode label="4.2 On Click 2" onclick="alert('On Click 2');" id="click2">
+ <tc:treeNode label="4.2.1 On Click 3" onclick="alert('On Click 3');" id="click3"/>
</tc:treeNode>
- <tc:treeNode label="5 Link" link="http://myfaces.apache.org/tobago/" id="link" tip="Subnode Link"/>
- <tc:treeNode label="6 Target" action="#{treeController.action2}" target="Target Window"/>
</tc:treeNode>
- </tc:tree>
- </tc:box>
- </jsp:body>
-</layout:plain>
+ <tc:treeNode label="5 Link" link="http://myfaces.apache.org/tobago/" id="link" tip="Subnode Link"/>
+ <tc:treeNode label="6 Target" action="#{treeController.action2}" target="Target Window"/>
+ </tc:treeNode>
+ </tc:tree>
+ </tc:box>
+</ui:composition>
Propchange: myfaces/tobago/trunk/example/demo/src/main/webapp/reference/tree/tree-normal.xhtml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/example/demo/src/main/webapp/reference/tree/tree-normal.xhtml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL