myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jwald...@apache.org
Subject svn commit: r780063 [8/8] - in /myfaces/trinidad/branches/1.2.11.3-branch: trinidad-build/src/main/resources/META-INF/maven-faces-plugin/ trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/javax/faces/ trinidad-build/src/main/reso...
Date Fri, 29 May 2009 18:47:26 GMT
Modified: myfaces/trinidad/branches/1.2.11.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/validators/trinidad/ByteLength.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.11.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/validators/trinidad/ByteLength.xml?rev=780063&r1=780062&r2=780063&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.11.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/validators/trinidad/ByteLength.xml
(original)
+++ myfaces/trinidad/branches/1.2.11.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/validators/trinidad/ByteLength.xml
Fri May 29 18:47:21 2009
@@ -20,7 +20,8 @@
 -->
 <faces-config version="1.2" xmlns="http://java.sun.com/xml/ns/javaee"
               xmlns:tr="http://myfaces.apache.org/trinidad"
-              xmlns:mfp="http://myfaces.apache.org/maven-faces-plugin">
+              xmlns:mfp="http://myfaces.apache.org/maven-faces-plugin"
+              xmlns:fmd="http://java.sun.com/xml/ns/javaee/faces/design-time-metadata">
   <validator>
     <description><![CDATA[Validate the byte length of strings when encoded.]]></description>
     <display-name>validateByteLength</display-name>
@@ -31,9 +32,10 @@
       <property-name>maximum</property-name>
       <property-class>int</property-class>
       <property-extension>
-        <mfp:property-metadata>
-          <mfp:preferred>true</mfp:preferred>
-        </mfp:property-metadata>
+        <mfp:property-metadata/>
+        <fmd:property-metadata>
+          <fmd:preferred>true</fmd:preferred>
+        </fmd:property-metadata>
       </property-extension>
     </property>
     <property>
@@ -42,9 +44,10 @@
       <property-class>java.lang.String</property-class>
       <default-value>iso-8859-1</default-value>
       <property-extension>
-        <mfp:property-metadata>
-          <mfp:preferred>true</mfp:preferred>
-        </mfp:property-metadata>
+        <mfp:property-metadata/>
+        <fmd:property-metadata>
+          <fmd:preferred>true</fmd:preferred>
+        </fmd:property-metadata>
       </property-extension>
     </property>
     <property>

Modified: myfaces/trinidad/branches/1.2.11.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/validators/trinidad/DateRestriction.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.11.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/validators/trinidad/DateRestriction.xml?rev=780063&r1=780062&r2=780063&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.11.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/validators/trinidad/DateRestriction.xml
(original)
+++ myfaces/trinidad/branches/1.2.11.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/validators/trinidad/DateRestriction.xml
Fri May 29 18:47:21 2009
@@ -20,7 +20,8 @@
 -->
 <faces-config version="1.2" xmlns="http://java.sun.com/xml/ns/javaee"
               xmlns:tr="http://myfaces.apache.org/trinidad"
-              xmlns:mfp="http://myfaces.apache.org/maven-faces-plugin">
+              xmlns:mfp="http://myfaces.apache.org/maven-faces-plugin"
+              xmlns:fmd="http://java.sun.com/xml/ns/javaee/faces/design-time-metadata">
   <validator>
     <description><![CDATA[Validate that the date entered is within a given restriction.]]></description>
     <display-name>validateDateRestriction</display-name>
@@ -34,9 +35,10 @@
       <property-name>invalidMonths</property-name>
       <property-class>java.lang.String[]</property-class>
       <property-extension>
-        <mfp:property-metadata>
-          <mfp:preferred>true</mfp:preferred>
-        </mfp:property-metadata>
+        <mfp:property-metadata/>
+        <fmd:property-metadata>
+          <fmd:preferred>true</fmd:preferred>
+        </fmd:property-metadata>
       </property-extension>
     </property>
     
@@ -48,9 +50,10 @@
       <property-name>invalidDaysOfWeek</property-name>
       <property-class>java.lang.String[]</property-class>
       <property-extension>
-        <mfp:property-metadata>
-          <mfp:preferred>true</mfp:preferred>
-        </mfp:property-metadata>
+        <mfp:property-metadata/>
+        <fmd:property-metadata>
+          <fmd:preferred>true</fmd:preferred>
+        </fmd:property-metadata>
       </property-extension>
     </property>
     
@@ -61,9 +64,10 @@
       <property-name>invalidDays</property-name>
       <property-class>org.apache.myfaces.trinidad.model.DateListProvider</property-class>
       <property-extension>
-        <mfp:property-metadata>
-          <mfp:preferred>true</mfp:preferred>
-        </mfp:property-metadata>
+        <mfp:property-metadata/>
+        <fmd:property-metadata>
+          <fmd:preferred>true</fmd:preferred>
+        </fmd:property-metadata>
       </property-extension>
     </property>
 

