myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lof...@apache.org
Subject svn commit: r1153100 - in /myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/tc: attribute/attribute.xhtml attribute/mode-valueIfSet.xhtml tree/tree-show-attributes.xhtml
Date Tue, 02 Aug 2011 11:52:44 GMT
Author: lofwyr
Date: Tue Aug  2 11:52:44 2011
New Revision: 1153100

URL: http://svn.apache.org/viewvc?rev=1153100&view=rev
Log:
After changing the XSLT to use different namespaces for JSP/JSTL and JSTL, the new namespace
must also be declared.
In the JSP EL only ${} works.

Modified:
    myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/tc/attribute/attribute.xhtml
    myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/tc/attribute/mode-valueIfSet.xhtml
    myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/tc/tree/tree-show-attributes.xhtml

Modified: myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/tc/attribute/attribute.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/tc/attribute/attribute.xhtml?rev=1153100&r1=1153099&r2=1153100&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/tc/attribute/attribute.xhtml
(original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/tc/attribute/attribute.xhtml
Tue Aug  2 11:52:44 2011
@@ -21,7 +21,8 @@
     xmlns:tx="http://myfaces.apache.org/tobago/extension"
     xmlns:ui="http://java.sun.com/jsf/facelets"
     xmlns:f="http://java.sun.com/jsf/core"
-    xmlns:c="http://java.sun.com/jstl/core">
+    xmlns:c="http://java.sun.com/jstl/core"
+    xmlns:jspc="http://java.sun.com/jsp/jstl/core">
 
   <tc:page>
     <f:facet name="layout">
@@ -55,26 +56,26 @@
 
     <tc:label value="conditional action (#{attribute.condition})"/>
     <tc:button label="Click">
-      <c:if test="#{attribute.condition}">
+      <c:if test="${attribute.condition}">
         <tc:attribute name="action" value="#{attribute.reload}"/>
       </c:if>
     </tc:button>
 
     <tc:label value="conditional action not (#{not attribute.condition})"/>
     <tc:button label="Click">
-      <c:if test="#{not attribute.condition}">
+      <c:if test="${not attribute.condition}">
         <tc:attribute name="action" value="#{attribute.reload}"/>
       </c:if>
     </tc:button>
 
     <tc:label value="conditional action (#{attribute.condition}) and link not (#{not attribute.condition})"/>
     <tc:button label="Click">
-      <c:if test="#{attribute.condition}">
+      <c:if test="${attribute.condition}">
         <tc:attribute name="action" value="#{attribute.reload}"/>
       </c:if>
-      <c:if test="#{not attribute.condition}">
+      <c:if test="${not attribute.condition}">
         <tc:attribute name="link" value="/"/>
-      </c:if>   
+      </c:if>
     </tc:button>
 
   </tc:page>

Modified: myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/tc/attribute/mode-valueIfSet.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/tc/attribute/mode-valueIfSet.xhtml?rev=1153100&r1=1153099&r2=1153100&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/tc/attribute/mode-valueIfSet.xhtml
(original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/tc/attribute/mode-valueIfSet.xhtml
Tue Aug  2 11:52:44 2011
@@ -21,7 +21,8 @@
     xmlns:tx="http://myfaces.apache.org/tobago/extension"
     xmlns:ui="http://java.sun.com/jsf/facelets"
     xmlns:f="http://java.sun.com/jsf/core"
-    xmlns:c="http://java.sun.com/jstl/core">
+    xmlns:c="http://java.sun.com/jstl/core"
+    xmlns:jspc="http://java.sun.com/jsp/jstl/core">
 
   <tc:page id="page">
     <f:facet name="layout">

Modified: myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/tc/tree/tree-show-attributes.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/tc/tree/tree-show-attributes.xhtml?rev=1153100&r1=1153099&r2=1153100&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/tc/tree/tree-show-attributes.xhtml
(original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/tc/tree/tree-show-attributes.xhtml
Tue Aug  2 11:52:44 2011
@@ -23,7 +23,8 @@
         xmlns:ui="http://java.sun.com/jsf/facelets"
         xmlns:h="http://java.sun.com/jsf/html"
         xmlns:f="http://java.sun.com/jsf/core"
-        xmlns:c="http://java.sun.com/jstl/core">
+        xmlns:c="http://java.sun.com/jstl/core"
+        xmlns:jspc="http://java.sun.com/jsp/jstl/core">
 
   <tc:page label="Different show attributes" id="page">
     <f:facet name="layout">



Mime
View raw message