You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lu...@apache.org on 2008/02/27 02:32:52 UTC
svn commit: r631458 - in
/myfaces/tomahawk/branches/1_2_0/build/src/main/resources/META-INF/maven-faces-plugin:
components/javax/faces/html/ components/org/apache/myfaces/custom/
components/org/apache/myfaces/html/ components/org/includes/custom/ compo...
Author: lu4242
Date: Tue Feb 26 17:32:49 2008
New Revision: 631458
URL: http://svn.apache.org/viewvc?rev=631458&view=rev
Log:
corrected id for validators, layout removed from javax and added to allow correct description
Added:
myfaces/tomahawk/branches/1_2_0/build/src/main/resources/META-INF/maven-faces-plugin/components/org/includes/custom/_LocationProperties.xml (with props)
Removed:
myfaces/tomahawk/branches/1_2_0/build/src/main/resources/META-INF/maven-faces-plugin/components/org/includes/html/ColspanProperty.xml
Modified:
myfaces/tomahawk/branches/1_2_0/build/src/main/resources/META-INF/maven-faces-plugin/components/javax/faces/html/HtmlPanelGroup.xml
myfaces/tomahawk/branches/1_2_0/build/src/main/resources/META-INF/maven-faces-plugin/components/org/apache/myfaces/custom/HtmlDataScroller.xml
myfaces/tomahawk/branches/1_2_0/build/src/main/resources/META-INF/maven-faces-plugin/components/org/apache/myfaces/custom/HtmlPanelLayout.xml
myfaces/tomahawk/branches/1_2_0/build/src/main/resources/META-INF/maven-faces-plugin/components/org/apache/myfaces/custom/HtmlPanelNavigationMenu.xml
myfaces/tomahawk/branches/1_2_0/build/src/main/resources/META-INF/maven-faces-plugin/components/org/apache/myfaces/html/HtmlPanelGroup.xml
myfaces/tomahawk/branches/1_2_0/build/src/main/resources/META-INF/maven-faces-plugin/validators/commons/CreditCard.xml
myfaces/tomahawk/branches/1_2_0/build/src/main/resources/META-INF/maven-faces-plugin/validators/commons/DateRestriction.xml
myfaces/tomahawk/branches/1_2_0/build/src/main/resources/META-INF/maven-faces-plugin/validators/commons/Email.xml
myfaces/tomahawk/branches/1_2_0/build/src/main/resources/META-INF/maven-faces-plugin/validators/commons/Equal.xml
myfaces/tomahawk/branches/1_2_0/build/src/main/resources/META-INF/maven-faces-plugin/validators/commons/RegExpr.xml
Modified: myfaces/tomahawk/branches/1_2_0/build/src/main/resources/META-INF/maven-faces-plugin/components/javax/faces/html/HtmlPanelGroup.xml
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/branches/1_2_0/build/src/main/resources/META-INF/maven-faces-plugin/components/javax/faces/html/HtmlPanelGroup.xml?rev=631458&r1=631457&r2=631458&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_2_0/build/src/main/resources/META-INF/maven-faces-plugin/components/javax/faces/html/HtmlPanelGroup.xml (original)
+++ myfaces/tomahawk/branches/1_2_0/build/src/main/resources/META-INF/maven-faces-plugin/components/javax/faces/html/HtmlPanelGroup.xml Tue Feb 26 17:32:49 2008
@@ -35,6 +35,9 @@
<xi:include href="../../../includes/html/StyleProperty.xml" xpointer="/faces-config/component/*"/>
<xi:include href="../../../includes/html/StyleClassProperty.xml" xpointer="/faces-config/component/*"/>
+ <!-- This property is used on other components that extends this
+ so it's better if we can define this property and description on
+ the class that needs instead (in tomahawk )
<property>
<description><![CDATA[The type of layout markup to use when rendering this group. If the value is "block"
the renderer must produce an HTML "div" element. Otherwise HTML "span" element must be produced.]]></description>
@@ -44,6 +47,7 @@
<mfp:required>false</mfp:required>
</property-extension>
</property>
+ -->
<component-extension>
<mfp:component-family>javax.faces.Panel</mfp:component-family>
Modified: myfaces/tomahawk/branches/1_2_0/build/src/main/resources/META-INF/maven-faces-plugin/components/org/apache/myfaces/custom/HtmlDataScroller.xml
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/branches/1_2_0/build/src/main/resources/META-INF/maven-faces-plugin/components/org/apache/myfaces/custom/HtmlDataScroller.xml?rev=631458&r1=631457&r2=631458&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_2_0/build/src/main/resources/META-INF/maven-faces-plugin/components/org/apache/myfaces/custom/HtmlDataScroller.xml (original)
+++ myfaces/tomahawk/branches/1_2_0/build/src/main/resources/META-INF/maven-faces-plugin/components/org/apache/myfaces/custom/HtmlDataScroller.xml Tue Feb 26 17:32:49 2008
@@ -30,6 +30,16 @@
<component-type>org.apache.myfaces.HtmlDataScroller</component-type>
<component-class>org.apache.myfaces.custom.datascroller.HtmlDataScroller</component-class>
+
+ <property>
+ <description><![CDATA[The layout this scroller should render with. Default is 'table', 'list' is implemented as well. Additionally you can use 'singleList' - then the data-scroller will render a list, but not the paginator - same with the value 'singleTable'.]]></description>
+ <property-name>layout</property-name>
+ <property-class>java.lang.String</property-class>
+ <property-extension>
+ <mfp:required>false</mfp:required>
+ </property-extension>
+ </property>
+
<property>
<description>Script to be invoked when the element is clicked.</description>
Modified: myfaces/tomahawk/branches/1_2_0/build/src/main/resources/META-INF/maven-faces-plugin/components/org/apache/myfaces/custom/HtmlPanelLayout.xml
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/branches/1_2_0/build/src/main/resources/META-INF/maven-faces-plugin/components/org/apache/myfaces/custom/HtmlPanelLayout.xml?rev=631458&r1=631457&r2=631458&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_2_0/build/src/main/resources/META-INF/maven-faces-plugin/components/org/apache/myfaces/custom/HtmlPanelLayout.xml (original)
+++ myfaces/tomahawk/branches/1_2_0/build/src/main/resources/META-INF/maven-faces-plugin/components/org/apache/myfaces/custom/HtmlPanelLayout.xml Tue Feb 26 17:32:49 2008
@@ -39,6 +39,24 @@
<xi:include href="../../../../includes/html/_EventHandlerProperties.xml" xpointer="/faces_config/component/*" />
<property>
+ <description><![CDATA[
+ <pre>
+ layout | header | navigation | body | footer
+ =================|========|============|=======|========
+ classic (Default)| top | left | right | bottom
+ navigationRight | top | right | left | bottom
+ upsideDown | bottom | left | right | top
+ </pre>
+ ]]>
+ </description>
+ <property-name>layout</property-name>
+ <property-class>java.lang.String</property-class>
+ <property-extension>
+ <mfp:required>false</mfp:required>
+ </property-extension>
+ </property>
+
+ <property>
<description></description>
<property-name>align</property-name>
<property-class>java.lang.String</property-class>
Modified: myfaces/tomahawk/branches/1_2_0/build/src/main/resources/META-INF/maven-faces-plugin/components/org/apache/myfaces/custom/HtmlPanelNavigationMenu.xml
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/branches/1_2_0/build/src/main/resources/META-INF/maven-faces-plugin/components/org/apache/myfaces/custom/HtmlPanelNavigationMenu.xml?rev=631458&r1=631457&r2=631458&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_2_0/build/src/main/resources/META-INF/maven-faces-plugin/components/org/apache/myfaces/custom/HtmlPanelNavigationMenu.xml (original)
+++ myfaces/tomahawk/branches/1_2_0/build/src/main/resources/META-INF/maven-faces-plugin/components/org/apache/myfaces/custom/HtmlPanelNavigationMenu.xml Tue Feb 26 17:32:49 2008
@@ -41,6 +41,17 @@
<!-- border, bgcolor, datafld, datasrc, frame, rules, summary, width-->
<xi:include href="../../../../includes/html/_TableProperties.xml" xpointer="/faces_config/component/*" />
+ <!--
+ <property>
+ <description><![CDATA['table' or 'list' Layout (default is 'table')]]></description>
+ <property-name>layout</property-name>
+ <property-class>java.lang.String</property-class>
+ <property-extension>
+ <mfp:required>false</mfp:required>
+ </property-extension>
+ </property>
+ -->
+
<property>
<description>HTML: Specifies the horizontal alignment of this element. Deprecated in HTML 4.01.</description>
<property-name>align</property-name>
Modified: myfaces/tomahawk/branches/1_2_0/build/src/main/resources/META-INF/maven-faces-plugin/components/org/apache/myfaces/html/HtmlPanelGroup.xml
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/branches/1_2_0/build/src/main/resources/META-INF/maven-faces-plugin/components/org/apache/myfaces/html/HtmlPanelGroup.xml?rev=631458&r1=631457&r2=631458&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_2_0/build/src/main/resources/META-INF/maven-faces-plugin/components/org/apache/myfaces/html/HtmlPanelGroup.xml (original)
+++ myfaces/tomahawk/branches/1_2_0/build/src/main/resources/META-INF/maven-faces-plugin/components/org/apache/myfaces/html/HtmlPanelGroup.xml Tue Feb 26 17:32:49 2008
@@ -39,6 +39,16 @@
<xi:include href="../../../includes/html/_DisplayValueOnlyProperties.xml" xpointer="/faces-config/component/*"/>
<xi:include href="../../../includes/html/ColspanProperty.xml" xpointer="/faces-config/component/*"/>
+ <property>
+ <description><![CDATA[The type of layout markup to use when rendering this group. If the value is "block"
+the renderer must produce an HTML "div" element. Otherwise HTML "span" element must be produced.]]></description>
+ <property-name>layout</property-name>
+ <property-class>java.lang.String</property-class>
+ <property-extension>
+ <mfp:required>false</mfp:required>
+ </property-extension>
+ </property>
+
<component-extension>
<!--for the Component generation-->
<mfp:component-family>javax.faces.Panel</mfp:component-family>
Added: myfaces/tomahawk/branches/1_2_0/build/src/main/resources/META-INF/maven-faces-plugin/components/org/includes/custom/_LocationProperties.xml
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/branches/1_2_0/build/src/main/resources/META-INF/maven-faces-plugin/components/org/includes/custom/_LocationProperties.xml?rev=631458&view=auto
==============================================================================
--- myfaces/tomahawk/branches/1_2_0/build/src/main/resources/META-INF/maven-faces-plugin/components/org/includes/custom/_LocationProperties.xml (added)
+++ myfaces/tomahawk/branches/1_2_0/build/src/main/resources/META-INF/maven-faces-plugin/components/org/includes/custom/_LocationProperties.xml Tue Feb 26 17:32:49 2008
@@ -0,0 +1,46 @@
+<?xml version="1.0" ?>
+<!--
+ Copyright 2006 The Apache Software Foundation.
+
+ Licensed 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.
+-->
+<faces-config version="1.2" xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:mfp="http://myfaces.apache.org/maven-faces-plugin"
+ xmlns:xi="http://www.w3.org/2001/XInclude">
+ <component>
+ <property>
+ <description>An alternate location to find javascript resources. If no values is specified, javascript will be loaded from the resources directory using AddResource and ExtensionsFilter.</description>
+ <property-name>javascriptLocation</property-name>
+ <property-class>java.lang.String</property-class>
+ <property-extension>
+ <mfp:required>false</mfp:required>
+ </property-extension>
+ </property>
+ <property>
+ <description>An alternate location to find image resources. If no values is specified, images will be loaded from the resources directory using AddResource and ExtensionsFilter.</description>
+ <property-name>imageLocation</property-name>
+ <property-class>java.lang.String</property-class>
+ <property-extension>
+ <mfp:required>false</mfp:required>
+ </property-extension>
+ </property>
+ <property>
+ <description>An alternate location to find stylesheet resources. If no values is specified, stylesheets will be loaded from the resources directory using AddResource and ExtensionsFilter.</description>
+ <property-name>styleLocation</property-name>
+ <property-class>java.lang.String</property-class>
+ <property-extension>
+ <mfp:required>false</mfp:required>
+ </property-extension>
+ </property>
+ </component>
+</faces-config>
Propchange: myfaces/tomahawk/branches/1_2_0/build/src/main/resources/META-INF/maven-faces-plugin/components/org/includes/custom/_LocationProperties.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tomahawk/branches/1_2_0/build/src/main/resources/META-INF/maven-faces-plugin/components/org/includes/custom/_LocationProperties.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: myfaces/tomahawk/branches/1_2_0/build/src/main/resources/META-INF/maven-faces-plugin/validators/commons/CreditCard.xml
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/branches/1_2_0/build/src/main/resources/META-INF/maven-faces-plugin/validators/commons/CreditCard.xml?rev=631458&r1=631457&r2=631458&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_2_0/build/src/main/resources/META-INF/maven-faces-plugin/validators/commons/CreditCard.xml (original)
+++ myfaces/tomahawk/branches/1_2_0/build/src/main/resources/META-INF/maven-faces-plugin/validators/commons/CreditCard.xml Tue Feb 26 17:32:49 2008
@@ -25,7 +25,7 @@
<validator>
<description><![CDATA[Validate that the string entered is an CreditCard.]]></description>
<display-name>validateCreditCard</display-name>
- <validator-id>org.apache.myfaces.commons.validator.CreditCard</validator-id>
+ <validator-id>org.apache.myfaces.validator.CreditCard</validator-id>
<validator-class>org.apache.myfaces.commons.validator.CreditCardValidator</validator-class>
<property>
<description><![CDATA[<p>
Modified: myfaces/tomahawk/branches/1_2_0/build/src/main/resources/META-INF/maven-faces-plugin/validators/commons/DateRestriction.xml
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/branches/1_2_0/build/src/main/resources/META-INF/maven-faces-plugin/validators/commons/DateRestriction.xml?rev=631458&r1=631457&r2=631458&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_2_0/build/src/main/resources/META-INF/maven-faces-plugin/validators/commons/DateRestriction.xml (original)
+++ myfaces/tomahawk/branches/1_2_0/build/src/main/resources/META-INF/maven-faces-plugin/validators/commons/DateRestriction.xml Tue Feb 26 17:32:49 2008
@@ -25,7 +25,7 @@
<validator>
<description><![CDATA[Validate that the date entered is within a given restriction.]]></description>
<display-name>validateDateRestriction</display-name>
- <validator-id>org.apache.myfaces.commons.validator.DateRestriction</validator-id>
+ <validator-id>org.apache.myfaces.validator.DateRestriction</validator-id>
<validator-class>org.apache.myfaces.commons.validator.DateRestrictionValidator</validator-class>
<property>
<description><![CDATA[<p>
Modified: myfaces/tomahawk/branches/1_2_0/build/src/main/resources/META-INF/maven-faces-plugin/validators/commons/Email.xml
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/branches/1_2_0/build/src/main/resources/META-INF/maven-faces-plugin/validators/commons/Email.xml?rev=631458&r1=631457&r2=631458&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_2_0/build/src/main/resources/META-INF/maven-faces-plugin/validators/commons/Email.xml (original)
+++ myfaces/tomahawk/branches/1_2_0/build/src/main/resources/META-INF/maven-faces-plugin/validators/commons/Email.xml Tue Feb 26 17:32:49 2008
@@ -25,7 +25,7 @@
<validator>
<description><![CDATA[Validate that the string entered is an email.]]></description>
<display-name>validateEmail</display-name>
- <validator-id>org.apache.myfaces.commons.validator.Email</validator-id>
+ <validator-id>org.apache.myfaces.validator.Email</validator-id>
<validator-class>org.apache.myfaces.commons.validator.EmailValidator</validator-class>
<property>
<description><![CDATA[<p>
Modified: myfaces/tomahawk/branches/1_2_0/build/src/main/resources/META-INF/maven-faces-plugin/validators/commons/Equal.xml
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/branches/1_2_0/build/src/main/resources/META-INF/maven-faces-plugin/validators/commons/Equal.xml?rev=631458&r1=631457&r2=631458&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_2_0/build/src/main/resources/META-INF/maven-faces-plugin/validators/commons/Equal.xml (original)
+++ myfaces/tomahawk/branches/1_2_0/build/src/main/resources/META-INF/maven-faces-plugin/validators/commons/Equal.xml Tue Feb 26 17:32:49 2008
@@ -25,7 +25,7 @@
<validator>
<description><![CDATA[A validator for validations against foreign component values.]]></description>
<display-name>validateEqual</display-name>
- <validator-id>org.apache.myfaces.commons.validator.Equal</validator-id>
+ <validator-id>org.apache.myfaces.validator.Equal</validator-id>
<validator-class>org.apache.myfaces.commons.validator.EqualValidator</validator-class>
<property>
<description><![CDATA[<p>
Modified: myfaces/tomahawk/branches/1_2_0/build/src/main/resources/META-INF/maven-faces-plugin/validators/commons/RegExpr.xml
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/branches/1_2_0/build/src/main/resources/META-INF/maven-faces-plugin/validators/commons/RegExpr.xml?rev=631458&r1=631457&r2=631458&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_2_0/build/src/main/resources/META-INF/maven-faces-plugin/validators/commons/RegExpr.xml (original)
+++ myfaces/tomahawk/branches/1_2_0/build/src/main/resources/META-INF/maven-faces-plugin/validators/commons/RegExpr.xml Tue Feb 26 17:32:49 2008
@@ -25,7 +25,7 @@
<validator>
<description><![CDATA[A validator for reg. expr., based upons Jakarta Commons.]]></description>
<display-name>validateRegExpr</display-name>
- <validator-id>org.apache.myfaces.commons.validator.RegExpr</validator-id>
+ <validator-id>org.apache.myfaces.validator.RegExpr</validator-id>
<validator-class>org.apache.myfaces.commons.validator.RegExprValidator</validator-class>
<property>
<description><![CDATA[<p>