Modified: myfaces/trinidad/branches/1.2.11.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/validators/trinidad/DateTimeRange.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.11.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/validators/trinidad/DateTimeRange.xml?rev=780063&r1=780062&r2=780063&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.11.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/validators/trinidad/DateTimeRange.xml
(original)
+++ myfaces/trinidad/branches/1.2.11.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/validators/trinidad/DateTimeRange.xml
Fri May 29 18:47:21 2009
@@ -19,7 +19,8 @@
      
 --><faces-config version="1.2" xmlns="http://java.sun.com/xml/ns/javaee"
               xmlns:tr="http://myfaces.apache.org/trinidad"
-              xmlns:mfp="http://myfaces.apache.org/maven-faces-plugin">
+              xmlns:mfp="http://myfaces.apache.org/maven-faces-plugin"
+                 xmlns:fmd="http://java.sun.com/xml/ns/javaee/faces/design-time-metadata">
   <validator>
     <description><![CDATA[Validate that the date entered is within a given range.]]></description>
     <display-name>validateDateTimeRange</display-name>
@@ -38,9 +39,11 @@
       <property-class>java.util.Date</property-class>
       <property-extension>
         <mfp:property-metadata>
-          <mfp:preferred>true</mfp:preferred>
           <mfp:use-max-time>true</mfp:use-max-time>
         </mfp:property-metadata>
+        <fmd:property-metadata>
+          <fmd:preferred>true</fmd:preferred>
+        </fmd:property-metadata>
       </property-extension>
     </property>
     <property>
@@ -55,9 +58,10 @@
       <property-name>minimum</property-name>
       <property-class>java.util.Date</property-class>
       <property-extension>
-        <mfp:property-metadata>
-          <mfp:preferred>true</mfp:preferred>
-        </mfp:property-metadata>
+        <mfp:property-metadata/>
+        <fmd:property-metadata>
+          <fmd:preferred>true</fmd:preferred>
+        </fmd:property-metadata>
       </property-extension>
     </property>
     <property>

Modified: myfaces/trinidad/branches/1.2.11.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/validators/trinidad/DoubleRange.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.11.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/validators/trinidad/DoubleRange.xml?rev=780063&r1=780062&r2=780063&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.11.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/validators/trinidad/DoubleRange.xml
(original)
+++ myfaces/trinidad/branches/1.2.11.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/validators/trinidad/DoubleRange.xml
Fri May 29 18:47:21 2009
@@ -19,7 +19,8 @@
      
 --><faces-config version="1.2" xmlns="http://java.sun.com/xml/ns/javaee"
               xmlns:tr="http://myfaces.apache.org/trinidad"
-              xmlns:mfp="http://myfaces.apache.org/maven-faces-plugin">
+              xmlns:mfp="http://myfaces.apache.org/maven-faces-plugin"
+                 xmlns:fmd="http://java.sun.com/xml/ns/javaee/faces/design-time-metadata">
   <validator>
     <description><![CDATA[Validate that the date entered is within a given range.]]></description>
     <display-name>validateDoubleRange</display-name>
@@ -31,9 +32,10 @@
       <property-name>maximum</property-name>
       <property-class>double</property-class>
       <property-extension>
-        <mfp:property-metadata>
-          <mfp:preferred>true</mfp:preferred>
-        </mfp:property-metadata>
+        <mfp:property-metadata/>
+        <fmd:property-metadata>
+          <fmd:preferred>true</fmd:preferred>
+        </fmd:property-metadata>
       </property-extension>
     </property>
     <property>
@@ -42,9 +44,10 @@
       <property-name>minimum</property-name>
       <property-class>double</property-class>
       <property-extension>
-        <mfp:property-metadata>
-          <mfp:preferred>true</mfp:preferred>
-        </mfp:property-metadata>
+        <mfp:property-metadata/>
+        <fmd:property-metadata>
+          <fmd:preferred>true</fmd:preferred>
+        </fmd:property-metadata>
       </property-extension>
     </property>
     <property>

Modified: myfaces/trinidad/branches/1.2.11.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/validators/trinidad/Length.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.11.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/validators/trinidad/Length.xml?rev=780063&r1=780062&r2=780063&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.11.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/validators/trinidad/Length.xml
(original)
+++ myfaces/trinidad/branches/1.2.11.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/validators/trinidad/Length.xml
Fri May 29 18:47:21 2009
@@ -19,7 +19,8 @@
      
 --><faces-config version="1.2" xmlns="http://java.sun.com/xml/ns/javaee"
               xmlns:tr="http://myfaces.apache.org/trinidad"
-              xmlns:mfp="http://myfaces.apache.org/maven-faces-plugin">
+              xmlns:mfp="http://myfaces.apache.org/maven-faces-plugin"
+                 xmlns:fmd="http://java.sun.com/xml/ns/javaee/faces/design-time-metadata">
   <validator>
     <description><![CDATA[Validate that the string entered is of a given length.]]></description>
     <display-name>validateLength</display-name>
@@ -31,9 +32,10 @@
       <property-name>maximum</property-name>
       <property-class>int</property-class>
       <property-extension>
-        <mfp:property-metadata>
-          <mfp:preferred>true</mfp:preferred>
-        </mfp:property-metadata>
+        <mfp:property-metadata/>
+        <fmd:property-metadata>
+          <fmd:preferred>true</fmd:preferred>
+        </fmd:property-metadata>
       </property-extension>
     </property>
     <property>
