incubator-adffaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From awi...@apache.org
Subject svn commit: r466181 - in /incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-demo: ./ src/main/java/org/apache/myfaces/trinidaddemo/ src/main/java/org/apache/myfaces/trinidaddemo/composite/ src/main/webapp/components/ src/main/webapp/demos/...
Date Fri, 20 Oct 2006 16:25:17 GMT
Author: awiner
Date: Fri Oct 20 09:25:16 2006
New Revision: 466181

URL: http://svn.apache.org/viewvc?view=rev&rev=466181
Log:
Merge back JSF 1.2 modifications, one step at a time.  Having svn problems with some files

Added:
    incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-demo/src/main/webapp/demos/testPageFlowScope.jspx
      - copied unchanged from r466160, incubator/adffaces/branches/faces-1_2/trinidad/trinidad-demo/src/main/webapp/demos/testPageFlowScope.jspx
Modified:
    incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-demo/pom.xml
    incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/DemoCommandNavigationItemBean.java
    incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/composite/DateFieldAsRenderer.java
    incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-demo/src/main/webapp/components/selectRangeChoiceBar.jspx
    incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-demo/src/main/webapp/demos/progressSteps.jspx
    incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-demo/src/main/webapp/email/showMessage.jspx
    incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-demo/src/main/webapp/surveydemo/surveyPage1.jspx
    incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-demo/src/main/webapp/surveydemo/surveyPage3.jspx
    incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-demo/src/main/webapp/surveydemo/surveyPage5.jspx
    incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-demo/src/main/webapp/surveydemo/surveyResults.jspx

Modified: incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-demo/pom.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-demo/pom.xml?view=diff&rev=466181&r1=466180&r2=466181
==============================================================================
--- incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-demo/pom.xml (original)
+++ incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-demo/pom.xml Fri Oct 20
09:25:16 2006
@@ -18,7 +18,7 @@
   <parent>
     <groupId>org.apache.myfaces.trinidad</groupId>
     <artifactId>trinidad</artifactId>
-    <version>incubator-m1-SNAPSHOT</version>
+    <version>incubator-1.2-m1-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
@@ -75,6 +75,12 @@
       <scope>runtime</scope>
     </dependency>
 
+    <dependency>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
+      <version>2.1</version>
+    </dependency>
+
 <!-- Dependencies pulled in via myfaces/ri pom
     <dependency>
       <groupId>commons-beanutils</groupId>
@@ -128,14 +134,15 @@
       <dependencies>
 
         <dependency>
-          <groupId>org.apache.myfaces.core</groupId>
-          <artifactId>myfaces-api</artifactId>
+          <groupId>javax.faces</groupId>
+          <artifactId>jsf-api</artifactId>
           <scope>compile</scope>
         </dependency>
 
+
         <dependency>
-          <groupId>org.apache.myfaces.core</groupId>
-          <artifactId>myfaces-impl</artifactId>
+          <groupId>javax.faces</groupId>
+          <artifactId>jsf-impl</artifactId>
           <scope>runtime</scope>
         </dependency>
       </dependencies>
@@ -198,4 +205,4 @@
     </profile>
   </profiles>
 
-</project>
\ No newline at end of file
+</project>

Modified: incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/DemoCommandNavigationItemBean.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/DemoCommandNavigationItemBean.java?view=diff&rev=466181&r1=466180&r2=466181
==============================================================================
--- incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/DemoCommandNavigationItemBean.java
(original)
+++ incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/DemoCommandNavigationItemBean.java
Fri Oct 20 09:25:16 2006
@@ -20,9 +20,6 @@
 import javax.faces.component.UIComponent;
 import javax.faces.event.ActionEvent;
 
-import org.apache.myfaces.trinidad.bean.FacesBean;
-import org.apache.myfaces.trinidad.bean.PropertyKey;
-import org.apache.myfaces.trinidad.component.UIXCommand;
 import org.apache.myfaces.trinidad.component.UIXNavigationHierarchy;
 import org.apache.myfaces.trinidad.context.RequestContext;
 
