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 2014/06/04 16:40:05 UTC
svn commit: r1600239 - in /myfaces/tobago/trunk/tobago-example: ./
tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/
tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/reference/
tobago-example-demo/src/main/web...
Author: lofwyr
Date: Wed Jun 4 14:40:04 2014
New Revision: 1600239
URL: http://svn.apache.org/r1600239
Log:
working on the examples
Added:
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/DateController.java
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/01-basic/00/
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/01-basic/00/input.xhtml
- copied, changed from r1599103, myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/reference/input.jsp
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/01-basic/01/
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/01-basic/01/output.xhtml
- copied, changed from r1599103, myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/reference/output.jsp
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/01-basic/02/
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/01-basic/02/container.xhtml
- copied, changed from r1599103, myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/reference/container.jsp
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/01-basic/03/
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/01-basic/03/separator.xhtml
- copied, changed from r1599103, myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/reference/separator.jsp
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/01-basic/04/
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/01-basic/04/date.xhtml
- copied, changed from r1599103, myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/reference/time.jsp
myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/java/org/apache/myfaces/tobago/example/test/Messages.java
myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/java/org/apache/myfaces/tobago/example/test/PopupReferenceController.java
- copied, changed from r1599103, myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/reference/PopupReferenceController.java
myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/test/messages/messages-confirmation.xhtml
- copied, changed from r1599103, myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/reference/messages-confirmation.jsp
myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/test/popup/popup-in-sheet.xhtml
- copied, changed from r1599103, myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/reference/popupSheet.jsp
Removed:
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/reference/PopupReferenceController.java
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/reference/container.jsp
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/reference/input.jsp
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/reference/inputSuggest.jsp
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/reference/intro.jsp
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/reference/layout-test.jsp
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/reference/menu.jsp
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/reference/messages-confirmation.jsp
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/reference/output.jsp
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/reference/popupSheet.jsp
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/reference/separator.jsp
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/reference/sheet.jsp
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/reference/tab.jsp
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/reference/time.jsp
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/reference/tool.jsp
Modified:
myfaces/tobago/trunk/tobago-example/pom.xml
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/faces-config.xml
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/05-toolBar/toolBar.xhtml
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/11-layout/layout.xhtml
myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/WEB-INF/faces-config.xml
Modified: myfaces/tobago/trunk/tobago-example/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/pom.xml?rev=1600239&r1=1600238&r2=1600239&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-example/pom.xml Wed Jun 4 14:40:04 2014
@@ -74,9 +74,9 @@
<plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
- <version>7.6.12.v20130726</version>
+ <version>7.6.15.v20140411</version>
<!--
- <version>8.1.14.v20131031</version>
+ <version>8.1.15.v20140411</version>
This only works with modifications,
see http://jsflive.wordpress.com/2012/08/19/jsf-2-on-jetty-8/
or Tobago 3.0.x
Added: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/DateController.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/DateController.java?rev=1600239&view=auto
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/DateController.java (added)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/DateController.java Wed Jun 4 14:40:04 2014
@@ -0,0 +1,56 @@
+/*
+ * 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.
+ */
+
+package org.apache.myfaces.tobago.example.demo;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.enterprise.context.SessionScoped;
+import javax.inject.Named;
+import java.io.Serializable;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+@SessionScoped
+@Named
+public class DateController implements Serializable {
+
+ private static final Logger LOG = LoggerFactory.getLogger(DateController.class);
+
+ private Date once;
+
+ public DateController() {
+ try {
+ once = new SimpleDateFormat("yyyy-MM-dd").parse("1980-03-22");
+ } catch (ParseException e) {
+ LOG.error("should not happen. ", e
+ );
+ }
+ }
+
+ public Date getOnce() {
+ return once;
+ }
+
+ public void setOnce(Date once) {
+ this.once = once;
+ }
+}
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/faces-config.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/faces-config.xml?rev=1600239&r1=1600238&r2=1600239&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/faces-config.xml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/faces-config.xml Wed Jun 4 14:40:04 2014
@@ -196,12 +196,6 @@
<!-- reference -->
<managed-bean>
- <managed-bean-name>popupReference</managed-bean-name>
- <managed-bean-class>org.apache.myfaces.tobago.example.reference.PopupReferenceController</managed-bean-class>
- <managed-bean-scope>session</managed-bean-scope>
- </managed-bean>
-
- <managed-bean>
<managed-bean-name>reference</managed-bean-name>
<managed-bean-class>org.apache.myfaces.tobago.example.reference.Controller</managed-bean-class>
<managed-bean-scope>session</managed-bean-scope>
@@ -255,64 +249,4 @@
<managed-bean-scope>session</managed-bean-scope>
</managed-bean>
- <navigation-rule>
- <navigation-case>
- <from-outcome>reference/intro</from-outcome>
- <to-view-id>/reference/intro.jsp</to-view-id>
- </navigation-case>
- <navigation-case>
- <from-outcome>reference/command</from-outcome>
- <to-view-id>/reference/command.jsp</to-view-id>
- </navigation-case>
- <navigation-case>
- <from-outcome>reference/container</from-outcome>
- <to-view-id>/reference/container.jsp</to-view-id>
- </navigation-case>
- <navigation-case>
- <from-outcome>reference/input</from-outcome>
- <to-view-id>/reference/input.jsp</to-view-id>
- </navigation-case>
- <navigation-case>
- <from-outcome>reference/inputSuggest</from-outcome>
- <to-view-id>/reference/inputSuggest.jsp</to-view-id>
- </navigation-case>
- <navigation-case>
- <from-outcome>reference/menu</from-outcome>
- <to-view-id>/reference/menu.jsp</to-view-id>
- </navigation-case>
- <navigation-case>
- <from-outcome>reference/output</from-outcome>
- <to-view-id>/reference/output.jsp</to-view-id>
- </navigation-case>
- <navigation-case>
- <from-outcome>reference/sheet</from-outcome>
- <to-view-id>/reference/sheet.jsp</to-view-id>
- </navigation-case>
- <navigation-case>
- <from-outcome>reference/tab</from-outcome>
- <to-view-id>/reference/tab.jsp</to-view-id>
- </navigation-case>
- <navigation-case>
- <from-outcome>reference/time</from-outcome>
- <to-view-id>/reference/time.jsp</to-view-id>
- </navigation-case>
- <navigation-case>
- <from-outcome>reference/tool</from-outcome>
- <to-view-id>/reference/tool.jsp</to-view-id>
- </navigation-case>
- <navigation-case>
- <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-menu.xhtml
-tree-normal.xhtml
-tree-select.xhtml
--->
- </navigation-rule>
-
</faces-config>
Copied: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/01-basic/00/input.xhtml (from r1599103, myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/reference/input.jsp)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/01-basic/00/input.xhtml?p2=myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/01-basic/00/input.xhtml&p1=myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/reference/input.jsp&r1=1599103&r2=1600239&rev=1600239&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/reference/input.jsp (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/01-basic/00/input.xhtml Wed Jun 4 14:40:04 2014
@@ -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,65 +15,65 @@
* 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:overview>
- <jsp:body>
- <tc:box label="Input">
- <f:facet name="layout">
- <tc:gridLayout rows="auto;auto;auto;auto;auto;auto;auto;2*;3*;2*;2*;2*;2*;2*"/>
- </f:facet>
+-->
+
+<ui:composition template="/WEB-INF/tags/layout/overview.xhtml"
+ 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:f="http://java.sun.com/jsf/core">
- <tc:in value="Some Text without Label"/>
+ <tc:box label="Input">
+ <f:facet name="layout">
+ <tc:gridLayout rows="auto;auto;auto;auto;auto;auto;auto;2*;3*;2*;2*;2*;2*;2*"/>
+ </f:facet>
- <%-- code-sniplet-start id="in" --%>
- <tx:in label="Input" value="Some Text"/>
- <%-- code-sniplet-end id="in" --%>
+ <tc:in value="Some Text without Label"/>
- <tx:in label="Read Only" readonly="true" value="Some Text"/>
+ <!-- code-sniplet-start id="in" -->
+ <tx:in label="Input" value="Some Text"/>
+ <!-- code-sniplet-end id="in" -->
- <tx:in label="Disabled" disabled="true" value="Some Text"/>
+ <tx:in label="Read Only" readonly="true" value="Some Text"/>
- <tc:panel>
- <f:facet name="layout">
- <tc:gridLayout columns="100px;*"/>
- </f:facet>
- <tc:label value="Short Label"/>
- <tc:in value="Some Text"/>
- </tc:panel>
+ <tx:in label="Disabled" disabled="true" value="Some Text"/>
+
+ <tc:panel>
+ <f:facet name="layout">
+ <tc:gridLayout columns="100px;*"/>
+ </f:facet>
+ <tc:label value="Short Label"/>
+ <tc:in value="Some Text"/>
+ </tc:panel>
- <tx:in label="Input (focus)" focus="true" value="Some Text"/>
+ <tx:in label="Input (focus)" focus="true" value="Some Text"/>
- <tx:in label="Password" password="true" value="Asterics"/>
+ <tx:in label="Password" password="true" value="Asterics"/>
- <tc:textarea value="Some text without label, some text without label, some text without label, some text without label, some text without label, some text without label, some text without label, some text without label, some text without label, some text without label, ..."/>
+ <tc:textarea
+ value="Some text without label, some text without label, some text without label, some text without label, some text without label, some text without label, some text without label, some text without label, some text without label, some text without label, ..."/>
- <%-- code-sniplet-start id="textarea" --%>
- <tx:textarea label="Text Area"
- value="Some text, some text, some text, some text, some text, some text, some text, some text, some text, some text, ..."/>
- <%-- code-sniplet-end id="textarea" --%>
+ <!-- code-sniplet-start id="textarea" -->
+ <tx:textarea label="Text Area"
+ value="Some text, some text, some text, some text, some text, some text, some text, some text, some text, some text, ..."/>
+ <!-- code-sniplet-end id="textarea" -->
- <tx:textarea label="Read Only"
- readonly="true"
- value="Some text, some text, some text, some text, some text, some text, some text, some text, some text, some text, ..."/>
+ <tx:textarea label="Read Only"
+ readonly="true"
+ value="Some text, some text, some text, some text, some text, some text, some text, some text, some text, some text, ..."/>
- <tx:textarea label="Disabled"
- disabled="true"
- value="Some text, some text, some text, some text, some text, some text, some text, some text, some text, some text, ..."/>
+ <tx:textarea label="Disabled"
+ disabled="true"
+ value="Some text, some text, some text, some text, some text, some text, some text, some text, some text, some text, ..."/>
- <tx:textarea label="Area (focus)" focus="true"
- value="Some Text"/>
+ <tx:textarea label="Area (focus)" focus="true"
+ value="Some Text"/>
- <tc:panel>
- <tc:out value="An input field is "/>
- <tc:in value="here" inline="true"/>
- <tc:out value=" inside of a floating text."/>
- </tc:panel>
+ <tc:panel>
+ <tc:out value="An input field is "/>
+ <tc:in value="here" inline="true"/>
+ <tc:out value=" inside of a floating text."/>
+ </tc:panel>
- </tc:box>
- </jsp:body>
-</layout:overview>
+ </tc:box>
+</ui:composition>
Copied: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/01-basic/01/output.xhtml (from r1599103, myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/reference/output.jsp)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/01-basic/01/output.xhtml?p2=myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/01-basic/01/output.xhtml&p1=myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/reference/output.jsp&r1=1599103&r2=1600239&rev=1600239&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/reference/output.jsp (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/01-basic/01/output.xhtml Wed Jun 4 14:40:04 2014
@@ -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,60 +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.
---%>
-<%@ page import="javax.faces.application.FacesMessage" %>
-<%@ page import="javax.faces.context.FacesContext" %>
-
-<%@ 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" %>
-
-<%
- final FacesContext facesContext = FacesContext.getCurrentInstance();
- facesContext.addMessage("message1", new FacesMessage(FacesMessage.SEVERITY_INFO, "Info message.", "Example of an info message."));
- facesContext.addMessage(null, new FacesMessage(FacesMessage.SEVERITY_WARN, "Warn message.", "Example of a warn message."));
- facesContext.addMessage(null, new FacesMessage(FacesMessage.SEVERITY_ERROR, "Error message.", "Example of an error message."));
- facesContext.addMessage(null, new FacesMessage(FacesMessage.SEVERITY_FATAL, "Fatal message.", "Example of a fatal message."));
- facesContext.addMessage(null, new FacesMessage("Message without a severity.", "Example of a message without a severity."));
-%>
-
-<layout:overview>
- <jsp:body>
- <tc:box label="Output Controls">
+-->
+
+<ui:composition template="/WEB-INF/tags/layout/overview.xhtml"
+ 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">
+<tc:box label="Output Controls">
<f:facet name="layout">
<tc:gridLayout columns="150px;*" rows="auto;300px;auto;auto;90px;*" border="1"/>
</f:facet>
- <%-- code-sniplet-start id="label" --%>
+ <!-- code-sniplet-start id="label" -->
<tc:label value="_Single Label"/>
- <%-- code-sniplet-end id="label" --%>
+ <!-- code-sniplet-end id="label" -->
<tc:cell/>
<tc:cell spanX="2">
- <%-- code-sniplet-start id="out" --%>
+ <!-- code-sniplet-start id="out" -->
<tc:out value="Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Quisque consequat, libero eget porta mattis, risus velit congue magna, at posuere sem orci vitae turpis. Integer pulvinar. Cras libero. Proin vestibulum tempor urna. Nulla odio nisl, auctor vitae, faucibus pharetra, feugiat eget, justo. Suspendisse at tellus non justo dictum tincidunt. Aenean placerat nunc id tortor. Donec mollis ornare pede. Vestibulum ut arcu et dolor auctor varius. Praesent tincidunt, eros quis vulputate facilisis, orci turpis sollicitudin justo, id faucibus nunc orci sed purus. Proin ligula erat, sollicitudin id, rhoncus eget, nonummy sit amet, risus. Aenean arcu lorem, facilisis et, posuere sed, ultrices tincidunt, nunc. Sed ac massa. Quisque lacinia. Donec quis nibh.
Aenean ac diam eget mi feugiat pulvinar. Etiam orci. Aliquam nec arcu nec eros ornare pulvinar. Sed nec velit. Ut ut orci. Nulla varius. Maecenas feugiat. Etiam varius ipsum et orci. Ut consectetuer odio sit amet libero. Nulla iaculis adipiscing purus. Maecenas a sed."/>
- <%-- code-sniplet-end id="out" --%>
+ <!-- code-sniplet-end id="out" -->
</tc:cell>
- <%-- code-sniplet-start id="messages" --%>
+ <!-- code-sniplet-start id="messages" -->
<tc:messages />
- <%-- code-sniplet-end id="messages" --%>
+ <!-- code-sniplet-end id="messages" -->
<tc:cell/>
- <%--<tc:messages maxNumber="2"/>--%>
+ <!--<tc:messages maxNumber="2"/>-->
<tc:cell/>
<tc:cell/>
- <%-- code-sniplet-start id="image" --%>
+ <!-- code-sniplet-start id="image" -->
<tc:image value="image/tobago_head.gif" width="150" height="83"/>
- <%-- code-sniplet-end id="image" --%>
+ <!-- code-sniplet-end id="image" -->
<tc:cell/>
<tc:cell/>
<tc:cell/>
</tc:box>
- </jsp:body>
-</layout:overview>
+</ui:composition>
Copied: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/01-basic/02/container.xhtml (from r1599103, myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/reference/container.jsp)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/01-basic/02/container.xhtml?p2=myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/01-basic/02/container.xhtml&p1=myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/reference/container.jsp&r1=1599103&r2=1600239&rev=1600239&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/reference/container.jsp (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/01-basic/02/container.xhtml Wed Jun 4 14:40:04 2014
@@ -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,23 +15,23 @@
* 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" %>
+-->
-<layout:overview>
- <jsp:body>
- <tc:panel>
+<ui:composition template="/WEB-INF/tags/layout/overview.xhtml"
+ 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">
+<tc:panel>
<f:facet name="layout">
<tc:gridLayout columns="400px;*" rows="200px;*"/>
</f:facet>
- <%-- code-sniplet-start id="box" --%>
+ <!-- code-sniplet-start id="box" -->
<tc:box label="Box Headline">
</tc:box>
- <%-- code-sniplet-end id="box" --%>
+ <!-- code-sniplet-end id="box" -->
<tc:cell/>
<tc:cell spanX="2"/>
</tc:panel>
- </jsp:body>
-</layout:overview>
+</ui:composition>
Copied: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/01-basic/03/separator.xhtml (from r1599103, myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/reference/separator.jsp)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/01-basic/03/separator.xhtml?p2=myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/01-basic/03/separator.xhtml&p1=myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/reference/separator.jsp&r1=1599103&r2=1600239&rev=1600239&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/reference/separator.jsp (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/01-basic/03/separator.xhtml Wed Jun 4 14:40:04 2014
@@ -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,47 @@
* 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:view>
- <tc:loadBundle basename="demo" var="bundle"/>
+<ui:composition template="/WEB-INF/tags/layout/overview.xhtml"
+ xmlns:tc="http://myfaces.apache.org/tobago/component"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:f="http://java.sun.com/jsf/core">
- <tc:page label="Sandbox - Separator" width="500px" height="800px">
+ <tc:box label="Separator">
<f:facet name="layout">
- <tc:gridLayout margin="10px" rows="*"/>
+ <tc:gridLayout columns="1*;1*" rows="auto;*"/>
</f:facet>
- <tc:box label="Separator">
+ <tc:cell spanX="2">
+ <tc:separator>
+ <f:facet name="label">
+ <tc:label value="Separator with Label"/>
+ </f:facet>
+ </tc:separator>
+ </tc:cell>
+
+ <tc:panel>
<f:facet name="layout">
- <tc:gridLayout columns="1*;1*" rows="auto;*"/>
+ <tc:gridLayout rows="*;auto;2*"/>
</f:facet>
+ <tc:textarea/>
+ <tc:separator/>
+ <tc:textarea/>
+ </tc:panel>
- <tc:cell spanX="2">
- <tc:separator>
- <f:facet name="label">
- <tc:label value="Separator with Label"/>
- </f:facet>
- </tc:separator>
- </tc:cell>
-
- <tc:panel>
- <f:facet name="layout">
- <tc:gridLayout rows="*;auto;2*"/>
- </f:facet>
- <tc:textarea/>
- <tc:separator/>
- <tc:textarea/>
- </tc:panel>
-
- <tc:panel>
- <f:facet name="layout">
- <tc:gridLayout rows="2*;auto;*"/>
+ <tc:panel>
+ <f:facet name="layout">
+ <tc:gridLayout rows="2*;auto;*"/>
+ </f:facet>
+ <tc:textarea/>
+ <tc:separator>
+ <f:facet name="label">
+ <tc:label value="Separator with Label"/>
</f:facet>
- <tc:textarea/>
- <tc:separator>
- <f:facet name="label">
- <tc:label value="Separator with Label"/>
- </f:facet>
- </tc:separator>
- <tc:textarea/>
- </tc:panel>
-
- </tc:box>
- </tc:page>
-</f:view>
+ </tc:separator>
+ <tc:textarea/>
+ </tc:panel>
+
+ </tc:box>
+</ui:composition>
Copied: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/01-basic/04/date.xhtml (from r1599103, myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/reference/time.jsp)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/01-basic/04/date.xhtml?p2=myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/01-basic/04/date.xhtml&p1=myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/reference/time.jsp&r1=1599103&r2=1600239&rev=1600239&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/reference/time.jsp (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/01-basic/04/date.xhtml Wed Jun 4 14:40:04 2014
@@ -1,5 +1,6 @@
-<%@ page import="java.text.SimpleDateFormat" %>
-<%--
+<?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.
@@ -14,108 +15,103 @@
* 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" %>
-
-<%
- request.setAttribute("now", new SimpleDateFormat("yyyy-MM-dd").parse("1980-03-22"));
-%>
-
-<layout:overview>
- <jsp:body>
- <tc:box label="Time Specific Controls">
- <f:facet name="layout">
- <tc:gridLayout columns="400px;*" rows="auto;auto;auto;auto;auto;auto;auto;auto;auto;auto;auto;auto;auto;auto;auto;250px;*"/>
- </f:facet>
- <%-- code-sniplet-start id="date" --%>
- <tx:date label="Date" value="#{now}">
- <f:convertDateTime pattern="dd.MM.yyyy"/>
- </tx:date>
- <%-- code-sniplet-end id="date" --%>
- <tc:cell/>
-
- <%-- code-sniplet-start id="dateTime" --%>
- <tx:date label="Date/Time" value="#{now}">
- <f:convertDateTime pattern="dd.MM.yyyy HH:mm"/>
- </tx:date>
- <%-- code-sniplet-end id="dateTime" --%>
- <tc:cell/>
-
- <tx:date label="Date (focus)" focus="true">
- <f:convertDateTime pattern="dd.MM.yyyy"/>
- </tx:date>
- <tc:cell/>
-
- <tx:date label="Short style" value="#{now}">
- <f:convertDateTime dateStyle="short" type="both" timeStyle="short"/>
- </tx:date>
- <tc:cell/>
-
- <tx:date label="Medium Style" value="#{now}">
- <f:convertDateTime dateStyle="medium" type="both" timeStyle="medium" />
- </tx:date>
- <tc:cell/>
-
- <tx:date label="Long Style" value="#{now}">
- <f:convertDateTime dateStyle="long" type="both" timeStyle="long" />
- </tx:date>
- <tc:cell/>
-
- <tx:date label="Full Style" value="#{now}">
- <f:convertDateTime dateStyle="full" type="both" timeStyle="full" />
- </tx:date>
- <tc:cell/>
-
- <tx:date label="Month" value="#{now}">
- <f:convertDateTime pattern="MM/yyyy"/>
- </tx:date>
- <tc:cell/>
-
- <tx:date label="Year" value="#{now}">
- <f:convertDateTime pattern="yyyy"/>
- </tx:date>
- <tc:cell/>
-
- <tx:time label="Time" value="#{now}">
- <f:convertDateTime type="time" pattern="HH:mm"/>
- </tx:time>
- <tc:cell/>
-
- <tx:time label="Time (Seconds)" value="#{now}">
- <f:convertDateTime type="time" pattern="HH:mm:ss"/>
- </tx:time>
- <tc:cell/>
-
- <tx:time label="Time" value="#{now}" readonly="true">
- <f:convertDateTime type="time" pattern="HH:mm"/>
- </tx:time>
- <tc:cell/>
-
- <tx:time label="Time (Seconds)" value="#{now}" readonly="true">
- <f:convertDateTime type="time" pattern="HH:mm:ss"/>
- </tx:time>
- <tc:cell/>
-
- <tx:time label="Time" value="#{now}" disabled="true">
- <f:convertDateTime type="time" pattern="HH:mm"/>
- </tx:time>
- <tc:cell/>
-
- <tx:time label="Time (Seconds)" value="#{now}" disabled="true">
- <f:convertDateTime type="time" pattern="HH:mm:ss"/>
- </tx:time>
- <tc:cell/>
-
- <%-- code-sniplet-start id="calendar" --%>
- <tc:calendar />
- <%-- code-sniplet-end id="calendar" --%>
- <tc:cell/>
-
- <tc:cell spanX="2"/>
-
- </tc:box>
- </jsp:body>
-</layout:overview>
+-->
+
+<ui:composition template="/WEB-INF/tags/layout/overview.xhtml"
+ 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:f="http://java.sun.com/jsf/core">
+ <tc:box label="Time Specific Controls">
+ <f:facet name="layout">
+ <tc:gridLayout columns="400px;*"
+ rows="auto;auto;auto;auto;auto;auto;auto;auto;auto;auto;auto;auto;auto;auto;auto;250px;*"/>
+ </f:facet>
+ <!-- code-sniplet-start id="date" -->
+ <tx:date label="Date" value="#{dateController.once}">
+ <f:convertDateTime pattern="dd.MM.yyyy"/>
+ </tx:date>
+ <!-- code-sniplet-end id="date" -->
+ <tc:cell/>
+
+ <!-- code-sniplet-start id="dateTime" -->
+ <tx:date label="Date/Time" value="#{dateController.once}">
+ <f:convertDateTime pattern="dd.MM.yyyy HH:mm"/>
+ </tx:date>
+ <!-- code-sniplet-end id="dateTime" -->
+ <tc:cell/>
+
+ <tx:date label="Date (focus)" focus="true">
+ <f:convertDateTime pattern="dd.MM.yyyy"/>
+ </tx:date>
+ <tc:cell/>
+
+ <tx:date label="Short style" value="#{dateController.once}">
+ <f:convertDateTime dateStyle="short" type="both" timeStyle="short"/>
+ </tx:date>
+ <tc:cell/>
+
+ <tx:date label="Medium Style" value="#{dateController.once}">
+ <f:convertDateTime dateStyle="medium" type="both" timeStyle="medium"/>
+ </tx:date>
+ <tc:cell/>
+
+ <tx:date label="Long Style" value="#{dateController.once}">
+ <f:convertDateTime dateStyle="long" type="both" timeStyle="long"/>
+ </tx:date>
+ <tc:cell/>
+
+ <tx:date label="Full Style" value="#{dateController.once}">
+ <f:convertDateTime dateStyle="full" type="both" timeStyle="full"/>
+ </tx:date>
+ <tc:cell/>
+
+ <tx:date label="Month" value="#{dateController.once}">
+ <f:convertDateTime pattern="MM/yyyy"/>
+ </tx:date>
+ <tc:cell/>
+
+ <tx:date label="Year" value="#{dateController.once}">
+ <f:convertDateTime pattern="yyyy"/>
+ </tx:date>
+ <tc:cell/>
+
+ <tx:time label="Time" value="#{dateController.once}">
+ <f:convertDateTime type="time" pattern="HH:mm"/>
+ </tx:time>
+ <tc:cell/>
+
+ <tx:time label="Time (Seconds)" value="#{dateController.once}">
+ <f:convertDateTime type="time" pattern="HH:mm:ss"/>
+ </tx:time>
+ <tc:cell/>
+
+ <tx:time label="Time" value="#{dateController.once}" readonly="true">
+ <f:convertDateTime type="time" pattern="HH:mm"/>
+ </tx:time>
+ <tc:cell/>
+
+ <tx:time label="Time (Seconds)" value="#{dateController.once}" readonly="true">
+ <f:convertDateTime type="time" pattern="HH:mm:ss"/>
+ </tx:time>
+ <tc:cell/>
+
+ <tx:time label="Time" value="#{dateController.once}" disabled="true">
+ <f:convertDateTime type="time" pattern="HH:mm"/>
+ </tx:time>
+ <tc:cell/>
+
+ <tx:time label="Time (Seconds)" value="#{dateController.once}" disabled="true">
+ <f:convertDateTime type="time" pattern="HH:mm:ss"/>
+ </tx:time>
+ <tc:cell/>
+
+ <!-- code-sniplet-start id="calendar" -->
+ <tc:calendar/>
+ <!-- code-sniplet-end id="calendar" -->
+ <tc:cell/>
+
+ <tc:cell spanX="2"/>
+
+ </tc:box>
+</ui:composition>
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/05-toolBar/toolBar.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/05-toolBar/toolBar.xhtml?rev=1600239&r1=1600238&r2=1600239&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/05-toolBar/toolBar.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/05-toolBar/toolBar.xhtml Wed Jun 4 14:40:04 2014
@@ -26,7 +26,7 @@
<ui:param name="title" value="#{overviewBundle.toolbar}"/>
<tc:panel id="pageToolbar">
<f:facet name="layout">
- <tc:gridLayout rows="65px;auto;1px;70px;auto;50px" id="pageToolbarLayout"/>
+ <tc:gridLayout rows="65px;auto;80px;*;*" id="pageToolbarLayout"/>
</f:facet>
<tc:out escape="false" value="#{overviewBundle.toolbar_text1}"/>
@@ -152,14 +152,9 @@
</tc:box>
- <tc:panel/>
-
<tc:out escape="false" value="#{overviewBundle.toolbar_text2}"/>
<tc:box label="#{overviewBundle.toolbar_sampleTitle2}" id="boxMenu">
- <f:facet name="layout">
- <tc:gridLayout rows="auto;100px"/>
- </f:facet>
<f:facet name="menuBar">
<tc:menuBar>
@@ -226,5 +221,53 @@
</f:facet>
</tc:box>
+
+ <tc:box label="#{overviewBundle.toolbar_sampleTitle2} 2">
+ <f:facet name="layout">
+ <tc:gridLayout rows="auto;*"/>
+ </f:facet>
+ <!-- code-sniplet-start id="menuBar" -->
+ <f:facet name="menuBar">
+ <tc:menuBar>
+ <tc:menu label="_File">
+ <tc:menuCommand label="New File"/>
+ <tc:menuCommand label="Open File"/>
+ <tc:menuCommand label="Save"/>
+ <tc:menuCommand label="Print"/>
+ <tc:menuSeparator/>
+ <tc:menuCommand label="Exit">
+ <f:facet name="confirmation">
+ <tc:out value="Are you sure?"/>
+ </f:facet>
+ </tc:menuCommand>
+ <!--<tx:menuCheckbox action="none" label="Administration Mode"/>-->
+ </tc:menu>
+
+ <!-- code-sniplet-start id="menu" -->
+ <tc:menu label="_Edit">
+ <tc:menuCommand label="Copy"/>
+ <tc:menuCommand label="Cut"/>
+ <tc:menuCommand label="Paste"/>
+ <!-- code-sniplet-start id="menuCommand" -->
+ <tc:menuCommand label="Delete"/>
+ <!-- code-sniplet-end id="menuCommand" -->
+ <tc:menuSeparator/>
+ <tc:menu label="_Delete">
+ <tc:menuCommand label="As Spam"/>
+ <tc:menuCommand label="As Newsletter"/>
+ <tc:menuCommand label="As Uninteresting"/>
+ </tc:menu>
+ </tc:menu>
+ <!-- code-sniplet-end id="menu" -->
+
+ <tc:menu label="_View">
+ <tc:menuCommand label="Snap to Grid"/>
+ <tc:menuCommand label="Show Rulers"/>
+ </tc:menu>
+ </tc:menuBar>
+ </f:facet>
+ <!-- code-sniplet-end id="menuBar" -->
+ </tc:box>
+
</tc:panel>
</ui:composition>
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/11-layout/layout.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/11-layout/layout.xhtml?rev=1600239&r1=1600238&r2=1600239&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/11-layout/layout.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/11-layout/layout.xhtml Wed Jun 4 14:40:04 2014
@@ -44,8 +44,10 @@
</tx:selectOneChoice>
<tc:panel/>
+ <tc:script file="content/11-layout/date.js"></tc:script>
+
<!-- 2 -->
- <tx:in value="" label="#{overviewBundle.layout_firstName}"/>
+ <tc:date value="#{overviewController.basicDate}"/>
<tx:in value="" label="#{overviewBundle.layout_lastName}"/>
<!-- 3 -->
Added: myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/java/org/apache/myfaces/tobago/example/test/Messages.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/java/org/apache/myfaces/tobago/example/test/Messages.java?rev=1600239&view=auto
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/java/org/apache/myfaces/tobago/example/test/Messages.java (added)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/java/org/apache/myfaces/tobago/example/test/Messages.java Wed Jun 4 14:40:04 2014
@@ -0,0 +1,38 @@
+/*
+ * 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.
+ */
+
+package org.apache.myfaces.tobago.example.test;
+
+import javax.faces.application.FacesMessage;
+import javax.faces.context.FacesContext;
+
+public class Messages {
+
+ public String createMessages() {
+
+ final FacesContext facesContext = FacesContext.getCurrentInstance();
+ facesContext.addMessage("message1", new FacesMessage(FacesMessage.SEVERITY_INFO, "Info message.", "Example of an info message."));
+ facesContext.addMessage(null, new FacesMessage(FacesMessage.SEVERITY_WARN, "Warn message.", "Example of a warn message."));
+ facesContext.addMessage(null, new FacesMessage(FacesMessage.SEVERITY_ERROR, "Error message.", "Example of an error message."));
+ facesContext.addMessage(null, new FacesMessage(FacesMessage.SEVERITY_FATAL, "Fatal message.", "Example of a fatal message."));
+ facesContext.addMessage(null, new FacesMessage("Message without a severity.", "Example of a message without a severity."));
+
+ return null;
+ }
+}
Copied: myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/java/org/apache/myfaces/tobago/example/test/PopupReferenceController.java (from r1599103, myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/reference/PopupReferenceController.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/java/org/apache/myfaces/tobago/example/test/PopupReferenceController.java?p2=myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/java/org/apache/myfaces/tobago/example/test/PopupReferenceController.java&p1=myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/reference/PopupReferenceController.java&r1=1599103&r2=1600239&rev=1600239&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/reference/PopupReferenceController.java (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/java/org/apache/myfaces/tobago/example/test/PopupReferenceController.java Wed Jun 4 14:40:04 2014
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.myfaces.tobago.example.reference;
+package org.apache.myfaces.tobago.example.test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/WEB-INF/faces-config.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/WEB-INF/faces-config.xml?rev=1600239&r1=1600238&r2=1600239&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/WEB-INF/faces-config.xml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/WEB-INF/faces-config.xml Wed Jun 4 14:40:04 2014
@@ -233,6 +233,18 @@
<managed-bean-scope>session</managed-bean-scope>
</managed-bean>
+ <managed-bean>
+ <managed-bean-name>popupReference</managed-bean-name>
+ <managed-bean-class>org.apache.myfaces.tobago.example.test.PopupReferenceController</managed-bean-class>
+ <managed-bean-scope>session</managed-bean-scope>
+ </managed-bean>
+
+ <managed-bean>
+ <managed-bean-name>messages</managed-bean-name>
+ <managed-bean-class>org.apache.myfaces.tobago.example.test.Messages</managed-bean-class>
+ <managed-bean-scope>session</managed-bean-scope>
+ </managed-bean>
+
<navigation-rule>
<navigation-case>
<from-outcome>navigation</from-outcome>
Copied: myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/test/messages/messages-confirmation.xhtml (from r1599103, myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/reference/messages-confirmation.jsp)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/test/messages/messages-confirmation.xhtml?p2=myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/test/messages/messages-confirmation.xhtml&p1=myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/reference/messages-confirmation.jsp&r1=1599103&r2=1600239&rev=1600239&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/reference/messages-confirmation.jsp (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/test/messages/messages-confirmation.xhtml Wed Jun 4 14:40:04 2014
@@ -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,32 +15,23 @@
* 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.
---%>
-<%@ page import="javax.faces.application.FacesMessage" %>
-<%@ page import="javax.faces.context.FacesContext" %>
-
-<%@ 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" %>
-
-<%
- final FacesContext facesContext = FacesContext.getCurrentInstance();
- facesContext.addMessage("message1", new FacesMessage(FacesMessage.SEVERITY_INFO, "Info message.", "Example of an info message."));
- facesContext.addMessage(null, new FacesMessage(FacesMessage.SEVERITY_WARN, "Warn message.", "Example of a warn message."));
- facesContext.addMessage(null, new FacesMessage(FacesMessage.SEVERITY_ERROR, "Error message.", "Example of an error message."));
- facesContext.addMessage(null, new FacesMessage(FacesMessage.SEVERITY_FATAL, "Fatal message.", "Example of a fatal message."));
- facesContext.addMessage(null, new FacesMessage("Message without a severity.", "Example of a message without a severity."));
-%>
+-->
+
+<f:view
+ xmlns:tc="http://myfaces.apache.org/tobago/component"
+ xmlns:f="http://java.sun.com/jsf/core">
+
+ <tc:page>
+ <tc:gridLayoutConstraint width="600px" height="600px"/>
-<layout:overview>
- <jsp:body>
<tc:box label="Messages must be confirmed here">
<f:facet name="layout">
- <tc:gridLayout/>
+ <tc:gridLayout rows="*;*"/>
</f:facet>
<tc:messages id="mymessages" confirmation="true"/>
+ <tc:button label="Please click to show the messages" action="#{messages.createMessages}"/>
</tc:box>
- </jsp:body>
-</layout:overview>
+ </tc:page>
+</f:view>
Copied: myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/test/popup/popup-in-sheet.xhtml (from r1599103, myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/reference/popupSheet.jsp)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/test/popup/popup-in-sheet.xhtml?p2=myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/test/popup/popup-in-sheet.xhtml&p1=myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/reference/popupSheet.jsp&r1=1599103&r2=1600239&rev=1600239&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/reference/popupSheet.jsp (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/test/popup/popup-in-sheet.xhtml Wed Jun 4 14:40:04 2014
@@ -1,4 +1,5 @@
-<%--
+<?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,79 +14,26 @@
* 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" %>
+<f:view
+ xmlns:tc="http://myfaces.apache.org/tobago/component"
+ xmlns:tx="http://myfaces.apache.org/tobago/extension"
+ xmlns:f="http://java.sun.com/jsf/core">
-<layout:overview>
- <jsp:body>
+ <tc:page width="800px" height="300px" id="page">
<tc:box label="Popups inside sheet">
<f:facet name="layout">
- <tc:gridLayout />
+ <tc:gridLayout rows="*;0px;0px"/>
</f:facet>
<tc:sheet id="sheet"
var="entry" columns="1*;1*;1*;1*" value="#{popupReference.sheet}">
- <f:facet name="popup1" >
- <tc:popup id="popup1" width="300px" height="100px">
- <%-- the clientId of this popup is "page:sheet:popup1" --%>
- <tc:box label="Popup1">
- <f:facet name="layout" >
- <tc:gridLayout rows="auto;1*;auto"/>
- </f:facet>
- <tx:in label="column 1 value:" value="#{popupReference.entry.column1}"/>
- <tc:panel/>
- <tc:panel>
- <f:facet name="layout">
- <tc:gridLayout columns="1*;auto;auto"/>
- </f:facet>
- <tc:panel/>
- <tc:button label="Save" actionListener="#{popupReference.saveChanges}"
- renderedPartially=":page:sheet">
- <tc:attribute name="popupClose" value="afterSubmit"/>
- </tc:button>
- <tc:button label="Cancel" >
- <tc:attribute name="popupClose" value="immediate"/>
- </tc:button>
- </tc:panel>
- </tc:box>
- </tc:popup>
- </f:facet>
- <f:facet name="popup2" >
- <tc:popup id="popup2" width="300px" height="150px">
- <%-- the clientId of this popup is "page:sheet:popup2" --%>
- <tc:box label="Popup1">
- <f:facet name="layout" >
- <tc:gridLayout rows="auto;auto;auto;1*;auto"/>
- </f:facet>
- <tx:in label="column 1 value:" value="#{popupReference.entry.column1}"/>
- <tx:in label="column 2 value:" value="#{popupReference.entry.column2}"/>
- <tx:in label="column 3 value:" value="#{popupReference.entry.column3}"/>
- <tc:panel/>
- <tc:panel>
- <f:facet name="layout">
- <tc:gridLayout columns="1*;auto;auto"/>
- </f:facet>
- <tc:panel/>
- <tc:button label="Save" actionListener="#{popupReference.saveChanges}"
- renderedPartially=":page:sheet">
- <tc:attribute name="popupClose" value="afterSubmit"/>
- </tc:button>
- <tc:button label="Cancel" >
- <tc:attribute name="popupClose" value="immediate"/>
- </tc:button>
- </tc:panel>
- </tc:box>
- </tc:popup>
- </f:facet>
<tc:column label="Column 1">
<tc:link label="#{entry.column1}" actionListener="#{popupReference.selectEntry}"
- renderedPartially=":page:sheet:popup1">
- <tc:popupReference for=":page:sheet:popup1"/>
+ renderedPartially=":page:popup1">
+ <tc:popupReference for=":page:popup1"/>
</tc:link>
</tc:column>
@@ -99,14 +47,63 @@
<tc:column label="Edit">
<tc:button label="Edit" actionListener="#{popupReference.selectEntry}"
- renderedPartially=":page:sheet:popup2">
- <tc:popupReference for=":page:sheet:popup2"/>
+ renderedPartially=":page:popup2">
+ <tc:popupReference for=":page:popup2"/>
</tc:button>
</tc:column>
-
</tc:sheet>
+ <tc:popup id="popup1" width="300px" height="100px">
+ <!-- the clientId of this popup is "page:sheet:popup1" -->
+ <tc:box label="Popup1">
+ <f:facet name="layout">
+ <tc:gridLayout rows="auto;1*;auto"/>
+ </f:facet>
+ <tx:in label="column 1 value:" value="#{popupReference.entry.column1}"/>
+ <tc:panel/>
+ <tc:panel>
+ <f:facet name="layout">
+ <tc:gridLayout columns="1*;auto;auto"/>
+ </f:facet>
+ <tc:panel/>
+ <tc:button label="Save" actionListener="#{popupReference.saveChanges}"
+ renderedPartially=":page:sheet">
+ <tc:attribute name="popupClose" value="afterSubmit"/>
+ </tc:button>
+ <tc:button label="Cancel">
+ <tc:attribute name="popupClose" value="immediate"/>
+ </tc:button>
+ </tc:panel>
+ </tc:box>
+ </tc:popup>
+
+ <tc:popup id="popup2" width="300px" height="150px">
+ <!-- the clientId of this popup is "page:sheet:popup2" -->
+ <tc:box label="Popup1">
+ <f:facet name="layout">
+ <tc:gridLayout rows="auto;auto;auto;1*;auto"/>
+ </f:facet>
+ <tx:in label="column 1 value:" value="#{popupReference.entry.column1}"/>
+ <tx:in label="column 2 value:" value="#{popupReference.entry.column2}"/>
+ <tx:in label="column 3 value:" value="#{popupReference.entry.column3}"/>
+ <tc:panel/>
+ <tc:panel>
+ <f:facet name="layout">
+ <tc:gridLayout columns="1*;auto;auto"/>
+ </f:facet>
+ <tc:panel/>
+ <tc:button label="Save" actionListener="#{popupReference.saveChanges}"
+ renderedPartially=":page:sheet">
+ <tc:attribute name="popupClose" value="afterSubmit"/>
+ </tc:button>
+ <tc:button label="Cancel">
+ <tc:attribute name="popupClose" value="immediate"/>
+ </tc:button>
+ </tc:panel>
+ </tc:box>
+ </tc:popup>
+
</tc:box>
- </jsp:body>
-</layout:overview>
+ </tc:page>
+</f:view>