@@ -42,9 +44,10 @@
       <property-name>minimum</property-name>
       <property-class>int</property-class>
       <property-extension>
-        <mfp:property-metadata>
-          <mfp:preferred>true</mfp:preferred>
-        </mfp:property-metadata>
+        <mfp:property-metadata/>
+        <fmd:property-metadata>
+          <fmd:preferred>true</fmd:preferred>
+        </fmd:property-metadata>
       </property-extension>
     </property>
     <property>

Modified: myfaces/trinidad/branches/1.2.11.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/validators/trinidad/LongRange.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.11.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/validators/trinidad/LongRange.xml?rev=780063&r1=780062&r2=780063&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.11.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/validators/trinidad/LongRange.xml
(original)
+++ myfaces/trinidad/branches/1.2.11.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/validators/trinidad/LongRange.xml
Fri May 29 18:47:21 2009
@@ -19,7 +19,8 @@
      
 --><faces-config version="1.2" xmlns="http://java.sun.com/xml/ns/javaee"
               xmlns:tr="http://myfaces.apache.org/trinidad"
-              xmlns:mfp="http://myfaces.apache.org/maven-faces-plugin">
+              xmlns:mfp="http://myfaces.apache.org/maven-faces-plugin"
+                 xmlns:fmd="http://java.sun.com/xml/ns/javaee/faces/design-time-metadata">
   <validator>
     <description><![CDATA[Validate that the date entered is within a given range.]]></description>
     <display-name>validateLongRange</display-name>
@@ -31,9 +32,10 @@
       <property-name>maximum</property-name>
       <property-class>long</property-class>
       <property-extension>
-        <mfp:property-metadata>
-          <mfp:preferred>true</mfp:preferred>
-        </mfp:property-metadata>
+        <mfp:property-metadata/>
+        <fmd:property-metadata>
+          <fmd:preferred>true</fmd:preferred>
+        </fmd:property-metadata>
       </property-extension>
     </property>
     <property>
@@ -42,9 +44,10 @@
       <property-name>minimum</property-name>
       <property-class>long</property-class>
       <property-extension>
-        <mfp:property-metadata>
-          <mfp:preferred>true</mfp:preferred>
-        </mfp:property-metadata>
+        <mfp:property-metadata/>
+        <fmd:property-metadata>
+          <fmd:preferred>true</fmd:preferred>
+        </fmd:property-metadata>
       </property-extension>
     </property>
     <property>

Modified: myfaces/trinidad/branches/1.2.11.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/validators/trinidad/RegExp.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.11.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/validators/trinidad/RegExp.xml?rev=780063&r1=780062&r2=780063&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.11.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/validators/trinidad/RegExp.xml
(original)
+++ myfaces/trinidad/branches/1.2.11.3-branch/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/validators/trinidad/RegExp.xml
Fri May 29 18:47:21 2009
@@ -20,7 +20,8 @@
 -->
 <faces-config version="1.2" xmlns="http://java.sun.com/xml/ns/javaee"
               xmlns:tr="http://myfaces.apache.org/trinidad"
-              xmlns:mfp="http://myfaces.apache.org/maven-faces-plugin">
+              xmlns:mfp="http://myfaces.apache.org/maven-faces-plugin"
+              xmlns:fmd="http://java.sun.com/xml/ns/javaee/faces/design-time-metadata">
   <validator>
     <description><![CDATA[Validate expression using Java regular expression syntax.
     If you want to match a metacharacter in a pattern, escape it with \\.
@@ -33,9 +34,10 @@
       <property-name>pattern</property-name>
       <property-class>java.lang.String</property-class>
       <property-extension>
-        <mfp:property-metadata>
-          <mfp:preferred>true</mfp:preferred>
-        </mfp:property-metadata>
+        <mfp:property-metadata/>
+        <fmd:property-metadata>
+          <fmd:preferred>true</fmd:preferred>
+        </fmd:property-metadata>
       </property-extension>
     </property>
     <property>

Modified: myfaces/trinidad/branches/1.2.11.3-branch/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/FacesConfigParser.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.11.3-branch/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/FacesConfigParser.java?rev=780063&r1=780062&r2=780063&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.11.3-branch/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/FacesConfigParser.java
(original)
+++ myfaces/trinidad/branches/1.2.11.3-branch/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/FacesConfigParser.java
Fri May 29 18:47:21 2009
@@ -325,7 +325,7 @@
       if ("property-name".equals(localName) ||
           "property-class".equals(localName) ||
           "default-value".equals(localName) ||
-          "attribute-values".equals(localName))
+          "property-values".equals(localName))
         return new StringParser();
       else if ("property-extension".equals(localName) ||
                "property-metadata".equals(localName))
@@ -380,7 +380,7 @@
             c = String.class;
           _property.defaultValue = Coercions.coerce(null, s, c);
         }
-        else if ("attribute-values".equals(localName))
+        else if ("property-values".equals(localName))
         {
           _property.enumValues = new ArrayList<Object>();
           String[] values = XMLUtils.parseNameTokens(s);



Mime
View raw message