svn commit: r920013 - in /myfaces/core/trunk/impl/src/main: java/org/apache/myfaces/config/impl/digester/DigesterFacesConfigUnmarshallerImpl.java resources/org/apache/myfaces/resource/web-facesconfig_2_0.xsd

[ja...@apache.org]

Author: jakobk
Date: Sun Mar  7 15:10:36 2010
New Revision: 920013

URL: http://svn.apache.org/viewvc?rev=920013&view=rev
Log:
MYFACES-2529 use of view-param in faces-config causes a NoSuchMethodExcepion for addViewParam (the main problem was already fixed, however causing another small bug; also updated the faces-config xsd file for view params)

Modified:
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/DigesterFacesConfigUnmarshallerImpl.java
    myfaces/core/trunk/impl/src/main/resources/org/apache/myfaces/resource/web-facesconfig_2_0.xsd

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/DigesterFacesConfigUnmarshallerImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/DigesterFacesConfigUnmarshallerImpl.java?rev=920013&r1=920012&r2=920013&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/DigesterFacesConfigUnmarshallerImpl.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/DigesterFacesConfigUnmarshallerImpl.java Sun Mar  7 15:10:36 2010
@@ -224,8 +224,7 @@
         digester.addCallMethod("faces-config/navigation-rule/navigation-case/to-view-id", "setToViewId", 0);
         digester.addObjectCreate("faces-config/navigation-rule/navigation-case/redirect", Redirect.class);
         digester.addSetNext("faces-config/navigation-rule/navigation-case/redirect", "setRedirect");
-        // TODO: digester doesn't seem to pick up the include-view-params attribute.  Any ideas why?
-        digester.addSetProperties("faces-config/navigation-rule/navigation-case/redirect", "include-view-params", "includeViewParams");
+        digester.addCallMethod("faces-config/navigation-rule/navigation-case/redirect/include-view-params", "setIncludeViewParams", 0);
         digester.addObjectCreate("faces-config/navigation-rule/navigation-case/redirect/view-param", ViewParam.class);
         digester.addSetNext("faces-config/navigation-rule/navigation-case/redirect/view-param", "addViewParam");
         digester.addCallMethod("faces-config/navigation-rule/navigation-case/redirect/view-param/name", "setName",0);

Modified: myfaces/core/trunk/impl/src/main/resources/org/apache/myfaces/resource/web-facesconfig_2_0.xsd
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/resources/org/apache/myfaces/resource/web-facesconfig_2_0.xsd?rev=920013&r1=920012&r2=920013&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/resources/org/apache/myfaces/resource/web-facesconfig_2_0.xsd (original)
+++ myfaces/core/trunk/impl/src/main/resources/org/apache/myfaces/resource/web-facesconfig_2_0.xsd Sun Mar  7 15:10:36 2010
@@ -459,6 +459,32 @@
     </xsd:complexType>
 
     <xsd:complexType name="faces-config-redirectType">
+        <xsd:annotation>
+            <xsd:documentation>
+                The "redirect" element indicates that navigation to the specified "to-view-id" should be 
+                accomplished by performing an HTTP redirect rather than the usual ViewHandler mechanisms.
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:sequence>
+            <xsd:element name="view-param" type="javaee:faces-config-redirect-viewParamType"
+                minOccurs="0" maxOccurs="unbounded"/>
+        </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:ID"/>
+        <xsd:attribute name="include-view-params" type="xsd:boolean" use="optional"/>
+    </xsd:complexType>
+    
+    <xsd:complexType name="faces-config-redirect-viewParamType">
+        <xsd:annotation>
+            <xsd:documentation>
+                The "view-param" element, only valid within a "redirect" element, contains child
+                "name" and "value" elements that must be included in the redirect url when the 
+                redirect is performed.
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:sequence>
+            <xsd:element name="name" type="javaee:string" minOccurs="1" maxOccurs="1"/>
+            <xsd:element name="value" type="javaee:string" minOccurs="1" maxOccurs="1"/>
+        </xsd:sequence>
         <xsd:attribute name="id" type="xsd:ID"/>
     </xsd:complexType>