myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lof...@apache.org
Subject svn commit: r1790265 - in /myfaces/tobago/branches/TOBAGO-1719: ./ tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ tobago-example/tobago-example-demo/src/main/resources/org/apache/myfaces/tobago/example/demo/ to...
Date Wed, 05 Apr 2017 13:57:24 GMT
Author: lofwyr
Date: Wed Apr  5 13:57:24 2017
New Revision: 1790265

URL: http://svn.apache.org/viewvc?rev=1790265&view=rev
Log:
Merged from trunk
improve demo
* add simple ConversationScope example
* add a test for labelLayout [from revision 1790126]
improve demo
* fix conversation scope example [from revision 1790134]

Added:
    myfaces/tobago/branches/TOBAGO-1719/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ConversationController.java
      - copied, changed from r1790126, myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ConversationController.java
    myfaces/tobago/branches/TOBAGO-1719/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/15-conversation/
      - copied from r1790126, myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/15-conversation/
    myfaces/tobago/branches/TOBAGO-1719/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4800-labelLayout/
      - copied from r1790126, myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4800-labelLayout/
Modified:
    myfaces/tobago/branches/TOBAGO-1719/   (props changed)
    myfaces/tobago/branches/TOBAGO-1719/tobago-example/tobago-example-demo/src/main/resources/org/apache/myfaces/tobago/example/demo/Demo.xml
  (contents, props changed)
    myfaces/tobago/branches/TOBAGO-1719/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/15-conversation/conversation.xhtml

Propchange: myfaces/tobago/branches/TOBAGO-1719/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Apr  5 13:57:24 2017
@@ -1,4 +1,4 @@
 /myfaces/tobago/branches/tobago-1.5.x:1356585,1357124
 /myfaces/tobago/branches/tobago-3.0.x:1781306,1781310,1781380
 /myfaces/tobago/branches/tobago-tree-table:1226794-1341423
-/myfaces/tobago/trunk:1571193,1571804,1571816,1571941,1571945,1571962,1571966,1576730,1589960,1591854,1600239,1600818,1601860,1602151,1602154,1602343,1604224,1606201,1607642,1609696-1609697,1609718,1610942,1610948,1610970,1610989,1611011,1611259,1611264,1611276,1611329,1611338-1611339,1611571,1613015,1613032,1614827,1614853,1615053,1615114,1615121,1617310,1619789,1621101,1621107,1621134,1621156,1621264,1621282,1621332,1622222,1622243,1622508,1623934,1624033,1625968,1625972,1626270,1628899,1628953,1636842,1636911,1640117,1640147,1640541,1640548,1640638,1640761,1640917,1641575,1641635,1641772,1641775,1641777,1656502,1656507,1657180,1657269,1657276,1657279,1658343,1658909,1658912,1659026,1659031,1660696,1660699,1660708,1660714,1665486,1665521,1665549,1665569-1665570,1666464,1667304,1667306-1667307,1667309,1668147,1668153,1668249,1675330,1675565,1675584,1675588-1675589,1675636,1676030,1676035,1676038,1679031,1680197,1681981,1682187,1682448,1682545,1682548,1683231,1683306,1683373,1683664
 ,1686204,1687354,1693426,1696720,1698292,1698297,1700742,1700795,1701249,1701251,1701256,1701980,1709006,1725894,1726691,1726986,1727161,1731050-1731051,1731054,1731057,1731218-1731219,1787403,1787422,1787443,1787651,1787780,1787926,1788112,1788115,1788125,1788196,1788214-1788215,1788225,1788239,1788381,1788385,1788392,1788484,1788502,1789295,1789305,1789309,1789347-1789348,1789354,1789364,1789366,1789379-1789380,1789406,1789409,1789500,1789568,1789645
+/myfaces/tobago/trunk:1571193,1571804,1571816,1571941,1571945,1571962,1571966,1576730,1589960,1591854,1600239,1600818,1601860,1602151,1602154,1602343,1604224,1606201,1607642,1609696-1609697,1609718,1610942,1610948,1610970,1610989,1611011,1611259,1611264,1611276,1611329,1611338-1611339,1611571,1613015,1613032,1614827,1614853,1615053,1615114,1615121,1617310,1619789,1621101,1621107,1621134,1621156,1621264,1621282,1621332,1622222,1622243,1622508,1623934,1624033,1625968,1625972,1626270,1628899,1628953,1636842,1636911,1640117,1640147,1640541,1640548,1640638,1640761,1640917,1641575,1641635,1641772,1641775,1641777,1656502,1656507,1657180,1657269,1657276,1657279,1658343,1658909,1658912,1659026,1659031,1660696,1660699,1660708,1660714,1665486,1665521,1665549,1665569-1665570,1666464,1667304,1667306-1667307,1667309,1668147,1668153,1668249,1675330,1675565,1675584,1675588-1675589,1675636,1676030,1676035,1676038,1679031,1680197,1681981,1682187,1682448,1682545,1682548,1683231,1683306,1683373,1683664
 ,1686204,1687354,1693426,1696720,1698292,1698297,1700742,1700795,1701249,1701251,1701256,1701980,1709006,1725894,1726691,1726986,1727161,1731050-1731051,1731054,1731057,1731218-1731219,1787403,1787422,1787443,1787651,1787780,1787926,1788112,1788115,1788125,1788196,1788214-1788215,1788225,1788239,1788381,1788385,1788392,1788484,1788502,1789295,1789305,1789309,1789347-1789348,1789354,1789364,1789366,1789379-1789380,1789406,1789409,1789500,1789568,1789645,1790126,1790134