@@ -50,16 +47,11 @@
       }
     }
 
-    List<UIXCommand> children = parent.getChildren();
-    for (UIXCommand child : children)
+    List<UIComponent> children = parent.getChildren();
+    for (UIComponent child : children)
     {
-      FacesBean childFacesBean = child.getFacesBean();
-      FacesBean.Type type = childFacesBean.getType();
-      PropertyKey selectedKey = type.findKey("selected");
-      if (selectedKey != null)
-      {
-        childFacesBean.setProperty(selectedKey, (child == actionItem));
-      }
+      child.getAttributes().put("selected",
+                                child == actionItem);
     }
 
     RequestContext adfContext = RequestContext.getCurrentInstance();

Modified: incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/composite/DateFieldAsRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/composite/DateFieldAsRenderer.java?view=diff&rev=466181&r1=466180&r2=466181
==============================================================================
--- incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/composite/DateFieldAsRenderer.java
(original)
+++ incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/composite/DateFieldAsRenderer.java
Fri Oct 20 09:25:16 2006
@@ -59,7 +59,7 @@
   {
     _addChildren(context, component);
 
-    Map<String, UIComponent> attrs = component.getAttributes();
+    Map<String, Object> attrs = component.getAttributes();
     if (Boolean.TRUE.equals(attrs.get("readOnly")) ||
         Boolean.TRUE.equals(attrs.get("disabled")))
       return;

Modified: incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-demo/src/main/webapp/components/selectRangeChoiceBar.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-demo/src/main/webapp/components/selectRangeChoiceBar.jspx?view=diff&rev=466181&r1=466180&r2=466181
==============================================================================
--- incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-demo/src/main/webapp/components/selectRangeChoiceBar.jspx
(original)
+++ incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-demo/src/main/webapp/components/selectRangeChoiceBar.jspx
Fri Oct 20 09:25:16 2006
@@ -17,6 +17,7 @@
 <jsp:root xmlns:jsp="http://java.sun.com/JSP/Page"
           version="1.2"
           xmlns:f="http://java.sun.com/jsf/core"
+          xmlns:c="http://java.sun.com/jsp/jstl/core"
           xmlns:h="http://java.sun.com/jsf/html"
           xmlns:trh="http://myfaces.apache.org/trinidad/html"
           xmlns:tr="http://myfaces.apache.org/trinidad">
@@ -54,9 +55,9 @@
                   </f:facet>
                 </tr:selectRangeChoiceBar>
                 <tr:panelGroupLayout partialTriggers="selectRangeCBId1">
-                   <tr:forEach items="#{animals.namesInRange}" var="animalName">
+                   <c:forEach items="#{animals.namesInRange}" var="animalName">
                     <tr:outputText value="#{animalName}, "/>
-                  </tr:forEach>
+                  </c:forEach>
                 </tr:panelGroupLayout>
               </tr:panelGroupLayout>
 

Modified: incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-demo/src/main/webapp/demos/progressSteps.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-demo/src/main/webapp/demos/progressSteps.jspx?view=diff&rev=466181&r1=466180&r2=466181
==============================================================================
--- incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-demo/src/main/webapp/demos/progressSteps.jspx
(original)
+++ incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-demo/src/main/webapp/demos/progressSteps.jspx
Fri Oct 20 09:25:16 2006
@@ -17,6 +17,7 @@
 <jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0"
           xmlns:f="http://java.sun.com/jsf/core"
           xmlns:h="http://java.sun.com/jsf/html"
+          xmlns:c="http://java.sun.com/jsp/jstl/core"
           xmlns:trh="http://myfaces.apache.org/trinidad/html" 
           xmlns:tr="http://myfaces.apache.org/trinidad" >
   <jsp:directive.page contentType="text/html;charset=utf-8"/>
@@ -35,7 +36,7 @@
              </tr:navigationPane>
             </f:facet>
           <tr:panelHeader
-             text="Progress steps demo using tr:forEach and BoundedRangeModel">
+             text="Progress steps demo using c:forEach and BoundedRangeModel">
 
             <tr:poll 
               binding="#{editor.component}" 
@@ -47,7 +48,7 @@
               value="&lt;b>The steps completed in a background task could be 
               shown as a check list or a growing list as shown below.&lt;br>
               This could be achieved using suitable output components and the
-              'tr:forEach' tag in conjunction with bindings to a 
+              'c:forEach' tag in conjunction with bindings to a 
               BoundedRangeModel&lt;/b>"/>
 
             <!--Represents a check list-->
@@ -55,7 +56,7 @@
             <tr:panelGroupLayout layout="horizontal">
               <tr:spacer width="30"/>
               <tr:panelGroupLayout layout="vertical" partialTriggers="pollid" id="pg1">
-                <tr:forEach 
+                <c:forEach 
                   var="progressStep" 
                   varStatus="vs" 
                   begin="0" 
@@ -73,7 +74,7 @@
                       value="#{progressStep}" 
                       styleClass="AFFieldText"/>
                   </tr:panelGroupLayout>
-                </tr:forEach>
+                </c:forEach>
               </tr:panelGroupLayout>
             </tr:panelGroupLayout>
 
@@ -82,7 +83,7 @@
             <tr:panelGroupLayout layout="horizontal">
               <tr:spacer width="30"/>
               <tr:panelGroupLayout layout="vertical" partialTriggers="pollid" id="pg2">
-                <tr:forEach 
+                <c:forEach 
                   var="progressStep" 
                   varStatus="vs" 
                   begin="0" 
@@ -94,7 +95,7 @@
                       styleClass="AFFieldText"
                       rendered="#{progressSteps.progressModel.value >= vs.index}"/>
                   </tr:panelGroupLayout>
-                </tr:forEach>
+                </c:forEach>
               </tr:panelGroupLayout>
             </tr:panelGroupLayout>
 

Modified: incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-demo/src/main/webapp/email/showMessage.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-demo/src/main/webapp/email/showMessage.jspx?view=diff&rev=466181&r1=466180&r2=466181
==============================================================================
--- incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-demo/src/main/webapp/email/showMessage.jspx
(original)
+++ incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-demo/src/main/webapp/email/showMessage.jspx
Fri Oct 20 09:25:16 2006
@@ -16,6 +16,7 @@
 -->
 <jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0"
           xmlns:f="http://java.sun.com/jsf/core"
+          xmlns:c="http://java.sun.com/jsp/jstl/core"
           xmlns:trh="http://myfaces.apache.org/trinidad/html" 
           xmlns:tr="http://myfaces.apache.org/trinidad" >
   <jsp:directive.page contentType="text/html;charset=utf-8"/>
@@ -74,19 +75,19 @@
                 </tr:panelLabelAndMessage>
                 <tr:panelLabelAndMessage label="To:">
                   <tr:panelGroupLayout layout="vertical">
-                    <tr:forEach items="#{showMessageBacking.message.tos}"
+                    <c:forEach items="#{showMessageBacking.message.tos}"
                                 var="address">  
                       <tr:outputText value="#{address}"/>
-                    </tr:forEach>
+                    </c:forEach>
                  </tr:panelGroupLayout>
                 </tr:panelLabelAndMessage>
                 <tr:panelLabelAndMessage label="Cc:"
                   labelStyle="vertical-align: top;">
                   <tr:panelGroupLayout layout="vertical">
-                    <tr:forEach items="#{showMessageBacking.message.ccs}"
+                    <c:forEach items="#{showMessageBacking.message.ccs}"
                                 var="address">
                       <tr:outputText value="#{address}"/>
-                    </tr:forEach>
+                    </c:forEach>
                   </tr:panelGroupLayout>
                 </tr:panelLabelAndMessage>
                 <tr:inputText label="Subject:" readOnly="true"
@@ -122,14 +123,14 @@
               <tr:panelBox text="Attachments"
                     rendered="#{showMessageBacking.message.attachmentPresent}">
                 <tr:panelGroupLayout layout="vertical">
-                  <tr:forEach items="#{showMessageBacking.message.attachments}"
+                  <c:forEach items="#{showMessageBacking.message.attachments}"
                               var="attachment">
                     <tr:commandLink text="#{attachment.fileName}"
                         action="#{showMessageBacking.downloadAttachment}">
                       <tr:setActionListener from="#{attachment}"
                          to="#{showMessageBacking.attachmentToDownload}"/>
                     </tr:commandLink>
-                  </tr:forEach>
+                  </c:forEach>
                 </tr:panelGroupLayout>
               </tr:panelBox>
             </f:facet>

Modified: incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-demo/src/main/webapp/surveydemo/surveyPage1.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-demo/src/main/webapp/surveydemo/surveyPage1.jspx?view=diff&rev=466181&r1=466180&r2=466181
==============================================================================
--- incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-demo/src/main/webapp/surveydemo/surveyPage1.jspx
(original)
+++ incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-demo/src/main/webapp/surveydemo/surveyPage1.jspx
Fri Oct 20 09:25:16 2006
@@ -16,6 +16,7 @@
 -->
 <jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0"
           xmlns:f="http://java.sun.com/jsf/core"
+          xmlns:c="http://java.sun.com/jsp/jstl/core"
           xmlns:tr="http://myfaces.apache.org/trinidad" >
   <jsp:directive.page contentType="text/html;charset=utf-8"/>
   <f:view>
@@ -24,7 +25,7 @@
        
         <tr:panelPage>
       
-        <tr:panelHeader text="Question 5 of 5">
+        <tr:panelHeader text="Question 1 of 5">
           <tr:panelFormLayout>
           
             <tr:selectOneRadio label="#{survey.q0.prompt}" 

Modified: incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-demo/src/main/webapp/surveydemo/surveyPage3.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-demo/src/main/webapp/surveydemo/surveyPage3.jspx?view=diff&rev=466181&r1=466180&r2=466181
==============================================================================
--- incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-demo/src/main/webapp/surveydemo/surveyPage3.jspx
(original)
+++ incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-demo/src/main/webapp/surveydemo/surveyPage3.jspx
Fri Oct 20 09:25:16 2006
@@ -16,6 +16,7 @@
 -->
 <jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0"
           xmlns:f="http://java.sun.com/jsf/core"
+          xmlns:c="http://java.sun.com/jsp/jstl/core"
           xmlns:tr="http://myfaces.apache.org/trinidad" >
   <jsp:directive.page contentType="text/html;charset=utf-8"/>
   <f:view>

Modified: incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-demo/src/main/webapp/surveydemo/surveyPage5.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-demo/src/main/webapp/surveydemo/surveyPage5.jspx?view=diff&rev=466181&r1=466180&r2=466181
==============================================================================
--- incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-demo/src/main/webapp/surveydemo/surveyPage5.jspx
(original)
+++ incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-demo/src/main/webapp/surveydemo/surveyPage5.jspx
Fri Oct 20 09:25:16 2006
@@ -16,6 +16,7 @@
 -->
 <jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0"
           xmlns:f="http://java.sun.com/jsf/core"
+          xmlns:c="http://java.sun.com/jsp/jstl/core"
           xmlns:tr="http://myfaces.apache.org/trinidad" >
   <jsp:directive.page contentType="text/html;charset=utf-8"/>
   <f:view>

Modified: incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-demo/src/main/webapp/surveydemo/surveyResults.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-demo/src/main/webapp/surveydemo/surveyResults.jspx?view=diff&rev=466181&r1=466180&r2=466181
==============================================================================
--- incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-demo/src/main/webapp/surveydemo/surveyResults.jspx
(original)
+++ incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-demo/src/main/webapp/surveydemo/surveyResults.jspx
Fri Oct 20 09:25:16 2006
@@ -16,6 +16,7 @@
 -->
 <jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0"
           xmlns:f="http://java.sun.com/jsf/core"
+          xmlns:c="http://java.sun.com/jsp/jstl/core"
           xmlns:tr="http://myfaces.apache.org/trinidad" 
           xmlns:survey="http://myfaces.apache.org/trinidad/demo" >
   <jsp:directive.page contentType="text/html;charset=utf-8"/>



Mime
View raw message