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 17:01:14 UTC
svn commit: r1600266 - in /myfaces/tobago/branches/tobago-3.0.x: ./
tobago-example/
tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/
tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/exam...
Author: lofwyr
Date: Wed Jun 4 15:01:13 2014
New Revision: 1600266
URL: http://svn.apache.org/r1600266
Log:
working on the examples
Added:
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/DateController.java
- copied unchanged from r1600239, myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/DateController.java
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/01-basic/00/
- copied from r1600239, myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/01-basic/00/
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/01-basic/01/
- copied from r1600239, myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/01-basic/01/
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/01-basic/02/
- copied from r1600239, myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/01-basic/02/
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/01-basic/03/
- copied from r1600239, myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/01-basic/03/
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/01-basic/04/
- copied from r1600239, myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/01-basic/04/
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/java/org/apache/myfaces/tobago/example/test/Messages.java
- copied unchanged from r1600239, myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/java/org/apache/myfaces/tobago/example/test/Messages.java
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/java/org/apache/myfaces/tobago/example/test/PopupReferenceController.java
- copied unchanged from r1600239, myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/java/org/apache/myfaces/tobago/example/test/PopupReferenceController.java
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/webapp/test/messages/messages-confirmation.xhtml
- copied unchanged from r1600239, myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/test/messages/messages-confirmation.xhtml
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/webapp/test/popup/popup-in-sheet.xhtml
- copied unchanged from r1600239, myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/test/popup/popup-in-sheet.xhtml
Removed:
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/reference/PopupReferenceController.java
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/reference/container.jsp
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/reference/input.jsp
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/reference/inputSuggest.jsp
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/reference/intro.jsp
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/reference/layout-test.jsp
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/reference/menu.jsp
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/reference/messages-confirmation.jsp
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/reference/output.jsp
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/reference/popupSheet.jsp
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/reference/separator.jsp
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/reference/sheet.jsp
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/reference/tab.jsp
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/reference/time.jsp
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/reference/tool.jsp
Modified:
myfaces/tobago/branches/tobago-3.0.x/ (props changed)
myfaces/tobago/branches/tobago-3.0.x/tobago-example/pom.xml
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/faces-config.xml
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/01-basic/00/input.xhtml
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/01-basic/01/output.xhtml
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/01-basic/02/container.xhtml
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/01-basic/03/separator.xhtml
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/01-basic/04/date.xhtml
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/05-toolBar/toolBar.xhtml (contents, props changed)
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/11-layout/layout.xhtml (contents, props changed)
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/webapp/WEB-INF/faces-config.xml
Propchange: myfaces/tobago/branches/tobago-3.0.x/
------------------------------------------------------------------------------
Merged /myfaces/tobago/trunk:r1600239
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/pom.xml?rev=1600266&r1=1600265&r2=1600266&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/pom.xml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/pom.xml Wed Jun 4 15:01:13 2014
@@ -81,7 +81,7 @@
<artifactId>jetty-maven-plugin</artifactId>
<!--<version>9.1.1.v20140108</version>-->
<!--<version>9.1.0.v20131115</version>-->
- <version>8.1.14.v20131031</version>
+ <version>8.1.15.v20140411</version>
<configuration>
<scanIntervalSeconds>5</scanIntervalSeconds>
<webAppConfig>
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/faces-config.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/faces-config.xml?rev=1600266&r1=1600265&r2=1600266&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/faces-config.xml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/faces-config.xml Wed Jun 4 15:01:13 2014
@@ -176,12 +176,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>
@@ -235,52 +229,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/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>
-<!--
-tree-menu.xhtml
-tree-normal.xhtml
-tree-select.xhtml
--->
- </navigation-rule>
-
</faces-config>
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/01-basic/00/input.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/01-basic/00/input.xhtml?rev=1600266&r1=1600239&r2=1600266&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/01-basic/00/input.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/01-basic/00/input.xhtml Wed Jun 4 15:01:13 2014
@@ -17,7 +17,7 @@
* limitations under the License.
-->
-<ui:composition template="/WEB-INF/tags/layout/overview.xhtml"
+<ui:composition template="/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"
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/01-basic/01/output.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/01-basic/01/output.xhtml?rev=1600266&r1=1600239&r2=1600266&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/01-basic/01/output.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/01-basic/01/output.xhtml Wed Jun 4 15:01:13 2014
@@ -17,7 +17,7 @@
* limitations under the License.
-->
-<ui:composition template="/WEB-INF/tags/layout/overview.xhtml"
+<ui:composition template="/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"
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/01-basic/02/container.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/01-basic/02/container.xhtml?rev=1600266&r1=1600239&r2=1600266&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/01-basic/02/container.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/01-basic/02/container.xhtml Wed Jun 4 15:01:13 2014
@@ -17,7 +17,7 @@
* limitations under the License.
-->
-<ui:composition template="/WEB-INF/tags/layout/overview.xhtml"
+<ui:composition template="/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"
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/01-basic/03/separator.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/01-basic/03/separator.xhtml?rev=1600266&r1=1600239&r2=1600266&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/01-basic/03/separator.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/01-basic/03/separator.xhtml Wed Jun 4 15:01:13 2014
@@ -17,7 +17,7 @@
* limitations under the License.
-->
-<ui:composition template="/WEB-INF/tags/layout/overview.xhtml"
+<ui:composition template="/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">
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/01-basic/04/date.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/01-basic/04/date.xhtml?rev=1600266&r1=1600239&r2=1600266&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/01-basic/04/date.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/01-basic/04/date.xhtml Wed Jun 4 15:01:13 2014
@@ -17,7 +17,7 @@
* limitations under the License.
-->
-<ui:composition template="/WEB-INF/tags/layout/overview.xhtml"
+<ui:composition template="/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"
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/05-toolBar/toolBar.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/05-toolBar/toolBar.xhtml?rev=1600266&r1=1600265&r2=1600266&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/05-toolBar/toolBar.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/05-toolBar/toolBar.xhtml Wed Jun 4 15:01:13 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>
Propchange: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/05-toolBar/toolBar.xhtml
------------------------------------------------------------------------------
Merged /myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/05-toolBar/toolBar.xhtml:r1600239
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/11-layout/layout.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/11-layout/layout.xhtml?rev=1600266&r1=1600265&r2=1600266&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/11-layout/layout.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/11-layout/layout.xhtml Wed Jun 4 15:01:13 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 -->
Propchange: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/11-layout/layout.xhtml
------------------------------------------------------------------------------
Merged /myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/11-layout/layout.xhtml:r1600239
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/webapp/WEB-INF/faces-config.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/webapp/WEB-INF/faces-config.xml?rev=1600266&r1=1600265&r2=1600266&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/webapp/WEB-INF/faces-config.xml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/webapp/WEB-INF/faces-config.xml Wed Jun 4 15:01:13 2014
@@ -239,6 +239,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>