Copied: myfaces/tobago/branches/TOBAGO-1719/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ConversationController.java
(from r1790126, myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ConversationController.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/TOBAGO-1719/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ConversationController.java?p2=myfaces/tobago/branches/TOBAGO-1719/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ConversationController.java&p1=myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ConversationController.java&r1=1790126&r2=1790265&rev=1790265&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ConversationController.java
(original)
+++ myfaces/tobago/branches/TOBAGO-1719/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ConversationController.java
Wed Apr  5 13:57:24 2017
@@ -35,7 +35,7 @@ public class ConversationController impl
   private static final Logger LOG = LoggerFactory.getLogger(ConversationController.class);
 
   @Inject
-  Conversation conversation;
+  private Conversation conversation;
   private int count = 0;
 
   public String getConversationStatus() {

Modified: myfaces/tobago/branches/TOBAGO-1719/tobago-example/tobago-example-demo/src/main/resources/org/apache/myfaces/tobago/example/demo/Demo.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/TOBAGO-1719/tobago-example/tobago-example-demo/src/main/resources/org/apache/myfaces/tobago/example/demo/Demo.xml?rev=1790265&r1=1790264&r2=1790265&view=diff
==============================================================================
--- myfaces/tobago/branches/TOBAGO-1719/tobago-example/tobago-example-demo/src/main/resources/org/apache/myfaces/tobago/example/demo/Demo.xml
(original)
+++ myfaces/tobago/branches/TOBAGO-1719/tobago-example/tobago-example-demo/src/main/resources/org/apache/myfaces/tobago/example/demo/Demo.xml
Wed Apr  5 13:57:24 2017
@@ -123,6 +123,7 @@
   <entry key="form_required">Required Forms</entry>
   <entry key="form_ajax">Ajax Forms</entry>
   <entry key="theme">Themes</entry>
+  <entry key="conversation">Conversation Scope</entry>
   <entry key="layout">Layout</entry>
   <entry key="flow_layout">FlowLayout</entry>
   <entry key="flex_layout">FlexLayout</entry>

Propchange: myfaces/tobago/branches/TOBAGO-1719/tobago-example/tobago-example-demo/src/main/resources/org/apache/myfaces/tobago/example/demo/Demo.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Apr  5 13:57:24 2017
@@ -1,4 +1,4 @@
 /myfaces/tobago/branches/tobago-1.5.x/tobago-example/tobago-example-demo/src/main/webapp/tobago-resource/html/standard/standard/property/overview.properties.xml:1356585,1357124
 /myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-demo/src/main/webapp/tobago-resource/html/standard/standard/property/overview.properties.xml:1226794-1341423
-/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/resources/org/apache/myfaces/tobago/example/demo/Demo.xml:1787926
+/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/resources/org/apache/myfaces/tobago/example/demo/Demo.xml:1787926,1790126
 /myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/tobago-resource/html/standard/standard/property/overview.properties.xml:1571193,1571804,1571816,1571941,1571945,1571962,1571966,1576730,1589960,1590288,1666464,1675588-1675589

Modified: myfaces/tobago/branches/TOBAGO-1719/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/15-conversation/conversation.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/TOBAGO-1719/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/15-conversation/conversation.xhtml?rev=1790265&r1=1790126&r2=1790265&view=diff
==============================================================================
--- myfaces/tobago/branches/TOBAGO-1719/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/15-conversation/conversation.xhtml
(original)
+++ myfaces/tobago/branches/TOBAGO-1719/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/15-conversation/conversation.xhtml
Wed Apr  5 13:57:24 2017
@@ -32,10 +32,10 @@
   <tc:box label="Example">
     <p>Counting up greater than '1' is only possible when a conversation is started.</p>
     <tc:out label="Conversation" value="#{conversationController.conversationStatus}"/>
-    <tc:buttons>
-      <tc:button label="Start Conversation" action="#{conversationController.beginConversation}"/>
-      <tc:button label="Stop Conversation" action="#{conversationController.endConversation}"/>
-    </tc:buttons>
+    <tc:button label="Start Conversation" action="#{conversationController.beginConversation}"
+               rendered="#{conversationController.conversationStatus == 'stopped'}"/>
+    <tc:button label="Stop Conversation" action="#{conversationController.endConversation}"
+               rendered="#{conversationController.conversationStatus == 'started'}"/>
     <tc:separator/>
     <tc:out label="Count" value="#{conversationController.count}"/>
     <tc:button label="Count Up" action="#{conversationController.countUp}"/>



Mime
View raw message