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 2012/02/28 07:08:47 UTC
svn commit: r1294475 [1/2] - in /myfaces/tobago/branches/tobago-tree-table:
./ src/site/apt/ src/site/resources/ tobago-assembly/ tobago-core/
tobago-core/src/main/java/org/apache/myfaces/tobago/ajax/
tobago-core/src/main/java/org/apache/myfaces/tobago...
Author: lofwyr
Date: Tue Feb 28 06:08:45 2012
New Revision: 1294475
URL: http://svn.apache.org/viewvc?rev=1294475&view=rev
Log:
merged from trunk
Added:
myfaces/tobago/branches/tobago-tree-table/tobago-core/src/main/java/org/apache/myfaces/tobago/context/MarkupEditor.java
- copied unchanged from r1294469, myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/MarkupEditor.java
myfaces/tobago/branches/tobago-tree-table/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/MeasureEditor.java
- copied unchanged from r1294469, myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/MeasureEditor.java
myfaces/tobago/branches/tobago-tree-table/tobago-core/src/test/java/org/apache/myfaces/tobago/component/SorterUnitTest.java
- copied unchanged from r1294469, myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/component/SorterUnitTest.java
myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-test/src/main/java/org/apache/myfaces/tobago/example/test/SheetSortController.java
- copied unchanged from r1294469, myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/java/org/apache/myfaces/tobago/example/test/SheetSortController.java
myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-test/src/main/java/org/apache/myfaces/tobago/example/test/Tobago1041.java
- copied unchanged from r1294469, myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/java/org/apache/myfaces/tobago/example/test/Tobago1041.java
myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-test/src/main/webapp/tc/selectBooleanCheckbox/checkbox-bug-tobago-1041.xhtml
- copied unchanged from r1294469, myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/tc/selectBooleanCheckbox/checkbox-bug-tobago-1041.xhtml
myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-test/src/main/webapp/tc/sheet/sheet-sort.xhtml
- copied unchanged from r1294469, myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/tc/sheet/sheet-sort.xhtml
myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-test/src/test/java/org/apache/myfaces/tobago/example/test/tc/sheet/Tobago986SeleniumTest.java
- copied unchanged from r1294469, myfaces/tobago/trunk/tobago-example/tobago-example-test/src/test/java/org/apache/myfaces/tobago/example/test/tc/sheet/Tobago986SeleniumTest.java
Modified:
myfaces/tobago/branches/tobago-tree-table/ (props changed)
myfaces/tobago/branches/tobago-tree-table/pom.xml
myfaces/tobago/branches/tobago-tree-table/src/site/apt/api-documentation.apt
myfaces/tobago/branches/tobago-tree-table/src/site/apt/compatibility.apt
myfaces/tobago/branches/tobago-tree-table/src/site/apt/download.apt
myfaces/tobago/branches/tobago-tree-table/src/site/apt/index.apt
myfaces/tobago/branches/tobago-tree-table/src/site/apt/news.apt
myfaces/tobago/branches/tobago-tree-table/src/site/apt/oldDocumentation.apt
myfaces/tobago/branches/tobago-tree-table/src/site/resources/ (props changed)
myfaces/tobago/branches/tobago-tree-table/src/site/resources/doap_tobago.rdf (contents, props changed)
myfaces/tobago/branches/tobago-tree-table/tobago-assembly/pom.xml
myfaces/tobago/branches/tobago-tree-table/tobago-core/pom.xml
myfaces/tobago/branches/tobago-tree-table/tobago-core/src/main/java/org/apache/myfaces/tobago/ajax/AjaxUtils.java
myfaces/tobago/branches/tobago-tree-table/tobago-core/src/main/java/org/apache/myfaces/tobago/component/Sorter.java
myfaces/tobago/branches/tobago-tree-table/tobago-core/src/main/java/org/apache/myfaces/tobago/context/UserAgent.java
myfaces/tobago/branches/tobago-tree-table/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectBooleanCheckboxTagDeclaration.java
myfaces/tobago/branches/tobago-tree-table/tobago-core/src/main/java/org/apache/myfaces/tobago/webapp/TobagoResponseWriter.java
myfaces/tobago/branches/tobago-tree-table/tobago-core/src/test/java/org/apache/myfaces/tobago/context/UserAgentUnitTest.java
myfaces/tobago/branches/tobago-tree-table/tobago-example/pom.xml
myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-addressbook/pom.xml
myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-assembly/pom.xml
myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-blank/pom.xml
myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-data/pom.xml
myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-demo/pom.xml
myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-demo/src/main/webapp/content/02-sheet/00/sheet-master-detail.xhtml (contents, props changed)
myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-demo/src/main/xslt/facelet2jsp.xsl
myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-experimental/pom.xml
myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-nonfacesrequest/pom.xml
myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-portlet/pom.xml
myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-sandbox/pom.xml
myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-security/pom.xml
myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-test/pom.xml
myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-test/src/main/webapp/WEB-INF/faces-config.xml
myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-test/src/main/webapp/WEB-INF/web.xml
myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-test/src/main/webapp/script/tobago-assert.js
myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-test/src/test/java/org/apache/myfaces/tobago/example/test/SeleniumTest.java
myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-test/src/test/java/org/apache/myfaces/tobago/example/test/TestTheAutomaticSeleniumTest.java
myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-test/src/test/java/org/apache/myfaces/tobago/example/test/tc/popup/BugTobago1091SeleniumTest.java
myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-theme-example/pom.xml
myfaces/tobago/branches/tobago-tree-table/tobago-extension/pom.xml
myfaces/tobago/branches/tobago-tree-table/tobago-extension/tobago-deprecation/pom.xml
myfaces/tobago/branches/tobago-tree-table/tobago-extension/tobago-facelets/pom.xml
myfaces/tobago/branches/tobago-tree-table/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/SelectBooleanCheckboxExtensionHandler.java
myfaces/tobago/branches/tobago-tree-table/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/TobagoLabelExtensionHandler.java
myfaces/tobago/branches/tobago-tree-table/tobago-extension/tobago-fileupload/pom.xml
myfaces/tobago/branches/tobago-tree-table/tobago-extension/tobago-sandbox/pom.xml
myfaces/tobago/branches/tobago-tree-table/tobago-extension/tobago-security/pom.xml
myfaces/tobago/branches/tobago-tree-table/tobago-extension/tobago-taglib-extension/pom.xml
myfaces/tobago/branches/tobago-tree-table/tobago-extension/tobago-taglib-extension/src/main/java-jsf-1.1/org/apache/myfaces/tobago/internal/taglib/extension/SelectBooleanCheckboxExtensionTag.java
myfaces/tobago/branches/tobago-tree-table/tobago-extension/tobago-taglib-extension/src/main/java-jsf-1.2/org/apache/myfaces/tobago/internal/taglib/extension/SelectBooleanCheckboxExtensionTag.java
myfaces/tobago/branches/tobago-tree-table/tobago-jsf-compat/pom.xml
myfaces/tobago/branches/tobago-tree-table/tobago-theme/pom.xml
myfaces/tobago/branches/tobago-tree-table/tobago-theme/tobago-theme-charlotteville/pom.xml
myfaces/tobago/branches/tobago-tree-table/tobago-theme/tobago-theme-richmond/pom.xml
myfaces/tobago/branches/tobago-tree-table/tobago-theme/tobago-theme-scarborough/pom.xml
myfaces/tobago/branches/tobago-tree-table/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PageRenderer.java
myfaces/tobago/branches/tobago-tree-table/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/RichTextEditorRenderer.java
myfaces/tobago/branches/tobago-tree-table/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectBooleanCheckboxRenderer.java
myfaces/tobago/branches/tobago-tree-table/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectManyShuttleRenderer.java
myfaces/tobago/branches/tobago-tree-table/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.java
myfaces/tobago/branches/tobago-tree-table/tobago-theme/tobago-theme-speyside/pom.xml
myfaces/tobago/branches/tobago-tree-table/tobago-theme/tobago-theme-standard/pom.xml
myfaces/tobago/branches/tobago-tree-table/tobago-tool/pom.xml
myfaces/tobago/branches/tobago-tree-table/tobago-tool/tobago-tool-annotation/pom.xml
myfaces/tobago/branches/tobago-tree-table/tobago-tool/tobago-tool-apt/pom.xml
Propchange: myfaces/tobago/branches/tobago-tree-table/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 28 06:08:45 2012
@@ -1 +1 @@
-/myfaces/tobago/trunk:1226794-1244118
+/myfaces/tobago/trunk:1226794-1294469
Modified: myfaces/tobago/branches/tobago-tree-table/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-tree-table/pom.xml?rev=1294475&r1=1294474&r2=1294475&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-tree-table/pom.xml (original)
+++ myfaces/tobago/branches/tobago-tree-table/pom.xml Tue Feb 28 06:08:45 2012
@@ -26,7 +26,7 @@
<artifactId>tobago</artifactId>
<packaging>pom</packaging>
<name>Apache Tobago</name>
- <version>1.5.4-SNAPSHOT</version>
+ <version>1.5.5-SNAPSHOT</version>
<description>The goal of Tobago is to provide the community with a well designed set of user interface components based on JSF and run on MyFaces.</description>
<prerequisites>
<maven>2.2.1</maven>
Modified: myfaces/tobago/branches/tobago-tree-table/src/site/apt/api-documentation.apt
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-tree-table/src/site/apt/api-documentation.apt?rev=1294475&r1=1294474&r2=1294475&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-tree-table/src/site/apt/api-documentation.apt (original)
+++ myfaces/tobago/branches/tobago-tree-table/src/site/apt/api-documentation.apt Tue Feb 28 06:08:45 2012
@@ -19,12 +19,12 @@
Tobago API and TLD Documentation
- {{{http://myfaces.apache.org/tobago/apidocs-1.0.38/index.html}1.0.38 Core API Documentation}}\
- {{{http://myfaces.apache.org/tobago/tobago-core/tlddoc-1.0.38/index.html}1.0.38 Tag Library Documentation}}
+ {{{http://myfaces.apache.org/tobago/apidocs-1.0.39/index.html}1.0.39 Core API Documentation}}\
+ {{{http://myfaces.apache.org/tobago/tobago-core/tlddoc-1.0.39/index.html}1.0.39 Tag Library Documentation}}
- {{{http://myfaces.apache.org/tobago/apidocs-1.5.2/index.html}1.5.2 API Documentation}}\
- {{{http://myfaces.apache.org/tobago/tobago-core/tlddoc-1.5.2/index.html}1.5.2 \<tc:\> Component Tag Library Documentation}}\
- {{{http://myfaces.apache.org/tobago/tobago-extension/tobago-taglib-extension/tlddoc-1.5.2/index.html}1.5.2 \<tx:\> Extension Tag Library Documentation}}
+ {{{http://myfaces.apache.org/tobago/apidocs-1.5.3/index.html}1.5.3 API Documentation}}\
+ {{{http://myfaces.apache.org/tobago/tobago-core/tlddoc-1.5.3/index.html}1.5.3 \<tc:\> Component Tag Library Documentation}}\
+ {{{http://myfaces.apache.org/tobago/tobago-extension/tobago-taglib-extension/tlddoc-1.5.3/index.html}1.5.3 \<tx:\> Extension Tag Library Documentation}}
{{{http://myfaces.apache.org/tobago/apidocs/index.html}Latest 1.5.x SVN API Documentation}}\
{{{http://myfaces.apache.org/tobago/tobago-core/tlddoc/index.html}Latest 1.5.x SVN \<tc:\> Component Tag Library Documentation}}\
Modified: myfaces/tobago/branches/tobago-tree-table/src/site/apt/compatibility.apt
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-tree-table/src/site/apt/compatibility.apt?rev=1294475&r1=1294474&r2=1294475&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-tree-table/src/site/apt/compatibility.apt (original)
+++ myfaces/tobago/branches/tobago-tree-table/src/site/apt/compatibility.apt Tue Feb 28 06:08:45 2012
@@ -25,25 +25,25 @@ Compatibility
\
*--+--+--+--+
-| <<Tobago Version>> | <<1.0.x>> | <<1.5.x-jsf-1.1>> \[unsettled\] (planning) | <<1.5.x>> (planning)
+| <<Tobago Version>> | <<1.0.x>> | <<1.5.x-jsf-1.1>> \[no release\] | <<1.5.x>>
*--+--+--+--+
| <<Specifications>> | | |
*--+--+--+--+
-| Java | 1.4\[retro\], <<1.5>>, 1.6 | 1.4\[retro\], <<1.5>>, 1.6 | <<1.5>>, 1.6
+| Java | 1.4\[retro\], <<1.5>>, 1.6 | 1.4\[retro\], <<1.5>>, 1.6 | 1.5, 1.6, 1.7
*--+--+--+--+
-| JSF | <<1.1>>, 1.2 | <<1.1>> | <<1.2>>, 2.0\[unsettled\]
+| JSF | <<1.1>>, 1.2 | 1.1 | 1.2, 2.0\[disable vh\]
*--+--+--+--+
| Servlet | 2.3, <<2.4>>, 2.5 | 2.3, <<2.4>>, 2.5 | 2.4\[facelets only\], <<2.5>>, 3.0
*--+--+--+--+
| JSP | 1.2, <<2.0>>, 2.1 | 1.2, <<2.0>>, 2.1 | <<2.1>>
*--+--+--+--+
-| Facelets | <<1.1>>\[ext\] | <<1.1>>\[ext\] ? | <<1.1>>\[ext\] ?
+| Facelets | <<1.1>>\[ext\] | <<1.1>>\[ext\] | <<1.1>>\[ext\]
*--+--+--+--+
| <<Implementations>> | | |
*--+--+--+--+
-| MyFaces | <<1.1>>, 1.2 | <<1.1>> | <<1.2>>, 2.0\[unsettled\]
+| MyFaces | <<1.1>>, 1.2 | 1.1 | 1.2, 2.0
*--+--+--+--+
-| Sun RI | <<1.1>>, 1.2 | <<1.1>> | <<1.2>>, 2.0\[unsettled\]
+| Sun RI | <<1.1>>, 1.2 | 1.1 | 1.2, 2.0
*--+--+--+--+
| | | |
*--+--+--+--+
@@ -63,31 +63,26 @@ Compatibility
*--+--+--+--+
| <<Browser>> | | |
*--+--+--+--+
-| Internet Explorer | 6, 7, 8, 9 | 6, 7, 8, 9 | 6, 7, 8, 9
+| Internet Explorer | 6, 7, 8, 9, 10 | 6, 7, 8, 9, 10 | 6, 7, 8, 9, 10
*--+--+--+--+
-| Firefox | 2, 3, 3.5, 3.6, 4.0 | 2, 3, 3.5, 3.6, 4.0 | 2, 3, 3.5, 3.6, 4.0
+| Firefox | 2, 3, 3.5, 3.6, 4, ..., 10 | 2, 3, 3.5, 3.6, 4, ..., 10 | 2, 3, 3.5, 3.6, 4, ..., 10
*--+--+--+--+
| Safari | | 4, 5 | 4, 5
*--+--+--+--+
-| Chrome | | 5 | 5
+| Chrome | | 5, ..., 17 | 5, ..., 17
*--+--+--+--+
-| Opera | | 10 | 10
+| Opera | | 10, 11 | 10, 11
*--+--+--+--+
| others | | \[other browsers\] | \[other browsers\]
*--+--+--+--+
-
- ~~ | WebSphere JSF Impl | ? |
- ~~ *--+--+--+--+
- ~~ | <<Frameworks>> | |
- ~~ *--+--+--+--+
- ~~ | Tomahawk | |
- ~~ *--+--+--+--+
- ~~ | Orchestra | |
- ~~ *--+--+--+--+
- ~~ | Seam | |
- ~~ *--+--+--+--+
- ~~ | ? | |
- ~~ *--+--+--+--+
+| | | |
+*--+--+--+--+
+| <<Frameworks>> | | |
+*--+--+--+--+
+| CDI / Codi | | | yes
+*--+--+--+--+
+| JSR-303 / BV | | | yes
+*--+--+--+--+
~~ JSF Addon-Frameworks: Apache Shale Dialog, Apache Shale Clay, Spring Web Flow, Seam, WebBeans, "Validator", ...
~~ IoC Frameworks: Spring, Guice, ...
@@ -108,3 +103,16 @@ Compatibility
\[other servers\]: other servers should work, when they are compliant to the named specifications
\[other browsers\]: other browsers should work, in their actual version, when they are standard compliant to HTML 4 and CSS 2.1
+
+ \[no release\]: Using Tobago 1.5 with JSF 1.1 is currently not part of the release, but can be build from the sources with mvn -Pjsf-1.1
+
+ \[disable vh\]: Tobago 1.5 works with JSF 2.0 when you are disable the Facelets ViewHandler from JSF 2.0 and using the
+ original Facelets:
+
++----------------------------------------
+ <context-param>
+ <description>For backward compatibility (using "old" Facelets with JSF 2.0)</description>
+ <param-name>javax.faces.DISABLE_FACELET_JSF_VIEWHANDLER</param-name>
+ <param-value>true</param-value>
+ </context-param>
++----------------------------------------
Modified: myfaces/tobago/branches/tobago-tree-table/src/site/apt/download.apt
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-tree-table/src/site/apt/download.apt?rev=1294475&r1=1294474&r2=1294475&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-tree-table/src/site/apt/download.apt (original)
+++ myfaces/tobago/branches/tobago-tree-table/src/site/apt/download.apt Tue Feb 28 06:08:45 2012
@@ -33,42 +33,42 @@ Download MyFaces Tobago
created using GNU tar extensions. Thus they must be untarred with a GNU compatible
version of tar.
-MyFaces Tobago 1.0.38 Distribution
+MyFaces Tobago 1.0.39 Distribution
Release notes can be found
- {{{http://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310273&styleName=Html&version=12317350}here}}.
+ {{{http://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310273&styleName=Html&version=12319455}here}}.
*-------------------------+---------+----------+-----------+
| | Mirrors | Checksum | Signature |
*-------------------------+---------+----------+-----------+
-| MyFaces Tobago 1.0.38 (tar.gz) | {{{http://www.apache.org/dyn/closer.cgi/myfaces/binaries/myfaces-tobago-1.0.38-dist.tar.gz} myfaces-tobago-1.0.38-dist.tar.gz}} | {{{http://www.apache.org/dist/myfaces/binaries/myfaces-tobago-1.0.38-dist.tar.gz.md5} myfaces-tobago-1.0.38-dist.tar.gz.md5}} | {{{http://www.apache.org/dist/myfaces/binaries/myfaces-tobago-1.0.38-dist.tar.gz.asc} myfaces-tobago-1.0.38-dist.tar.gz.asc}} |
+| MyFaces Tobago 1.0.39 (tar.gz) | {{{http://www.apache.org/dyn/closer.cgi/myfaces/binaries/myfaces-tobago-1.0.39-dist.tar.gz} myfaces-tobago-1.0.39-dist.tar.gz}} | {{{http://www.apache.org/dist/myfaces/binaries/myfaces-tobago-1.0.39-dist.tar.gz.md5} myfaces-tobago-1.0.39-dist.tar.gz.md5}} | {{{http://www.apache.org/dist/myfaces/binaries/myfaces-tobago-1.0.39-dist.tar.gz.asc} myfaces-tobago-1.0.39-dist.tar.gz.asc}} |
*-------------------------+---------+----------+-----------+
-| MyFaces Tobago 1.0.38 (zip) | {{{http://www.apache.org/dyn/closer.cgi/myfaces/binaries/myfaces-tobago-1.0.38-dist.zip} myfaces-tobago-1.0.38-dist.zip}} | {{{http://www.apache.org/dist/myfaces/binaries/myfaces-tobago-1.0.38-dist.zip.md5} myfaces-tobago-1.0.38-dist.zip.md5}} | {{{http://www.apache.org/dist/myfaces/binaries/myfaces-tobago-1.0.38-dist.zip.asc} myfaces-tobago-1.0.38-dist.zip.asc}} |
+| MyFaces Tobago 1.0.39 (zip) | {{{http://www.apache.org/dyn/closer.cgi/myfaces/binaries/myfaces-tobago-1.0.39-dist.zip} myfaces-tobago-1.0.39-dist.zip}} | {{{http://www.apache.org/dist/myfaces/binaries/myfaces-tobago-1.0.39-dist.zip.md5} myfaces-tobago-1.0.39-dist.zip.md5}} | {{{http://www.apache.org/dist/myfaces/binaries/myfaces-tobago-1.0.39-dist.zip.asc} myfaces-tobago-1.0.39-dist.zip.asc}} |
*-------------------------+---------+----------+-----------+
-| MyFaces Tobago Source 1.0.38 (zip) | {{{http://www.apache.org/dyn/closer.cgi/myfaces/source/myfaces-tobago-1.0.38-source-release.zip} myfaces-tobago-1.0.38-source-release.zip}} | {{{http://www.apache.org/dist/myfaces/source/myfaces-tobago-1.0.38-source-release.zip.md5} myfaces-tobago-1.0.38-source-release.zip.md5}} | {{{http://www.apache.org/dist/myfaces/source/myfaces-tobago-1.0.38-source-release.zip.asc} myfaces-tobago-1.0.38-source-release.zip.asc}} |
+| MyFaces Tobago Source 1.0.39 (zip) | {{{http://www.apache.org/dyn/closer.cgi/myfaces/source/myfaces-tobago-1.0.39-source-release.zip} myfaces-tobago-1.0.39-source-release.zip}} | {{{http://www.apache.org/dist/myfaces/source/myfaces-tobago-1.0.39-source-release.zip.md5} myfaces-tobago-1.0.39-source-release.zip.md5}} | {{{http://www.apache.org/dist/myfaces/source/myfaces-tobago-1.0.39-source-release.zip.asc} myfaces-tobago-1.0.39-source-release.zip.asc}} |
*-------------------------+---------+----------+-----------+
-| MyFaces Tobago Example 1.0.38 (tar.gz) | {{{http://www.apache.org/dyn/closer.cgi/myfaces/binaries/myfaces-tobago-1.0.38-example.tar.gz} myfaces-tobago-1.0.38-example.tar.gz}} | {{{http://www.apache.org/dist/myfaces/binaries/myfaces-tobago-1.0.38-example.tar.gz.md5} myfaces-tobago-1.0.38-example.tar.gz.md5}} | {{{http://www.apache.org/dist/myfaces/binaries/myfaces-tobago-1.0.38-example.tar.gz.asc} myfaces-tobago-1.0.38-example.tar.gz.asc}} |
+| MyFaces Tobago Example 1.0.39 (tar.gz) | {{{http://www.apache.org/dyn/closer.cgi/myfaces/binaries/myfaces-tobago-1.0.39-example.tar.gz} myfaces-tobago-1.0.39-example.tar.gz}} | {{{http://www.apache.org/dist/myfaces/binaries/myfaces-tobago-1.0.39-example.tar.gz.md5} myfaces-tobago-1.0.39-example.tar.gz.md5}} | {{{http://www.apache.org/dist/myfaces/binaries/myfaces-tobago-1.0.39-example.tar.gz.asc} myfaces-tobago-1.0.39-example.tar.gz.asc}} |
*-------------------------+---------+----------+-----------+
-| MyFaces Tobago Example 1.0.38 (zip) | {{{http://www.apache.org/dyn/closer.cgi/myfaces/binaries/myfaces-tobago-1.0.38-example.zip} myfaces-tobago-1.0.38-example.zip}} | {{{http://www.apache.org/dist/myfaces/binaries/myfaces-tobago-1.0.38-example.zip.md5} myfaces-tobago-1.0.38-example.zip.md5}} | {{{http://www.apache.org/dist/myfaces/binaries/myfaces-tobago-1.0.38-example.zip.asc} myfaces-tobago-1.0.38-example.zip.asc}} |
+| MyFaces Tobago Example 1.0.39 (zip) | {{{http://www.apache.org/dyn/closer.cgi/myfaces/binaries/myfaces-tobago-1.0.39-example.zip} myfaces-tobago-1.0.39-example.zip}} | {{{http://www.apache.org/dist/myfaces/binaries/myfaces-tobago-1.0.39-example.zip.md5} myfaces-tobago-1.0.39-example.zip.md5}} | {{{http://www.apache.org/dist/myfaces/binaries/myfaces-tobago-1.0.39-example.zip.asc} myfaces-tobago-1.0.39-example.zip.asc}} |
*-------------------------+---------+----------+-----------+
-MyFaces Tobago 1.5.2 Distribution
+MyFaces Tobago 1.5.3 Distribution
Release notes can be found
- {{{http://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310273&styleName=Html&version=12319248}here}}.
+ {{{http://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310273&styleName=Html&version=12319499}here}}.
*-------------------------+---------+----------+-----------+
| | Mirrors | Checksum | Signature |
*-------------------------+---------+----------+-----------+
-| MyFaces Tobago 1.5.2 (tar.gz) | {{{http://www.apache.org/dyn/closer.cgi/myfaces/binaries/myfaces-tobago-1.5.2-dist.tar.gz} myfaces-tobago-1.5.2-dist.tar.gz}} | {{{http://www.apache.org/dist/myfaces/binaries/myfaces-tobago-1.5.2-dist.tar.gz.md5} myfaces-tobago-1.5.2-dist.tar.gz.md5}} | {{{http://www.apache.org/dist/myfaces/binaries/myfaces-tobago-1.5.2-dist.tar.gz.asc} myfaces-tobago-1.5.2-dist.tar.gz.asc}} |
+| MyFaces Tobago 1.5.3 (tar.gz) | {{{http://www.apache.org/dyn/closer.cgi/myfaces/binaries/myfaces-tobago-1.5.3-dist.tar.gz} myfaces-tobago-1.5.3-dist.tar.gz}} | {{{http://www.apache.org/dist/myfaces/binaries/myfaces-tobago-1.5.3-dist.tar.gz.md5} myfaces-tobago-1.5.3-dist.tar.gz.md5}} | {{{http://www.apache.org/dist/myfaces/binaries/myfaces-tobago-1.5.3-dist.tar.gz.asc} myfaces-tobago-1.5.3-dist.tar.gz.asc}} |
*-------------------------+---------+----------+-----------+
-| MyFaces Tobago 1.5.2 (zip) | {{{http://www.apache.org/dyn/closer.cgi/myfaces/binaries/myfaces-tobago-1.5.2-dist.zip} myfaces-tobago-1.5.2-dist.zip}} | {{{http://www.apache.org/dist/myfaces/binaries/myfaces-tobago-1.5.2-dist.zip.md5} myfaces-tobago-1.5.2-dist.zip.md5}} | {{{http://www.apache.org/dist/myfaces/binaries/myfaces-tobago-1.5.2-dist.zip.asc} myfaces-tobago-1.5.2-dist.zip.asc}} |
+| MyFaces Tobago 1.5.3 (zip) | {{{http://www.apache.org/dyn/closer.cgi/myfaces/binaries/myfaces-tobago-1.5.3-dist.zip} myfaces-tobago-1.5.3-dist.zip}} | {{{http://www.apache.org/dist/myfaces/binaries/myfaces-tobago-1.5.3-dist.zip.md5} myfaces-tobago-1.5.3-dist.zip.md5}} | {{{http://www.apache.org/dist/myfaces/binaries/myfaces-tobago-1.5.3-dist.zip.asc} myfaces-tobago-1.5.3-dist.zip.asc}} |
*-------------------------+---------+----------+-----------+
-| MyFaces Tobago Source 1.5.2 (zip) | {{{http://www.apache.org/dyn/closer.cgi/myfaces/source/myfaces-tobago-1.5.2-source-release.zip} myfaces-tobago-1.5.2-source-release.zip}} | {{{http://www.apache.org/dist/myfaces/source/myfaces-tobago-1.5.2-source-release.zip.md5} myfaces-tobago-1.5.2-source-release.zip.md5}} | {{{http://www.apache.org/dist/myfaces/source/myfaces-tobago-1.5.2-source-release.zip.asc} myfaces-tobago-1.5.2-source-release.zip.asc}} |
+| MyFaces Tobago Source 1.5.3 (zip) | {{{http://www.apache.org/dyn/closer.cgi/myfaces/source/myfaces-tobago-1.5.3-source-release.zip} myfaces-tobago-1.5.3-source-release.zip}} | {{{http://www.apache.org/dist/myfaces/source/myfaces-tobago-1.5.3-source-release.zip.md5} myfaces-tobago-1.5.3-source-release.zip.md5}} | {{{http://www.apache.org/dist/myfaces/source/myfaces-tobago-1.5.3-source-release.zip.asc} myfaces-tobago-1.5.3-source-release.zip.asc}} |
*-------------------------+---------+----------+-----------+
-| MyFaces Tobago Example 1.5.2 (tar.gz) | {{{http://www.apache.org/dyn/closer.cgi/myfaces/binaries/myfaces-tobago-1.5.2-example.tar.gz} myfaces-tobago-1.5.2-example.tar.gz}} | {{{http://www.apache.org/dist/myfaces/binaries/myfaces-tobago-1.5.2-example.tar.gz.md5} myfaces-tobago-1.5.2-example.tar.gz.md5}} | {{{http://www.apache.org/dist/myfaces/binaries/myfaces-tobago-1.5.2-example.tar.gz.asc} myfaces-tobago-1.5.2-example.tar.gz.asc}} |
+| MyFaces Tobago Example 1.5.3 (tar.gz) | {{{http://www.apache.org/dyn/closer.cgi/myfaces/binaries/myfaces-tobago-1.5.3-example.tar.gz} myfaces-tobago-1.5.3-example.tar.gz}} | {{{http://www.apache.org/dist/myfaces/binaries/myfaces-tobago-1.5.3-example.tar.gz.md5} myfaces-tobago-1.5.3-example.tar.gz.md5}} | {{{http://www.apache.org/dist/myfaces/binaries/myfaces-tobago-1.5.3-example.tar.gz.asc} myfaces-tobago-1.5.3-example.tar.gz.asc}} |
*-------------------------+---------+----------+-----------+
-| MyFaces Tobago Example 1.5.2 (zip) | {{{http://www.apache.org/dyn/closer.cgi/myfaces/binaries/myfaces-tobago-1.5.2-example.zip} myfaces-tobago-1.5.2-example.zip}} | {{{http://www.apache.org/dist/myfaces/binaries/myfaces-tobago-1.5.2-example.zip.md5} myfaces-tobago-1.5.2-example.zip.md5}} | {{{http://www.apache.org/dist/myfaces/binaries/myfaces-tobago-1.5.2-example.zip.asc} myfaces-tobago-1.5.2-example.zip.asc}} |
+| MyFaces Tobago Example 1.5.3 (zip) | {{{http://www.apache.org/dyn/closer.cgi/myfaces/binaries/myfaces-tobago-1.5.3-example.zip} myfaces-tobago-1.5.3-example.zip}} | {{{http://www.apache.org/dist/myfaces/binaries/myfaces-tobago-1.5.3-example.zip.md5} myfaces-tobago-1.5.3-example.zip.md5}} | {{{http://www.apache.org/dist/myfaces/binaries/myfaces-tobago-1.5.3-example.zip.asc} myfaces-tobago-1.5.3-example.zip.asc}} |
*-------------------------+---------+----------+-----------+
Modified: myfaces/tobago/branches/tobago-tree-table/src/site/apt/index.apt
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-tree-table/src/site/apt/index.apt?rev=1294475&r1=1294474&r2=1294475&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-tree-table/src/site/apt/index.apt (original)
+++ myfaces/tobago/branches/tobago-tree-table/src/site/apt/index.apt Tue Feb 28 06:08:45 2012
@@ -49,6 +49,10 @@ News
[]
+ * <<19-02-12>> - Apache MyFaces Tobago 1.0.39 released!
+
+ * <<15-02-12>> - Apache MyFaces Tobago 1.5.3 released!
+
* <<24-01-12>> - Apache MyFaces Tobago 1.5.2 released!
* <<12-12-11>> - Apache MyFaces Tobago 1.5.1 released!
Modified: myfaces/tobago/branches/tobago-tree-table/src/site/apt/news.apt
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-tree-table/src/site/apt/news.apt?rev=1294475&r1=1294474&r2=1294475&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-tree-table/src/site/apt/news.apt (original)
+++ myfaces/tobago/branches/tobago-tree-table/src/site/apt/news.apt Tue Feb 28 06:08:45 2012
@@ -13,6 +13,22 @@
~~ See the License for the specific language governing permissions and
~~ limitations under the License.
+February 19, 2012 - MyFaces Tobago 1.0.39 Released
+
+ The MyFaces Tobago component library in version 1.0.39 has been released.
+
+ Release notes can be found
+ {{{http://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310273&styleName=Html&version=12319455}here}}.
+
+
+February 15, 2012 - MyFaces Tobago 1.5.3 Released
+
+ The MyFaces Tobago component library in version 1.5.3 has been released.
+
+ Release notes can be found
+ {{{http://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310273&styleName=Html&version=12319499}here}}.
+
+
January 24, 2012 - MyFaces Tobago 1.5.2 Released
The MyFaces Tobago component library in version 1.5.2 has been released.
@@ -20,6 +36,7 @@ January 24, 2012 - MyFaces Tobago 1.5.2
Release notes can be found
{{{http://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310273&styleName=Html&version=12319248}here}}.
+
December 12, 2011 - MyFaces Tobago 1.5.1 Released
The MyFaces Tobago component library in version 1.5.1 has been released.
Modified: myfaces/tobago/branches/tobago-tree-table/src/site/apt/oldDocumentation.apt
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-tree-table/src/site/apt/oldDocumentation.apt?rev=1294475&r1=1294474&r2=1294475&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-tree-table/src/site/apt/oldDocumentation.apt (original)
+++ myfaces/tobago/branches/tobago-tree-table/src/site/apt/oldDocumentation.apt Tue Feb 28 06:08:45 2012
@@ -19,12 +19,16 @@
Tobago Javadoc Documentation
+ {{{http://myfaces.apache.org/tobago/apidocs-1.5.3/index.html}1.5.3 API Documentation}}
+
{{{http://myfaces.apache.org/tobago/apidocs-1.5.2/index.html}1.5.2 API Documentation}}
{{{http://myfaces.apache.org/tobago/apidocs-1.5.1/index.html}1.5.1 API Documentation}}
{{{http://myfaces.apache.org/tobago/apidocs-1.5.0/index.html}1.5.0 API Documentation}}
+ {{{http://myfaces.apache.org/tobago/apidocs-1.0.39/index.html}1.0.39 Javadoc Documentation}}
+
{{{http://myfaces.apache.org/tobago/apidocs-1.0.38/index.html}1.0.38 Javadoc Documentation}}
{{{http://myfaces.apache.org/tobago/apidocs-1.0.37/index.html}1.0.37 Javadoc Documentation}}
@@ -91,6 +95,9 @@ Tobago Javadoc Documentation
Tobago TLD Documentation
+ {{{http://myfaces.apache.org/tobago/tobago-core/tlddoc-1.5.3/index.html}1.5.3 \<tc:\> Component Tag Library Documentation}}\
+ {{{http://myfaces.apache.org/tobago/tobago-extension/tobago-taglib-extension/tlddoc-1.5.3/index.html}1.5.3 \<tx:\> Extension Tag Library Documentation}}
+
{{{http://myfaces.apache.org/tobago/tobago-core/tlddoc-1.5.2/index.html}1.5.2 \<tc:\> Component Tag Library Documentation}}\
{{{http://myfaces.apache.org/tobago/tobago-extension/tobago-taglib-extension/tlddoc-1.5.2/index.html}1.5.2 \<tx:\> Extension Tag Library Documentation}}
@@ -100,6 +107,8 @@ Tobago TLD Documentation
{{{http://myfaces.apache.org/tobago/tobago-core/tlddoc-1.5.0/index.html}1.5.0 \<tc:\> Component Tag Library Documentation}}\
{{{http://myfaces.apache.org/tobago/tobago-extension/tobago-taglib-extension/tlddoc-1.5.0/index.html}1.5.0 \<tx:\> Extension Tag Library Documentation}}
+ {{{http://myfaces.apache.org/tobago/tobago-core/tlddoc-1.0.39/index.html}1.0.39 TLD Documentation}}
+
{{{http://myfaces.apache.org/tobago/tobago-core/tlddoc-1.0.38/index.html}1.0.38 TLD Documentation}}
{{{http://myfaces.apache.org/tobago/tobago-core/tlddoc-1.0.37/index.html}1.0.37 TLD Documentation}}
Propchange: myfaces/tobago/branches/tobago-tree-table/src/site/resources/
('svn:mergeinfo' removed)
Modified: myfaces/tobago/branches/tobago-tree-table/src/site/resources/doap_tobago.rdf
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-tree-table/src/site/resources/doap_tobago.rdf?rev=1294475&r1=1294474&r2=1294475&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-tree-table/src/site/resources/doap_tobago.rdf (original)
+++ myfaces/tobago/branches/tobago-tree-table/src/site/resources/doap_tobago.rdf Tue Feb 28 06:08:45 2012
@@ -38,19 +38,19 @@
<release>
<Version>
<name>Latest stable release of 1.0.x</name>
- <created>2011-10-23</created>
- <revision>1.0.38</revision>
- <file-release>http://www.apache.org/dyn/closer.cgi/myfaces/binaries/myfaces-tobago-1.0.38-dist.tar.gz</file-release>
- <file-release>http://www.apache.org/dyn/closer.cgi/myfaces/binaries/myfaces-tobago-1.0.38-dist.zip</file-release>
+ <created>2012-02-19</created>
+ <revision>1.0.39</revision>
+ <file-release>http://www.apache.org/dyn/closer.cgi/myfaces/binaries/myfaces-tobago-1.0.39-dist.tar.gz</file-release>
+ <file-release>http://www.apache.org/dyn/closer.cgi/myfaces/binaries/myfaces-tobago-1.0.39-dist.zip</file-release>
</Version>
</release>
<release>
<Version>
<name>Latest stable release of 1.5.x</name>
- <created>2012-01-24</created>
- <revision>1.5.2</revision>
- <file-release>http://www.apache.org/dyn/closer.cgi/myfaces/binaries/myfaces-tobago-1.5.2-dist.tar.gz</file-release>
- <file-release>http://www.apache.org/dyn/closer.cgi/myfaces/binaries/myfaces-tobago-1.5.2-dist.zip</file-release>
+ <created>2012-02-15</created>
+ <revision>1.5.3</revision>
+ <file-release>http://www.apache.org/dyn/closer.cgi/myfaces/binaries/myfaces-tobago-1.5.3-dist.tar.gz</file-release>
+ <file-release>http://www.apache.org/dyn/closer.cgi/myfaces/binaries/myfaces-tobago-1.5.3-dist.zip</file-release>
</Version>
</release>
<repository>
Propchange: myfaces/tobago/branches/tobago-tree-table/src/site/resources/doap_tobago.rdf
('svn:mergeinfo' removed)
Modified: myfaces/tobago/branches/tobago-tree-table/tobago-assembly/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-tree-table/tobago-assembly/pom.xml?rev=1294475&r1=1294474&r2=1294475&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-tree-table/tobago-assembly/pom.xml (original)
+++ myfaces/tobago/branches/tobago-tree-table/tobago-assembly/pom.xml Tue Feb 28 06:08:45 2012
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.myfaces.tobago</groupId>
<artifactId>tobago</artifactId>
- <version>1.5.4-SNAPSHOT</version>
+ <version>1.5.5-SNAPSHOT</version>
</parent>
<dependencies>
Modified: myfaces/tobago/branches/tobago-tree-table/tobago-core/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-tree-table/tobago-core/pom.xml?rev=1294475&r1=1294474&r2=1294475&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-tree-table/tobago-core/pom.xml (original)
+++ myfaces/tobago/branches/tobago-tree-table/tobago-core/pom.xml Tue Feb 28 06:08:45 2012
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.myfaces.tobago</groupId>
<artifactId>tobago</artifactId>
- <version>1.5.4-SNAPSHOT</version>
+ <version>1.5.5-SNAPSHOT</version>
</parent>
<artifactId>tobago-core</artifactId>
<packaging>jar</packaging>
Modified: myfaces/tobago/branches/tobago-tree-table/tobago-core/src/main/java/org/apache/myfaces/tobago/ajax/AjaxUtils.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-tree-table/tobago-core/src/main/java/org/apache/myfaces/tobago/ajax/AjaxUtils.java?rev=1294475&r1=1294474&r2=1294475&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-tree-table/tobago-core/src/main/java/org/apache/myfaces/tobago/ajax/AjaxUtils.java (original)
+++ myfaces/tobago/branches/tobago-tree-table/tobago-core/src/main/java/org/apache/myfaces/tobago/ajax/AjaxUtils.java Tue Feb 28 06:08:45 2012
@@ -130,6 +130,7 @@ public class AjaxUtils {
}
private static void redirectInternal(Writer writer, String url) throws IOException {
+ writer.flush(); // is needed in some cases, e. g. TOBAGO-1094
writer.write("{\n \"tobagoAjaxResponse\": true,\n");
writer.write(" \"responseCode\": 302,\n");
writer.write(" \"location\": \"");
Modified: myfaces/tobago/branches/tobago-tree-table/tobago-core/src/main/java/org/apache/myfaces/tobago/component/Sorter.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-tree-table/tobago-core/src/main/java/org/apache/myfaces/tobago/component/Sorter.java?rev=1294475&r1=1294474&r2=1294475&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-tree-table/tobago-core/src/main/java/org/apache/myfaces/tobago/component/Sorter.java (original)
+++ myfaces/tobago/branches/tobago-tree-table/tobago-core/src/main/java/org/apache/myfaces/tobago/component/Sorter.java Tue Feb 28 06:08:45 2012
@@ -76,6 +76,11 @@ public class Sorter {
String attributeName = child instanceof AbstractUICommand ? Attributes.LABEL:Attributes.VALUE;
if (FacesUtils.hasValueBindingOrValueExpression(child, attributeName)) {
String var = data.getVar();
+ if (var == null) {
+ LOG.error("No sorting performed. Property var of sheet is not set!");
+ unsetSortableAttribute(column);
+ return;
+ }
String expressionString = FacesUtils.getExpressionString(child, attributeName);
if (isSimpleProperty(expressionString)) {
if (expressionString.startsWith("#{")
@@ -98,8 +103,11 @@ public class Sorter {
actualComparator =
FacesUtils.getBindingOrExpressionComparator(facesContext, child, var, descending, comparator);
}
+ } else {
+ LOG.error("No sorting performed. No Expression target found for sorting!");
+ unsetSortableAttribute(column);
+ return;
}
-
} else {
LOG.error("No sorting performed. Value is not instanceof List or Object[]!");
unsetSortableAttribute(column);
@@ -199,7 +207,7 @@ public class Sorter {
if (child instanceof UISelectMany
|| child instanceof UISelectOne
|| child instanceof UISelectBoolean
- || child instanceof AbstractUICommand
+ || (child instanceof AbstractUICommand && child.getChildren().isEmpty())
|| (child instanceof UIInput && RendererTypes.HIDDEN.equals(child.getRendererType()))) {
continue;
// look for a better component if any
Modified: myfaces/tobago/branches/tobago-tree-table/tobago-core/src/main/java/org/apache/myfaces/tobago/context/UserAgent.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-tree-table/tobago-core/src/main/java/org/apache/myfaces/tobago/context/UserAgent.java?rev=1294475&r1=1294474&r2=1294475&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-tree-table/tobago-core/src/main/java/org/apache/myfaces/tobago/context/UserAgent.java (original)
+++ myfaces/tobago/branches/tobago-tree-table/tobago-core/src/main/java/org/apache/myfaces/tobago/context/UserAgent.java Tue Feb 28 06:08:45 2012
@@ -65,6 +65,8 @@ public class UserAgent implements Serial
public static final UserAgent MSIE_9_0 = new UserAgent("msie", "9_0", EnumSet.of(Capability.CONTENT_TYPE_XHTML));
+ public static final UserAgent MSIE_10_0 = new UserAgent("msie", "10_0", EnumSet.of(Capability.CONTENT_TYPE_XHTML));
+
/**
* @deprecated no longer supported, since Tobago 1.5
*/
@@ -236,6 +238,8 @@ public class UserAgent implements Serial
return MSIE_8_0;
} else if (header.contains("MSIE 9.0")) {
return MSIE_9_0;
+ } else if (header.contains("MSIE 10.0")) {
+ return MSIE_10_0;
} else {
return MSIE;
}
Modified: myfaces/tobago/branches/tobago-tree-table/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectBooleanCheckboxTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-tree-table/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectBooleanCheckboxTagDeclaration.java?rev=1294475&r1=1294474&r2=1294475&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-tree-table/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectBooleanCheckboxTagDeclaration.java (original)
+++ myfaces/tobago/branches/tobago-tree-table/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectBooleanCheckboxTagDeclaration.java Tue Feb 28 06:08:45 2012
@@ -27,6 +27,7 @@ import org.apache.myfaces.tobago.interna
import org.apache.myfaces.tobago.internal.taglib.declaration.HasConverterMessage;
import org.apache.myfaces.tobago.internal.taglib.declaration.HasCurrentMarkup;
import org.apache.myfaces.tobago.internal.taglib.declaration.HasIdBindingAndRendered;
+import org.apache.myfaces.tobago.internal.taglib.declaration.HasItemLabel;
import org.apache.myfaces.tobago.internal.taglib.declaration.HasLabelAndAccessKey;
import org.apache.myfaces.tobago.internal.taglib.declaration.HasMarkup;
import org.apache.myfaces.tobago.internal.taglib.declaration.HasOnchange;
@@ -37,10 +38,10 @@ import org.apache.myfaces.tobago.interna
import org.apache.myfaces.tobago.internal.taglib.declaration.HasValidatorMessage;
import org.apache.myfaces.tobago.internal.taglib.declaration.HasValue;
import org.apache.myfaces.tobago.internal.taglib.declaration.HasValueChangeListener;
+import org.apache.myfaces.tobago.internal.taglib.declaration.IsDeprecatedInline;
import org.apache.myfaces.tobago.internal.taglib.declaration.IsDisabled;
import org.apache.myfaces.tobago.internal.taglib.declaration.IsFocus;
import org.apache.myfaces.tobago.internal.taglib.declaration.IsGridLayoutComponent;
-import org.apache.myfaces.tobago.internal.taglib.declaration.IsDeprecatedInline;
import org.apache.myfaces.tobago.internal.taglib.declaration.IsReadonly;
import org.apache.myfaces.tobago.internal.taglib.declaration.IsRequired;
@@ -68,6 +69,6 @@ import org.apache.myfaces.tobago.interna
public interface SelectBooleanCheckboxTagDeclaration extends HasValidator,
HasOnchange, HasValueChangeListener, HasIdBindingAndRendered, HasLabelAndAccessKey, HasValue, IsDisabled,
IsDeprecatedInline, HasTip, IsReadonly, HasMarkup, HasCurrentMarkup, HasTabIndex, IsRequired, HasConverter, IsFocus,
- HasValidatorMessage, HasRequiredMessage, HasConverterMessage, IsGridLayoutComponent {
+ HasValidatorMessage, HasRequiredMessage, HasConverterMessage, IsGridLayoutComponent, HasItemLabel {
// IsImmediateComponent
}
Modified: myfaces/tobago/branches/tobago-tree-table/tobago-core/src/main/java/org/apache/myfaces/tobago/webapp/TobagoResponseWriter.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-tree-table/tobago-core/src/main/java/org/apache/myfaces/tobago/webapp/TobagoResponseWriter.java?rev=1294475&r1=1294474&r2=1294475&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-tree-table/tobago-core/src/main/java/org/apache/myfaces/tobago/webapp/TobagoResponseWriter.java (original)
+++ myfaces/tobago/branches/tobago-tree-table/tobago-core/src/main/java/org/apache/myfaces/tobago/webapp/TobagoResponseWriter.java Tue Feb 28 06:08:45 2012
@@ -197,6 +197,7 @@ public abstract class TobagoResponseWrit
public void startJavascript() throws IOException {
startElement(HtmlElements.SCRIPT, null);
writeAttribute(HtmlAttributes.TYPE, "text/javascript", false);
+ flush(); // is needed in some cases, e. g. TOBAGO-1094
// write("\n<!--\n");
}
Modified: myfaces/tobago/branches/tobago-tree-table/tobago-core/src/test/java/org/apache/myfaces/tobago/context/UserAgentUnitTest.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-tree-table/tobago-core/src/test/java/org/apache/myfaces/tobago/context/UserAgentUnitTest.java?rev=1294475&r1=1294474&r2=1294475&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-tree-table/tobago-core/src/test/java/org/apache/myfaces/tobago/context/UserAgentUnitTest.java (original)
+++ myfaces/tobago/branches/tobago-tree-table/tobago-core/src/test/java/org/apache/myfaces/tobago/context/UserAgentUnitTest.java Tue Feb 28 06:08:45 2012
@@ -80,6 +80,14 @@ public class UserAgentUnitTest {
"Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 6.1; Win64; x64; Trident/5.0; "
+ ".NET CLR 2.0.50727; SLCC2; .NET CLR 3.5.30729; .NET CLR 3.0.30729; Media Center PC 6.0; .NET4.0C)"},
+ {"Internet Explorer 10 - Windows 8 - Developer Preview",
+ UserAgent.MSIE_10_0,
+ "Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.2; WOW64; Trident/6.0)"},
+
+ {"Internet Explorer 10 - Compatibility Mode - Windows 8 - Developer Preview",
+ UserAgent.MSIE_7_0_COMPAT,
+ "Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 6.2; WOW64; Trident/6.0; .NET4.0E; .NET4.0C)"},
+
{"Firefox 3.6 - Ubuntu 10.4",
UserAgent.GECKO_1_9,
"Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2) Gecko/20100308 Ubuntu/10.04 (lucid) Firefox/3.6"},
Modified: myfaces/tobago/branches/tobago-tree-table/tobago-example/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-tree-table/tobago-example/pom.xml?rev=1294475&r1=1294474&r2=1294475&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-tree-table/tobago-example/pom.xml (original)
+++ myfaces/tobago/branches/tobago-tree-table/tobago-example/pom.xml Tue Feb 28 06:08:45 2012
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.myfaces.tobago</groupId>
<artifactId>tobago</artifactId>
- <version>1.5.4-SNAPSHOT</version>
+ <version>1.5.5-SNAPSHOT</version>
</parent>
<packaging>pom</packaging>
<name>Tobago Examples</name>
Modified: myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-addressbook/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-addressbook/pom.xml?rev=1294475&r1=1294474&r2=1294475&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-addressbook/pom.xml (original)
+++ myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-addressbook/pom.xml Tue Feb 28 06:08:45 2012
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.myfaces.tobago</groupId>
<artifactId>tobago-example</artifactId>
- <version>1.5.4-SNAPSHOT</version>
+ <version>1.5.5-SNAPSHOT</version>
</parent>
<artifactId>tobago-example-addressbook</artifactId>
<packaging>war</packaging>
Modified: myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-assembly/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-assembly/pom.xml?rev=1294475&r1=1294474&r2=1294475&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-assembly/pom.xml (original)
+++ myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-assembly/pom.xml Tue Feb 28 06:08:45 2012
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.myfaces.tobago</groupId>
<artifactId>tobago-example</artifactId>
- <version>1.5.4-SNAPSHOT</version>
+ <version>1.5.5-SNAPSHOT</version>
</parent>
<profiles>
Modified: myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-blank/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-blank/pom.xml?rev=1294475&r1=1294474&r2=1294475&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-blank/pom.xml (original)
+++ myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-blank/pom.xml Tue Feb 28 06:08:45 2012
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.myfaces.tobago</groupId>
<artifactId>tobago-example</artifactId>
- <version>1.5.4-SNAPSHOT</version>
+ <version>1.5.5-SNAPSHOT</version>
</parent>
<artifactId>tobago-example-blank</artifactId>
<packaging>war</packaging>
Modified: myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-data/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-data/pom.xml?rev=1294475&r1=1294474&r2=1294475&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-data/pom.xml (original)
+++ myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-data/pom.xml Tue Feb 28 06:08:45 2012
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.myfaces.tobago</groupId>
<artifactId>tobago-example</artifactId>
- <version>1.5.4-SNAPSHOT</version>
+ <version>1.5.5-SNAPSHOT</version>
</parent>
<artifactId>tobago-example-data</artifactId>
<packaging>jar</packaging>
Modified: myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-demo/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-demo/pom.xml?rev=1294475&r1=1294474&r2=1294475&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-demo/pom.xml (original)
+++ myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-demo/pom.xml Tue Feb 28 06:08:45 2012
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.myfaces.tobago</groupId>
<artifactId>tobago-example</artifactId>
- <version>1.5.4-SNAPSHOT</version>
+ <version>1.5.5-SNAPSHOT</version>
</parent>
<artifactId>tobago-example-demo</artifactId>
<packaging>war</packaging>
Modified: myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-demo/src/main/webapp/content/02-sheet/00/sheet-master-detail.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-demo/src/main/webapp/content/02-sheet/00/sheet-master-detail.xhtml?rev=1294475&r1=1294474&r2=1294475&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-demo/src/main/webapp/content/02-sheet/00/sheet-master-detail.xhtml (original)
+++ myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-demo/src/main/webapp/content/02-sheet/00/sheet-master-detail.xhtml Tue Feb 28 06:08:45 2012
@@ -36,15 +36,13 @@
<tc:box label="List of Objects">
<tc:sheet value="#{demo.solarList}" id="sheet"
- columns="*" var="luminary" selectable="single"
- state="#{demo.sheetState}">
+ columns="*" var="luminary" selectable="single">
<tc:column label="#{overviewBundle.solarArrayName}" id="name">
<tc:out value="#{luminary.name}" id="t_name"/>
</tc:column>
<tc:columnEvent event="click">
- <tc:command actionListener="#{demo.selectLuminary}" renderedPartially=":page:detail">
- </tc:command>
- </tc:columnEvent>
+ <tc:command actionListener="#{demo.selectLuminary}" renderedPartially=":page:detail"/>
+ </tc:columnEvent>
</tc:sheet>
</tc:box>
@@ -52,7 +50,7 @@
<tc:box label="Details" rendered="#{demo.currentSolarObject != null}">
<tx:in label="Name" value="#{demo.currentSolarObject.name}"/>
<tc:out value="todo..."/>
- </tc:box>
+ </tc:box>
</tc:panel>
</tc:panel>
Propchange: myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-demo/src/main/webapp/content/02-sheet/00/sheet-master-detail.xhtml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 28 06:08:45 2012
@@ -0,0 +1 @@
+/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/02-sheet/00/sheet-master-detail.xhtml:1236713-1294469
Modified: myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-demo/src/main/xslt/facelet2jsp.xsl
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-demo/src/main/xslt/facelet2jsp.xsl?rev=1294475&r1=1294474&r2=1294475&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-demo/src/main/xslt/facelet2jsp.xsl (original)
+++ myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-demo/src/main/xslt/facelet2jsp.xsl Tue Feb 28 06:08:45 2012
@@ -51,6 +51,38 @@
</jsp:root>
</xsl:template>
+ <xsl:template match="/f:view">
+ <xsl:comment>
+ This Code is generated. Do not change.
+ </xsl:comment>
+
+ <xsl:comment>
+ * 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.
+ </xsl:comment>
+
+ <jsp:root version="2.1">
+ <jsp:directive.page contentType="text/html; charset=utf-8"/>
+ <jsp:body>
+ <f:view>
+ <xsl:apply-templates/>
+ </f:view>
+ </jsp:body>
+ </jsp:root>
+ </xsl:template>
+
<xsl:template match="ui:param" mode="parameter">
<jsp:params>
<jsp:param name="title" value="BASICS"/>
Modified: myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-experimental/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-experimental/pom.xml?rev=1294475&r1=1294474&r2=1294475&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-experimental/pom.xml (original)
+++ myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-experimental/pom.xml Tue Feb 28 06:08:45 2012
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.myfaces.tobago</groupId>
<artifactId>tobago-example</artifactId>
- <version>1.5.4-SNAPSHOT</version>
+ <version>1.5.5-SNAPSHOT</version>
</parent>
<artifactId>tobago-example-experimental</artifactId>
<packaging>war</packaging>
Modified: myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-nonfacesrequest/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-nonfacesrequest/pom.xml?rev=1294475&r1=1294474&r2=1294475&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-nonfacesrequest/pom.xml (original)
+++ myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-nonfacesrequest/pom.xml Tue Feb 28 06:08:45 2012
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.myfaces.tobago</groupId>
<artifactId>tobago-example</artifactId>
- <version>1.5.4-SNAPSHOT</version>
+ <version>1.5.5-SNAPSHOT</version>
</parent>
<artifactId>tobago-example-nonfacesrequest</artifactId>
<packaging>war</packaging>
Modified: myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-portlet/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-portlet/pom.xml?rev=1294475&r1=1294474&r2=1294475&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-portlet/pom.xml (original)
+++ myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-portlet/pom.xml Tue Feb 28 06:08:45 2012
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.myfaces.tobago</groupId>
<artifactId>tobago-example</artifactId>
- <version>1.5.4-SNAPSHOT</version>
+ <version>1.5.5-SNAPSHOT</version>
</parent>
<artifactId>tobago-example-portlet</artifactId>
<packaging>war</packaging>
Modified: myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-sandbox/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-sandbox/pom.xml?rev=1294475&r1=1294474&r2=1294475&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-sandbox/pom.xml (original)
+++ myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-sandbox/pom.xml Tue Feb 28 06:08:45 2012
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.myfaces.tobago</groupId>
<artifactId>tobago-example</artifactId>
- <version>1.5.4-SNAPSHOT</version>
+ <version>1.5.5-SNAPSHOT</version>
</parent>
<artifactId>tobago-example-sandbox</artifactId>
<packaging>war</packaging>
Modified: myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-security/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-security/pom.xml?rev=1294475&r1=1294474&r2=1294475&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-security/pom.xml (original)
+++ myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-security/pom.xml Tue Feb 28 06:08:45 2012
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.myfaces.tobago</groupId>
<artifactId>tobago-example</artifactId>
- <version>1.5.4-SNAPSHOT</version>
+ <version>1.5.5-SNAPSHOT</version>
</parent>
<artifactId>tobago-example-security</artifactId>
<packaging>war</packaging>
Modified: myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-test/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-test/pom.xml?rev=1294475&r1=1294474&r2=1294475&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-test/pom.xml (original)
+++ myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-test/pom.xml Tue Feb 28 06:08:45 2012
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.myfaces.tobago</groupId>
<artifactId>tobago-example</artifactId>
- <version>1.5.4-SNAPSHOT</version>
+ <version>1.5.5-SNAPSHOT</version>
</parent>
<artifactId>tobago-example-test</artifactId>
<packaging>war</packaging>
Modified: myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-test/src/main/webapp/WEB-INF/faces-config.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-test/src/main/webapp/WEB-INF/faces-config.xml?rev=1294475&r1=1294474&r2=1294475&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-test/src/main/webapp/WEB-INF/faces-config.xml (original)
+++ myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-test/src/main/webapp/WEB-INF/faces-config.xml Tue Feb 28 06:08:45 2012
@@ -108,6 +108,12 @@
</managed-bean>
<managed-bean>
+ <managed-bean-name>sort</managed-bean-name>
+ <managed-bean-class>org.apache.myfaces.tobago.example.test.SheetSortController</managed-bean-class>
+ <managed-bean-scope>session</managed-bean-scope>
+ </managed-bean>
+
+ <managed-bean>
<managed-bean-name>tree</managed-bean-name>
<managed-bean-class>org.apache.myfaces.tobago.example.test.TreeController</managed-bean-class>
<managed-bean-scope>session</managed-bean-scope>
@@ -143,6 +149,12 @@
<managed-bean-scope>session</managed-bean-scope>
</managed-bean>
+ <managed-bean>
+ <managed-bean-name>tobago1041</managed-bean-name>
+ <managed-bean-class>org.apache.myfaces.tobago.example.test.Tobago1041</managed-bean-class>
+ <managed-bean-scope>none</managed-bean-scope>
+ </managed-bean>
+
<navigation-rule>
<navigation-case>
<from-outcome>navigation</from-outcome>
Modified: myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-test/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-test/src/main/webapp/WEB-INF/web.xml?rev=1294475&r1=1294474&r2=1294475&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-test/src/main/webapp/WEB-INF/web.xml (original)
+++ myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-test/src/main/webapp/WEB-INF/web.xml Tue Feb 28 06:08:45 2012
@@ -17,10 +17,10 @@
* limitations under the License.
-->
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
+<web-app xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
- version="2.4">
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+ version="2.5">
<display-name>Tobago Application for Quality Assurance</display-name>
<description>Will be used for automated tests in the build process.</description>
@@ -106,6 +106,7 @@
<jsp-config>
<jsp-property-group>
<url-pattern>*.jsp</url-pattern>
+ <url-pattern>*.jspx</url-pattern>
<url-pattern>*.html</url-pattern>
<page-encoding>UTF-8</page-encoding>
</jsp-property-group>
Modified: myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-test/src/main/webapp/script/tobago-assert.js
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-test/src/main/webapp/script/tobago-assert.js?rev=1294475&r1=1294474&r2=1294475&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-test/src/main/webapp/script/tobago-assert.js (original)
+++ myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-test/src/main/webapp/script/tobago-assert.js Tue Feb 28 06:08:45 2012
@@ -22,13 +22,8 @@
var TobagoAssert = {
assertLeft: function(elementOrId, left) {
- var element = TobagoAssert.jQueryElement(elementOrId).get(0);
- var offsetLeft = element.offsetLeft;
- var parent = element;
- while (parent.offsetParent != null) {
- parent = parent.offsetParent;
- offsetLeft += parent.offsetLeft;
- }
+ var element = TobagoAssert.jQueryElement(elementOrId);
+ var offsetLeft = element.offset().left;
if (offsetLeft != left) {
LOG.error("The element '" + element.tagName + "' with id='" + element.id + "' has wrong left: expected=" + left
+ " actual=" + offsetLeft);
@@ -36,13 +31,8 @@ var TobagoAssert = {
},
assertTop: function(elementOrId, top) {
- var element = TobagoAssert.jQueryElement(elementOrId).get(0);
- var offsetTop = element.offsetTop;
- var parent = element;
- while (parent.offsetParent != null) {
- parent = parent.offsetParent;
- offsetTop += parent.offsetTop;
- }
+ var element = TobagoAssert.jQueryElement(elementOrId);
+ var offsetTop = element.offset().top;
if (offsetTop != top) {
LOG.error("The element '" + element.tagName + "' with id='" + element.id + "' has wrong top: expected=" + top
+ " actual=" + offsetTop);
@@ -90,6 +80,14 @@ var TobagoAssert = {
}
},
+ assertContent: function(elementOrId, expected) {
+ var element = TobagoAssert.jQueryElement(elementOrId);
+ if (element.html() != expected) {
+ LOG.error("The content of element with id=" + element.attr('id')
+ + " is '" + element.html() + "', but expected was '" + expected + "'.");
+ }
+ },
+
/**
* Util to get an jQuery object from a plain id string (unescaped) or a jQuery object.
*/
Modified: myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-test/src/test/java/org/apache/myfaces/tobago/example/test/SeleniumTest.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-test/src/test/java/org/apache/myfaces/tobago/example/test/SeleniumTest.java?rev=1294475&r1=1294474&r2=1294475&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-test/src/test/java/org/apache/myfaces/tobago/example/test/SeleniumTest.java (original)
+++ myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-test/src/test/java/org/apache/myfaces/tobago/example/test/SeleniumTest.java Tue Feb 28 06:08:45 2012
@@ -19,9 +19,9 @@ package org.apache.myfaces.tobago.exampl
import com.thoughtworks.selenium.DefaultSelenium;
import com.thoughtworks.selenium.SeleniumException;
-import org.junit.After;
+import org.junit.AfterClass;
import org.junit.Assert;
-import org.junit.Before;
+import org.junit.BeforeClass;
public abstract class SeleniumTest {
@@ -33,16 +33,16 @@ public abstract class SeleniumTest {
public static final String HAS_ERROR_SEVERITY = "has error severity";
public static final String IS_BROKEN = "is broken";
- private DefaultSelenium selenium;
+ private static DefaultSelenium selenium;
- @Before
- public void setUp() throws Exception {
+ @BeforeClass
+ public static void setUp() throws Exception {
selenium = createSeleniumClient();
selenium.start();
}
- @After
- public void tearDown() throws Exception {
+ @AfterClass
+ public static void tearDown() throws Exception {
selenium.stop();
}
@@ -50,10 +50,17 @@ public abstract class SeleniumTest {
return selenium;
}
- protected DefaultSelenium createSeleniumClient() throws Exception {
+ protected static DefaultSelenium createSeleniumClient() throws Exception {
return new DefaultSelenium("localhost", 4444, "*firefox", "http://localhost:8080/");
}
+ protected void waitForAjaxComplete() {
+ getSelenium().waitForCondition(
+ "selenium.browserbot.getCurrentWindow().document.getElementsByClassName('tobago-page-overlay').length == 0",
+ "5000"
+ );
+ }
+
protected void checkPage() {
final String location = selenium.getLocation();
final String html = getHtmlSource();
Modified: myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-test/src/test/java/org/apache/myfaces/tobago/example/test/TestTheAutomaticSeleniumTest.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-test/src/test/java/org/apache/myfaces/tobago/example/test/TestTheAutomaticSeleniumTest.java?rev=1294475&r1=1294474&r2=1294475&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-test/src/test/java/org/apache/myfaces/tobago/example/test/TestTheAutomaticSeleniumTest.java (original)
+++ myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-test/src/test/java/org/apache/myfaces/tobago/example/test/TestTheAutomaticSeleniumTest.java Tue Feb 28 06:08:45 2012
@@ -17,7 +17,10 @@ package org.apache.myfaces.tobago.exampl
* limitations under the License.
*/
+import com.thoughtworks.selenium.SeleniumException;
+import org.junit.AfterClass;
import org.junit.Assert;
+import org.junit.BeforeClass;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -31,6 +34,16 @@ public class TestTheAutomaticSeleniumTes
private static final Logger LOG = LoggerFactory.getLogger(TestTheAutomaticSeleniumTest.class);
+ @BeforeClass
+ public static void setUp() throws Exception {
+ AutomaticSeleniumTest.setUp();
+ }
+
+ @AfterClass
+ public static void tearDown() throws Exception {
+ AutomaticSeleniumTest.tearDown();
+ }
+
@Test
public void areTheCorrectFilesTested() {
@@ -63,12 +76,14 @@ public class TestTheAutomaticSeleniumTes
String url = AutomaticSeleniumTest.createUrl("/meta-test/meta-404-not-existing.xhtml");
LOG.info("Testing page: '" + url + "'");
AutomaticSeleniumTest test = new AutomaticSeleniumTest(url, url);
- test.setUp();
+
test.testPageConsistency();
- test.tearDown();
+
Assert.fail("The test should fail, but wasn't.");
- } catch (AssertionError e) {
+ } catch (AssertionError e) { // from IDE
Assert.assertTrue(e.getMessage().contains("404 - page not found"));
+ } catch (SeleniumException e) { // from mvn -Pintegration-test
+ Assert.assertTrue(e.getMessage().contains("Response_Code = 404"));
}
}
@@ -78,9 +93,9 @@ public class TestTheAutomaticSeleniumTes
String url = AutomaticSeleniumTest.createUrl("/meta-test/meta-1-fail.xhtml");
LOG.info("Testing page: '" + url + "'");
AutomaticSeleniumTest test = new AutomaticSeleniumTest(url, url);
- test.setUp();
+
test.testPageConsistency();
- test.tearDown();
+
Assert.fail("The test should fail, but wasn't.");
} catch (AssertionError e) {
if (e.getMessage().contains(AutomaticSeleniumTest.HAS_ERROR_SEVERITY)) {
@@ -97,9 +112,9 @@ public class TestTheAutomaticSeleniumTes
String url = AutomaticSeleniumTest.createUrl("/meta-test/meta-4-not-tobago.xhtml");
LOG.info("Testing page: '" + url + "'");
AutomaticSeleniumTest test = new AutomaticSeleniumTest(url, url);
- test.setUp();
+
test.testPageConsistency();
- test.tearDown();
+
Assert.fail("The test should fail, but wasn't.");
} catch (AssertionError e) {
if (e.getMessage().contains(AutomaticSeleniumTest.IS_BROKEN)) {
Modified: myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-test/src/test/java/org/apache/myfaces/tobago/example/test/tc/popup/BugTobago1091SeleniumTest.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-test/src/test/java/org/apache/myfaces/tobago/example/test/tc/popup/BugTobago1091SeleniumTest.java?rev=1294475&r1=1294474&r2=1294475&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-test/src/test/java/org/apache/myfaces/tobago/example/test/tc/popup/BugTobago1091SeleniumTest.java (original)
+++ myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-test/src/test/java/org/apache/myfaces/tobago/example/test/tc/popup/BugTobago1091SeleniumTest.java Tue Feb 28 06:08:45 2012
@@ -23,6 +23,9 @@ import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
+import static org.hamcrest.CoreMatchers.anyOf;
+import static org.hamcrest.CoreMatchers.is;
+
@RunWith(Parameterized.class)
public class BugTobago1091SeleniumTest extends MultiSuffixSeleniumTest {
@@ -35,8 +38,10 @@ public class BugTobago1091SeleniumTest e
// load page
open("/tc/popup/popup-bug-tobago-1091.");
- Assert.assertEquals(
- "Checkbox should be checked!", "true", getSelenium().getAttribute("page:check@checked"));
+ Assert.assertThat(
+ "Checkbox should be checked!",
+ getSelenium().getAttribute("page:check@checked"),
+ anyOf(is("true"), is("checked")));
// click on open popup
getSelenium().click("page:open");
@@ -46,7 +51,9 @@ public class BugTobago1091SeleniumTest e
getSelenium().click("page:popup:close");
getSelenium().waitForPageToLoad("5000");
- Assert.assertEquals(
- "Checkbox should be checked!", "true", getSelenium().getAttribute("page:check@checked"));
+ Assert.assertThat(
+ "Checkbox should be checked!",
+ getSelenium().getAttribute("page:check@checked"),
+ anyOf(is("true"), is("checked")));
}
}
Modified: myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-theme-example/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-theme-example/pom.xml?rev=1294475&r1=1294474&r2=1294475&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-theme-example/pom.xml (original)
+++ myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-theme-example/pom.xml Tue Feb 28 06:08:45 2012
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.myfaces.tobago</groupId>
<artifactId>tobago-example</artifactId>
- <version>1.5.4-SNAPSHOT</version>
+ <version>1.5.5-SNAPSHOT</version>
</parent>
<artifactId>tobago-theme-example</artifactId>
<name>Tobago Theme Example</name>
Modified: myfaces/tobago/branches/tobago-tree-table/tobago-extension/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-tree-table/tobago-extension/pom.xml?rev=1294475&r1=1294474&r2=1294475&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-tree-table/tobago-extension/pom.xml (original)
+++ myfaces/tobago/branches/tobago-tree-table/tobago-extension/pom.xml Tue Feb 28 06:08:45 2012
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.myfaces.tobago</groupId>
<artifactId>tobago</artifactId>
- <version>1.5.4-SNAPSHOT</version>
+ <version>1.5.5-SNAPSHOT</version>
</parent>
<packaging>pom</packaging>
<name>Tobago Extensions</name>
Modified: myfaces/tobago/branches/tobago-tree-table/tobago-extension/tobago-deprecation/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-tree-table/tobago-extension/tobago-deprecation/pom.xml?rev=1294475&r1=1294474&r2=1294475&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-tree-table/tobago-extension/tobago-deprecation/pom.xml (original)
+++ myfaces/tobago/branches/tobago-tree-table/tobago-extension/tobago-deprecation/pom.xml Tue Feb 28 06:08:45 2012
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.myfaces.tobago</groupId>
<artifactId>tobago-extension</artifactId>
- <version>1.5.4-SNAPSHOT</version>
+ <version>1.5.5-SNAPSHOT</version>
</parent>
<artifactId>tobago-deprecation</artifactId>
<packaging>jar</packaging>
Modified: myfaces/tobago/branches/tobago-tree-table/tobago-extension/tobago-facelets/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-tree-table/tobago-extension/tobago-facelets/pom.xml?rev=1294475&r1=1294474&r2=1294475&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-tree-table/tobago-extension/tobago-facelets/pom.xml (original)
+++ myfaces/tobago/branches/tobago-tree-table/tobago-extension/tobago-facelets/pom.xml Tue Feb 28 06:08:45 2012
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.myfaces.tobago</groupId>
<artifactId>tobago-extension</artifactId>
- <version>1.5.4-SNAPSHOT</version>
+ <version>1.5.5-SNAPSHOT</version>
</parent>
<artifactId>tobago-facelets</artifactId>
<packaging>jar</packaging>
Modified: myfaces/tobago/branches/tobago-tree-table/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/SelectBooleanCheckboxExtensionHandler.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-tree-table/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/SelectBooleanCheckboxExtensionHandler.java?rev=1294475&r1=1294474&r2=1294475&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-tree-table/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/SelectBooleanCheckboxExtensionHandler.java (original)
+++ myfaces/tobago/branches/tobago-tree-table/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/SelectBooleanCheckboxExtensionHandler.java Tue Feb 28 06:08:45 2012
@@ -42,11 +42,13 @@ public class SelectBooleanCheckboxExtens
UISelectBooleanCheckbox checkbox = (UISelectBooleanCheckbox) input;
if (itemLabelAttribute != null) {
if (itemLabelAttribute.isLiteral()) {
- checkbox.setLabel(itemLabelAttribute.getValue(faceletContext));
+ checkbox.setItemLabel(itemLabelAttribute.getValue(faceletContext));
} else {
ValueExpression expression = itemLabelAttribute.getValueExpression(faceletContext, String.class);
- ELAdaptor.setExpression(checkbox, Attributes.TIP, expression);
+ ELAdaptor.setExpression(checkbox, Attributes.ITEM_LABEL, expression);
}
+ } else {
+ checkbox.setItemLabel(""); // for compatibility (TOBAGO-1093)
}
}
Modified: myfaces/tobago/branches/tobago-tree-table/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/TobagoLabelExtensionHandler.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-tree-table/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/TobagoLabelExtensionHandler.java?rev=1294475&r1=1294474&r2=1294475&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-tree-table/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/TobagoLabelExtensionHandler.java (original)
+++ myfaces/tobago/branches/tobago-tree-table/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/TobagoLabelExtensionHandler.java Tue Feb 28 06:08:45 2012
@@ -135,9 +135,9 @@ public abstract class TobagoLabelExtensi
UIComponent input = application.createComponent(getSubComponentType());
input.setRendererType(getSubRendererType());
input.setId(uid);
- enrichInput(faceletContext, input);
-
+
setSubComponentAttributes(faceletContext, input);
+ enrichInput(faceletContext, input);
panel.getChildren().add(input);
}
Modified: myfaces/tobago/branches/tobago-tree-table/tobago-extension/tobago-fileupload/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-tree-table/tobago-extension/tobago-fileupload/pom.xml?rev=1294475&r1=1294474&r2=1294475&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-tree-table/tobago-extension/tobago-fileupload/pom.xml (original)
+++ myfaces/tobago/branches/tobago-tree-table/tobago-extension/tobago-fileupload/pom.xml Tue Feb 28 06:08:45 2012
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.myfaces.tobago</groupId>
<artifactId>tobago-extension</artifactId>
- <version>1.5.4-SNAPSHOT</version>
+ <version>1.5.5-SNAPSHOT</version>
</parent>
<packaging>jar</packaging>
<name>Tobago Fileupload</name>
Modified: myfaces/tobago/branches/tobago-tree-table/tobago-extension/tobago-sandbox/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-tree-table/tobago-extension/tobago-sandbox/pom.xml?rev=1294475&r1=1294474&r2=1294475&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-tree-table/tobago-extension/tobago-sandbox/pom.xml (original)
+++ myfaces/tobago/branches/tobago-tree-table/tobago-extension/tobago-sandbox/pom.xml Tue Feb 28 06:08:45 2012
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.myfaces.tobago</groupId>
<artifactId>tobago-extension</artifactId>
- <version>1.5.4-SNAPSHOT</version>
+ <version>1.5.5-SNAPSHOT</version>
</parent>
<artifactId>tobago-sandbox</artifactId>
<packaging>jar</packaging>
Modified: myfaces/tobago/branches/tobago-tree-table/tobago-extension/tobago-security/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-tree-table/tobago-extension/tobago-security/pom.xml?rev=1294475&r1=1294474&r2=1294475&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-tree-table/tobago-extension/tobago-security/pom.xml (original)
+++ myfaces/tobago/branches/tobago-tree-table/tobago-extension/tobago-security/pom.xml Tue Feb 28 06:08:45 2012
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.myfaces.tobago</groupId>
<artifactId>tobago-extension</artifactId>
- <version>1.5.4-SNAPSHOT</version>
+ <version>1.5.5-SNAPSHOT</version>
</parent>
<packaging>jar</packaging>
<name>Tobago Security</name>
Modified: myfaces/tobago/branches/tobago-tree-table/tobago-extension/tobago-taglib-extension/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-tree-table/tobago-extension/tobago-taglib-extension/pom.xml?rev=1294475&r1=1294474&r2=1294475&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-tree-table/tobago-extension/tobago-taglib-extension/pom.xml (original)
+++ myfaces/tobago/branches/tobago-tree-table/tobago-extension/tobago-taglib-extension/pom.xml Tue Feb 28 06:08:45 2012
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.myfaces.tobago</groupId>
<artifactId>tobago-extension</artifactId>
- <version>1.5.4-SNAPSHOT</version>
+ <version>1.5.5-SNAPSHOT</version>
</parent>
<artifactId>tobago-taglib-extension</artifactId>
<packaging>jar</packaging>
Modified: myfaces/tobago/branches/tobago-tree-table/tobago-extension/tobago-taglib-extension/src/main/java-jsf-1.1/org/apache/myfaces/tobago/internal/taglib/extension/SelectBooleanCheckboxExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-tree-table/tobago-extension/tobago-taglib-extension/src/main/java-jsf-1.1/org/apache/myfaces/tobago/internal/taglib/extension/SelectBooleanCheckboxExtensionTag.java?rev=1294475&r1=1294474&r2=1294475&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-tree-table/tobago-extension/tobago-taglib-extension/src/main/java-jsf-1.1/org/apache/myfaces/tobago/internal/taglib/extension/SelectBooleanCheckboxExtensionTag.java (original)
+++ myfaces/tobago/branches/tobago-tree-table/tobago-extension/tobago-taglib-extension/src/main/java-jsf-1.1/org/apache/myfaces/tobago/internal/taglib/extension/SelectBooleanCheckboxExtensionTag.java Tue Feb 28 06:08:45 2012
@@ -130,9 +130,6 @@ public class SelectBooleanCheckboxExtens
if (fieldId != null) {
selectBooleanCheckboxTag.setId(fieldId);
}
- if (label != null) {
- selectBooleanCheckboxTag.setLabel(label);
- }
if (readonly != null) {
selectBooleanCheckboxTag.setReadonly(readonly);
}
@@ -142,8 +139,13 @@ public class SelectBooleanCheckboxExtens
if (required != null) {
selectBooleanCheckboxTag.setRequired(required);
}
+ if (label != null) {
+ selectBooleanCheckboxTag.setLabel(label);
+ }
if (itemLabel != null) {
- selectBooleanCheckboxTag.setLabel(itemLabel);
+ selectBooleanCheckboxTag.setItemLabel(itemLabel);
+ } else {
+ selectBooleanCheckboxTag.setItemLabel("");
}
if (markup != null) {
selectBooleanCheckboxTag.setMarkup(markup);